X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=sdnvpn%2Ftest%2Ffunctest%2Ftestcase_1.py;h=937ab7ac68deaaca4893abab1b6c498c4b312dd8;hb=8a20b43bfb9723ae1f2410a5448363a5e3f38f7b;hp=2cd03b6f42599659da4bf9364f53696b501d934d;hpb=de80ee56c458b127be3497f3882bc1c962f42dfe;p=sdnvpn.git

diff --git a/sdnvpn/test/functest/testcase_1.py b/sdnvpn/test/functest/testcase_1.py
index 2cd03b6..937ab7a 100644
--- a/sdnvpn/test/functest/testcase_1.py
+++ b/sdnvpn/test/functest/testcase_1.py
@@ -8,28 +8,20 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 
-import argparse
 import logging
-from random import randint
-
-import functest.utils.openstack_utils as os_utils
+import sys
 
-from sdnvpn.lib import utils as test_utils
+from functest.utils import openstack_utils as os_utils
+from random import randint
 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()
-
-parser.add_argument("-r", "--report",
-                    help="Create json result file",
-                    action="store_true")
-
-args = parser.parse_args()
-
-logger = logging.getLogger('sdnvpn-testcase-1')
+logger = logging.getLogger(__name__)
 
 COMMON_CONFIG = sdnvpn_config.CommonConfig()
-TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig('testcase_1')
+TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
+    'sdnvpn.test.functest.testcase_1')
 
 
 def main():
@@ -150,7 +142,7 @@ def main():
         "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)
@@ -159,7 +151,7 @@ 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)
 
     # Wait for VMs to get ips.
@@ -179,7 +171,7 @@ def main():
     results.add_to_summary(0, "-")
     results.record_action(msg)
     results.add_to_summary(0, "-")
-    os_utils.create_network_association(
+    test_utils.create_network_association(
         neutron_client, bgpvpn_id, network_2_id)
 
     test_utils.wait_for_bgp_net_assocs(neutron_client,
@@ -203,7 +195,7 @@ def main():
     kwargs = {"import_targets": TESTCASE_CONFIG.targets1,
               "export_targets": TESTCASE_CONFIG.targets1,
               "name": vpn_name}
-    bgpvpn = os_utils.update_bgpvpn(neutron_client, bgpvpn_id, **kwargs)
+    bgpvpn = test_utils.update_bgpvpn(neutron_client, bgpvpn_id, **kwargs)
 
     logger.info("Waiting for the VMs to connect to each other using the"
                 " updated network configuration")
@@ -212,14 +204,14 @@ 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)
+    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__':
     logging.basicConfig(level=logging.INFO)
-    main()
+    sys.exit(main())