fixed the merge from master

diff --git a/exec/xenrt/lib/xenserver/host.py b/exec/xenrt/lib/xenserver/host.py
index 17841361e0404b91d42733ba650b9468faa5a303..f42878ed06e0fbec3a6e8829f64993d404a44ab2 100755 (executable)
--- a/exec/xenrt/lib/xenserver/host.py
+++ b/exec/xenrt/lib/xenserver/host.py
@@ -635,6 +635,15 @@ class Host(xenrt.GenericHost):
         
         self.installationCookie = "%012x" % xenrt.random.randint(0,0xffffffffffff)
 
+    def uninstallGuestByName(self, name):
+        cli = self.getCLIInstance()
+        try:
+            cli.execute("vm-shutdown", "vm=\"%s\" --force" % name)
+        except Exception, ex:
+            xenrt.TEC().logverbose(str(ex))
+        cli.execute("vm-uninstall", "vm=\"%s\" --force" % name)
+
+    
     def getUptime(self):
         return float(self.execdom0("cat /proc/uptime").split()[0])
 
@@ -6663,13 +6672,11 @@ fi
                         template = self.chooseTemplate(\
                             "TEMPLATE_NAME_SLES_%s_64" % (v))
                     else:
-                        template = self.chooseTemplate(\
-                                                   "TEMPLATE_NAME_SLES_%s" % (v))
+                        template = self.chooseTemplate("TEMPLATE_NAME_SLES_%s" % (v))
             elif re.search(r"sled\d+", distro):
                 v = re.search(r"sled(\d+)", distro).group(1)
                 if arch and arch == "x86-64":
-                    template = self.chooseTemplate(\
-                            "TEMPLATE_NAME_SLED_%s_64" % (v))
+                    template = self.chooseTemplate("TEMPLATE_NAME_SLED_%s_64" % (v))
                 else:
                     template = self.chooseTemplate("TEMPLATE_NAME_SLED_%s" % (v))
             elif re.search(r"sl7", distro):
@@ -6723,7 +6730,7 @@ fi
                                     (distro))
                 template = self.chooseTemplate("TEMPLATE_NAME_RHEL_5")
             else:
-                raise e
+                raise
 
         return template
 
@@ -12536,7 +12543,7 @@ class Pool(object):
             raise xenrt.XRTError("Pool master (%s) is not a known host" %
                                  (masterip))
         else:
-            raise xenrt.XRTError("Unknown entry in pool.conf: %s" % 
+            raise xenrt.XRTError("Unknown entry in pool.conf: %s" %
                                  (pc.strip()))
 
     def recoverSlaves(self):