diff options
Diffstat (limited to 'sdnvpn/test/functest/testcase_1.py')
| -rw-r--r-- | sdnvpn/test/functest/testcase_1.py | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/sdnvpn/test/functest/testcase_1.py b/sdnvpn/test/functest/testcase_1.py index 544d30f..2cd03b6 100644 --- a/sdnvpn/test/functest/testcase_1.py +++ b/sdnvpn/test/functest/testcase_1.py @@ -43,26 +43,33 @@ def main(): neutron_client = os_utils.get_neutron_client() glance_client = os_utils.get_glance_client() + (floatingip_ids, instance_ids, router_ids, network_ids, image_ids, + subnet_ids, interfaces, bgpvpn_ids) = ([] for i in range(8)) + image_id = os_utils.create_glance_image(glance_client, TESTCASE_CONFIG.image_name, COMMON_CONFIG.image_path, disk=COMMON_CONFIG.image_format, container="bare", public='public') + image_ids.append(image_id) + network_1_id = test_utils.create_net(neutron_client, TESTCASE_CONFIG.net_1_name) - test_utils.create_subnet(neutron_client, - TESTCASE_CONFIG.subnet_1_name, - TESTCASE_CONFIG.subnet_1_cidr, - network_1_id) + subnet_1_id = test_utils.create_subnet(neutron_client, + TESTCASE_CONFIG.subnet_1_name, + TESTCASE_CONFIG.subnet_1_cidr, + network_1_id) network_2_id = test_utils.create_net(neutron_client, TESTCASE_CONFIG.net_2_name) - test_utils.create_subnet(neutron_client, - TESTCASE_CONFIG.subnet_2_name, - TESTCASE_CONFIG.subnet_2_cidr, - network_2_id) + subnet_2_id = test_utils.create_subnet(neutron_client, + TESTCASE_CONFIG.subnet_2_name, + TESTCASE_CONFIG.subnet_2_cidr, + network_2_id) + network_ids.extend([network_1_id, network_2_id]) + subnet_ids.extend([subnet_1_id, subnet_2_id]) sg_id = os_utils.create_security_group_full(neutron_client, TESTCASE_CONFIG.secgroup_name, @@ -132,6 +139,7 @@ def main(): secgroup_name=TESTCASE_CONFIG.secgroup_name, compute_node=av_zone_1, userdata=u1) + instance_ids.extend([vm_1.id, vm_2.id, vm_3.id, vm_4.id, vm_5.id]) msg = ("Create VPN with eRT<>iRT") results.record_action(msg) @@ -145,6 +153,7 @@ def main(): bgpvpn = os_utils.create_bgpvpn(neutron_client, **kwargs) bgpvpn_id = bgpvpn['bgpvpn']['id'] logger.debug("VPN created details: %s" % bgpvpn) + bgpvpn_ids.append(bgpvpn_id) msg = ("Associate network '%s' to the VPN." % TESTCASE_CONFIG.net_1_name) results.record_action(msg) @@ -203,6 +212,11 @@ def main(): results.get_ping_status(vm_1, vm_4, expected="PASS", timeout=30) results.get_ping_status(vm_1, vm_5, expected="PASS", timeout=30) + test_utils.cleanup_nova(nova_client, floatingip_ids, instance_ids, + image_ids) + test_utils.cleanup_neutron(neutron_client, bgpvpn_ids, interfaces, + subnet_ids, router_ids, network_ids) + return results.compile_summary() |