diff options
Diffstat (limited to 'sdnvpn/test')
| -rw-r--r-- | sdnvpn/test/functest/testcase_13.py | 2 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_3.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sdnvpn/test/functest/testcase_13.py b/sdnvpn/test/functest/testcase_13.py index dc8f3bc..bc11533 100644 --- a/sdnvpn/test/functest/testcase_13.py +++ b/sdnvpn/test/functest/testcase_13.py @@ -196,7 +196,7 @@ def main(): raise finally: test_utils.update_router_no_extra_route(neutron_client, router_ids) - test_utils.cleanup_nova(nova_client, instance_ids) + test_utils.cleanup_nova(nova_client, instance_ids, flavor_ids) test_utils.cleanup_glance(glance_client, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py index 97c0601..a09f95d 100644 --- a/sdnvpn/test/functest/testcase_3.py +++ b/sdnvpn/test/functest/testcase_3.py @@ -155,6 +155,9 @@ def main(): subnet_ids, interfaces, bgpvpn_ids, flavor_ids) = ([] for i in range(9)) try: + _, flavor_id = test_utils.create_custom_flavor() + flavor_ids.append(flavor_id) + sg_id = os_utils.create_security_group_full( neutron_client, TESTCASE_CONFIG.secgroup_name, TESTCASE_CONFIG.secgroup_descr) @@ -230,9 +233,6 @@ def main(): fake_fip['fip_addr'], ext_net_mask) - _, flavor_id = test_utils.create_custom_flavor() - flavor_ids.append(flavor_id) - quagga_vm = test_utils.create_instance( nova_client, TESTCASE_CONFIG.quagga_instance_name, |