Merge "Prepare run_tests to be called directly to main()"

[sdnvpn.git] / sdnvpn / test / functest / run_tests.py

diff --git a/sdnvpn/test/functest/run_tests.py b/sdnvpn/test/functest/run_tests.py
index 9acfa0f..140aee2 100644 (file)
--- a/sdnvpn/test/functest/run_tests.py
+++ b/sdnvpn/test/functest/run_tests.py
@@ -20,13 +20,7 @@ import functest.utils.functest_utils as ft_utils
 from sdnvpn.lib import 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-run-tests").getLogger()
+logger = ft_logger.Logger(__name__).getLogger()
 
 COMMON_CONFIG = sdnvpn_config.CommonConfig()
 TEST_DB_URL = COMMON_CONFIG.test_db
@@ -42,9 +36,10 @@ def push_results(testname, start_time, end_time, criteria, details):
                                 details)
 
 
-def main():
+def main(report=False):
     # Workaround for https://jira.opnfv.org/projects/SDNVPN/issues/SDNVPN-100
-    cmd_line = "neutron quota-update --subnet -1 --network -1"
+    # and SDNVPN-126
+    cmd_line = "neutron quota-update --subnet -1 --network -1 --port -1"
     logger.info("Setting subnet/net quota to unlimited : %s" % cmd_line)
     cmd = os.popen(cmd_line)
     output = cmd.read()
@@ -87,7 +82,7 @@ def main():
                 if status == "FAIL":
                     overall_status = "FAIL"
 
-            if args.report:
+            if report:
                 push_results(
                     test_name_db, start_time, end_time, status, details)
 
@@ -98,4 +93,9 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-r", "--report",
+                        help="Create json result file",
+                        action="store_true")
+    args = parser.parse_args()
+    main(report=args.report)