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

NBI component: 

- Code cleanup
parent b352ccce

src/nbi/.gitlab-ci.yml

+8 −8
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ unit_test nbi: 
  stage: unit_test

  needs:

    - build nbi

    - build mock_nbi_dependencies

    - build mock_tfs_nbi_dependencies

  before_script:

    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

    - >
@@ -63,14 +63,14 @@ unit_test nbi: 
      fi

  script:

    - docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

    - docker pull "$CI_REGISTRY_IMAGE/mock_nbi_dependencies:test"

    - docker pull "$CI_REGISTRY_IMAGE/mock_tfs_nbi_dependencies:test"

    - >

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

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

      --network=teraflowbridge

      --env BIND_ADDRESS=0.0.0.0

      --env BIND_PORT=10000

      --env LOG_LEVEL=DEBUG

      $CI_REGISTRY_IMAGE/mock_nbi_dependencies:test

      --env LOG_LEVEL=INFO

      $CI_REGISTRY_IMAGE/mock_tfs_nbi_dependencies:test

    - >

      docker run --name $IMAGE_NAME -d -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" 

      --network=teraflowbridge
@@ -80,7 +80,7 @@ unit_test nbi: 
      $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG

    - sleep 5

    - docker ps -a

    - docker logs mock_nbi_dependencies

    - docker logs mock_tfs_nbi_dependencies

    - docker logs $IMAGE_NAME

    - date

    - docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=DEBUG --verbose $IMAGE_NAME/tests/test_core.py --junitxml=/opt/results/${IMAGE_NAME}_report_core.xml"
@@ -98,8 +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 logs mock_nbi_dependencies

    - docker rm -f mock_nbi_dependencies $IMAGE_NAME

    - docker logs mock_tfs_nbi_dependencies

    - docker rm -f mock_tfs_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('mock_nbi_dependencies')

os.environ[get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_HOST     )] = str('mock_tfs_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('mock_nbi_dependencies')

os.environ[get_env_var_name(ServiceNameEnum.DEVICE,  ENVVAR_SUFIX_SERVICE_HOST     )] = str('mock_tfs_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('mock_nbi_dependencies')

os.environ[get_env_var_name(ServiceNameEnum.SERVICE, ENVVAR_SUFIX_SERVICE_HOST     )] = str('mock_tfs_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('mock_nbi_dependencies')

os.environ[get_env_var_name(ServiceNameEnum.SLICE,   ENVVAR_SUFIX_SERVICE_HOST     )] = str('mock_tfs_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/tests/tools/mock_nbi_dependencies/.gitlab-ci.yml'
 
  - local: '/src/tests/tools/mock_tfs_nbi_dependencies/.gitlab-ci.yml'

src/tests/tools/mock_nbi_dependencies/.gitlab-ci.yml

+5 −5
Original line number Diff line number Diff line
@@ -13,13 +13,13 @@ 
# limitations under the License.



# Build, tag, and push the Docker image to the GitLab Docker registry

build mock_nbi_dependencies:

build mock_tfs_nbi_dependencies:

  stage: build

  before_script:

    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

  script:

    - docker buildx build -t "$CI_REGISTRY_IMAGE/mock_nbi_dependencies:test" -f ./src/tests/tools/mock_nbi_dependencies/Dockerfile .

    - docker push "$CI_REGISTRY_IMAGE/mock_nbi_dependencies:test"

    - docker buildx build -t "$CI_REGISTRY_IMAGE/mock_tfs_nbi_dependencies:test" -f ./src/tests/tools/mock_tfs_nbi_dependencies/Dockerfile .

    - docker push "$CI_REGISTRY_IMAGE/mock_tfs_nbi_dependencies:test"

  after_script:

    - docker images --filter="dangling=true" --quiet | xargs -r docker rmi

  rules:
@@ -28,8 +28,8 @@ build mock_nbi_dependencies: 
    - changes:

      - src/common/**/*.py

      - proto/*.proto

      - src/src/tests/tools/mock_nbi_dependencies/**/*.{py,in,yml,yaml}

      - src/src/tests/tools/mock_nbi_dependencies/Dockerfile

      - src/src/tests/tools/mock_tfs_nbi_dependencies/**/*.{py,in,yml,yaml}

      - src/src/tests/tools/mock_tfs_nbi_dependencies/Dockerfile

      - src/nbi/**/*.{py,in,yml}

      - src/nbi/Dockerfile

      - src/nbi/tests/*.py

src/tests/tools/mock_nbi_dependencies/Dockerfile

+5 −5
Original line number Diff line number Diff line
@@ -54,9 +54,9 @@ RUN rm *.proto 
RUN find . -type f -exec sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' {} \;



# Create component sub-folders, get specific Python packages

RUN mkdir -p /var/teraflow/mock_nbi_dependencies

WORKDIR /var/teraflow/mock_nbi_dependencies

COPY src/tests/tools/mock_nbi_dependencies/requirements.in requirements.in

RUN mkdir -p /var/teraflow/mock_tfs_nbi_dependencies

WORKDIR /var/teraflow/mock_tfs_nbi_dependencies

COPY src/tests/tools/mock_tfs_nbi_dependencies/requirements.in requirements.in

RUN pip-compile --quiet --output-file=requirements.txt requirements.in

RUN python3 -m pip install -r requirements.txt
@@ -70,7 +70,7 @@ 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/tests/tools/mock_nbi_dependencies/. mock_nbi_dependencies/

COPY src/tests/tools/mock_tfs_nbi_dependencies/. mock_tfs_nbi_dependencies/



# Start the service

ENTRYPOINT ["python", "-m", "mock_nbi_dependencies"]
 
ENTRYPOINT ["python", "-m", "mock_tfs_nbi_dependencies"]