From a02690a7cb16a61754cce2a2cb826f2d080d6cc3 Mon Sep 17 00:00:00 2001 From: gifrerenom Date: Mon, 7 Oct 2024 11:06:46 +0000 Subject: [PATCH] CI/CD pipeline unitary tests: - Context: Removed unneeded HTTP-related code - NBI: Added missing qkd_app client in Dockerfile --- src/context/tests/conftest.py | 7 +++---- src/nbi/Dockerfile | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/context/tests/conftest.py b/src/context/tests/conftest.py index 905c87c31..108814c58 100644 --- a/src/context/tests/conftest.py +++ b/src/context/tests/conftest.py @@ -18,8 +18,9 @@ from _pytest.terminal import TerminalReporter from typing import Tuple from common.Constants import ServiceNameEnum from common.Settings import ( - ENVVAR_SUFIX_SERVICE_HOST, ENVVAR_SUFIX_SERVICE_PORT_GRPC, ENVVAR_SUFIX_SERVICE_PORT_HTTP, get_env_var_name, - get_service_port_grpc, get_service_port_http) + ENVVAR_SUFIX_SERVICE_HOST, ENVVAR_SUFIX_SERVICE_PORT_GRPC, + get_env_var_name, get_service_port_grpc +) from common.message_broker.Factory import get_messagebroker_backend from common.message_broker.MessageBroker import MessageBroker from common.method_wrappers.Decorator import MetricsPool @@ -30,11 +31,9 @@ from context.service.database.models._Base import rebuild_database LOCAL_HOST = '127.0.0.1' GRPC_PORT = 10000 + int(get_service_port_grpc(ServiceNameEnum.CONTEXT)) # avoid privileged ports -HTTP_PORT = 10000 + int(get_service_port_http(ServiceNameEnum.CONTEXT)) # avoid privileged ports os.environ[get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_HOST )] = str(LOCAL_HOST) os.environ[get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(GRPC_PORT) -os.environ[get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_PORT_HTTP)] = str(HTTP_PORT) @pytest.fixture(scope='session') def context_db_mb(request) -> Tuple[sqlalchemy.engine.Engine, MessageBroker]: # pylint: disable=unused-argument diff --git a/src/nbi/Dockerfile b/src/nbi/Dockerfile index 1435e9757..c5fc8d324 100644 --- a/src/nbi/Dockerfile +++ b/src/nbi/Dockerfile @@ -89,6 +89,8 @@ COPY src/service/__init__.py service/__init__.py COPY src/service/client/. service/client/ COPY src/slice/__init__.py slice/__init__.py COPY src/slice/client/. slice/client/ +COPY src/qkd_app/__init__.py qkd_app/__init__.py +COPY src/qkd_app/client/. qkd_app/client/ RUN mkdir -p /var/teraflow/tests/tools COPY src/tests/tools/mock_osm/. tests/tools/mock_osm/ -- GitLab