etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.8' into 4.9

This commit is contained in:
Rohit Yadav 2016-12-01 10:38:43 +05:30
parent bef2236d33 b57d0ae7c3
commit 5d7288b858
No known key found for this signature in database
GPG Key ID: 484248210EE3D884
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