Merge "Compass4NFV add new scenario nosdn-kvm"

[releng.git] / utils / test / testapi / opnfv_testapi / cmd / server.py

diff --git a/utils/test/testapi/opnfv_testapi/cmd/server.py b/utils/test/testapi/opnfv_testapi/cmd/server.py
index fa2b722..545d5e3 100644 (file)
--- a/utils/test/testapi/opnfv_testapi/cmd/server.py
+++ b/utils/test/testapi/opnfv_testapi/cmd/server.py
@@ -48,7 +48,9 @@ def parse_config(argv=[]):
     parser.add_argument("-c", "--config-file", dest='config_file',
                         help="Config file location")
     args = parser.parse_args(argv)
-    CONF = config.APIConfig().parse(args.config_file)
+    if args.config_file:
+        config.Config.CONFIG = args.config_file
+    CONF = config.Config()
 
 
 def get_db():
@@ -56,12 +58,14 @@ def get_db():
 
 
 def make_app():
-    swagger.docs(base_url=CONF.swagger_base_url)
+    swagger.docs(base_url=CONF.swagger_base_url,
+                 static_path=CONF.static_path)
     return swagger.Application(
         url_mappings.mappings,
         db=get_db(),
-        debug=CONF.api_debug_on,
-        auth=CONF.api_authenticate_on
+        debug=CONF.api_debug,
+        auth=CONF.api_authenticate,
+        cookie_secret='opnfv-testapi',
     )