X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=sdnvpn%2Ftest%2Ffunctest%2Ftestcase_8.py;h=bab767d3d04ad3455cfc6caa7e102d20af23d04b;hb=25620fad6a0b553a603441c6ec268e3ca27300c7;hp=f68507e341a2b6d0cefedb202b988752d91a0698;hpb=9a52d17d9ac79c358647d87b5d540e869b25769d;p=sdnvpn.git

diff --git a/sdnvpn/test/functest/testcase_8.py b/sdnvpn/test/functest/testcase_8.py
index f68507e..bab767d 100644
--- a/sdnvpn/test/functest/testcase_8.py
+++ b/sdnvpn/test/functest/testcase_8.py
@@ -18,27 +18,20 @@ Test whether router assoc can coexist with floating IP
 - Assign a floating IP to the VM in the router assoc network
 - Ping it the floating ip
 """
-import argparse
+import logging
+import sys
 
-import functest.utils.functest_logger as ft_logger
-import functest.utils.openstack_utils as os_utils
-
-import sdnvpn.lib.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
-import sdnvpn.lib.config as sdnvpn_config
-
-parser = argparse.ArgumentParser()
-
-parser.add_argument("-r", "--report",
-                    help="Create json result file",
-                    action="store_true")
 
-args = parser.parse_args()
 
-logger = ft_logger.Logger("sdnvpn-testcase-8").getLogger()
+logger = logging.getLogger(__name__)
 
 COMMON_CONFIG = sdnvpn_config.CommonConfig()
-TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig('testcase_8')
+TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
+    'sdnvpn.test.functest.testcase_8')
 
 
 def main():
@@ -52,13 +45,18 @@ 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, _, router_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,
@@ -67,10 +65,17 @@ def main():
     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)
+
+    interfaces.append(tuple((router_1_id, subnet_1_id)))
+    network_ids.extend([network_1_id, network_2_id])
+    router_ids.append(router_1_id)
+    subnet_ids.extend([subnet_1_id, subnet_2_id])
 
     sg_id = os_utils.create_security_group_full(neutron_client,
                                                 TESTCASE_CONFIG.secgroup_name,
@@ -96,16 +101,18 @@ def main():
         sg_id,
         secgroup_name=TESTCASE_CONFIG.secgroup_name,
         userdata=u1)
+    instance_ids.extend([vm_1.id, vm_2.id])
 
     results.record_action("Create VPN with eRT==iRT")
-    vpn_name = "sdnvpn-7"
+    vpn_name = "sdnvpn-8"
     kwargs = {"import_targets": TESTCASE_CONFIG.targets,
               "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 router '%s' and net '%s' to the VPN."
            % (TESTCASE_CONFIG.router_1_name,
@@ -113,9 +120,9 @@ def main():
     results.record_action(msg)
     results.add_to_summary(0, "-")
 
-    os_utils.create_router_association(
+    test_utils.create_router_association(
         neutron_client, bgpvpn_id, router_1_id)
-    os_utils.create_network_association(
+    test_utils.create_network_association(
         neutron_client, bgpvpn_id, network_2_id)
 
     test_utils.wait_for_bgp_router_assoc(
@@ -138,18 +145,28 @@ def main():
     results.record_action(msg)
 
     fip = os_utils.create_floating_ip(neutron_client)
+
     fip_added = os_utils.add_floating_ip(nova_client, vm_1.id, fip['fip_addr'])
     if fip_added:
         results.add_success(msg)
     else:
         results.add_failure(msg)
 
+    results.add_to_summary(0, "=")
     results.record_action("Ping %s via Floating IP" % vm_1.name)
     results.add_to_summary(0, "-")
     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())