Pre-merge cleanup (9a86eaed) · Commits · TFS / controller

src/monitoring/client/MonitoringClient.py

+2 −3

Original line number	Diff line number	Diff line
		@@ -20,9 +20,8 @@ from common.Settings import get_service_host, get_service_port_grpc
		from common.tools.client.RetryDecorator import retry, delay_exponential
		from common.tools.grpc.Tools import grpc_message_to_json_string
		from common.proto.context_pb2 import Empty
		from common.proto.kpi_manager_pb2 import KpiId, KpiDescriptor, KpiDescriptorList
		from common.proto.monitoring_pb2 import Kpi, MonitorKpiRequest, \
		KpiQuery, KpiList, SubsDescriptor, SubscriptionID, SubsList, \
		from common.proto.monitoring_pb2 import Kpi, KpiDescriptor, KpiId, MonitorKpiRequest, \
		KpiDescriptorList, KpiQuery, KpiList, SubsDescriptor, SubscriptionID, SubsList, \
		SubsResponse, AlarmDescriptor, AlarmID, AlarmList, AlarmResponse, AlarmSubscription, RawKpiTable
		from common.proto.monitoring_pb2_grpc import MonitoringServiceStub

src/monitoring/requirements.in

+0 −12

Original line number	Diff line number	Diff line
		@@ -32,15 +32,3 @@ requests==2.27.1
		xmltodict==0.12.0
		questdb==1.0.1
		psycopg2-binary==2.9.3
		coverage==6.3
		grpcio==1.47.*
		grpcio-health-checking==1.47.*
		grpcio-tools==1.47.*
		grpclib==0.4.4
		prettytable==3.5.0
		prometheus-client==0.13.0
		protobuf==3.20.*
		pytest==6.2.5
		pytest-benchmark==3.4.1
		python-dateutil==2.8.2
		pytest-depends==1.0.1

src/monitoring/service/MonitoringServiceServicerImpl.py

+2 −3

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@ from common.proto.context_pb2 import Empty
		from common.proto.device_pb2 import MonitoringSettings
		from common.proto.kpi_sample_types_pb2 import KpiSampleType
		from common.proto.monitoring_pb2_grpc import MonitoringServiceServicer
		from common.proto.monitoring_pb2 import AlarmResponse, AlarmDescriptor, AlarmList, SubsList, \
		KpiQuery, SubsDescriptor, SubscriptionID, AlarmID, KpiList,\
		from common.proto.monitoring_pb2 import AlarmResponse, AlarmDescriptor, AlarmList, SubsList, KpiId, \
		KpiDescriptor, KpiList, KpiQuery, SubsDescriptor, SubscriptionID, AlarmID, KpiDescriptorList, \
		MonitorKpiRequest, Kpi, AlarmSubscription, SubsResponse, RawKpiTable, RawKpi, RawKpiList
		from common.tools.timestamp.Converters import timestamp_string_to_float, timestamp_utcnow_to_float
		from device.client.DeviceClient import DeviceClient
		@@ -30,7 +30,6 @@ from monitoring.service.AlarmManager import AlarmManager
		from monitoring.service.NameMapping import NameMapping
		from monitoring.service.SubscriptionManager import SubscriptionManager

		from common.proto.kpi_manager_pb2 import KpiId, KpiDescriptor, KpiDescriptorList

		LOGGER = logging.getLogger(__name__)

src/monitoring/tests/Messages.py

+51 −51

