Commit af298c82 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/200-cttc-multiple-ci-cd-pipeline-fixes' into 'develop' 

Resolve "(CTTC) Multiple CI/CD pipeline fixes"

See merge request !274
parents b26436b1 a02690a7

src/context/tests/conftest.py

+3 −4
Original line number Diff line number Diff line
@@ -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

src/nbi/Dockerfile

+2 −0
Original line number Diff line number Diff line
@@ -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/