cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [24/29] git commit: updated refs/heads/master-6-17-stable to 93712c2
Date Fri, 28 Jun 2013 19:22:45 GMT
CLOUDSTACK-1758: Fix ssvm test failures, where ssh to ssvm failed.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 5140473f2b754c1f178aae7946798d95027ec69a)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7733ddb5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7733ddb5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7733ddb5

Branch: refs/heads/master-6-17-stable
Commit: 7733ddb575f55e70c3d6864aaac925e5f32a7d16
Parents: aaa9fc0
Author: Girish Shilamkar <girish@clogeny.com>
Authored: Wed Jun 19 20:26:43 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Sat Jun 29 00:52:08 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/7733ddb5/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"],


Mime
View raw message