cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [01/50] [abbrv] git commit: updated refs/heads/vmsync to 3c2aa18
Date Thu, 27 Jun 2013 20:57:03 GMT
Updated Branches:
  refs/heads/vmsync cbca4bb6f -> 3c2aa1850


CLOUDSTACK-3060: condition for vmware while getting process status.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


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

Branch: refs/heads/vmsync
Commit: 1fc7aeaaea80e30651a47024cf928ff11fb29e9c
Parents: 0962633
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Thu Jun 20 00:27:29 2013 -0400
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Tue Jun 25 12:30:18 2013 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_routers.py | 52 ++++++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1fc7aeaa/test/integration/smoke/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py
index d89acf9..2e4553b 100644
--- a/test/integration/smoke/test_routers.py
+++ b/test/integration/smoke/test_routers.py
@@ -180,7 +180,18 @@ class TestRouterServices(cloudstackTestCase):
                             "Check list router response for router state"
                         )
 
-        result = get_process_status(
+   if self.apiclient.hypervisor.lower() == 'vmware':
+           result = get_process_status(
+                               self.apiclient.connection.mgtSvr,
+                               22,
+                           self.apiclient.connection.user,
+                           self.apiclient.connection.passwd,
+                           router.linklocalip,
+                           "service dnsmasq status",
+                               hypervisor=self.apiclient.hypervisor
+                           )
+   else:
+            result = get_process_status(
                                 host.ipaddress,
                                 self.services['virtual_machine']["publicport"],
                                 self.vm_1.username,
@@ -242,7 +253,18 @@ class TestRouterServices(cloudstackTestCase):
                             "Check list router response for router state"
                         )
 
-        result = get_process_status(
+   if self.apiclient.hypervisor.lower() == 'vmware':
+           result = get_process_status(
+                           self.apiclient.connection.mgtSvr,
+                               22,
+                           self.apiclient.connection.user,
+                           self.apiclient.connection.passwd,
+                           router.linklocalip,
+                           "service dnsmasq status",
+                               hypervisor=self.apiclient.hypervisor
+                           )
+   else:
+            result = get_process_status(
                                 host.ipaddress,
                                 self.services['virtual_machine']["publicport"],
                                 self.vm_1.username,
@@ -259,7 +281,18 @@ class TestRouterServices(cloudstackTestCase):
                             "Check dnsmasq service is running or not"
                         )
 
-        result = get_process_status(
+   if self.apiclient.hypervisor.lower() == 'vmware':
+           result = get_process_status(
+                               self.apiclient.connection.mgtSvr,
+                           22,
+                           self.apiclient.connection.user,
+                           self.apiclient.connection.passwd,
+                           router.linklocalip,
+                           "service haproxy status",
+                           hypervisor=self.apiclient.hypervisor
+                           )
+   else:
+            result = get_process_status(
                                 host.ipaddress,
                                 self.services['virtual_machine']["publicport"],
                                 self.vm_1.username,
@@ -423,7 +456,18 @@ class TestRouterServices(cloudstackTestCase):
                         )
         host = hosts[0]
 
-        res = get_process_status(
+   if self.apiclient.hypervisor.lower() == 'vmware':
+           res = get_process_status(
+                           self.apiclient.connection.mgtSvr,
+                           22,
+                           self.apiclient.connection.user,
+                           self.apiclient.connection.passwd,
+                           router.linklocalip,
+                           "uptime",
+                           hypervisor=self.apiclient.hypervisor
+                           )
+   else:
+            res = get_process_status(
                                 host.ipaddress,
                                 self.services['virtual_machine']["publicport"],
                                 self.vm_1.username,


Mime
View raw message