cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject git commit: refs/heads/4.1 - CLOUDSTACK-1620: getXenServer602GuestOsType -> getXenServer610GuestOsType Fixing XenServer 6.1 OS types incompatible with XS6.0
Date Mon, 11 Mar 2013 14:00:07 GMT
Updated Branches:
  refs/heads/4.1 b8a16856f -> 29ec31c64


CLOUDSTACK-1620: getXenServer602GuestOsType -> getXenServer610GuestOsType Fixing XenServer
6.1 OS types incompatible with XS6.0


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

Branch: refs/heads/4.1
Commit: 29ec31c645cbf0fce73f4818a9b53e836d7e6835
Parents: b8a1685
Author: Dennis Lawler <dlawler@gmail.com>
Authored: Sun Mar 10 12:16:37 2013 -0700
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Mon Mar 11 09:54:54 2013 -0400

----------------------------------------------------------------------
 .../hypervisor/xen/resource/CitrixHelper.java      |   41 ++++++++-------
 .../xen/resource/XenServer610Resource.java         |    2 +-
 2 files changed, 22 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/29ec31c6/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 1b8496f..828a827 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
@@ -576,13 +576,12 @@ public class CitrixHelper {
         _xenServer610GuestOsMap.put("CentOS 5.6 (64-bit)", "CentOS 5 (64-bit)");
         _xenServer610GuestOsMap.put("CentOS 5.7 (32-bit)", "CentOS 5 (32-bit)");
         _xenServer610GuestOsMap.put("CentOS 5.7 (64-bit)", "CentOS 5 (64-bit)");
-        _xenServer610GuestOsMap.put("CentOS 6.0 (32-bit)", "CentOS 6.0 (32-bit)");
-        _xenServer610GuestOsMap.put("CentOS 6.0 (64-bit)", "CentOS 6.0 (64-bit)");
-        _xenServer610GuestOsMap.put("CentOS 6.1 (32-bit)", "CentOS 6.1 (32-bit)");
-        _xenServer610GuestOsMap.put("CentOS 6.1 (64-bit)", "CentOS 6.1 (64-bit)");
-        _xenServer610GuestOsMap.put("CentOS 6.2 (32-bit)", "CentOS 6.2 (32-bit)");
-        _xenServer610GuestOsMap.put("CentOS 6.2 (64-bit)", "CentOS 6.2 (64-bit)");
-        _xenServer610GuestOsMap.put("Debian GNU/Linux 5.0 (32-bit)", "Debian Lenny 5.0 (32-bit)");
+        _xenServer610GuestOsMap.put("CentOS 6.0 (32-bit)", "CentOS 6 (32-bit)");
+        _xenServer610GuestOsMap.put("CentOS 6.0 (64-bit)", "CentOS 6 (64-bit)");
+        _xenServer610GuestOsMap.put("CentOS 6.1 (32-bit)", "CentOS 6 (32-bit)");
+        _xenServer610GuestOsMap.put("CentOS 6.1 (64-bit)", "CentOS 6 (64-bit)");
+        _xenServer610GuestOsMap.put("CentOS 6.2 (32-bit)", "CentOS 6 (32-bit)");
+        _xenServer610GuestOsMap.put("CentOS 6.2 (64-bit)", "CentOS 6 (64-bit)");
         _xenServer610GuestOsMap.put("Debian GNU/Linux 6(32-bit)", "Debian Squeeze 6.0 (32-bit)");
         _xenServer610GuestOsMap.put("Debian GNU/Linux 6(64-bit)", "Debian Squeeze 6.0 (64-bit)");
         _xenServer610GuestOsMap.put("Oracle Enterprise Linux 5.0 (32-bit)", "Oracle Enterprise
Linux 5 (32-bit)");
@@ -601,12 +600,12 @@ public class CitrixHelper {
         _xenServer610GuestOsMap.put("Oracle Enterprise Linux 5.6 (64-bit)", "Oracle Enterprise
Linux 5 (64-bit)");
         _xenServer610GuestOsMap.put("Oracle Enterprise Linux 5.7 (32-bit)", "Oracle Enterprise
Linux 5 (32-bit)");
         _xenServer610GuestOsMap.put("Oracle Enterprise Linux 5.7 (64-bit)", "Oracle Enterprise
Linux 5 (64-bit)");
-        _xenServer610GuestOsMap.put("Oracle Enterprise Linux 6.0 (32-bit)", "Oracle Enterprise
Linux 6.0 (32-bit)");
-        _xenServer610GuestOsMap.put("Oracle Enterprise Linux 6.0 (64-bit)", "Oracle Enterprise
Linux 6.0 (64-bit)");
-        _xenServer610GuestOsMap.put("Oracle Enterprise Linux 6.1 (32-bit)", "Oracle Enterprise
Linux 6.1 (32-bit)");
-        _xenServer610GuestOsMap.put("Oracle Enterprise Linux 6.1 (64-bit)", "Oracle Enterprise
Linux 6.1 (64-bit)");
-        _xenServer610GuestOsMap.put("Oracle Enterprise Linux 6.2 (32-bit)", "Oracle Enterprise
Linux 6.2 (32-bit)");
-        _xenServer610GuestOsMap.put("Oracle Enterprise Linux 6.2 (64-bit)", "Oracle Enterprise
Linux 6.2 (64-bit)");
+        _xenServer610GuestOsMap.put("Oracle Enterprise Linux 6.0 (32-bit)", "Oracle Enterprise
Linux 6 (32-bit)");
+        _xenServer610GuestOsMap.put("Oracle Enterprise Linux 6.0 (64-bit)", "Oracle Enterprise
Linux 6 (64-bit)");
+        _xenServer610GuestOsMap.put("Oracle Enterprise Linux 6.1 (32-bit)", "Oracle Enterprise
Linux 6 (32-bit)");
+        _xenServer610GuestOsMap.put("Oracle Enterprise Linux 6.1 (64-bit)", "Oracle Enterprise
Linux 6 (64-bit)");
+        _xenServer610GuestOsMap.put("Oracle Enterprise Linux 6.2 (32-bit)", "Oracle Enterprise
Linux 6 (32-bit)");
+        _xenServer610GuestOsMap.put("Oracle Enterprise Linux 6.2 (64-bit)", "Oracle Enterprise
Linux 6 (64-bit)");
         _xenServer610GuestOsMap.put("Red Hat Enterprise Linux 4.5 (32-bit)", "Red Hat Enterprise
Linux 4.5 (32-bit)");
         _xenServer610GuestOsMap.put("Red Hat Enterprise Linux 4.6 (32-bit)", "Red Hat Enterprise
Linux 4.6 (32-bit)");
         _xenServer610GuestOsMap.put("Red Hat Enterprise Linux 4.7 (32-bit)", "Red Hat Enterprise
Linux 4.7 (32-bit)");
@@ -627,12 +626,12 @@ public class CitrixHelper {
         _xenServer610GuestOsMap.put("Red Hat Enterprise Linux 5.6 (64-bit)", "Red Hat Enterprise
Linux 5 (64-bit)");
         _xenServer610GuestOsMap.put("Red Hat Enterprise Linux 5.7 (32-bit)", "Red Hat Enterprise
Linux 5 (32-bit)");
         _xenServer610GuestOsMap.put("Red Hat Enterprise Linux 5.7 (64-bit)", "Red Hat Enterprise
Linux 5 (64-bit)");
-        _xenServer610GuestOsMap.put("Red Hat Enterprise Linux 6.0 (32-bit)", "Red Hat Enterprise
Linux 6.0 (32-bit)");
-        _xenServer610GuestOsMap.put("Red Hat Enterprise Linux 6.0 (64-bit)", "Red Hat Enterprise
Linux 6.0 (64-bit)");
-        _xenServer610GuestOsMap.put("Red Hat Enterprise Linux 6.1 (32-bit)", "Red Hat Enterprise
Linux 6.1 (32-bit)");
-        _xenServer610GuestOsMap.put("Red Hat Enterprise Linux 6.1 (64-bit)", "Red Hat Enterprise
Linux 6.1 (64-bit)");
-        _xenServer610GuestOsMap.put("Red Hat Enterprise Linux 6.2 (32-bit)", "Red Hat Enterprise
Linux 6.2 (32-bit)");
-        _xenServer610GuestOsMap.put("Red Hat Enterprise Linux 6.2 (64-bit)", "Red Hat Enterprise
Linux 6.2 (64-bit)");
+        _xenServer610GuestOsMap.put("Red Hat Enterprise Linux 6.0 (32-bit)", "Red Hat Enterprise
Linux 6 (32-bit)");
+        _xenServer610GuestOsMap.put("Red Hat Enterprise Linux 6.0 (64-bit)", "Red Hat Enterprise
Linux 6 (64-bit)");
+        _xenServer610GuestOsMap.put("Red Hat Enterprise Linux 6.1 (32-bit)", "Red Hat Enterprise
Linux 6 (32-bit)");
+        _xenServer610GuestOsMap.put("Red Hat Enterprise Linux 6.1 (64-bit)", "Red Hat Enterprise
Linux 6 (64-bit)");
+        _xenServer610GuestOsMap.put("Red Hat Enterprise Linux 6.2 (32-bit)", "Red Hat Enterprise
Linux 6 (32-bit)");
+        _xenServer610GuestOsMap.put("Red Hat Enterprise Linux 6.2 (64-bit)", "Red Hat Enterprise
Linux 6 (64-bit)");
         _xenServer610GuestOsMap.put("SUSE Linux Enterprise Server 9 SP4 (32-bit)", "SUSE
Linux Enterprise Server 10 SP1 (32-bit)");
         _xenServer610GuestOsMap.put("SUSE Linux Enterprise Server 10 SP1 (32-bit)", "SUSE
Linux Enterprise Server 10 SP1 (32-bit)");
         _xenServer610GuestOsMap.put("SUSE Linux Enterprise Server 10 SP1 (64-bit)", "SUSE
Linux Enterprise Server 10 SP1 (64-bit)");
@@ -662,13 +661,15 @@ public class CitrixHelper {
         _xenServer610GuestOsMap.put("Windows Server 2008 (32-bit)", "Windows Server 2008
(32-bit)");
         _xenServer610GuestOsMap.put("Windows Server 2008 (64-bit)", "Windows Server 2008
(64-bit)");
         _xenServer610GuestOsMap.put("Windows Server 2008 R2 (64-bit)", "Windows Server 2008
R2 (64-bit)");
-        _xenServer610GuestOsMap.put("Windows Server 8 (64-bit)", "Windows Server 8 (64-bit)
(experimental)");
+        _xenServer610GuestOsMap.put("Windows Server 8 (64-bit)", "Windows Server 2012 (64-bit)
(experimental)");
         _xenServer610GuestOsMap.put("Windows Vista (32-bit)", "Windows Vista (32-bit)");
         _xenServer610GuestOsMap.put("Windows XP SP3 (32-bit)", "Windows XP SP3 (32-bit)");
         _xenServer610GuestOsMap.put("Ubuntu 10.04 (32-bit)", "Ubuntu Lucid Lynx 10.04 (32-bit)");
         _xenServer610GuestOsMap.put("Ubuntu 10.04 (64-bit)", "Ubuntu Lucid Lynx 10.04 (64-bit)");
         _xenServer610GuestOsMap.put("Ubuntu 10.10 (32-bit)", "Ubuntu Maverick Meerkat 10.10
(32-bit) (experimental)");
         _xenServer610GuestOsMap.put("Ubuntu 10.10 (64-bit)", "Ubuntu Maverick Meerkat 10.10
(64-bit) (experimental)");
+        _xenServer610GuestOsMap.put("Ubuntu 12.04 (32-bit)", "Ubuntu Precise Pangolin 12.04
(32-bit)");
+        _xenServer610GuestOsMap.put("Ubuntu 12.04 (64-bit)", "Ubuntu Precise Pangolin 12.04
(64-bit)");
         _xenServer610GuestOsMap.put("Other Linux (32-bit)", "Other install media");
         _xenServer610GuestOsMap.put("Other Linux (64-bit)", "Other install media");
         _xenServer610GuestOsMap.put("Other (32-bit)", "Other install media");

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/29ec31c6/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer610Resource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer610Resource.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer610Resource.java
index 17ad3e6..8d267b1 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer610Resource.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer610Resource.java
@@ -40,7 +40,7 @@ public class XenServer610Resource extends XenServer56FP1Resource {
 
     @Override
     protected String getGuestOsType(String stdType, boolean bootFromCD) {
-        return CitrixHelper.getXenServer602GuestOsType(stdType, bootFromCD);
+        return CitrixHelper.getXenServer610GuestOsType(stdType, bootFromCD);
     }
 
     @Override


Mime
View raw message