From baa66668976e1c36c9017ba08250e49f85e22836 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Fri, 17 Dec 2010 20:21:28 -0800
Subject: [PATCH] create xenserver 5.6 patch file

---
 .../xen/resource/XenServerResource.java       |  2 +-
 .../vm/hypervisor/xenserver/xenserver56/patch |  1 -
 .../hypervisor/xenserver/xenserver56oss/patch | 32 +++++++++++++++++++
 .../xen/discoverer/XcpServerDiscoverer.java   |  2 +-
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 scripts/vm/hypervisor/xenserver/xenserver56oss/patch

diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServerResource.java b/core/src/com/cloud/hypervisor/xen/resource/XenServerResource.java
index 1690ea00965..f1a8e09ccaa 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/XenServerResource.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/XenServerResource.java
@@ -68,7 +68,7 @@ public class XenServerResource extends CitrixResourceBase {
     @Override
     protected List<File> getPatchFiles() {      
         List<File> files = new ArrayList<File>();
-        String patch = "scripts/vm/hypervisor/xenserver/xenserver56/patch";      
+        String patch = "scripts/vm/hypervisor/xenserver/xenserver56oss/patch";      
         String patchfilePath = Script.findScript("" , patch);
         if ( patchfilePath == null ) {
             throw new CloudRuntimeException("Unable to find patch file " + patch);
diff --git a/scripts/vm/hypervisor/xenserver/xenserver56/patch b/scripts/vm/hypervisor/xenserver/xenserver56/patch
index 51bc38adc8e..26a1b76a1f3 100644
--- a/scripts/vm/hypervisor/xenserver/xenserver56/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver56/patch
@@ -13,7 +13,6 @@ NFSSR.py=/opt/xensource/sm
 nfs.py=/opt/xensource/sm
 vmops=..,0755,/etc/xapi.d/plugins
 vmopsSnapshot=..,0755,/etc/xapi.d/plugins
-systemvm.iso=../../../../../vms,0644,/opt/xensource/packages/iso
 hostvmstats.py=..,0755,/opt/xensource/sm
 id_rsa.cloud=..,0600,/root/.ssh
 network_info.sh=..,0755,/opt/xensource/bin
diff --git a/scripts/vm/hypervisor/xenserver/xenserver56oss/patch b/scripts/vm/hypervisor/xenserver/xenserver56oss/patch
new file mode 100644
index 00000000000..d69b3a1e3a9
--- /dev/null
+++ b/scripts/vm/hypervisor/xenserver/xenserver56oss/patch
@@ -0,0 +1,32 @@
+# This file specifies the files that need
+# to be transferred over to the XenServer.
+# The format of this file is as follows:
+# [Name of file]=[source path],[file permission],[destination path]
+# [destination path] is required.
+# If [file permission] is missing, 755 is assumed.
+# If [source path] is missing, it looks in the same
+# directory as the patch file.
+# If [source path] starts with '/', then it is absolute path.
+# If [source path] starts with '~', then it is path relative to management server home directory.
+# If [source path] does not start with '/' or '~', then it is relative path to the location of the patch file. 
+NFSSR.py=../xenserver56,755,/opt/xensource/sm
+nfs.py=../xenserver56,755,/opt/xensource/sm
+vmops=..,0755,/etc/xapi.d/plugins
+vmopsSnapshot=..,0755,/etc/xapi.d/plugins
+systemvm.iso=../../../../../vms,0644,/opt/xensource/packages/iso
+hostvmstats.py=..,0755,/opt/xensource/sm
+id_rsa.cloud=..,0600,/root/.ssh
+network_info.sh=..,0755,/opt/xensource/bin
+setupxenserver.sh=..,0755,/opt/xensource/bin
+make_migratable.sh=..,0755,/opt/xensource/bin
+setup_iscsi.sh=..,0755,/opt/xensource/bin
+version=..,0755,/opt/xensource/bin
+pingtest.sh=../../..,0755,/opt/xensource/bin
+dhcp_entry.sh=../../../../network/domr/,0755,/opt/xensource/bin
+ipassoc.sh=../../../../network/domr/,0755,/opt/xensource/bin
+vm_data.sh=../../../../network/domr/,0755,/opt/xensource/bin
+save_password_to_domr.sh=../../../../network/domr/,0755,/opt/xensource/bin
+networkUsage.sh=../../../../network/domr/,0755,/opt/xensource/bin
+call_firewall.sh=../../../../network/domr/,0755,/opt/xensource/bin
+call_loadbalancer.sh=../../../../network/domr/,0755,/opt/xensource/bin
+l2tp_vpn.sh=../../../../network/domr/,0755,/opt/xensource/bin
diff --git a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
index c46ab332070..657494f0591 100644
--- a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
+++ b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
@@ -375,7 +375,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
         if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.0")) 
         	return new XenServerResource();
         
-        String msg = "Only support XCP 0.1.1 and XenServer 5.6.0, but this one is " + prodBrand + " " + prodVersion;
+        String msg = "Only support XCP 0.1.1 and XenServer 5.6 , but this one is " + prodBrand + " " + prodVersion;
         _alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, dcId, podId, msg, msg);
         s_logger.debug(msg);
         throw new RuntimeException(msg);