]> xenbits.xensource.com Git - xenrt-citrix/xenrt.git/commitdiff
host instead pool as parameter
authorCraig Orendi <craig.orendi@citrix.com>
Mon, 12 Oct 2015 21:30:16 +0000 (22:30 +0100)
committerCraig Orendi <craig.orendi@citrix.com>
Tue, 3 Nov 2015 10:23:23 +0000 (10:23 +0000)
exec/testcases/xenserver/tc/dotnetagentlicensing.py

index 216624f0381028ff2f7973f86b025aecdf09200a..909bb3740e123163bd10f8794088b8db86d1028e 100755 (executable)
@@ -50,14 +50,14 @@ class DotNetAgentAdapter(object):
         vm.importVM(host,path,sr=host.getLocalSR())
         vm.start()
 
-    def settingsCleanup(self,pool):
+    def settingsCleanup(self, host):
         xenrt.TEC().logverbose("-----Cleanup settings-----")
         try:
-            host.execdom0("xe pool-param-remove uuid=%s param-name=guest-agent-config param-key=auto_update_enabled"%pool.getUUID())
+            host.execdom0("xe pool-param-remove uuid=%s param-name=guest-agent-config param-key=auto_update_enabled"%host.getPool().uuid)
         except Exception, e:
             xenrt.TEC().logverbose("%s"%e)
         try:
-            host.execdom0("xe pool-param-remove uuid=%s param-name=guest-agent-config param-key=auto_update_url"%pool.getUUID())
+            host.execdom0("xe pool-param-remove uuid=%s param-name=guest-agent-config param-key=auto_update_url"%host.getPool().uuid)
         except Exception, e:
             xenrt.TEC().logverbose("%s"%e)
 
@@ -74,7 +74,7 @@ class DotNetAgentAdapter(object):
         except:
             return False
 
-    def getnonCryptoMSIs(self, server):
+    def getnNonCryptoMSIs(self, server):
         pass
 
     def setUpServer(self,guest,port):
@@ -112,7 +112,7 @@ class DotNetAgentTestCases(xenrt.TestCase):
 
     def postRun(self):
         self.adapter.cleanupLicense(self.getDefaultPool())
-        self.adapter.settingsCleanup(self.getDefaultPool())
+        self.adapter.settingsCleanup(self.getHost("RESOURCE_HOST_0"))
         self._revertVMs()
 
     def prepare(self, arglist):