Commit 4d126f2c authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Multiple changes: 

- corrected unitary test file for device component
- arranged clients used by optical centralized attack detector
- Minor corrections in unitary test of Context component
- corrected skeleton for unitary tests of Slice component
parent 1ed5b830

scripts/run_tests_locally.sh

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \ 
    context/tests/test_unitary.py



coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \

    device/tests/test_unitary.py

    device/tests/test_unitary_emulated.py



coverage run --rcfile=$RCFILE --append -m pytest -s --log-level=INFO --verbose \

    l3_centralizedattackdetector/tests/test_unitary.py

src/context/tests/test_unitary.py

+3 −3
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ LOCAL_HOST = '127.0.0.1' 
GRPC_PORT = 10000 + get_service_port_grpc(ServiceNameEnum.CONTEXT)   # avoid privileged ports

HTTP_PORT = 10000 + get_service_port_http(ServiceNameEnum.CONTEXT)   # avoid privileged ports



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

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

os.environ[get_env_var_name(ServiceNameEnum.CONTEXT.value, ENVVAR_SUFIX_SERVICE_PORT_HTTP)] = str(HTTP_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_PORT_GRPC)] = str(GRPC_PORT)

os.environ[get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_PORT_HTTP)] = str(HTTP_PORT)



DEFAULT_REDIS_SERVICE_HOST = LOCAL_HOST

DEFAULT_REDIS_SERVICE_PORT = 6379

src/opticalcentralizedattackdetector/service/OpticalCentralizedAttackDetectorServiceServicerImpl.py

+11 −11
Original line number Diff line number Diff line
@@ -16,11 +16,8 @@ import os, grpc, logging, random 
from influxdb import InfluxDBClient

from common.rpc_method_wrapper.Decorator import create_metrics, safe_and_metered_rpc_method

from context.client.ContextClient import ContextClient

from context.Config import GRPC_SERVICE_PORT as CONTEXT_GRPC_SERVICE_PORT

from monitoring.client.MonitoringClient import MonitoringClient

from monitoring.Config import GRPC_SERVICE_PORT as MONITORING_GRPC_SERVICE_PORT

from service.client.ServiceClient import ServiceClient

from service.Config import GRPC_SERVICE_PORT as SERVICE_GRPC_SERVICE_PORT

from dbscanserving.proto.dbscanserving_pb2 import DetectionRequest, DetectionResponse, Sample

from dbscanserving.client.DbscanServingClient import DbscanServingClient

from dbscanserving.Config import GRPC_SERVICE_PORT as DBSCANSERVING_GRPC_SERVICE_PORT
@@ -35,8 +32,7 @@ from opticalcentralizedattackdetector.proto.monitoring_pb2 import KpiList 
from opticalcentralizedattackdetector.proto.optical_centralized_attack_detector_pb2_grpc import (

    OpticalCentralizedAttackDetectorServiceServicer)

from opticalcentralizedattackdetector.Config import (

    CONTEXT_SERVICE_ADDRESS, SERVICE_SERVICE_ADDRESS, INFERENCE_SERVICE_ADDRESS, MONITORING_SERVICE_ADDRESS,

    ATTACK_MITIGATOR_SERVICE_ADDRESS)

    INFERENCE_SERVICE_ADDRESS, MONITORING_SERVICE_ADDRESS, ATTACK_MITIGATOR_SERVICE_ADDRESS)





LOGGER = logging.getLogger(__name__)
@@ -49,12 +45,16 @@ INFLUXDB_HOSTNAME = os.environ.get("INFLUXDB_HOSTNAME") 
INFLUXDB_USER = os.environ.get("INFLUXDB_USER")

INFLUXDB_PASSWORD = os.environ.get("INFLUXDB_PASSWORD")

INFLUXDB_DATABASE = os.environ.get("INFLUXDB_DATABASE")

context_client: ContextClient = ContextClient(address=CONTEXT_SERVICE_ADDRESS, port=CONTEXT_GRPC_SERVICE_PORT)

