add method to check if agent is alive, logging to find out xenstore exists

diff --git a/exec/testcases/xenserver/tc/dotnetagentlicensing.py b/exec/testcases/xenserver/tc/dotnetagentlicensing.py
index 08934f4ef7e7cfe80972681f61de6f258b061383..9cf681c069f2e50b9d5e7d8c88f5195361bd264c 100755 (executable)
--- a/exec/testcases/xenserver/tc/dotnetagentlicensing.py
+++ b/exec/testcases/xenserver/tc/dotnetagentlicensing.py
@@ -407,8 +407,5 @@ class NoServerSurvive(DotNetAgentTestCases):
         autoupdate.setURL("http://localhost:55555")
         self.agent.restartAgent()
         xenrt.sleep(60)
-        os = self.agent.os
-        try:
-            os.execCmd("net stop \"XenSvc\" ")
-        except:
+        if self.agent.isAgentAlive() == False:
             raise xenrt.XRTFailure("Agent Stopped")
\ No newline at end of file

diff --git a/exec/xenrt/lib/xenserver/dotnetagentlicensing.py b/exec/xenrt/lib/xenserver/dotnetagentlicensing.py
index 40f3d8b40792b5993ecd88be26a1479419a268a4..9381191293b813fff32e8e5baee061ccd12e0b1a 100755 (executable)
--- a/exec/xenrt/lib/xenserver/dotnetagentlicensing.py
+++ b/exec/xenrt/lib/xenserver/dotnetagentlicensing.py
@@ -62,6 +62,12 @@ class DotNetAgent(object):
             assert isinstance(x, AutoUpdate)
         return x
 
+    def isAgentAlive(self):
+        info = self.os.execCmd("sc query \"XenSvc\" | find \"RUNNING\"")
+        if "RUNNING" in info:
+            return True
+        else:
+            return False
 
 class LicensedFeature(object):
     __metaclass__ = ABCMeta
@@ -168,6 +174,8 @@ class PoolAdmin(ActorImp):
 
     def checkKeyPresent(self):
         host = self.guest.host
+        xenrt.TEC().logverbose("----xenstore-exists: %s"%host.xenstoreExists("/guest_agent_features/Guest_agent_auto_update/parameters/enabled"))
+        xenrt.TEC().logverbose("%s" % host.execdom0("xenstore-ls -f"))
         return host.xenstoreExists("/guest_agent_features/Guest_agent_auto_update/parameters/enabled")
 
 class VMUser(ActorImp):