changed citrixguestagent msi to managementagent

diff --git a/exec/testcases/xenserver/tc/dotnetagentlicensing.py b/exec/testcases/xenserver/tc/dotnetagentlicensing.py
index 9cd201310e0e6d30c86d6f0ba8f582d4a9ead97c..4aadcf5d0d60838d01a4a8ddc678ddf45950e6a9 100755 (executable)
--- a/exec/testcases/xenserver/tc/dotnetagentlicensing.py
+++ b/exec/testcases/xenserver/tc/dotnetagentlicensing.py
@@ -80,8 +80,8 @@ class DotNetAgentAdapter(object):
     def getNonCryptoMSIs(self, server):
         server.guest.execguest("wget '%s/citrixguestagent-Noncrypto.tgz'"%(xenrt.TEC().lookup("TEST_TARBALL_BASE")))
         server.guest.execguest("tar -xf citrixguestagent-Noncrypto.tgz")
-        server.guest.execguest("mv citrixguestagent-Noncrypto/citrixguestagentx64.msi citrixguestagentx64.msi")
-        server.guest.execguest("mv citrixguestagent-Noncrypto/citrixguestagentx86.msi citrixguestagentx86.msi")
+        server.guest.execguest("mv citrixguestagent-Noncrypto/managementagentx64.msi managementagentx64.msi")
+        server.guest.execguest("mv citrixguestagent-Noncrypto/managementagentx86.msi managementagentx86.msi")
 
     def setUpServer(self,guest,port):
         xenrt.TEC().logverbose("-----Setting up server-----")
@@ -370,7 +370,6 @@ class AUByDefault(DotNetAgentTestCases):
         version = self.agent.agentVersion()
         self.agent.restartAgent()
         xenrt.sleep(200)
-        xenrt.TEC().logverbose("----msi download: %s----"%autoupdate.checkDownloadedMSI())
         assertions.assertNotNone(autoupdate.checkDownloadedMSI(),"Agent did not download MSI")
         assertions.assertNotEquals(version,self.agent.agentVersion(),"Agent Did not install latest version")
 
@@ -407,4 +406,4 @@ class NoServerSurvive(DotNetAgentTestCases):
         autoupdate.setURL("http://localhost:55555")
         self.agent.restartAgent()
         xenrt.sleep(60)
-        assertions.assertTrue(isAgentAlive(), "Agent Stopped")
\ No newline at end of file
+        assertions.assertTrue(self.agent.isAgentAlive(), "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 87b718521a90dd2c1a9030f870a8312c848ae5a3..b96c124a21c2c19a5c2885c0e23c673a53ad21c2 100755 (executable)
--- a/exec/xenrt/lib/xenserver/dotnetagentlicensing.py
+++ b/exec/xenrt/lib/xenserver/dotnetagentlicensing.py
@@ -259,9 +259,9 @@ class AutoUpdate(ActorAbstract):
         self.setUserPoolAdmin()
 
     def checkDownloadedMSI(self):
-        if self.os.fileExists("C:\\Windows\\System32\\config\\systemprofile\\AppData\\Local\\citrixguestagentx64.msi"):
+        if self.os.fileExists("C:\\Windows\\System32\\config\\systemprofile\\AppData\\Local\\managementagentx64.msi"):
             return "64"
-        elif self.os.fileExists("C:\\Windows\\System32\\config\\systemprofile\\AppData\\Local\\citrixguestagentx86.msi"):
+        elif self.os.fileExists("C:\\Windows\\System32\\config\\systemprofile\\AppData\\Local\\managementagentx86.msi"):
             return "86"
         else:
             return None