Added new app by qkd_app

src/webui/service/__init__.py

@@ -72,48 +72,48 @@ class SetSubAppMiddleware():
         return self.app(environ, start_response)
 
 def create_app(use_config=None, web_app_root=None):
-    qkd_app = Flask(__name__)
+    app = Flask(__name__)
     if use_config:
-        qkd_app.config.from_mapping(**use_config)
+        app.config.from_mapping(**use_config)
     
-    qkd_app.config.update(HEALTHZ={
+    app.config.update(HEALTHZ={
         'live': liveness,
         'ready': readiness
     })
     
-    qkd_app.register_blueprint(healthz, url_prefix='/healthz')
+    app.register_blueprint(healthz, url_prefix='/healthz')
 
     from webui.service.js.routes import js                  # pylint: disable=import-outside-toplevel
-    qkd_app.register_blueprint(js)
+    app.register_blueprint(js)
 
     from webui.service.main.routes import main              # pylint: disable=import-outside-toplevel
-    qkd_app.register_blueprint(main)
+    app.register_blueprint(main)
 
     from webui.service.load_gen.routes import load_gen      # pylint: disable=import-outside-toplevel
-    qkd_app.register_blueprint(load_gen)
+    app.register_blueprint(load_gen)
 
     from webui.service.service.routes import service        # pylint: disable=import-outside-toplevel
-    qkd_app.register_blueprint(service)
+    app.register_blueprint(service)
 
     from webui.service.slice.routes import slice            # pylint: disable=import-outside-toplevel,redefined-builtin
-    qkd_app.register_blueprint(slice)
+    app.register_blueprint(slice)
 
     from webui.service.device.routes import device          # pylint: disable=import-outside-toplevel
-    qkd_app.register_blueprint(device)
+    app.register_blueprint(device)
     
     from webui.service.bgpls.routes import bgpls          # pylint: disable=import-outside-toplevel
-    qkd_app.register_blueprint(bgpls)
+    app.register_blueprint(bgpls)
 
     from webui.service.link.routes import link              # pylint: disable=import-outside-toplevel
-    qkd_app.register_blueprint(link)
+    app.register_blueprint(link)
 
     from webui.service.qkd_app.routes import qkd_app as _qkd_app             # pylint: disable=import-outside-toplevel
-    qkd_app.register_blueprint(_qkd_app)
+    app.register_blueprint(_qkd_app)
 
     from webui.service.policy_rule.routes import policy_rule # pylint: disable=import-outside-toplevel
-    qkd_app.register_blueprint(policy_rule)
+    app.register_blueprint(policy_rule)
 
-    qkd_app.jinja_env.globals.update({              # pylint: disable=no-member
+    app.jinja_env.globals.update({              # pylint: disable=no-member
         'enumerate'           : enumerate,
         'grpc_message_to_json': grpc_message_to_json,
         'json_to_list'        : json_to_list,
@@ -123,5 +123,5 @@ def create_app(use_config=None, web_app_root=None):
     })
 
     if web_app_root is not None:
-        qkd_app.wsgi_qkd_app = SetSubAppMiddleware(qkd_app.wsgi_qkd_app, web_qkd_app_root)
-    return qkd_app
+        app.wsgi_app = SetSubAppMiddleware(app.wsgi_app, web_app_root)
+    return app

src/webui/service/templates/base.html

@@ -104,7 +104,7 @@
                   {% endif %}
                 </li>
                 <li class="nav-item">
-                  {% if '/app/' in request.path %}
+                  {% if '/qkd_app/' in request.path %}
                   <a class="nav-link active" aria-current="page" href="{{ url_for('app.home') }}">App</a>
                   {% else %}
                   <a class="nav-link" href="{{ url_for('app.home') }}">App</a>