Merge "Refactored docker watchdog code"

[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 3e0484f..b7d3caa 100644 (file)
--- a/utils/test/testapi/opnfv_testapi/cmd/server.py
+++ b/utils/test/testapi/opnfv_testapi/cmd/server.py
@@ -29,34 +29,21 @@ TODOs :
 
 """
 
-import argparse
-
-import motor
 import tornado.ioloop
 
-from opnfv_testapi.common import config
+from opnfv_testapi.common.config import CONF
 from opnfv_testapi.router import url_mappings
 from opnfv_testapi.tornado_swagger import swagger
 
-# optionally get config file from command line
-parser = argparse.ArgumentParser()
-parser.add_argument("-c", "--config-file", dest='config_file',
-                    help="Config file location")
-args = parser.parse_args()
-CONF = config.APIConfig().parse(args.config_file)
-
-# connecting to MongoDB server, and choosing database
-client = motor.MotorClient(CONF.mongo_url)
-db = client[CONF.mongo_dbname]
-
-swagger.docs(base_url=CONF.swagger_base_url)
-
 
 def make_app():
+    swagger.docs(base_url=CONF.ui_url,
+                 static_path=CONF.ui_static_path)
     return swagger.Application(
         url_mappings.mappings,
-        db=db,
-        debug=CONF.api_debug_on,
+        debug=CONF.api_debug,
+        auth=CONF.api_authenticate,
+        cookie_secret='opnfv-testapi',
     )