Commit 9e315685 authored by Alberto Gonzalez Barneo's avatar Alberto Gonzalez Barneo
Browse files

Addede left files needed to qkd into webui

parent a65b35ea

src/webui/Dockerfile

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ COPY --chown=webui:webui src/service/__init__.py service/__init__.py 
COPY --chown=webui:webui src/service/client/. service/client/

COPY --chown=webui:webui src/slice/__init__.py slice/__init__.py

COPY --chown=webui:webui src/slice/client/. slice/client/

COPY --chown=webui:webui src/app/__init__.py app/__init__.py

COPY --chown=webui:webui src/app/client/. app/client/

COPY --chown=webui:webui src/webui/. webui/

COPY --chown=webui:webui src/bgpls_speaker/__init__.py bgpls_speaker/__init__.py

COPY --chown=webui:webui src/bgpls_speaker/client/. bgpls_speaker/client/

src/webui/service/__init__.py

+13 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ from flask_healthz import healthz, HealthError 
from common.tools.grpc.Tools import grpc_message_to_json

from context.client.ContextClient import ContextClient

from device.client.DeviceClient import DeviceClient

from app.client.AppClient import AppClient



def get_working_context() -> str:

    return session['context_uuid'] if 'context_uuid' in session else '---'
@@ -37,6 +38,10 @@ def readiness(): 
        device_client = DeviceClient()

        device_client.connect()

        device_client.close()

        # DEPENDENCY QKD

        app_client = AppClient()

        app_client.connect()

        app_client.close()

    except Exception as e:

        raise HealthError("Can't connect with the service: {:s}".format(str(e))) from e
@@ -49,7 +54,10 @@ def json_to_list(json_str : str) -> List[Union[str, Tuple[str, str]]]: 
    if isinstance(data, dict):

        return [('kv', (key, value)) for key, value in data.items()]

    elif isinstance(data, list):

        return [('item', ', '.join(data))]

        if len(data) == 1 and isinstance(data[0], dict):

            return [('kv', (key, value)) for key, value in data[0].items()]

        else:

            return [('item', ', '.join([str(d) for d in data]))]

    else:

        return [('item', str(data))]
@@ -99,6 +107,9 @@ def create_app(use_config=None, web_app_root=None): 
    from webui.service.link.routes import link              # pylint: disable=import-outside-toplevel

    app.register_blueprint(link)



    from webui.service.app.routes import app as _app             # pylint: disable=import-outside-toplevel

    app.register_blueprint(_app)



    from webui.service.policy_rule.routes import policy_rule # pylint: disable=import-outside-toplevel

    app.register_blueprint(policy_rule)

src/webui/service/__main__.py

+4 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ def main(): 
    logging.basicConfig(level=log_level)

    logger = logging.getLogger(__name__)



    # DEPENDENCY QKD

    wait_for_environment_variables([

        get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_HOST     ),

        get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_PORT_GRPC),
@@ -42,6 +43,8 @@ def main(): 
        get_env_var_name(ServiceNameEnum.SERVICE, ENVVAR_SUFIX_SERVICE_PORT_GRPC),

        get_env_var_name(ServiceNameEnum.SLICE,   ENVVAR_SUFIX_SERVICE_HOST     ),

        get_env_var_name(ServiceNameEnum.SLICE,   ENVVAR_SUFIX_SERVICE_PORT_GRPC),

        get_env_var_name(ServiceNameEnum.APP,   ENVVAR_SUFIX_SERVICE_HOST     ),

        get_env_var_name(ServiceNameEnum.APP,   ENVVAR_SUFIX_SERVICE_PORT_GRPC),

    ])



    logger.info('Starting...')