apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Gaurav Aradhye 2013-06-20 00:27:29 -04:00 committed by Prasanna Santhanam
parent 09626337ab
commit 1fc7aeaaea
1 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
test/integration/smoke/test_routers.py
View File

@ -180,7 +180,18 @@ class TestRouterServices(cloudstackTestCase):
"Check list router response for router state" "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, host.ipaddress,
self.services['virtual_machine']["publicport"], self.services['virtual_machine']["publicport"],
self.vm_1.username, self.vm_1.username,
@ -242,7 +253,18 @@ class TestRouterServices(cloudstackTestCase):
"Check list router response for router state" "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, host.ipaddress,
self.services['virtual_machine']["publicport"], self.services['virtual_machine']["publicport"],
self.vm_1.username, self.vm_1.username,
@ -259,7 +281,18 @@ class TestRouterServices(cloudstackTestCase):
"Check dnsmasq service is running or not" "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, host.ipaddress,
self.services['virtual_machine']["publicport"], self.services['virtual_machine']["publicport"],
self.vm_1.username, self.vm_1.username,
@ -423,7 +456,18 @@ class TestRouterServices(cloudstackTestCase):
) )
host = hosts[0] 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, host.ipaddress,
self.services['virtual_machine']["publicport"], self.services['virtual_machine']["publicport"],
self.vm_1.username, self.vm_1.username,