You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/06/19 17:05:25 UTC
git commit: updated refs/heads/master to 5140473
Updated Branches:
refs/heads/master fe8eca2c7 -> 5140473f2
CLOUDSTACK-1758: Fix ssvm test failures, where ssh to ssvm failed.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5140473f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5140473f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5140473f
Branch: refs/heads/master
Commit: 5140473f2b754c1f178aae7946798d95027ec69a
Parents: fe8eca2
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Wed Jun 19 20:26:43 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jun 19 20:33:45 2013 +0530
----------------------------------------------------------------------
test/integration/smoke/test_ssvm.py | 42 +++++++++++++++++++++++++++++---
1 file changed, 39 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5140473f/test/integration/smoke/test_ssvm.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_ssvm.py b/test/integration/smoke/test_ssvm.py
index d637f96..6893472 100644
--- a/test/integration/smoke/test_ssvm.py
+++ b/test/integration/smoke/test_ssvm.py
@@ -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"],