diff --git a/src/monitoring/Dockerfile b/src/monitoring/Dockerfile
index 4495ca0b81d737514a45b223b420a21578e6acce..af2fd608521c297f7aa97b45f0e3fc5d88e5615c 100644
--- a/src/monitoring/Dockerfile
+++ b/src/monitoring/Dockerfile
@@ -46,6 +46,6 @@ COPY context/. context
RUN rm -r common/message_broker/tests
RUN rm -r common/orm/tests
RUN rm -r common/rpc_method_wrapper/tests
-RUN rm -r context/tests
+RUN rm -r context/tests/test_unitary.py
ENTRYPOINT ["python", "-m", "monitoring.service"]
diff --git a/src/monitoring/tests/example_objects.py b/src/monitoring/tests/example_objects.py
deleted file mode 100644
index 226119f9d29213a6f1857a476b37b32c9941a813..0000000000000000000000000000000000000000
--- a/src/monitoring/tests/example_objects.py
+++ /dev/null
@@ -1,196 +0,0 @@
-from copy import deepcopy
-from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID
-from context.proto.context_pb2 import (
- ConfigActionEnum, DeviceDriverEnum, DeviceOperationalStatusEnum, ServiceStatusEnum, ServiceTypeEnum)
-from context.proto.kpi_sample_types_pb2 import KpiSampleType
-
-# Some example objects to be used by the tests
-
-# Helper methods
-def config_rule(action, resource_key, resource_value, kpi_sample_type):
- return {'action': action, 'resource_key': resource_key, 'resource_value': resource_value, 'kpi_sample_type': kpi_sample_type}
-
-def endpoint_id(topology_id, device_id, endpoint_uuid):
- return {'topology_id': deepcopy(topology_id), 'device_id': deepcopy(device_id),
- 'endpoint_uuid': {'uuid': endpoint_uuid}}
-
-def endpoint(topology_id, device_id, endpoint_uuid, endpoint_type):
- return {'endpoint_id': endpoint_id(topology_id, device_id, endpoint_uuid), 'endpoint_type': endpoint_type}
-
-## use "deepcopy" to prevent propagating forced changes during tests
-CONTEXT_ID = {'context_uuid': {'uuid': DEFAULT_CONTEXT_UUID}}
-CONTEXT = {
- 'context_id': deepcopy(CONTEXT_ID),
- 'topology_ids': [],
- 'service_ids': [],
-}
-
-TOPOLOGY_ID = {
- 'context_id': deepcopy(CONTEXT_ID),
- 'topology_uuid': {'uuid': DEFAULT_TOPOLOGY_UUID},
-}
-TOPOLOGY = {
- 'topology_id': deepcopy(TOPOLOGY_ID),
- 'device_ids': [],
- 'link_ids': [],
-}
-
-DEVICE1_UUID = 'DEV1'
-DEVICE1_ID = {'device_uuid': {'uuid': DEVICE1_UUID}}
-DEVICE1 = {
- 'device_id': deepcopy(DEVICE1_ID),
- 'device_type': 'packet-router',
- 'device_config': {'config_rules': [
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'dev/rsrc1/value', 'value1', KpiSampleType.PACKETS_TRANSMITTED),
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'dev/rsrc2/value', 'value2', KpiSampleType.PACKETS_RECEIVED),
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'dev/rsrc3/value', 'value3', KpiSampleType.BYTES_TRANSMITTED),
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'dev/rsrc4/value', 'value4', KpiSampleType.BYTES_RECEIVED),
- ]},
- 'device_operational_status': DeviceOperationalStatusEnum.DEVICEOPERATIONALSTATUS_ENABLED,
- 'device_drivers': [DeviceDriverEnum.DEVICEDRIVER_OPENCONFIG, DeviceDriverEnum.DEVICEDRIVER_P4],
- 'device_endpoints': [
- endpoint(TOPOLOGY_ID, DEVICE1_ID, 'EP2', 'port-packet-100G'),
- endpoint(TOPOLOGY_ID, DEVICE1_ID, 'EP3', 'port-packet-100G'),
- endpoint(TOPOLOGY_ID, DEVICE1_ID, 'EP100', 'port-packet-10G'),
- ],
-}
-
-DEVICE2_UUID = 'DEV2'
-DEVICE2_ID = {'device_uuid': {'uuid': DEVICE2_UUID}}
-DEVICE2 = {
- 'device_id': deepcopy(DEVICE2_ID),
- 'device_type': 'packet-router',
- 'device_config': {'config_rules': [
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'dev/rsrc1/value', 'value4', KpiSampleType.PACKETS_TRANSMITTED),
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'dev/rsrc2/value', 'value5', KpiSampleType.PACKETS_RECEIVED),
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'dev/rsrc3/value', 'value6', KpiSampleType.BYTES_TRANSMITTED),
- ]},
- 'device_operational_status': DeviceOperationalStatusEnum.DEVICEOPERATIONALSTATUS_ENABLED,
- 'device_drivers': [DeviceDriverEnum.DEVICEDRIVER_OPENCONFIG, DeviceDriverEnum.DEVICEDRIVER_P4],
- 'device_endpoints': [
- endpoint(TOPOLOGY_ID, DEVICE2_ID, 'EP1', 'port-packet-100G'),
- endpoint(TOPOLOGY_ID, DEVICE2_ID, 'EP3', 'port-packet-100G'),
- endpoint(TOPOLOGY_ID, DEVICE2_ID, 'EP100', 'port-packet-10G'),
- ],
-}
-
-DEVICE3_UUID = 'DEV3'
-DEVICE3_ID = {'device_uuid': {'uuid': DEVICE3_UUID}}
-DEVICE3 = {
- 'device_id': deepcopy(DEVICE3_ID),
- 'device_type': 'packet-router',
- 'device_config': {'config_rules': [
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'dev/rsrc1/value', 'value4', KpiSampleType.PACKETS_TRANSMITTED),
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'dev/rsrc2/value', 'value5', KpiSampleType.PACKETS_RECEIVED),
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'dev/rsrc3/value', 'value6', KpiSampleType.BYTES_TRANSMITTED),
- ]},
- 'device_operational_status': DeviceOperationalStatusEnum.DEVICEOPERATIONALSTATUS_ENABLED,
- 'device_drivers': [DeviceDriverEnum.DEVICEDRIVER_OPENCONFIG, DeviceDriverEnum.DEVICEDRIVER_P4],
- 'device_endpoints': [
- endpoint(TOPOLOGY_ID, DEVICE3_ID, 'EP1', 'port-packet-100G'),
- endpoint(TOPOLOGY_ID, DEVICE3_ID, 'EP2', 'port-packet-100G'),
- endpoint(TOPOLOGY_ID, DEVICE3_ID, 'EP100', 'port-packet-10G'),
- ],
-}
-
-LINK_DEV1_DEV2_UUID = 'DEV1/EP2 ==> DEV2/EP1'
-LINK_DEV1_DEV2_ID = {'link_uuid': {'uuid': LINK_DEV1_DEV2_UUID}}
-LINK_DEV1_DEV2 = {
- 'link_id': deepcopy(LINK_DEV1_DEV2_ID),
- 'link_endpoint_ids' : [
- endpoint_id(TOPOLOGY_ID, DEVICE1_ID, 'EP2'),
- endpoint_id(TOPOLOGY_ID, DEVICE2_ID, 'EP1'),
- ]
-}
-
-LINK_DEV2_DEV3_UUID = 'DEV2/EP3 ==> DEV3/EP2'
-LINK_DEV2_DEV3_ID = {'link_uuid': {'uuid': LINK_DEV2_DEV3_UUID}}
-LINK_DEV2_DEV3 = {
- 'link_id': deepcopy(LINK_DEV2_DEV3_ID),
- 'link_endpoint_ids' : [
- endpoint_id(TOPOLOGY_ID, DEVICE2_ID, 'EP3'),
- endpoint_id(TOPOLOGY_ID, DEVICE3_ID, 'EP2'),
- ]
-}
-
-LINK_DEV1_DEV3_UUID = 'DEV1/EP3 ==> DEV3/EP1'
-LINK_DEV1_DEV3_ID = {'link_uuid': {'uuid': LINK_DEV1_DEV3_UUID}}
-LINK_DEV1_DEV3 = {
- 'link_id': deepcopy(LINK_DEV1_DEV3_ID),
- 'link_endpoint_ids' : [
- endpoint_id(TOPOLOGY_ID, DEVICE1_ID, 'EP3'),
- endpoint_id(TOPOLOGY_ID, DEVICE3_ID, 'EP1'),
- ]
-}
-
-SERVICE_DEV1_DEV2_UUID = 'SVC:DEV1/EP100-DEV2/EP100'
-SERVICE_DEV1_DEV2_ID = {
- 'context_id': deepcopy(CONTEXT_ID),
- 'service_uuid': {'uuid': SERVICE_DEV1_DEV2_UUID},
-}
-SERVICE_DEV1_DEV2 = {
- 'service_id': deepcopy(SERVICE_DEV1_DEV2_ID),
- 'service_type': ServiceTypeEnum.SERVICETYPE_L3NM,
- 'service_endpoint_ids' : [
- endpoint_id(TOPOLOGY_ID, DEVICE1_ID, 'EP100'),
- endpoint_id(TOPOLOGY_ID, DEVICE2_ID, 'EP100'),
- ],
- 'service_constraints': [
- {'constraint_type': 'latency_ms', 'constraint_value': '15.2'},
- {'constraint_type': 'jitter_us', 'constraint_value': '1.2'},
- ],
- 'service_status': {'service_status': ServiceStatusEnum.SERVICESTATUS_ACTIVE},
- 'service_config': {'config_rules': [
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'svc/rsrc1/value', 'value7', KpiSampleType.PACKETS_TRANSMITTED),
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'svc/rsrc2/value', 'value8', KpiSampleType.PACKETS_TRANSMITTED),
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'svc/rsrc3/value', 'value9', KpiSampleType.PACKETS_TRANSMITTED),
- ]},
-}
-
-SERVICE_DEV1_DEV3_UUID = 'SVC:DEV1/EP100-DEV3/EP100'
-SERVICE_DEV1_DEV3_ID = {
- 'context_id': deepcopy(CONTEXT_ID),
- 'service_uuid': {'uuid': SERVICE_DEV1_DEV3_UUID},
-}
-SERVICE_DEV1_DEV3 = {
- 'service_id': deepcopy(SERVICE_DEV1_DEV3_ID),
- 'service_type': ServiceTypeEnum.SERVICETYPE_L3NM,
- 'service_endpoint_ids' : [
- endpoint_id(TOPOLOGY_ID, DEVICE1_ID, 'EP100'),
- endpoint_id(TOPOLOGY_ID, DEVICE3_ID, 'EP100'),
- ],
- 'service_constraints': [
- {'constraint_type': 'latency_ms', 'constraint_value': '5.8'},
- {'constraint_type': 'jitter_us', 'constraint_value': '0.1'},
- ],
- 'service_status': {'service_status': ServiceStatusEnum.SERVICESTATUS_ACTIVE},
- 'service_config': {'config_rules': [
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'svc/rsrc1/value', 'value7', KpiSampleType.PACKETS_TRANSMITTED),
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'svc/rsrc2/value', 'value8', KpiSampleType.PACKETS_TRANSMITTED),
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'svc/rsrc3/value', 'value9', KpiSampleType.PACKETS_TRANSMITTED),
- ]},
-}
-
-SERVICE_DEV2_DEV3_UUID = 'SVC:DEV2/EP100-DEV3/EP100'
-SERVICE_DEV2_DEV3_ID = {
- 'context_id': deepcopy(CONTEXT_ID),
- 'service_uuid': {'uuid': SERVICE_DEV2_DEV3_UUID},
-}
-SERVICE_DEV2_DEV3 = {
- 'service_id': deepcopy(SERVICE_DEV2_DEV3_ID),
- 'service_type': ServiceTypeEnum.SERVICETYPE_L3NM,
- 'service_endpoint_ids' : [
- endpoint_id(TOPOLOGY_ID, DEVICE2_ID, 'EP100'),
- endpoint_id(TOPOLOGY_ID, DEVICE3_ID, 'EP100'),
- ],
- 'service_constraints': [
- {'constraint_type': 'latency_ms', 'constraint_value': '23.1'},
- {'constraint_type': 'jitter_us', 'constraint_value': '3.4'},
- ],
- 'service_status': {'service_status': ServiceStatusEnum.SERVICESTATUS_ACTIVE},
- 'service_config': {'config_rules': [
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'svc/rsrc1/value', 'value7', KpiSampleType.PACKETS_TRANSMITTED),
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'svc/rsrc2/value', 'value8', KpiSampleType.PACKETS_TRANSMITTED),
- config_rule(ConfigActionEnum.CONFIGACTION_SET, 'svc/rsrc3/value', 'value9', KpiSampleType.PACKETS_TRANSMITTED),
- ]},
-}
diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py
index a9bab1f0ef055debf5375dad1cebf98e659e5a3f..145e2c718c12c4798c7955ade023267ffceaca4d 100644
--- a/src/monitoring/tests/test_unitary.py
+++ b/src/monitoring/tests/test_unitary.py
@@ -8,7 +8,6 @@ from monitoring.client.monitoring_client import MonitoringClient
from monitoring.Config import GRPC_SERVICE_PORT, GRPC_MAX_WORKERS, GRPC_GRACE_PERIOD
from monitoring.service.MonitoringService import MonitoringService
from monitoring.service.EventTools import EventsDeviceCollector
-from monitoring.tests.example_objects import (DEVICE1, DEVICE1_UUID)
from common.orm.Database import Database
from common.orm.Factory import get_database_backend, BackendEnum as DatabaseBackendEnum
@@ -20,6 +19,7 @@ from context.client.ContextClient import ContextClient
from context.service.grpc_server.ContextService import ContextService
from context.service.Populate import populate
from context.proto.context_pb2 import EventTypeEnum, DeviceEvent, Device
+from context.tests.example_objects import (DEVICE1, DEVICE1_UUID)
LOGGER = logging.getLogger(__name__)
LOGGER.setLevel(logging.DEBUG)