Fix WebUI imports related to qkd_app

src/webui/service/__init__.py

@@ -83,32 +83,32 @@ def create_app(use_config=None, web_app_root=None):
     
     app.register_blueprint(healthz, url_prefix='/healthz')
 
-    from webui.service.js.routes import js                  # pylint: disable=import-outside-toplevel
+    from webui.service.js.routes import js                   # pylint: disable=import-outside-toplevel
     app.register_blueprint(js)
 
-    from webui.service.main.routes import main              # pylint: disable=import-outside-toplevel
+    from webui.service.main.routes import main               # pylint: disable=import-outside-toplevel
     app.register_blueprint(main)
 
-    from webui.service.load_gen.routes import load_gen      # pylint: disable=import-outside-toplevel
+    from webui.service.load_gen.routes import load_gen       # pylint: disable=import-outside-toplevel
     app.register_blueprint(load_gen)
 
-    from webui.service.service.routes import service        # pylint: disable=import-outside-toplevel
+    from webui.service.service.routes import service         # pylint: disable=import-outside-toplevel
     app.register_blueprint(service)
 
-    from webui.service.slice.routes import slice            # pylint: disable=import-outside-toplevel,redefined-builtin
+    from webui.service.slice.routes import slice             # pylint: disable=import-outside-toplevel,redefined-builtin
     app.register_blueprint(slice)
 
-    from webui.service.device.routes import device          # pylint: disable=import-outside-toplevel
+    from webui.service.device.routes import device           # pylint: disable=import-outside-toplevel
     app.register_blueprint(device)
     
-    from webui.service.bgpls.routes import bgpls          # pylint: disable=import-outside-toplevel
+    from webui.service.bgpls.routes import bgpls             # pylint: disable=import-outside-toplevel
     app.register_blueprint(bgpls)
 
-    from webui.service.link.routes import link              # pylint: disable=import-outside-toplevel
+    from webui.service.link.routes import link               # pylint: disable=import-outside-toplevel
     app.register_blueprint(link)
 
-    from webui.service.qkd_app.routes import qkd_app as _qkd_app             # pylint: disable=import-outside-toplevel
-    app.register_blueprint(_qkd_app)
+    from webui.service.qkd_app.routes import qkd_app         # pylint: disable=import-outside-toplevel
+    app.register_blueprint(qkd_app)
 
     from webui.service.policy_rule.routes import policy_rule # pylint: disable=import-outside-toplevel
     app.register_blueprint(policy_rule)

src/webui/service/qkd_app/routes.py

@@ -25,12 +25,12 @@ from qkd_app.client.QKDAppClient import QKDAppClient
 
 
 LOGGER = logging.getLogger(__name__)
-app = Blueprint('qkd_app', __name__, url_prefix='/qkd_app')
+qkd_app = Blueprint('qkd_app', __name__, url_prefix='/qkd_app')
 
 qkd_app_client = QKDAppClient()
 context_client = ContextClient()
 
-@app.get('/')
+@qkd_app.get('/')
 def home():
     if 'context_uuid' not in session or 'topology_uuid' not in session:
         flash("Please select a context!", "warning")
@@ -68,10 +68,10 @@ def home():
 
     context_client.close()
     return render_template(
-        'app/home.html', apps=apps, device_names=device_names, ate=QKDAppTypesEnum, ase=QKDAppStatusEnum)
+        'qkd_app/home.html', apps=apps, device_names=device_names, ate=QKDAppTypesEnum, ase=QKDAppStatusEnum)
 
 
-@app.route('detail/<path:app_uuid>', methods=('GET', 'POST'))
+@qkd_app.route('detail/<path:app_uuid>', methods=('GET', 'POST'))
 def detail(app_uuid: str):
     '''
     context_client.connect()
@@ -87,7 +87,7 @@ def detail(app_uuid: str):
     '''
     pass
 
-@app.get('<path:app_uuid>/delete')
+@qkd_app.get('<path:app_uuid>/delete')
 def delete(app_uuid):
     '''
     try: