Commit 1d7d9178 authored by Carlos Natalino's avatar Carlos Natalino
Browse files

Fixing tests of the mitigator.

parent 6d70ec5e

src/opticalattackmitigator/.gitlab-ci.yml

+2 −4
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ build opticalattackmitigator: 
      - src/$IMAGE_NAME/**/*.{py,in,yml}

      - src/$IMAGE_NAME/Dockerfile

      - src/$IMAGE_NAME/tests/*.py

      - src/$IMAGE_NAME/tests/Dockerfile

      - manifests/${IMAGE_NAME}service.yaml

      - .gitlab-ci.yml
@@ -48,7 +47,7 @@ unit_test opticalattackmitigator: 
  before_script:

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

    - if docker network list | grep teraflowbridge; then echo "teraflowbridge is already created"; else docker network create -d bridge teraflowbridge; fi

    - if docker container ls | grep $IMAGE_NAME; then docker rm -f $IMAGE_NAME; else echo "$IMAGE_NAME image is not in the system"; fi

    - if docker container ls | grep $IMAGE_NAME; then docker rm -f $IMAGE_NAME; else echo "$IMAGE_NAME container is not in the system"; fi

  script:

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

    - docker run --name $IMAGE_NAME -d -p 10007:10007 -v "$PWD/src/$IMAGE_NAME/tests:/home/${IMAGE_NAME}/results" --network=teraflowbridge --rm $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG
@@ -66,8 +65,7 @@ unit_test opticalattackmitigator: 
      - src/$IMAGE_NAME/**/*.{py,in,yml}

      - src/$IMAGE_NAME/Dockerfile

      - src/$IMAGE_NAME/tests/*.py

      - src/$IMAGE_NAME/tests/Dockerfile

      - manifests/$IMAGE_NAMEservice.yaml

      - manifests/${IMAGE_NAME}service.yaml

      - .gitlab-ci.yml

  artifacts:

    when: always

src/opticalattackmitigator/tests/test_unitary.py

+2 −11
Original line number Diff line number Diff line
@@ -17,29 +17,20 @@ import os 
from unittest.mock import patch



import pytest

from common.Constants import (DEFAULT_GRPC_GRACE_PERIOD,

                              DEFAULT_GRPC_MAX_WORKERS)

from common.proto.optical_attack_mitigator_pb2 import AttackDescription



from opticalattackmitigator.client.OpticalAttackMitigatorClient import \

    OpticalAttackMitigatorClient

from opticalattackmitigator.Config import GRPC_SERVICE_PORT

from opticalattackmitigator.service.OpticalAttackMitigatorService import \

    OpticalAttackMitigatorService



port = 10000 + GRPC_SERVICE_PORT  # avoid privileged ports



LOGGER = logging.getLogger(__name__)

LOGGER.setLevel(logging.DEBUG)





@pytest.fixture(scope="session")

def optical_attack_mitigator_service():

    _service = OpticalAttackMitigatorService(

        port=port,

        max_workers=DEFAULT_GRPC_MAX_WORKERS,

        grace_period=DEFAULT_GRPC_GRACE_PERIOD,

    )

    _service = OpticalAttackMitigatorService()

    _service.start()

    yield _service

    _service.stop()
@@ -51,7 +42,7 @@ def optical_attack_mitigator_client(optical_attack_mitigator_service): 
        os.environ,

        {

            "OPTICALATTACKMITIGATORSERVICE_SERVICE_HOST": "127.0.0.1",

            "OPTICALATTACKMITIGATORSERVICE_SERVICE_PORT_GRPC": str(port),

            "OPTICALATTACKMITIGATORSERVICE_SERVICE_PORT_GRPC": str(optical_attack_mitigator_service.bind_port),

        },

        clear=True,

    ):