diff options
Diffstat (limited to 'sdnvpn/test/functest/testcase_7.py')
| -rw-r--r-- | sdnvpn/test/functest/testcase_7.py | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/sdnvpn/test/functest/testcase_7.py b/sdnvpn/test/functest/testcase_7.py index 715b55a..e588b14 100644 --- a/sdnvpn/test/functest/testcase_7.py +++ b/sdnvpn/test/functest/testcase_7.py @@ -43,7 +43,6 @@ def main(): results.add_to_summary(0, "=") neutron_client = os_utils.get_neutron_client() - conn = os_utils.get_os_connection() (floatingip_ids, instance_ids, router_ids, network_ids, image_ids, subnet_ids, interfaces, bgpvpn_ids) = ([] for i in range(8)) @@ -56,14 +55,14 @@ def main(): image_ids.append(image_id) network_1_id, subnet_1_id, router_1_id = test_utils.create_network( - neutron_client, + conn, TESTCASE_CONFIG.net_1_name, TESTCASE_CONFIG.subnet_1_name, TESTCASE_CONFIG.subnet_1_cidr, TESTCASE_CONFIG.router_1_name) network_2_id, subnet_2_id, router_2_id = test_utils.create_network( - neutron_client, + conn, TESTCASE_CONFIG.net_2_name, TESTCASE_CONFIG.subnet_2_name, TESTCASE_CONFIG.subnet_2_cidr, @@ -76,10 +75,10 @@ def main(): subnet_ids.extend([subnet_1_id, subnet_2_id]) sg_id = os_utils.create_security_group_full( - neutron_client, TESTCASE_CONFIG.secgroup_name, + conn, TESTCASE_CONFIG.secgroup_name, TESTCASE_CONFIG.secgroup_descr) - test_utils.open_icmp(neutron_client, sg_id) - test_utils.open_http_port(neutron_client, sg_id) + test_utils.open_icmp(conn, sg_id) + test_utils.open_http_port(conn, sg_id) vm_2 = test_utils.create_instance( conn, @@ -151,18 +150,16 @@ def main(): results.record_action(msg) results.add_to_summary(0, '-') - vm2_port = test_utils.get_port(neutron_client, - vm_2.id) - fip_added = os_utils.attach_floating_ip(neutron_client, - vm2_port['id']) + vm2_port = test_utils.get_port(conn, vm_2.id) + fip_added = os_utils.attach_floating_ip(conn, vm2_port.id) if fip_added: results.add_success(msg) else: results.add_failure(msg) - results.ping_ip_test(fip_added['floatingip']['floating_ip_address']) + results.ping_ip_test(fip_added.floating_ip_address) - floatingip_ids.append(fip_added['floatingip']['id']) + floatingip_ids.append(fip_added.id) except Exception as e: logger.error("exception occurred while executing testcase_7: %s", e) @@ -170,7 +167,7 @@ def main(): finally: test_utils.cleanup_nova(conn, instance_ids) test_utils.cleanup_glance(conn, image_ids) - test_utils.cleanup_neutron(neutron_client, floatingip_ids, + test_utils.cleanup_neutron(conn, neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, router_ids, network_ids) |