Original line number	Diff line number	Diff line
		@@ -17,54 +17,54 @@ from common.proto import monitoring_pb2
		from common.proto.kpi_sample_types_pb2 import KpiSampleType
		from common.tools.timestamp.Converters import timestamp_utcnow_to_float

		# def kpi_id():
		# _kpi_id = monitoring_pb2.KpiId()
		# _kpi_id.kpi_id.uuid = str(1) # pylint: disable=maybe-no-member
		# return _kpi_id

		# def create_kpi_request(kpi_id_str):
		# _create_kpi_request = monitoring_pb2.KpiDescriptor()
		# _create_kpi_request.kpi_description = 'KPI Description Test'
		# _create_kpi_request.kpi_sample_type = KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED
		# _create_kpi_request.device_id.device_uuid.uuid = 'DEV' + str(kpi_id_str)
		# _create_kpi_request.service_id.service_uuid.uuid = 'SERV' + str(kpi_id_str)
		# _create_kpi_request.slice_id.slice_uuid.uuid = 'SLC' + str(kpi_id_str)
		# _create_kpi_request.endpoint_id.endpoint_uuid.uuid = 'END' + str(kpi_id_str)
		# _create_kpi_request.connection_id.connection_uuid.uuid = 'CON' + str(kpi_id_str)
		# return _create_kpi_request

		# def create_kpi_request_b():
		# _create_kpi_request = monitoring_pb2.KpiDescriptor()
		# _create_kpi_request.kpi_description = 'KPI Description Test'
		# _create_kpi_request.kpi_sample_type = KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED
		# _create_kpi_request.device_id.device_uuid.uuid = 'DEV2' # pylint: disable=maybe-no-member
		# _create_kpi_request.service_id.service_uuid.uuid = 'SERV2' # pylint: disable=maybe-no-member
		# _create_kpi_request.slice_id.slice_uuid.uuid = 'SLC2' # pylint: disable=maybe-no-member
		# _create_kpi_request.endpoint_id.endpoint_uuid.uuid = 'END2' # pylint: disable=maybe-no-member
		# _create_kpi_request.connection_id.connection_uuid.uuid = 'CON2' # pylint: disable=maybe-no-member
		# return _create_kpi_request

		# def create_kpi_request_c():
		# _create_kpi_request = monitoring_pb2.KpiDescriptor()
		# _create_kpi_request.kpi_description = 'KPI Description Test'
		# _create_kpi_request.kpi_sample_type = KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED
		# _create_kpi_request.device_id.device_uuid.uuid = 'DEV3' # pylint: disable=maybe-no-member
		# _create_kpi_request.service_id.service_uuid.uuid = 'SERV3' # pylint: disable=maybe-no-member
		# _create_kpi_request.slice_id.slice_uuid.uuid = 'SLC3' # pylint: disable=maybe-no-member
		# _create_kpi_request.endpoint_id.endpoint_uuid.uuid = 'END3' # pylint: disable=maybe-no-member
		# _create_kpi_request.connection_id.connection_uuid.uuid = 'CON3' # pylint: disable=maybe-no-member
		# return _create_kpi_request

		# def create_kpi_request_d():
		# _create_kpi_request = monitoring_pb2.KpiDescriptor()
		# _create_kpi_request.kpi_description = 'KPI Description Test'
		# _create_kpi_request.kpi_sample_type = KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED
		# _create_kpi_request.device_id.device_uuid.uuid = 'DEV4' # pylint: disable=maybe-no-member
		# _create_kpi_request.service_id.service_uuid.uuid = 'SERV4' # pylint: disable=maybe-no-member
		# _create_kpi_request.slice_id.slice_uuid.uuid = 'SLC4' # pylint: disable=maybe-no-member
		# _create_kpi_request.endpoint_id.endpoint_uuid.uuid = 'END4' # pylint: disable=maybe-no-member
		# _create_kpi_request.connection_id.connection_uuid.uuid = 'CON4' # pylint: disable=maybe-no-member
		# return _create_kpi_request
		def kpi_id():
		_kpi_id = monitoring_pb2.KpiId()
		_kpi_id.kpi_id.uuid = str(1) # pylint: disable=maybe-no-member
		return _kpi_id

		def create_kpi_request(kpi_id_str):
		_create_kpi_request = monitoring_pb2.KpiDescriptor()
		_create_kpi_request.kpi_description = 'KPI Description Test'
		_create_kpi_request.kpi_sample_type = KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED
		_create_kpi_request.device_id.device_uuid.uuid = 'DEV' + str(kpi_id_str)
		_create_kpi_request.service_id.service_uuid.uuid = 'SERV' + str(kpi_id_str)
		_create_kpi_request.slice_id.slice_uuid.uuid = 'SLC' + str(kpi_id_str)
		_create_kpi_request.endpoint_id.endpoint_uuid.uuid = 'END' + str(kpi_id_str)
		_create_kpi_request.connection_id.connection_uuid.uuid = 'CON' + str(kpi_id_str)
		return _create_kpi_request

		def create_kpi_request_b():
		_create_kpi_request = monitoring_pb2.KpiDescriptor()
		_create_kpi_request.kpi_description = 'KPI Description Test'
		_create_kpi_request.kpi_sample_type = KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED
		_create_kpi_request.device_id.device_uuid.uuid = 'DEV2' # pylint: disable=maybe-no-member
		_create_kpi_request.service_id.service_uuid.uuid = 'SERV2' # pylint: disable=maybe-no-member
		_create_kpi_request.slice_id.slice_uuid.uuid = 'SLC2' # pylint: disable=maybe-no-member
		_create_kpi_request.endpoint_id.endpoint_uuid.uuid = 'END2' # pylint: disable=maybe-no-member
		_create_kpi_request.connection_id.connection_uuid.uuid = 'CON2' # pylint: disable=maybe-no-member
		return _create_kpi_request

		def create_kpi_request_c():
		_create_kpi_request = monitoring_pb2.KpiDescriptor()
		_create_kpi_request.kpi_description = 'KPI Description Test'
		_create_kpi_request.kpi_sample_type = KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED
		_create_kpi_request.device_id.device_uuid.uuid = 'DEV3' # pylint: disable=maybe-no-member
		_create_kpi_request.service_id.service_uuid.uuid = 'SERV3' # pylint: disable=maybe-no-member
		_create_kpi_request.slice_id.slice_uuid.uuid = 'SLC3' # pylint: disable=maybe-no-member
		_create_kpi_request.endpoint_id.endpoint_uuid.uuid = 'END3' # pylint: disable=maybe-no-member
		_create_kpi_request.connection_id.connection_uuid.uuid = 'CON3' # pylint: disable=maybe-no-member
		return _create_kpi_request

		def create_kpi_request_d():
		_create_kpi_request = monitoring_pb2.KpiDescriptor()
		_create_kpi_request.kpi_description = 'KPI Description Test'
		_create_kpi_request.kpi_sample_type = KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED
		_create_kpi_request.device_id.device_uuid.uuid = 'DEV4' # pylint: disable=maybe-no-member
		_create_kpi_request.service_id.service_uuid.uuid = 'SERV4' # pylint: disable=maybe-no-member
		_create_kpi_request.slice_id.slice_uuid.uuid = 'SLC4' # pylint: disable=maybe-no-member
		_create_kpi_request.endpoint_id.endpoint_uuid.uuid = 'END4' # pylint: disable=maybe-no-member
		_create_kpi_request.connection_id.connection_uuid.uuid = 'CON4' # pylint: disable=maybe-no-member
		return _create_kpi_request

		def monitor_kpi_request(kpi_uuid, monitoring_window_s, sampling_rate_s):
		_monitor_kpi_request = monitoring_pb2.MonitorKpiRequest()
		@@ -80,10 +80,10 @@ def include_kpi_request(kpi_id):
		_include_kpi_request.kpi_value.floatVal = 500*random() # pylint: disable=maybe-no-member
		return _include_kpi_request

		# def kpi_descriptor_list():
		# _kpi_descriptor_list = monitoring_pb2.KpiDescriptorList()
		def kpi_descriptor_list():
		_kpi_descriptor_list = monitoring_pb2.KpiDescriptorList()

		# return _kpi_descriptor_list
		return _kpi_descriptor_list

		def kpi_query(kpi_id_list):
		_kpi_query = monitoring_pb2.KpiQuery()