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

Fix reviewboard messup of python indentation

Browse Source 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-06-26 17:12:54 +05:30
parent 2af6db24ed
commit 8dc99d92b6
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,7 +171,7 @@ class TestRouterServices(cloudstackTestCase):
"Check list host returns a valid list"
)
host = hosts[0]
self.debug("Router ID: %s, state: %s" % (router.id, router.state))
self.assertEqual(
@ -180,32 +180,32 @@ class TestRouterServices(cloudstackTestCase):
"Check list router response for router state"
)
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,
self.vm_1.password,
router.linklocalip,
"service dnsmasq status"
)
res = str(result)
self.debug("Dnsmasq process status: %s" % res)
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,
self.vm_1.password,
router.linklocalip,
"service dnsmasq status"
)
res = str(result)
self.debug("Dnsmasq process status: %s" % res)
self.assertEqual(
res.count("running"),
1,
"Check dnsmasq service is running or not"
self.assertEqual(
res.count("running"),
1,
"Check dnsmasq service is running or not"
)
return
@ -253,7 +253,7 @@ class TestRouterServices(cloudstackTestCase):
"Check list router response for router state"
)
if self.apiclient.hypervisor.lower() == 'vmware':
if self.apiclient.hypervisor.lower() == 'vmware':
result = get_process_status(
self.apiclient.connection.mgtSvr,
22,
@ -263,7 +263,7 @@ class TestRouterServices(cloudstackTestCase):
"service dnsmasq status",
hypervisor=self.apiclient.hypervisor
)
else:
else:
result = get_process_status(
host.ipaddress,
self.services['virtual_machine']["publicport"],
@ -281,7 +281,7 @@ class TestRouterServices(cloudstackTestCase):
"Check dnsmasq service is running or not"
)
if self.apiclient.hypervisor.lower() == 'vmware':
if self.apiclient.hypervisor.lower() == 'vmware':
result = get_process_status(
self.apiclient.connection.mgtSvr,
22,
@ -291,7 +291,7 @@ class TestRouterServices(cloudstackTestCase):
"service haproxy status",
hypervisor=self.apiclient.hypervisor
)
else:
else:
result = get_process_status(
host.ipaddress,
self.services['virtual_machine']["publicport"],
@ -456,7 +456,7 @@ class TestRouterServices(cloudstackTestCase):
)
host = hosts[0]
if self.apiclient.hypervisor.lower() == 'vmware':
if self.apiclient.hypervisor.lower() == 'vmware':
res = get_process_status(
self.apiclient.connection.mgtSvr,
22,
@ -466,7 +466,7 @@ class TestRouterServices(cloudstackTestCase):
"uptime",
hypervisor=self.apiclient.hypervisor
)
else:
else:
res = get_process_status(
host.ipaddress,
self.services['virtual_machine']["publicport"],