Commit 72c092fd authored by Alberto Gonzalez Barneo's avatar Alberto Gonzalez Barneo
Browse files

Merge remote-tracking branch 'upstream/develop' into... 

Merge remote-tracking branch 'upstream/develop' into feat/134-opt-qkd-application-register-new-component
parents f132e3b0 d8b1d0b9

src/common/tools/object_factory/Service.py

+10 −0
Original line number Diff line number Diff line
@@ -42,6 +42,16 @@ def json_service( 
        'service_config'      : {'config_rules': copy.deepcopy(config_rules)},

    }



def json_service_qkd_planned(

        service_uuid : str, endpoint_ids : List[Dict] = [], constraints : List[Dict] = [],

        config_rules : List[Dict] = [], context_uuid : str = DEFAULT_CONTEXT_NAME

    ):



    return json_service(

        service_uuid, ServiceTypeEnum.SERVICETYPE_QKD, context_id=json_context_id(context_uuid),

        status=ServiceStatusEnum.SERVICESTATUS_PLANNED, endpoint_ids=endpoint_ids, constraints=constraints,

        config_rules=config_rules)



def json_service_l2nm_planned(

        service_uuid : str, endpoint_ids : List[Dict] = [], constraints : List[Dict] = [],

        config_rules : List[Dict] = [], context_uuid : str = DEFAULT_CONTEXT_NAME

src/device/tests/qkd/unit/test_qkd_mock_connectivity.py

+1 −0
Original line number Diff line number Diff line
@@ -38,3 +38,4 @@ def test_qkd_driver_timeout_connection(mock_get, qkd_driver): 
    mock_get.side_effect = requests.exceptions.Timeout

    qkd_driver.timeout = 0.001  # Simulate very short timeout

    assert qkd_driver.Connect() is False

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

+8 −0
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 qkd_app.client.QKDAppClient import QKDAppClient



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

        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
@@ -102,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.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

+3 −0
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...')