Roy Golan has uploaded a new change for review.
Change subject: core: Add Windows 8/2012 to VM OS list
......................................................................
core: Add Windows 8/2012 to VM OS list
Change-Id: I21be8a69feddc89adcc671e307a96e4dd7897993
Signed-off-by: Roy Golan <rgo...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmOsType.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
M
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/OsType.java
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java
M
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
M
frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
8 files changed, 98 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/9530/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmOsType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmOsType.java
index 67d0dde..fcd4edd 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmOsType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmOsType.java
@@ -21,7 +21,11 @@
Windows2008x64(16, OsType.Windows, true),
Windows2008R2x64(17, OsType.Windows, true),
RHEL6(18, OsType.Linux, false),
- RHEL6x64(19, OsType.Linux, true);
+ RHEL6x64(19, OsType.Linux, true),
+ Windows8(20, OsType.Windows, false),
+ Windows8x64(21, OsType.Windows, true),
+ Windows2012(22, OsType.Windows, false),
+ Windows2012x64(23, OsType.Windows, true);
private final int intValue;
private final OsType osType;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
index 6a46b74..b762537 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
@@ -1559,6 +1559,38 @@
@DefaultValueAttribute("300")
GlusterRefreshRateHeavy(396),
+ @TypeConverterAttribute(String.class)
+ @DefaultValueAttribute("")
+ SysPrepWindows8Path(397),
+
+ @TypeConverterAttribute(String.class)
+ @DefaultValueAttribute("")
+ ProductKeyWindows8(398),
+
+ @TypeConverterAttribute(String.class)
+ @DefaultValueAttribute("")
+ SysPrepWindows8x64Path(399),
+
+ @TypeConverterAttribute(String.class)
+ @DefaultValueAttribute("")
+ ProductKeyWindows8x64(400),
+
+ @TypeConverterAttribute(String.class)
+ @DefaultValueAttribute("")
+ SysPrepWindows2012Path(401),
+
+ @TypeConverterAttribute(String.class)
+ @DefaultValueAttribute("")
+ ProductKeyWindows2012(402),
+
+ @TypeConverterAttribute(String.class)
+ @DefaultValueAttribute("")
+ SysPrepWindows2012x64Path(403),
+
+ @TypeConverterAttribute(String.class)
+ @DefaultValueAttribute("")
+ ProductKeyWindows2012x64(404),
+
Invalid(65535);
private int intValue;
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/OsType.java
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/OsType.java
index 7adfdc3..6542326 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/OsType.java
+++
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/OsType.java
@@ -35,7 +35,11 @@
WINDOWS_2008X64,
WINDOWS_2008R2,
RHEL_6,
- RHEL_6X64;
+ RHEL_6X64,
+ WINDOWS_8,
+ WINDOWS_8X64,
+ WINDOWS_2012,
+ WINDOWS_2012X64;
public String value() {
return name().toLowerCase();
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
index 81cd791..1eda79c 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
@@ -808,6 +808,14 @@
return OsType.RHEL_6;
case RHEL6x64:
return OsType.RHEL_6X64;
+ case Windows8:
+ return OsType.WINDOWS_8;
+ case Windows8x64:
+ return OsType.WINDOWS_8X64;
+ case Windows2012:
+ return OsType.WINDOWS_2012;
+ case Windows2012x64:
+ return OsType.WINDOWS_2012X64;
default:
return null;
@@ -855,6 +863,10 @@
return VmOsType.RHEL6;
case RHEL_6X64:
return VmOsType.RHEL6x64;
+ case WINDOWS_8:
+ return VmOsType.Windows8;
+ case WINDOWS_8X64:
+ return VmOsType.Windows8x64;
default:
return null;
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
index 79a5318..3a3287d 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
@@ -105,6 +105,36 @@
sysPrepContent = replace(sysPrepContent, "$ProductKey$",
Config.<String> GetValue(ConfigValues.ProductKeyWindow7x64));
break;
+ case Windows8:
+ sysPrepContent = LoadFile(Config.<String>
GetValue(ConfigValues.SysPrepWindows8Path));
+ sysPrepContent =
+ replace(sysPrepContent, "$ProductKey$", Config.<String>
GetValue(ConfigValues.ProductKeyWindows8));
+ break;
+
+ case Windows8x64:
+ sysPrepContent = LoadFile(Config.<String>
GetValue(ConfigValues.SysPrepWindows8x64Path));
+ sysPrepContent =
+ replace(sysPrepContent,
+ "$ProductKey$",
+ Config.<String>
GetValue(ConfigValues.ProductKeyWindows8x64));
+ break;
+
+ case Windows2012:
+ sysPrepContent = LoadFile(Config.<String>
GetValue(ConfigValues.SysPrepWindows2012Path));
+ sysPrepContent =
+ replace(sysPrepContent,
+ "$ProductKey$",
+ Config.<String>
GetValue(ConfigValues.ProductKeyWindows2012));
+ break;
+
+ case Windows2012x64:
+ sysPrepContent = LoadFile(Config.<String>
GetValue(ConfigValues.SysPrepWindows2012x64Path));
+ sysPrepContent =
+ replace(sysPrepContent,
+ "$ProductKey$",
+ Config.<String>
GetValue(ConfigValues.ProductKeyWindows2012x64));
+ break;
+
default:
break;
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java
index 645b9a3..d28157c 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java
@@ -2533,17 +2533,13 @@
// return new List<VmOsType>();
/***** TODO: remove once the gwt is using generic api instead of
backend! *****/
- windowsOsTypes =
- new ArrayList<VmOsType>(Arrays.asList(new VmOsType[] {
- VmOsType.Windows2003,
- VmOsType.Windows2003x64,
- VmOsType.Windows2008,
- VmOsType.Windows2008R2x64,
- VmOsType.Windows2008x64,
- VmOsType.Windows7,
- VmOsType.Windows7x64,
- VmOsType.WindowsXP
- }));
+ windowsOsTypes = new ArrayList<VmOsType>();
+
+ for (VmOsType type : VmOsType.values()) {
+ if (type.isWindows()) {
+ windowsOsTypes.add(type);
+ }
+ }
return windowsOsTypes;
/*******************************************************************************/
diff --git
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
index 190cf26..b491def 100644
---
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
+++
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
@@ -115,6 +115,10 @@
String VmOsType___Windows7x64();
+ String VmOsType___Windows8();
+
+ String VmOsType___Windows8x64();
+
String VmOsType___OtherLinux();
String VmOsType___Other();
diff --git
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
index 055a4e1..bdf0d4d 100644
---
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
+++
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
@@ -55,6 +55,8 @@
VmOsType___Windows2008R2x64=Windows 2008 R2
VmOsType___Windows7=Windows 7
VmOsType___Windows7x64=Windows 7 x64
+VmOsType___Windows8=Windows 8
+VmOsType___Windows8x64=Windows 8 x64
VmOsType___OtherLinux=Other Linux
VmOsType___Other=Other
VmOsType___RHEL6=Red Hat Enterprise Linux 6.x
@@ -174,4 +176,4 @@
JobExecutionStatus___FINISHED=Finished
JobExecutionStatus___FAILED=Failed
JobExecutionStatus___ABORTED=Aborted
-JobExecutionStatus___UNKNOWN=Unknown
\ No newline at end of file
+JobExecutionStatus___UNKNOWN=Unknown
--
To view, visit http://gerrit.ovirt.org/9530
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21be8a69feddc89adcc671e307a96e4dd7897993
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Roy Golan <rgo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
