X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=sdnvpn%2Ftest%2Ffunctest%2Ftestcase_7.py;h=607a2993f0896652317c1edde5657241eaff8b1f;hb=c8e46b6ead26822c6e91bfc9a7be0562041d3c0c;hp=18b6dda9cedc6c0b8dbc6600a6ca6280a06c7ec7;hpb=ad8df02ac735202f1b3a92e4eac43948d98793d6;p=sdnvpn.git

diff --git a/sdnvpn/test/functest/testcase_7.py b/sdnvpn/test/functest/testcase_7.py
index 18b6dda..607a299 100644
--- a/sdnvpn/test/functest/testcase_7.py
+++ b/sdnvpn/test/functest/testcase_7.py
@@ -19,12 +19,12 @@ network associated:
 - Ping it
 """
 import argparse
+import logging
+import sys
 
-import functest.utils.functest_logger as ft_logger
-import functest.utils.openstack_utils as os_utils
-
-from sdnvpn.lib import utils as test_utils
+from functest.utils import openstack_utils as os_utils
 from sdnvpn.lib import config as sdnvpn_config
+from sdnvpn.lib import utils as test_utils
 from sdnvpn.lib.results import Results
 
 parser = argparse.ArgumentParser()
@@ -35,7 +35,7 @@ parser.add_argument("-r", "--report",
 
 args = parser.parse_args()
 
-logger = ft_logger.Logger("sdnvpn-testcase-7").getLogger()
+logger = logging.getLogger('sdnvpn-testcase-7')
 
 COMMON_CONFIG = sdnvpn_config.CommonConfig()
 TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig('testcase_7')
@@ -52,29 +52,43 @@ 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')
-    network_1_id, _, _ = test_utils.create_network(
+    image_ids.append(image_id)
+
+    network_1_id, subnet_1_id, router_1_id = test_utils.create_network(
         neutron_client,
         TESTCASE_CONFIG.net_1_name,
         TESTCASE_CONFIG.subnet_1_name,
         TESTCASE_CONFIG.subnet_1_cidr,
         TESTCASE_CONFIG.router_1_name)
-    network_2_id, _, _ = test_utils.create_network(
+
+    network_2_id, subnet_2_id, router_2_id = test_utils.create_network(
         neutron_client,
         TESTCASE_CONFIG.net_2_name,
         TESTCASE_CONFIG.subnet_2_name,
         TESTCASE_CONFIG.subnet_2_cidr,
         TESTCASE_CONFIG.router_2_name)
 
+    interfaces.append(tuple((router_1_id, subnet_1_id)))
+    interfaces.append(tuple((router_2_id, subnet_2_id)))
+    network_ids.extend([network_1_id, network_2_id])
+    router_ids.extend([router_1_id, router_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,
                                                 TESTCASE_CONFIG.secgroup_descr)
-    test_utils.open_icmp_ssh(neutron_client, sg_id)
+    test_utils.open_icmp(neutron_client, sg_id)
+    test_utils.open_http_port(neutron_client, sg_id)
+
     vm_2 = test_utils.create_instance(
         nova_client,
         TESTCASE_CONFIG.instance_2_name,
@@ -82,7 +96,7 @@ def main():
         network_2_id,
         sg_id,
         secgroup_name=TESTCASE_CONFIG.secgroup_name)
-    vm_2_ip = vm_2.networks.itervalues().next()[0]
+    vm_2_ip = test_utils.get_instance_ip(vm_2)
 
     u1 = test_utils.generate_ping_userdata([vm_2_ip])
     vm_1 = test_utils.create_instance(
@@ -94,6 +108,8 @@ def main():
         secgroup_name=TESTCASE_CONFIG.secgroup_name,
         userdata=u1)
 
+    instance_ids.extend([vm_1.id, vm_2.id])
+
     msg = ("Create VPN with eRT==iRT")
     results.record_action(msg)
     vpn_name = "sdnvpn-7"
@@ -101,9 +117,10 @@ def main():
               "export_targets": TESTCASE_CONFIG.targets,
               "route_distinguishers": TESTCASE_CONFIG.route_distinguishers,
               "name": vpn_name}
-    bgpvpn = os_utils.create_bgpvpn(neutron_client, **kwargs)
+    bgpvpn = test_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 networks '%s', '%s' to the VPN."
            % (TESTCASE_CONFIG.net_1_name,
@@ -111,9 +128,9 @@ def main():
     results.record_action(msg)
     results.add_to_summary(0, "-")
 
-    os_utils.create_network_association(
+    test_utils.create_network_association(
         neutron_client, bgpvpn_id, network_1_id)
-    os_utils.create_network_association(
+    test_utils.create_network_association(
         neutron_client, bgpvpn_id, network_2_id)
 
     test_utils.wait_for_bgp_net_assoc(
@@ -137,7 +154,8 @@ def main():
     results.add_to_summary(0, '-')
 
     fip = os_utils.create_floating_ip(neutron_client)
-    fip_added = os_utils.add_floating_ip(nova_client, vm_2.id, fip['fip_addr'])
+    fip_added = os_utils.add_floating_ip(nova_client, vm_2.id,
+                                         fip['fip_addr'])
     if fip_added:
         results.add_success(msg)
     else:
@@ -145,8 +163,15 @@ def main():
 
     results.ping_ip_test(fip['fip_addr'])
 
+    floatingip_ids.append(fip['fip_id'])
+
+    test_utils.cleanup_nova(nova_client, instance_ids, image_ids)
+    test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids,
+                               interfaces, subnet_ids, router_ids,
+                               network_ids)
     return results.compile_summary()
 
 
 if __name__ == '__main__':
-    main()
+    logging.basicConfig(level=logging.INFO)
+    sys.exit(main())