From d18f60379f198c8d820ff1343bca9272c2f09820 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Wed, 29 Dec 2010 14:06:07 -0800
Subject: [PATCH] add getGuestOsType

---
 cloud.spec                                                | 2 ++
 .../cloud/hypervisor/xen/resource/CitrixResourceBase.java | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cloud.spec b/cloud.spec
index 9005992d466..02f35ab4d61 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -465,6 +465,7 @@ fi
 %exclude %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/vmopspremium
 %exclude %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
 %exclude %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/xenserver56/patch-premium
+%exclude %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch-premium
 %exclude %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/xenserver56/InterfaceReconfigure.py
 %exclude %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/xs_cleanup.sh
 %endif
@@ -697,6 +698,7 @@ fi
 %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/vmopspremium
 %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
 %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/xenserver56/patch-premium
+%{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch-premium
 %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/xenserver56/InterfaceReconfigure.py
 %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/xs_cleanup.sh
 %doc README
diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 5237a9b2c04..debba015b06 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -626,6 +626,12 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
         }
     }
 
+    
+    /*Override by subclass*/
+    protected String getGuestOsType(String stdType, boolean bootFromCD) {
+        return stdType;
+    }
+    
     protected Answer execute(ModifySshKeysCommand cmd) {
         String publickey = cmd.getPubKey();
         String privatekey = cmd.getPrvKey();
@@ -2171,7 +2177,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
     protected VM createVmFromTemplate(Connection conn, StartCommand cmd) throws XenAPIException, XmlRpcException {
         Set<VM> templates;
         VM vm = null;
-        String guestOsTypeName = cmd.getGuestOSDescription();
+        String guestOsTypeName = getGuestOsType(cmd.getGuestOSDescription(), false);
         templates = VM.getByNameLabel(conn, guestOsTypeName);
         assert templates.size() == 1 : "Should only have 1 template but found " + templates.size();
         VM template = templates.iterator().next();