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

fixed test_nuage_extra_dhcp test failures due to refactoring

Browse Source 
duplicate validate_vpc methods, renamed one to
validate_vpc_and_vpcoffering
fixed a typo in remove default_nic test
This commit is contained in:
rsmeets 2018-07-19 10:53:26 +02:00 committed by Frank Maximus
parent 604158220d
commit b0490c5195
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/integration/plugins/nuagevsp/test_nuage_extra_dhcp.py
View File

@ -456,8 +456,7 @@ class TestNuageExtraDhcp(nuageTestCase):
self.debug("clear lease is done properly:" + completeoutput) self.debug("clear lease is done properly:" + completeoutput)
def update_zone_details(self, value): def update_zone_details(self, value):
"""Updates the VM data""" """Updates Network Domain at zone level"""
# update Network Domain at zone level
cmd = updateZone.updateZoneCmd() cmd = updateZone.updateZoneCmd()
cmd.id = self.zone.id cmd.id = self.zone.id
cmd.domain = value cmd.domain = value
@ -490,7 +489,7 @@ class TestNuageExtraDhcp(nuageTestCase):
self.validate_NetworkOffering(network_offering, state="Enabled") self.validate_NetworkOffering(network_offering, state="Enabled")
self.validate_Network(network) self.validate_Network(network)
def validate_vpc(self, vpc, vpc_offering): def validate_vpc_and_vpcoffering(self, vpc, vpc_offering):
self.debug("Validating vpc...") self.debug("Validating vpc...")
self.validate_vpc(vpc) self.validate_vpc(vpc)
self.validate_VpcOffering(vpc_offering) self.validate_VpcOffering(vpc_offering)
@ -1268,8 +1267,9 @@ class TestNuageExtraDhcp(nuageTestCase):
self.when_i_stop_and_start_a_vm(vm1) self.when_i_stop_and_start_a_vm(vm1)
with self.assertRaises(Exception): with self.assertRaises(Exception):
vm1.remove_nic( vm1.remove_nic(
self.api_client, [nic for nic in result.nic self.api_client,
if nic.networkid == network.id][0]) [nic for nic in result.nic
if nic.networkid == network.id][0].id)
def validate_all_extra_dhcp_for_update_multinic( def validate_all_extra_dhcp_for_update_multinic(
self, network, self, network,
@ -1684,7 +1684,7 @@ class TestNuageExtraDhcp(nuageTestCase):
@attr(tags=["advanced", "nuagevsp"], required_hardware="false") @attr(tags=["advanced", "nuagevsp"], required_hardware="false")
def test_02_nuage_extra_dhcp_single_nic_in_vpc(self): def test_02_nuage_extra_dhcp_single_nic_in_vpc(self):
self.update_zone_details("testvpc.com") self.update_zone_details("testvpc.com")
self.validate_vpc(self.vpc1, self.vpc_offering) self.validate_vpc_and_vpcoffering(self.vpc1, self.vpc_offering)
self.validate_Network(self.vpc_network) self.validate_Network(self.vpc_network)
self.validate_all_extra_dhcp_deploy_vm( self.validate_all_extra_dhcp_deploy_vm(
@ -1711,7 +1711,7 @@ class TestNuageExtraDhcp(nuageTestCase):
@attr(tags=["advanced", "nuagevsp"], required_hardware="false") @attr(tags=["advanced", "nuagevsp"], required_hardware="false")
def test_05_nuage_extra_dhcp_update_vm_in_vpc(self): def test_05_nuage_extra_dhcp_update_vm_in_vpc(self):
self.update_zone_details("testvpc.com") self.update_zone_details("testvpc.com")
self.validate_vpc(self.vpc1, self.vpc_offering) self.validate_vpc_and_vpcoffering(self.vpc1, self.vpc_offering)
self.validate_Network(self.vpc_network) self.validate_Network(self.vpc_network)
self.validate_all_extra_dhcp_after_vm_update( self.validate_all_extra_dhcp_after_vm_update(
@ -1737,7 +1737,7 @@ class TestNuageExtraDhcp(nuageTestCase):
@attr(tags=["advanced", "nuagevsp"], required_hardware="false") @attr(tags=["advanced", "nuagevsp"], required_hardware="false")
def test_08_nuage_extra_dhcp_add_nic_in_vpc(self): def test_08_nuage_extra_dhcp_add_nic_in_vpc(self):
self.update_zone_details("testvpc.com") self.update_zone_details("testvpc.com")
self.validate_vpc(self.vpc1, self.vpc_offering) self.validate_vpc_and_vpcoffering(self.vpc1, self.vpc_offering)
self.validate_Network(self.vpc_network) self.validate_Network(self.vpc_network)
self.validate_all_extra_dhcp_after_plug_nic( self.validate_all_extra_dhcp_after_plug_nic(
@ -1763,7 +1763,7 @@ class TestNuageExtraDhcp(nuageTestCase):
@attr(tags=["advanced", "nuagevsp"], required_hardware="false") @attr(tags=["advanced", "nuagevsp"], required_hardware="false")
def test_11_nuage_extra_dhcp_deploy_multi_nic_vm_in_vpc(self): def test_11_nuage_extra_dhcp_deploy_multi_nic_vm_in_vpc(self):
self.update_zone_details("testvpc.com") self.update_zone_details("testvpc.com")
self.validate_vpc(self.vpc1, self.vpc_offering) self.validate_vpc_and_vpcoffering(self.vpc1, self.vpc_offering)
self.validate_Network(self.vpc_network) self.validate_Network(self.vpc_network)
self.validate_all_extra_dhcp_for_multi_nic( self.validate_all_extra_dhcp_for_multi_nic(
@ -1789,7 +1789,7 @@ class TestNuageExtraDhcp(nuageTestCase):
@attr(tags=["advanced", "nuagevsp"], required_hardware="false") @attr(tags=["advanced", "nuagevsp"], required_hardware="false")
def test_14_nuage_extra_dhcp_update_multi_nic_in_vpc(self): def test_14_nuage_extra_dhcp_update_multi_nic_in_vpc(self):
self.update_zone_details("testvpc.com") self.update_zone_details("testvpc.com")
self.validate_vpc(self.vpc1, self.vpc_offering) self.validate_vpc_and_vpcoffering(self.vpc1, self.vpc_offering)
self.validate_Network(self.vpc_network) self.validate_Network(self.vpc_network)
self.validate_all_extra_dhcp_for_update_multinic( self.validate_all_extra_dhcp_for_update_multinic(
@ -1815,7 +1815,7 @@ class TestNuageExtraDhcp(nuageTestCase):
@attr(tags=["advanced", "nuagevsp"], required_hardware="false") @attr(tags=["advanced", "nuagevsp"], required_hardware="false")
def test_17_nuage_extra_dhcp_remove_nic_in_vpc(self): def test_17_nuage_extra_dhcp_remove_nic_in_vpc(self):
self.update_zone_details("testvpc.com") self.update_zone_details("testvpc.com")
self.validate_vpc(self.vpc1, self.vpc_offering) self.validate_vpc_and_vpcoffering(self.vpc1, self.vpc_offering)
self.validate_Network(self.vpc_network) self.validate_Network(self.vpc_network)
self.validate_all_extra_dhcp_for_remove_nic_from_vm( self.validate_all_extra_dhcp_for_remove_nic_from_vm(
@ -1842,7 +1842,7 @@ class TestNuageExtraDhcp(nuageTestCase):
@attr(tags=["advanced", "nuagevsp"], required_hardware="false") @attr(tags=["advanced", "nuagevsp"], required_hardware="false")
def test_20_nuage_nuage_extra_dhcp_vm_actions_in_vpc(self): def test_20_nuage_nuage_extra_dhcp_vm_actions_in_vpc(self):
self.update_zone_details("testvpc.com") self.update_zone_details("testvpc.com")
self.validate_vpc(self.vpc1, self.vpc_offering) self.validate_vpc_and_vpcoffering(self.vpc1, self.vpc_offering)
self.validate_Network(self.vpc_network) self.validate_Network(self.vpc_network)
self.validate_all_extra_dhcp_for_vm_actions_in_network( self.validate_all_extra_dhcp_for_vm_actions_in_network(
@ -1869,7 +1869,7 @@ class TestNuageExtraDhcp(nuageTestCase):
@attr(tags=["advanced", "nuagevsp"], required_hardware="false") @attr(tags=["advanced", "nuagevsp"], required_hardware="false")
def test_23_nuage_nuage_extra_dhcp_network_actions_in_vpc(self): def test_23_nuage_nuage_extra_dhcp_network_actions_in_vpc(self):
self.update_zone_details("testvpc.com") self.update_zone_details("testvpc.com")
self.validate_vpc(self.vpc1, self.vpc_offering) self.validate_vpc_and_vpcoffering(self.vpc1, self.vpc_offering)
self.validate_Network(self.vpc_network) self.validate_Network(self.vpc_network)
self.validate_all_extra_dhcp_for_network_actions_in_network( self.validate_all_extra_dhcp_for_network_actions_in_network(
@ -1896,7 +1896,7 @@ class TestNuageExtraDhcp(nuageTestCase):
@attr(tags=["advanced", "nuagevsp"], required_hardware="false") @attr(tags=["advanced", "nuagevsp"], required_hardware="false")
def test_26_nuage_nuage_extra_dhcp_nic_after_migrate_in_vpc(self): def test_26_nuage_nuage_extra_dhcp_nic_after_migrate_in_vpc(self):
self.update_zone_details("testvpc.com") self.update_zone_details("testvpc.com")
self.validate_vpc(self.vpc1, self.vpc_offering) self.validate_vpc_and_vpcoffering(self.vpc1, self.vpc_offering)
self.validate_Network(self.vpc_network) self.validate_Network(self.vpc_network)
self.validate_all_extra_dhcp_for_add_remove_nic_after_migrate( self.validate_all_extra_dhcp_for_add_remove_nic_after_migrate(
@ -1930,7 +1930,7 @@ class TestNuageExtraDhcp(nuageTestCase):
@attr(tags=["advanced", "nuagevsp"], required_hardware="false") @attr(tags=["advanced", "nuagevsp"], required_hardware="false")
def test_30_nuage_extra_dhcp_allocated_vpc(self): def test_30_nuage_extra_dhcp_allocated_vpc(self):
self.update_zone_details("testvpc.com") self.update_zone_details("testvpc.com")
self.validate_vpc(self.vpc1, self.vpc_offering) self.validate_vpc_and_vpcoffering(self.vpc1, self.vpc_offering)
self.validate_Network(self.vpc_network) self.validate_Network(self.vpc_network)
self.validate_all_extra_dhcp_for_network_in_allocated( self.validate_all_extra_dhcp_for_network_in_allocated(