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

CLOUDSTACK-9634: fix marvin test failure test_router_dhcp_opts

Browse Source 
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
This commit is contained in:
Murali Reddy 2016-11-30 16:24:02 +05:30
parent 5811d33658
commit a07e7ac099
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/integration/smoke/test_router_dhcphosts.py
View File

@ -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