etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-1758: Fix ssvm test failures, where ssh to ssvm failed. 

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Girish Shilamkar 2013-06-19 20:26:43 +05:30 committed by Prasanna Santhanam
parent fe8eca2c76
commit 5140473f2b
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
test/integration/smoke/test_ssvm.py
View File

@ -334,7 +334,19 @@ class TestSSVMs(cloudstackTestCase):
self.debug("Running SSVM check script")
result = get_process_status(
if self.apiclient.hypervisor.lower() == 'vmware':
#SSH into SSVMs is done via management server for Vmware
result = get_process_status(
self.apiclient.connection.mgtSvr,
22,
self.apiclient.connection.user,
self.apiclient.connection.passwd,
ssvm.privateip,
"/usr/local/cloud/systemvm/ssvm-check.sh |grep -e ERROR -e WARNING -e FAIL",
hypervisor=self.apiclient.hypervisor
)
else:
result = get_process_status(
host.ipaddress,
self.services['host']["publicport"],
self.services['host']["username"],
@ -358,7 +370,19 @@ class TestSSVMs(cloudstackTestCase):
)
#Check status of cloud service
result = get_process_status(
if self.apiclient.hypervisor.lower() == 'vmware':
#SSH into SSVMs is done via management server for Vmware
result = get_process_status(
self.apiclient.connection.mgtSvr,
22,
self.apiclient.connection.user,
self.apiclient.connection.passwd,
ssvm.privateip,
"service cloud status",
hypervisor=self.apiclient.hypervisor
)
else:
result = get_process_status(
host.ipaddress,
self.services['host']["publicport"],
self.services['host']["username"],
@ -426,7 +450,19 @@ class TestSSVMs(cloudstackTestCase):
self.debug("Checking cloud process status")
result = get_process_status(
if self.apiclient.hypervisor.lower() == 'vmware':
#SSH into SSVMs is done via management server for vmware
result = get_process_status(
self.apiclient.connection.mgtSvr,
22,
self.apiclient.connection.user,
self.apiclient.connection.passwd,
cpvm.privateip,
"service cloud status",
hypervisor=self.apiclient.hypervisor
)
else:
result = get_process_status(
host.ipaddress,
self.services['host']["publicport"],
self.services['host']["username"],