influxdb_client: InfluxDBClient = InfluxDBClient(host=MONITORING_SERVICE_ADDRESS, port=8086, username=INFLUXDB_USER, password=INFLUXDB_PASSWORD, database=INFLUXDB_DATABASE)

monitoring_client: MonitoringClient = MonitoringClient(server=MONITORING_SERVICE_ADDRESS, port=MONITORING_GRPC_SERVICE_PORT)

dbscanserving_client: DbscanServingClient = DbscanServingClient(address=INFERENCE_SERVICE_ADDRESS, port=DBSCANSERVING_GRPC_SERVICE_PORT)

service_client: ServiceClient = ServiceClient(SERVICE_SERVICE_ADDRESS, SERVICE_GRPC_SERVICE_PORT)

attack_mitigator_client: OpticalAttackMitigatorClient = OpticalAttackMitigatorClient(address=ATTACK_MITIGATOR_SERVICE_ADDRESS, port=ATTACK_MITIGATOR_GRPC_SERVICE_PORT)

context_client: ContextClient = ContextClient()

influxdb_client: InfluxDBClient = InfluxDBClient(

    host=MONITORING_SERVICE_ADDRESS, port=8086, username=INFLUXDB_USER, password=INFLUXDB_PASSWORD,

    database=INFLUXDB_DATABASE)

monitoring_client: MonitoringClient = MonitoringClient()

dbscanserving_client: DbscanServingClient = DbscanServingClient(

    address=INFERENCE_SERVICE_ADDRESS, port=DBSCANSERVING_GRPC_SERVICE_PORT)

service_client: ServiceClient = ServiceClient()

attack_mitigator_client: OpticalAttackMitigatorClient = OpticalAttackMitigatorClient(

    address=ATTACK_MITIGATOR_SERVICE_ADDRESS, port=ATTACK_MITIGATOR_GRPC_SERVICE_PORT)





class OpticalCentralizedAttackDetectorServiceServicerImpl(OpticalCentralizedAttackDetectorServiceServicer):

src/slice/tests/test_unitary.py

+13 −15
Original line number Diff line number Diff line
@@ -12,34 +12,32 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



import copy, grpc, logging, pytest

from common.database.Factory import get_database, DatabaseEngineEnum

import logging, os, pytest

from common.Constants import ServiceNameEnum

from common.Settings import (

    ENVVAR_SUFIX_SERVICE_HOST, ENVVAR_SUFIX_SERVICE_PORT_GRPC, get_env_var_name, get_service_port_grpc)

from slice.client.SliceClient import SliceClient

from slice.proto.slice_pb2 import TransportSlice

from slice.service.SliceService import SliceService

from slice.Config import GRPC_SERVICE_PORT, GRPC_MAX_WORKERS, GRPC_GRACE_PERIOD



port = 10000 + GRPC_SERVICE_PORT # avoid privileged ports

LOCAL_HOST = '127.0.0.1'

MOCKSERVICE_PORT = 10000

SLICE_SERVICE_PORT = MOCKSERVICE_PORT + get_service_port_grpc(ServiceNameEnum.SLICE) # avoid privileged ports

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_PORT_GRPC)] = str(SLICE_SERVICE_PORT)



LOGGER = logging.getLogger(__name__)

LOGGER.setLevel(logging.DEBUG)



@pytest.fixture(scope='session')

def slice_database():

    _database = get_database(engine=DatabaseEngineEnum.INMEMORY)

    return _database



@pytest.fixture(scope='session')

def slice_service(slice_database):

    _service = SliceService(

        slice_database, port=port, max_workers=GRPC_MAX_WORKERS, grace_period=GRPC_GRACE_PERIOD)

def slice_service():

    _service = SliceService()

    _service.start()

    yield _service

    _service.stop()



@pytest.fixture(scope='session')

def slice_client(slice_service):

    _client = SliceClient(address='127.0.0.1', port=port)

def slice_client(slice_service : SliceService): # pylint: disable=redefined-outer-name

    _client = SliceClient()

    yield _client

    _client.close()