Commit 1f345a50 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

NBI component: 

- Fixed unitary tests
- Fixed CI/CD pipeline
parent 0bf11c59

src/nbi/.gitlab-ci.yml

+4 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ unit_test nbi: 
    - docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

    - docker pull "$CI_REGISTRY_IMAGE/mock_nbi_dependencies:test"

    - >

      docker run --name mock_nbi_dependencies -d

      docker run --name mock_nbi_dependencies -d -p 10000:10000

      --network=teraflowbridge

      --env BIND_ADDRESS=0.0.0.0

      --env BIND_PORT=10000
@@ -80,6 +80,7 @@ unit_test nbi: 
      $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG

    - sleep 5

    - docker ps -a

    - docker logs mock_nbi_dependencies

    - docker logs $IMAGE_NAME

    - date

    - docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=DEBUG -o log_cli=true --verbose $IMAGE_NAME/tests/test_core.py --junitxml=/opt/results/${IMAGE_NAME}_report_core.xml"
@@ -97,7 +98,8 @@ unit_test nbi: 
    - docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"

  coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'

  after_script:

    - docker rm -f $IMAGE_NAME

    - docker logs mock_nbi_dependencies

    - docker rm -f mock_nbi_dependencies $IMAGE_NAME

    - docker network rm teraflowbridge

  rules:

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'

src/nbi/tests/PrepareTestScenario.py

+4 −4
Original line number Diff line number Diff line
@@ -38,13 +38,13 @@ from .MockWebServer import MockWebServer 


os.environ[get_env_var_name(ServiceNameEnum.NBI,     ENVVAR_SUFIX_SERVICE_HOST     )] = str(LOCAL_HOST)

os.environ[get_env_var_name(ServiceNameEnum.NBI,     ENVVAR_SUFIX_SERVICE_PORT_HTTP)] = str(NBI_SERVICE_PORT)

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_HOST     )] = str('mock_nbi_dependencies')

os.environ[get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(MOCKSERVICE_PORT)

os.environ[get_env_var_name(ServiceNameEnum.DEVICE,  ENVVAR_SUFIX_SERVICE_HOST     )] = str(LOCAL_HOST)

os.environ[get_env_var_name(ServiceNameEnum.DEVICE,  ENVVAR_SUFIX_SERVICE_HOST     )] = str('mock_nbi_dependencies')

os.environ[get_env_var_name(ServiceNameEnum.DEVICE,  ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(MOCKSERVICE_PORT)

os.environ[get_env_var_name(ServiceNameEnum.SERVICE, ENVVAR_SUFIX_SERVICE_HOST     )] = str(LOCAL_HOST)

os.environ[get_env_var_name(ServiceNameEnum.SERVICE, ENVVAR_SUFIX_SERVICE_HOST     )] = str('mock_nbi_dependencies')

os.environ[get_env_var_name(ServiceNameEnum.SERVICE, ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(MOCKSERVICE_PORT)

os.environ[get_env_var_name(ServiceNameEnum.SLICE,   ENVVAR_SUFIX_SERVICE_HOST     )] = str(LOCAL_HOST)

os.environ[get_env_var_name(ServiceNameEnum.SLICE,   ENVVAR_SUFIX_SERVICE_HOST     )] = str('mock_nbi_dependencies')

os.environ[get_env_var_name(ServiceNameEnum.SLICE,   ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(MOCKSERVICE_PORT)

src/tests/.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -23,4 +23,4 @@ include: 
#  - local: '/src/tests/eucnc24/.gitlab-ci.yml'

#  - local: '/src/tests/ecoc24/.gitlab-ci.yml'



  - local: '/src/tools/mock_nbi_dependencies/.gitlab-ci.yml'
 
  - local: '/src/tests/tools/mock_nbi_dependencies/.gitlab-ci.yml'