cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From likit...@apache.org
Subject [2/7] git commit: updated refs/heads/master to 5c36766
Date Fri, 09 Aug 2013 13:37:32 GMT
CLOUDSTACK-2448: XenServer Guest OS Mapping Corrections.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d95e3dac
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d95e3dac
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d95e3dac

Branch: refs/heads/master
Commit: d95e3dacd6ab6dba3d6e3bff0b0b9b0dc462648a
Parents: ec669ff
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Authored: Thu Aug 8 12:58:49 2013 +0530
Committer: Likitha Shetty <likitha.shetty@citrix.com>
Committed: Fri Aug 9 18:49:02 2013 +0530

----------------------------------------------------------------------
 .../hypervisor/xen/resource/CitrixHelper.java   | 48 ++++++++++++++++++--
 1 file changed, 45 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d95e3dac/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
index eec957b..ed890ef 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
@@ -111,6 +111,12 @@ public class CitrixHelper {
         _xcp100GuestOsMap.put("Windows 7 (64-bit)", "Windows 7 (64-bit)");
         _xcp100GuestOsMap.put("Windows Server 2003 (32-bit)", "Windows Server 2003 (32-bit)");
         _xcp100GuestOsMap.put("Windows Server 2003 (64-bit)", "Windows Server 2003 (64-bit)");
+        _xcp100GuestOsMap.put("Windows Server 2003 Enterprise Edition(32-bit)", "Windows
Server 2003 (32-bit)");
+        _xcp100GuestOsMap.put("Windows Server 2003 Enterprise Edition(64-bit)", "Windows
Server 2003 (64-bit)");
+        _xcp100GuestOsMap.put("Windows Server 2003 DataCenter Edition(32-bit)", "Windows
Server 2003 (32-bit)");
+        _xcp100GuestOsMap.put("Windows Server 2003 DataCenter Edition(64-bit)", "Windows
Server 2003 (64-bit)");
+        _xcp100GuestOsMap.put("Windows Server 2003 Standard Edition(32-bit)", "Windows Server
2003 (32-bit)");
+        _xcp100GuestOsMap.put("Windows Server 2003 Standard Edition(64-bit)", "Windows Server
2003 (64-bit)");
         _xcp100GuestOsMap.put("Windows Server 2008 (32-bit)", "Windows Server 2008 (32-bit)");
         _xcp100GuestOsMap.put("Windows Server 2008 (64-bit)", "Windows Server 2008 (64-bit)");
         _xcp100GuestOsMap.put("Windows Server 2008 R2 (64-bit)", "Windows Server 2008 R2
(64-bit)");
@@ -141,6 +147,16 @@ public class CitrixHelper {
         _xcp160GuestOsMap.put("CentOS 5.4 (64-bit)", "CentOS 5 (64-bit)");
         _xcp160GuestOsMap.put("CentOS 5.5 (32-bit)", "CentOS 5 (32-bit)");
         _xcp160GuestOsMap.put("CentOS 5.5 (64-bit)", "CentOS 5 (64-bit)");
+        _xcp160GuestOsMap.put("CentOS 5.6 (32-bit)", "CentOS 5 (32-bit)");
+        _xcp160GuestOsMap.put("CentOS 5.6 (64-bit)", "CentOS 5 (64-bit)");
+        _xcp160GuestOsMap.put("CentOS 5.7 (32-bit)", "CentOS 5 (32-bit)");
+        _xcp160GuestOsMap.put("CentOS 5.7 (64-bit)", "CentOS 5 (64-bit)");
+        _xcp160GuestOsMap.put("CentOS 6.0 (32-bit)", "CentOS 6 (32-bit)");
+        _xcp160GuestOsMap.put("CentOS 6.0 (64-bit)", "CentOS 6 (64-bit)");
+        _xcp160GuestOsMap.put("CentOS 6.1 (32-bit)", "CentOS 6 (32-bit)");
+        _xcp160GuestOsMap.put("CentOS 6.1 (64-bit)", "CentOS 6 (64-bit)");
+        _xcp160GuestOsMap.put("CentOS 6.2 (32-bit)", "CentOS 6 (32-bit)");
+        _xcp160GuestOsMap.put("CentOS 6.2 (64-bit)", "CentOS 6 (64-bit)");
         _xcp160GuestOsMap.put("Debian GNU/Linux 5.0 (32-bit)", "Debian Lenny 5.0 (32-bit)");
         _xcp160GuestOsMap.put("Debian GNU/Linux 6(32-bit)", "Debian Squeeze 6.0 (32-bit)");
         _xcp160GuestOsMap.put("Debian GNU/Linux 6(64-bit)", "Debian Squeeze 6.0 (64-bit)");
@@ -158,6 +174,16 @@ public class CitrixHelper {
         _xcp160GuestOsMap.put("Oracle Enterprise Linux 5.4 (64-bit)", "Oracle Enterprise
Linux 5 (64-bit)");
         _xcp160GuestOsMap.put("Oracle Enterprise Linux 5.5 (32-bit)", "Oracle Enterprise
Linux 5 (32-bit)");
         _xcp160GuestOsMap.put("Oracle Enterprise Linux 5.5 (64-bit)", "Oracle Enterprise
Linux 5 (64-bit)");
+        _xcp160GuestOsMap.put("Oracle Enterprise Linux 5.6 (32-bit)", "Oracle Enterprise
Linux 5 (32-bit)");
+        _xcp160GuestOsMap.put("Oracle Enterprise Linux 5.6 (64-bit)", "Oracle Enterprise
Linux 5 (64-bit)");
+        _xcp160GuestOsMap.put("Oracle Enterprise Linux 5.7 (32-bit)", "Oracle Enterprise
Linux 5 (32-bit)");
+        _xcp160GuestOsMap.put("Oracle Enterprise Linux 5.7 (64-bit)", "Oracle Enterprise
Linux 5 (64-bit)");
+        _xcp160GuestOsMap.put("Oracle Enterprise Linux 6.0 (32-bit)", "Oracle Enterprise
Linux 6 (32-bit)");
+        _xcp160GuestOsMap.put("Oracle Enterprise Linux 6.0 (64-bit)", "Oracle Enterprise
Linux 6 (64-bit)");
+        _xcp160GuestOsMap.put("Oracle Enterprise Linux 6.1 (32-bit)", "Oracle Enterprise
Linux 6 (32-bit)");
+        _xcp160GuestOsMap.put("Oracle Enterprise Linux 6.1 (64-bit)", "Oracle Enterprise
Linux 6 (64-bit)");
+        _xcp160GuestOsMap.put("Oracle Enterprise Linux 6.2 (32-bit)", "Oracle Enterprise
Linux 6 (32-bit)");
+        _xcp160GuestOsMap.put("Oracle Enterprise Linux 6.2 (64-bit)", "Oracle Enterprise
Linux 6 (64-bit)");
         _xcp160GuestOsMap.put("Red Hat Enterprise Linux 4.5 (32-bit)", "Red Hat Enterprise
Linux 4.5 (32-bit)");
         _xcp160GuestOsMap.put("Red Hat Enterprise Linux 4.6 (32-bit)", "Red Hat Enterprise
Linux 4.6 (32-bit)");
         _xcp160GuestOsMap.put("Red Hat Enterprise Linux 4.7 (32-bit)", "Red Hat Enterprise
Linux 4.7 (32-bit)");
@@ -174,8 +200,16 @@ public class CitrixHelper {
         _xcp160GuestOsMap.put("Red Hat Enterprise Linux 5.4 (64-bit)", "Red Hat Enterprise
Linux 5 (64-bit)");
         _xcp160GuestOsMap.put("Red Hat Enterprise Linux 5.5 (32-bit)", "Red Hat Enterprise
Linux 5 (32-bit)");
         _xcp160GuestOsMap.put("Red Hat Enterprise Linux 5.5 (64-bit)", "Red Hat Enterprise
Linux 5 (64-bit)");
+        _xcp160GuestOsMap.put("Red Hat Enterprise Linux 5.6 (32-bit)", "Red Hat Enterprise
Linux 5 (32-bit)");
+        _xcp160GuestOsMap.put("Red Hat Enterprise Linux 5.6 (64-bit)", "Red Hat Enterprise
Linux 5 (64-bit)");
+        _xcp160GuestOsMap.put("Red Hat Enterprise Linux 5.7 (32-bit)", "Red Hat Enterprise
Linux 5 (32-bit)");
+        _xcp160GuestOsMap.put("Red Hat Enterprise Linux 5.7 (64-bit)", "Red Hat Enterprise
Linux 5 (64-bit)");
         _xcp160GuestOsMap.put("Red Hat Enterprise Linux 6.0 (32-bit)", "Red Hat Enterprise
Linux 6 (32-bit)");
         _xcp160GuestOsMap.put("Red Hat Enterprise Linux 6.0 (64-bit)", "Red Hat Enterprise
Linux 6 (64-bit)");
+        _xcp160GuestOsMap.put("Red Hat Enterprise Linux 6.1 (32-bit)", "Red Hat Enterprise
Linux 6 (32-bit)");
+        _xcp160GuestOsMap.put("Red Hat Enterprise Linux 6.1 (64-bit)", "Red Hat Enterprise
Linux 6 (64-bit)");
+        _xcp160GuestOsMap.put("Red Hat Enterprise Linux 6.2 (32-bit)", "Red Hat Enterprise
Linux 6 (32-bit)");
+        _xcp160GuestOsMap.put("Red Hat Enterprise Linux 6.2 (64-bit)", "Red Hat Enterprise
Linux 6 (64-bit)");
         _xcp160GuestOsMap.put("SUSE Linux Enterprise Server 9 SP4 (32-bit)", "SUSE Linux
Enterprise Server 9 SP4");
         _xcp160GuestOsMap.put("SUSE Linux Enterprise Server 10 SP1 (32-bit)", "SUSE Linux
Enterprise Server 10 SP1");
         _xcp160GuestOsMap.put("SUSE Linux Enterprise Server 10 SP1 (64-bit)", "SUSE Linux
Enterprise Server 10 SP1 x64");
@@ -190,13 +224,21 @@ public class CitrixHelper {
         _xcp160GuestOsMap.put("Windows 7 (64-bit)", "Windows 7 (64-bit)");
         _xcp160GuestOsMap.put("Windows Server 2003 (32-bit)", "Windows Server 2003 (32-bit)");
         _xcp160GuestOsMap.put("Windows Server 2003 (64-bit)", "Windows Server 2003 (64-bit)");
+        _xcp160GuestOsMap.put("Windows Server 2003 Enterprise Edition(32-bit)", "Windows
Server 2003 (32-bit)");
+        _xcp160GuestOsMap.put("Windows Server 2003 Enterprise Edition(64-bit)", "Windows
Server 2003 (64-bit)");
+        _xcp160GuestOsMap.put("Windows Server 2003 DataCenter Edition(32-bit)", "Windows
Server 2003 (32-bit)");
+        _xcp160GuestOsMap.put("Windows Server 2003 DataCenter Edition(64-bit)", "Windows
Server 2003 (64-bit)");
+        _xcp160GuestOsMap.put("Windows Server 2003 Standard Edition(32-bit)", "Windows Server
2003 (32-bit)");
+        _xcp160GuestOsMap.put("Windows Server 2003 Standard Edition(64-bit)", "Windows Server
2003 (64-bit)");
         _xcp160GuestOsMap.put("Windows Server 2008 (32-bit)", "Windows Server 2008 (32-bit)");
         _xcp160GuestOsMap.put("Windows Server 2008 (64-bit)", "Windows Server 2008 (64-bit)");
         _xcp160GuestOsMap.put("Windows Server 2008 R2 (64-bit)", "Windows Server 2008 R2
(64-bit)");
         _xcp160GuestOsMap.put("Windows XP SP3 (32-bit)", "Windows XP SP3 (32-bit)");
         _xcp160GuestOsMap.put("Windows Vista (32-bit)", "Windows Vista (32-bit)");
-        _xcp160GuestOsMap.put("Ubuntu 10.04 (32-bit)", "Ubuntu Lucid Lynx 10.04 (32-bit)
(experimental)");
-        _xcp160GuestOsMap.put("Ubuntu 10.04 (64-bit)", "Ubuntu Lucid Lynx 10.04 (64-bit)
(experimental)");
+        _xcp160GuestOsMap.put("Ubuntu 10.04 (32-bit)", "Ubuntu Lucid Lynx 10.04 (32-bit)");
+        _xcp160GuestOsMap.put("Ubuntu 10.04 (64-bit)", "Ubuntu Lucid Lynx 10.04 (64-bit)");
+        _xcp160GuestOsMap.put("Ubuntu 12.04 (32-bit)", "Ubuntu Precise Pangolin 12.04 (32-bit)");
+        _xcp160GuestOsMap.put("Ubuntu 12.04 (64-bit)", "Ubuntu Precise Pangolin 12.04 (64-bit)");
         _xcp160GuestOsMap.put("Other Linux (32-bit)", "Other install media");
         _xcp160GuestOsMap.put("Other Linux (64-bit)", "Other install media");
         _xcp160GuestOsMap.put("Other PV (32-bit)", "CentOS 5 (32-bit)");
@@ -1026,7 +1068,7 @@ public class CitrixHelper {
         _xenServer602GuestOsMap.put("Windows 7 (32-bit)", "Windows 7 (32-bit)");
         _xenServer602GuestOsMap.put("Windows 7 (64-bit)", "Windows 7 (64-bit)");
         _xenServer602GuestOsMap.put("Windows 8 (32-bit)", "Windows 8 (32-bit) (experimental)");
-        _xenServer602GuestOsMap.put("Windows 8 (64-bit)", "Windows 7 (64-bit) (experimental)");
+        _xenServer602GuestOsMap.put("Windows 8 (64-bit)", "Windows 8 (64-bit) (experimental)");
         _xenServer602GuestOsMap.put("Windows Server 2003 (32-bit)", "Windows Server 2003
(32-bit)");
         _xenServer602GuestOsMap.put("Windows Server 2003 (64-bit)", "Windows Server 2003
(64-bit)");
         _xenServer602GuestOsMap.put("Windows Server 2003 PAE (32-bit)", "Windows Server 2003
PAE (32-bit)");


Mime
View raw message