From a07e7ac0991921ce4e4899ed33dcde49be530ffd Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Wed, 30 Nov 2016 16:24:02 +0530 Subject: [PATCH] CLOUDSTACK-9634: fix marvin test failure test_router_dhcp_opts marvin, VirtualMachine object, nic attribute does not have nic's in any particualr order in the array. soi check isdefault attribute to the get non-default nic earlier test made assumption that nic[0] is default nic, which is not true always --- test/integration/smoke/test_router_dhcphosts.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/test/integration/smoke/test_router_dhcphosts.py b/test/integration/smoke/test_router_dhcphosts.py index 3a59998067c..668475e3510 100644 --- a/test/integration/smoke/test_router_dhcphosts.py +++ b/test/integration/smoke/test_router_dhcphosts.py @@ -749,8 +749,19 @@ class TestRouterDHCPOpts(cloudstackTestCase): "Check list port forwarding rules" ) - self.logger.debug("Testing DHCP options for VMs %s and %s" % (self.vm_1.id, self.vm_2.id)) - self.test_dhcphopts(self.vm_2.nic[1].ipaddress, network1_router) - self.test_dhcphopts(self.vm_1.nic[0].ipaddress, network2_router) + vm1_non_default_nic_ip = self.get_vm_non_default_nic_ip(self.vm_1) + vm2_non_default_nic_ip = self.get_vm_non_default_nic_ip(self.vm_2) + + self.logger.debug("Testing DHCP options for VM's %s IP address %s in virtual router %s" % (self.vm_2.id, vm2_non_default_nic_ip, str(network1_router) )) + self.test_dhcphopts(vm2_non_default_nic_ip, network1_router) + + self.logger.debug("Testing DHCP options for VM's %s IP address %s in virtual router %s" % (self.vm_1.id, vm1_non_default_nic_ip, str(network2_router) )) + self.test_dhcphopts(vm1_non_default_nic_ip, network2_router) return + + def get_vm_non_default_nic_ip(self, vm): + if vm.nic[0].isdefault: + return vm.nic[1].ipaddress + else: + return vm.nic[0].ipaddress