[04/27] git commit: updated refs/heads/master to d4d5cab

[anthonyxu]

fix devcloud: user template's guest os type is changed

Conflicts:

        
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java


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

Branch: refs/heads/master
Commit: b9855968a8bc878ae10aa95b4821bcd36103119b
Parents: 731ccb8
Author: Edison Su <sudi...@gmail.com>
Authored: Thu Mar 27 15:33:56 2014 -0700
Committer: Anthony Xu <anthony...@citrix.com>
Committed: Fri Mar 28 16:20:15 2014 -0700

----------------------------------------------------------------------
 .../hypervisor/xen/resource/XcpOssResource.java | 25 ++++++++++----------
 1 file changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b9855968/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
----------------------------------------------------------------------
diff --git 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
index 47a8d7d..36400f2 100644
--- 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
+++ 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
@@ -23,17 +23,11 @@ import java.util.List;
 import java.util.Set;
 
 import javax.ejb.Local;
+import javax.ws.rs.HEAD;
 
 import org.apache.log4j.Logger;
 import org.apache.xmlrpc.XmlRpcException;
 
-import com.xensource.xenapi.Connection;
-import com.xensource.xenapi.Types;
-import com.xensource.xenapi.Types.XenAPIException;
-import com.xensource.xenapi.VBD;
-import com.xensource.xenapi.VDI;
-import com.xensource.xenapi.VM;
-
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.Command;
 import com.cloud.agent.api.NetworkUsageAnswer;
@@ -49,7 +43,12 @@ import com.cloud.network.Networks.TrafficType;
 import com.cloud.resource.ServerResource;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.script.Script;
-import com.cloud.vm.VirtualMachine;
+import com.xensource.xenapi.Connection;
+import com.xensource.xenapi.Types;
+import com.xensource.xenapi.Types.XenAPIException;
+import com.xensource.xenapi.VBD;
+import com.xensource.xenapi.VDI;
+import com.xensource.xenapi.VM;
 
 @Local(value = ServerResource.class)
 public class XcpOssResource extends CitrixResourceBase {
@@ -77,11 +76,13 @@ public class XcpOssResource extends CitrixResourceBase {
 
     @Override
     protected String getGuestOsType(String stdType, boolean bootFromCD) {
-        if (stdType.equalsIgnoreCase("Debian GNU/Linux 6(64-bit)")) {
-            return "Debian Squeeze 6.0 (64-bit)";
+       if (stdType.equalsIgnoreCase("Debian GNU/Linux 6(64-bit)")) {
+               return "Debian Squeeze 6.0 (64-bit)";
+       } else if (stdType.equalsIgnoreCase("CentOS 5.6 (64-bit)")) {
+            return "CentOS 5 (64-bit)";
         } else {
-            return CitrixHelper.getXcpGuestOsType(stdType);
-        }
+               return CitrixHelper.getXcpGuestOsType(stdType);
+       }
     }
 
     @Override