diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py index d89acf93736..2e4553be35f 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,