Merge "Updated python version and flake8 in tox"

[pti/o2.git] / o2app / entrypoints / flask_application.py

diff --git a/o2app/entrypoints/flask_application.py b/o2app/entrypoints/flask_application.py
index f74dca2..c7e0ef9 100644 (file)
--- a/o2app/entrypoints/flask_application.py
+++ b/o2app/entrypoints/flask_application.py
@@ -18,9 +18,8 @@ from flask_restx import Api
 
 from o2app import bootstrap
 from o2ims.views import configure_namespace as ims_route_configure_namespace
-from o2dms.api import configure_namespace as dms_route_configure_namespace
+from o2common.views.route_exception import configure_exception
 
-from o2ims.adapter.clients.alarm_dict_client import load_alarm_definition
 from o2common.authmw import authmiddleware
 from o2common.authmw import authprov
 from o2common.config.config import get_review_url
@@ -40,6 +39,8 @@ def _get_k8s_url():
         raise Exception('Get k8s token review url failed')
 
 
+FLASK_API_VERSION = '1.0.0'
+
 if auth:
     # perform service account identity&privilege check.
     _get_k8s_url()
@@ -48,13 +49,16 @@ if auth:
     app.wsgi_app = authmiddleware.authmiddleware(app.wsgi_app)
 
 app.config.SWAGGER_UI_DOC_EXPANSION = 'list'
-api = Api(app, version='1.0.0',
-          title='INF O2 Services API',
-          description='Swagger OpenAPI document for the INF O2 Services',
+# app.config['RESTX_MASK_HEADER'] = 'fields'
+app.config['RESTX_MASK_SWAGGER'] = False
+app.config['ERROR_INCLUDE_MESSAGE'] = False
+api = Api(
+    app, version=FLASK_API_VERSION,
+    catch_all_404s=True,
+    title='INF O2 Services API',
+    description='Swagger OpenAPI document for the INF O2 Services',
           )
 bus = bootstrap.bootstrap()
 
+configure_exception(api)
 ims_route_configure_namespace(api)
-dms_route_configure_namespace(api)
-
-load_alarm_definition(bus.uow)