Commit be5e51c9 authored by Mohammad Ismaeel's avatar Mohammad Ismaeel
Browse files

commented Qkapp

parent 843911d9

deploy/all.sh

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"} 


# If not already set, set the list of components, separated by spaces, you want to build images for, and deploy.

# By default, only basic components are deployed 

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice nbi webui load_generator"}

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device  pathcomp opticalcontroller service slice nbi webui load_generator"}



# Uncomment to activate Monitoring (old)

#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"

src/service/service/__main__.py

+2 −2
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ def main(): 
        get_env_var_name(ServiceNameEnum.OPTICALCONTROLLER, ENVVAR_SUFIX_SERVICE_PORT_GRPC),

        get_env_var_name(ServiceNameEnum.OPTICALCONTROLLER, ENVVAR_SUFIX_SERVICE_HOST     ),

        

        get_env_var_name(ServiceNameEnum.QKD_APP,  ENVVAR_SUFIX_SERVICE_HOST     ),

        get_env_var_name(ServiceNameEnum.QKD_APP,  ENVVAR_SUFIX_SERVICE_PORT_GRPC),

        # get_env_var_name(ServiceNameEnum.QKD_APP,  ENVVAR_SUFIX_SERVICE_HOST     ),

        # get_env_var_name(ServiceNameEnum.QKD_APP,  ENVVAR_SUFIX_SERVICE_PORT_GRPC),

    ])

    VAR_NAME_OPTICAL_CONTROLLER_HOST = get_env_var_name(ServiceNameEnum.OPTICALCONTROLLER, ENVVAR_SUFIX_SERVICE_HOST)

    VAR_NAME_OPTICAL_CONTROLLER_PORT = get_env_var_name(ServiceNameEnum.OPTICALCONTROLLER, ENVVAR_SUFIX_SERVICE_PORT_GRPC)

src/webui/Dockerfile

+0 −2
Original line number Diff line number Diff line
@@ -84,8 +84,6 @@ 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

+6 −6
Original line number Diff line number Diff line
@@ -19,7 +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 qkd_app.client.QKDAppClient import QKDAppClient

#from qkd_app.client.QKDAppClient import QKDAppClient



def get_working_context() -> str:

    return session['context_uuid'] if 'context_uuid' in session else '---'
@@ -39,9 +39,9 @@ def readiness(): 
        device_client.connect()

        device_client.close()

        # DEPENDENCY QKD

        qkd_app_client = QKDAppClient()

        qkd_app_client.connect()

        qkd_app_client.close()

        # qkd_app_client = QKDAppClient()

        # qkd_app_client.connect()

        # qkd_app_client.close()

    except Exception as e:

        raise HealthError("Can't connect with the service: {:s}".format(str(e))) from e
@@ -116,8 +116,8 @@ 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.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 as _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/__main__.py

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +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),

        # get_env_var_name(ServiceNameEnum.APP,   ENVVAR_SUFIX_SERVICE_HOST     ),

        # get_env_var_name(ServiceNameEnum.APP,   ENVVAR_SUFIX_SERVICE_PORT_GRPC),

    ])



    logger.info('Starting...')