From 0148f285fa8bd8f775ec5c55ba40b24a1d5a8b2e Mon Sep 17 00:00:00 2001 From: Javier Moreno Date: Mon, 19 Sep 2022 18:27:39 +0200 Subject: [PATCH 01/34] Added new unit tests according to the new monitoring data model --- .gitignore | 2 + src/monitoring/client/MonitoringClient.py | 8 +- .../service/MonitoringServiceServicerImpl.py | 114 +++++++-------- src/monitoring/tests/Messages.py | 43 ++++++ src/monitoring/tests/test_unitary.py | 134 +++++++++++++++--- 5 files changed, 219 insertions(+), 82 deletions(-) diff --git a/.gitignore b/.gitignore index aef881143..7d70601f9 100644 --- a/.gitignore +++ b/.gitignore @@ -161,3 +161,5 @@ tfs_runtime_env_vars.sh delete_local_deployment.sh local_docker_deployment.sh local_k8s_deployment.sh +/src/common/proto/.gitkeep +/src/common/proto/__init__.py diff --git a/src/monitoring/client/MonitoringClient.py b/src/monitoring/client/MonitoringClient.py index f65072f19..9b78d3d4f 100644 --- a/src/monitoring/client/MonitoringClient.py +++ b/src/monitoring/client/MonitoringClient.py @@ -100,10 +100,10 @@ class MonitoringClient: return response @RETRY_DECORATOR - def SubscribeKpi(self, request : SubsDescriptor) -> Iterator[KpiList]: - LOGGER.debug('SubscribeKpi: {:s}'.format(grpc_message_to_json_string(request))) - response = self.stub.SubscribeKpi(request) - LOGGER.debug('SubscribeKpi result: {:s}'.format(grpc_message_to_json_string(response))) + def SetKpiSubscription(self, request : SubsDescriptor) -> Iterator[KpiList]: + LOGGER.debug('SetKpiSubscription: {:s}'.format(grpc_message_to_json_string(request))) + response = self.stub.SetKpiSubscription(request) + LOGGER.debug('SetKpiSubscription result: {:s}'.format(grpc_message_to_json_string(response))) return response @RETRY_DECORATOR diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py index df3b90741..ae6e9570c 100644 --- a/src/monitoring/service/MonitoringServiceServicerImpl.py +++ b/src/monitoring/service/MonitoringServiceServicerImpl.py @@ -104,6 +104,30 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): except Exception as e: # pragma: no cover LOGGER.exception('DeleteKpi exception') + def GetKpiDescriptor(self, request: KpiId, grpc_context: grpc.ServicerContext) -> KpiDescriptor: + LOGGER.info('getting Kpi by KpiID') + try: + kpi_db = self.sql_db.get_KPI(int(request.kpi_id.uuid)) + # LOGGER.info('sql_db.get_KPIS={:s}'.format(str(self.sql_db.get_KPIS()))) + # LOGGER.info('kpi_db={:s}'.format(str(kpi_db))) + if kpi_db is None: return None + + kpiDescriptor = KpiDescriptor() + + kpiDescriptor.kpi_description = kpi_db[1] + kpiDescriptor.kpi_sample_type = kpi_db[2] + kpiDescriptor.device_id.device_uuid.uuid = str(kpi_db[3]) + kpiDescriptor.endpoint_id.endpoint_uuid.uuid = str(kpi_db[4]) + kpiDescriptor.service_id.service_uuid.uuid = str(kpi_db[5]) + + return kpiDescriptor + except ServiceException as e: + LOGGER.exception('GetKpiDescriptor exception') + grpc_context.abort(e.code, e.details) + + except Exception: # pragma: no cover + LOGGER.exception('GetKpiDescriptor exception') + def GetKpiDescriptorList ( self, request : Empty, grpc_context : grpc.ServicerContext) -> KpiDescriptorList: LOGGER.info('GetKpiDescriptorList') @@ -116,34 +140,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): except Exception as e: # pragma: no cover LOGGER.exception('GetKpiDescriptorList exception') - # rpc MonitorKpi (MonitorKpiRequest) returns (context.Empty) {} - def MonitorKpi ( self, request : MonitorKpiRequest, grpc_context : grpc.ServicerContext) -> Empty: - LOGGER.info('MonitorKpi') - try: - # Sets the request to send to the device service - monitor_device_request = MonitoringSettings() - - kpiDescriptor = self.GetKpiDescriptor(request.kpi_id, grpc_context) - - monitor_device_request.kpi_descriptor.CopyFrom(kpiDescriptor) - monitor_device_request.kpi_id.kpi_id.uuid = request.kpi_id.kpi_id.uuid - monitor_device_request.sampling_duration_s = request.monitoring_window_s - monitor_device_request.sampling_interval_s = request.sampling_rate_s - - device_client = DeviceClient() - device_client.MonitorDeviceKpi(monitor_device_request) - - except ServiceException as e: - LOGGER.exception('MonitorKpi exception') - # CREATEKPI_COUNTER_FAILED.inc() - grpc_context.abort(e.code, e.details) - except Exception as e: # pragma: no cover - LOGGER.exception('MonitorKpi exception') - grpc_context.abort(grpc.StatusCode.INTERNAL, str(e)) - # CREATEKPI_COUNTER_FAILED.inc() - - return Empty() # rpc IncludeKpi(IncludeKpiRequest) returns(context.Empty) {} def IncludeKpi(self, request : Kpi, grpc_context : grpc.ServicerContext) -> Empty: @@ -178,55 +175,49 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): # CREATEKPI_COUNTER_FAILED.inc() return Empty() - # def GetStreamKpi ( self, request, grpc_context : grpc.ServicerContext): - # - # LOGGER.info('GetStreamKpi') - # yield monitoring_pb2.Kpi() - # - # @MONITORING_GETINSTANTKPI_REQUEST_TIME.time() - # def GetInstantKpi ( self, request, grpc_context : grpc.ServicerContext): - # - # LOGGER.info('GetInstantKpi') - # return monitoring_pb2.Kpi() - + # rpc MonitorKpi (MonitorKpiRequest) returns (context.Empty) {} + def MonitorKpi ( self, request : MonitorKpiRequest, grpc_context : grpc.ServicerContext) -> Empty: - def GetKpiDescriptor(self, request : KpiId, grpc_context : grpc.ServicerContext) -> KpiDescriptor: - LOGGER.info('getting Kpi by KpiID') + LOGGER.info('MonitorKpi') try: - kpi_db = self.sql_db.get_KPI(int(request.kpi_id.uuid)) - #LOGGER.info('sql_db.get_KPIS={:s}'.format(str(self.sql_db.get_KPIS()))) - #LOGGER.info('kpi_db={:s}'.format(str(kpi_db))) - if kpi_db is None: return None + # Sets the request to send to the device service + monitor_device_request = MonitoringSettings() - kpiDescriptor = KpiDescriptor() + kpiDescriptor = self.GetKpiDescriptor(request.kpi_id, grpc_context) + + monitor_device_request.kpi_descriptor.CopyFrom(kpiDescriptor) + monitor_device_request.kpi_id.kpi_id.uuid = request.kpi_id.kpi_id.uuid + monitor_device_request.sampling_duration_s = request.monitoring_window_s + monitor_device_request.sampling_interval_s = request.sampling_rate_s - kpiDescriptor.kpi_description = kpi_db[1] - kpiDescriptor.kpi_sample_type = kpi_db[2] - kpiDescriptor.device_id.device_uuid.uuid = str(kpi_db[3]) - kpiDescriptor.endpoint_id.endpoint_uuid.uuid = str(kpi_db[4]) - kpiDescriptor.service_id.service_uuid.uuid = str(kpi_db[5]) + device_client = DeviceClient() + device_client.MonitorDeviceKpi(monitor_device_request) - return kpiDescriptor except ServiceException as e: - LOGGER.exception('GetKpiDescriptor exception') + LOGGER.exception('MonitorKpi exception') + # CREATEKPI_COUNTER_FAILED.inc() grpc_context.abort(e.code, e.details) + except Exception as e: # pragma: no cover + LOGGER.exception('MonitorKpi exception') + grpc_context.abort(grpc.StatusCode.INTERNAL, str(e)) + # CREATEKPI_COUNTER_FAILED.inc() + + return Empty() - except Exception: # pragma: no cover - LOGGER.exception('GetKpiDescriptor exception') def QueryKpiData ( self, request : KpiQuery, grpc_context : grpc.ServicerContext) -> KpiList: LOGGER.info('QueryKpiData') try: # TBC - return KpiQuery() + return KpiList() except ServiceException as e: LOGGER.exception('QueryKpiData exception') grpc_context.abort(e.code, e.details) except Exception as e: # pragma: no cover LOGGER.exception('QueryKpiData exception') - def SubscribeKpi ( self, request : SubsDescriptor, grpc_context : grpc.ServicerContext) -> KpiList: + def SetKpiSubscription ( self, request : SubsDescriptor, grpc_context : grpc.ServicerContext) -> KpiList: LOGGER.info('SubscribeKpi') try: @@ -335,3 +326,14 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): grpc_context.abort(e.code, e.details) except Exception as e: # pragma: no cover LOGGER.exception('DeleteAlarm exception') + + def GetStreamKpi ( self, request : KpiId, grpc_context : grpc.ServicerContext) -> Iterator[Kpi]: + + LOGGER.info('GetStreamKpi') + yield Kpi() + + @MONITORING_GETINSTANTKPI_REQUEST_TIME.time() + def GetInstantKpi ( self, request : KpiId, grpc_context : grpc.ServicerContext) -> KpiList: + + LOGGER.info('GetInstantKpi') + return KpiList() \ No newline at end of file diff --git a/src/monitoring/tests/Messages.py b/src/monitoring/tests/Messages.py index cf81ceed1..450f6accc 100644 --- a/src/monitoring/tests/Messages.py +++ b/src/monitoring/tests/Messages.py @@ -32,6 +32,24 @@ def create_kpi_request(): _create_kpi_request.endpoint_id.endpoint_uuid.uuid = 'END1' # pylint: disable=maybe-no-member 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.endpoint_id.endpoint_uuid.uuid = 'END2' # 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.endpoint_id.endpoint_uuid.uuid = 'END3' # 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() _monitor_kpi_request.kpi_id.kpi_id.uuid = kpi_uuid # pylint: disable=maybe-no-member @@ -45,3 +63,28 @@ def include_kpi_request(kpi_id): _include_kpi_request.timestamp.timestamp = timestamp_utcnow_to_float() _include_kpi_request.kpi_value.int32Val = 500 # pylint: disable=maybe-no-member return _include_kpi_request + +def kpi_query(): + _kpi_query = monitoring_pb2.KpiQuery() + + return _kpi_query + +def subs_descriptor(): + _subs_descriptor = monitoring_pb2.SubsDescriptor() + + return _subs_descriptor + +def subs_id(): + _subs_id = monitoring_pb2.SubsDescriptor() + + return _subs_id + +def alarm_descriptor(): + _alarm_descriptor = monitoring_pb2.AlarmDescriptor() + + return _alarm_descriptor + +def alarm_id(): + _alarm_id = monitoring_pb2.AlarmID() + + return _alarm_id \ No newline at end of file diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py index 03d5e665b..50d58c98d 100644 --- a/src/monitoring/tests/test_unitary.py +++ b/src/monitoring/tests/test_unitary.py @@ -15,6 +15,9 @@ import copy, os, pytest from time import sleep from typing import Tuple + +from grpc._channel import _MultiThreadedRendezvous + 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) @@ -24,7 +27,8 @@ from common.orm.Factory import get_database_backend, BackendEnum as DatabaseBack from common.message_broker.Factory import get_messagebroker_backend, BackendEnum as MessageBrokerBackendEnum from common.message_broker.MessageBroker import MessageBroker from common.proto import monitoring_pb2 -from common.proto.monitoring_pb2 import KpiId, KpiDescriptor +from common.proto.monitoring_pb2 import KpiId, KpiDescriptor, KpiList, SubsDescriptor, SubsIDList, AlarmID, \ + AlarmDescriptor, AlarmIDList, Kpi from context.client.ContextClient import ContextClient from context.service.grpc_server.ContextService import ContextService @@ -41,7 +45,8 @@ from common.proto.kpi_sample_types_pb2 import KpiSampleType from monitoring.service import SqliteTools, MetricsDBTools from monitoring.service.MonitoringService import MonitoringService from monitoring.service.EventTools import EventsDeviceCollector -from monitoring.tests.Messages import create_kpi_request, include_kpi_request, monitor_kpi_request +from monitoring.tests.Messages import create_kpi_request, include_kpi_request, monitor_kpi_request, \ + create_kpi_request_b, create_kpi_request_c, kpi_query, subs_descriptor, subs_id, alarm_descriptor, alarm_id, kpi_id from monitoring.tests.Objects import DEVICE_DEV1, DEVICE_DEV1_CONNECT_RULES, DEVICE_DEV1_UUID from monitoring.service.MonitoringServiceServicerImpl import LOGGER @@ -170,8 +175,38 @@ def test_set_kpi(monitoring_client): # pylint: disable=redefined-outer-name LOGGER.warning('test_create_kpi requesting') response = monitoring_client.SetKpi(create_kpi_request()) LOGGER.debug(str(response)) + response = monitoring_client.SetKpi(create_kpi_request_b()) + LOGGER.debug(str(response)) assert isinstance(response, KpiId) + +# Test case that makes use of client fixture to test server's DeleteKpi method +def test_delete_kpi(monitoring_client): # pylint: disable=redefined-outer-name + # make call to server + LOGGER.warning('delete_kpi requesting') + response = monitoring_client.SetKpi(create_kpi_request_b()) + response = monitoring_client.DeleteKpi(response) + LOGGER.debug(str(response)) + assert isinstance(response, Empty) + +# Test case that makes use of client fixture to test server's GetInstantKpi method +def test_get_kpidescritor(monitoring_client): # pylint: disable=redefined-outer-name + LOGGER.warning('test_getkpidescritor_kpi begin') + response = monitoring_client.SetKpi(create_kpi_request_c()) + # LOGGER.debug(str(response)) + response = monitoring_client.GetKpiDescriptor(response) + # LOGGER.debug(str(response)) + assert isinstance(response, KpiDescriptor) + + +# Test case that makes use of client fixture to test server's IncludeKpi method +def test_include_kpi(monitoring_client): # pylint: disable=redefined-outer-name + # make call to server + LOGGER.warning('test_include_kpi requesting') + kpi_id = monitoring_client.SetKpi(create_kpi_request_c()) + response = monitoring_client.IncludeKpi(include_kpi_request(kpi_id)) + assert isinstance(response, Empty) + # Test case that makes use of client fixture to test server's MonitorKpi method def test_monitor_kpi( context_client : ContextClient, # pylint: disable=redefined-outer-name @@ -207,13 +242,76 @@ def test_monitor_kpi( LOGGER.debug(str(response)) assert isinstance(response, Empty) +# Test case that makes use of client fixture to test server's QueryKpiData method +def test_query_kpi_data(monitoring_client): # pylint: disable=redefined-outer-name + LOGGER.warning('test_query_kpi_data') + response = monitoring_client.QueryKpiData(kpi_query()) + LOGGER.debug(str(response)) + assert isinstance(response, KpiList) + +# Test case that makes use of client fixture to test server's SetKpiSubscription method +def test_set_kpi_subscription(monitoring_client): # pylint: disable=redefined-outer-name + LOGGER.warning('test_set_kpi_subscription') + response = monitoring_client.SetKpiSubscription(subs_descriptor()) + LOGGER.debug(type(response)) + assert isinstance(response, _MultiThreadedRendezvous) + +# Test case that makes use of client fixture to test server's GetSubsDescriptor method +def test_get_subs_descriptor(monitoring_client): + LOGGER.warning('test_get_subs_descriptor') + response = monitoring_client.GetSubsDescriptor(subs_id()) + LOGGER.debug(type(response)) + assert isinstance(response, SubsDescriptor) + +# Test case that makes use of client fixture to test server's GetSubscriptions method +def test_get_subscriptions(monitoring_client): + LOGGER.warning('test_get_subscriptions') + response = monitoring_client.GetSubscriptions(Empty()) + LOGGER.debug(type(response)) + assert isinstance(response, SubsIDList) + +# Test case that makes use of client fixture to test server's DeleteSubscription method +def test_delete_subscription(monitoring_client): + LOGGER.warning('test_delete_subscription') + response = monitoring_client.DeleteSubscription(subs_id()) + LOGGER.debug(type(response)) + assert isinstance(response, Empty) -# Test case that makes use of client fixture to test server's IncludeKpi method -def test_include_kpi(monitoring_client): # pylint: disable=redefined-outer-name - # make call to server - LOGGER.warning('test_include_kpi requesting') - kpi_id = monitoring_client.SetKpi(create_kpi_request()) - response = monitoring_client.IncludeKpi(include_kpi_request(kpi_id)) +# Test case that makes use of client fixture to test server's SetKpiAlarm method +def test_set_kpi_alarm(monitoring_client): + LOGGER.warning('test_set_kpi_alarm') + response = monitoring_client.SetKpiAlarm(alarm_descriptor()) + LOGGER.debug(type(response)) + assert isinstance(response, AlarmID) + +# Test case that makes use of client fixture to test server's GetAlarms method +def test_get_alarms(monitoring_client): + LOGGER.warning('test_get_alarms') + response = monitoring_client.GetAlarms(Empty()) + LOGGER.debug(type(response)) + assert isinstance(response, AlarmIDList) + + +# Test case that makes use of client fixture to test server's GetAlarmDescriptor method +def test_get_alarm_descriptor(monitoring_client): + LOGGER.warning('test_get_alarm_descriptor') + response = monitoring_client.GetAlarmDescriptor(alarm_id()) + LOGGER.debug(type(response)) + assert isinstance(response, AlarmDescriptor) + +# Test case that makes use of client fixture to test server's GetAlarmResponseStream method +def test_get_alarm_response_stream(monitoring_client): + LOGGER.warning('test_get_alarm_descriptor') + response = monitoring_client.GetAlarmResponseStream(alarm_descriptor()) + LOGGER.debug(type(response)) + assert isinstance(response, _MultiThreadedRendezvous) + + +# Test case that makes use of client fixture to test server's DeleteAlarm method +def test_delete_alarm(monitoring_client): + LOGGER.warning('test_delete_alarm') + response = monitoring_client.DeleteAlarm(alarm_id()) + LOGGER.debug(type(response)) assert isinstance(response, Empty) # Test case that makes use of client fixture to test server's GetStreamKpi method @@ -221,23 +319,15 @@ def test_get_stream_kpi(monitoring_client): # pylint: disable=redefined-outer-na LOGGER.warning('test_getstream_kpi begin') response = monitoring_client.GetStreamKpi(monitoring_pb2.Kpi()) LOGGER.debug(str(response)) - #assert isinstance(response, Kpi) + assert isinstance(response, _MultiThreadedRendezvous) # Test case that makes use of client fixture to test server's GetInstantKpi method -# def test_get_instant_kpi(monitoring_client): # pylint: disable=redefined-outer-name -# LOGGER.warning('test_getinstant_kpi begin') -# response = monitoring_client.GetInstantKpi(kpi_id()) -# LOGGER.debug(str(response)) -# # assert isinstance(response, Kpi) +def test_get_instant_kpi(monitoring_client): # pylint: disable=redefined-outer-name + LOGGER.warning('test_getinstant_kpi begin') + response = monitoring_client.GetInstantKpi(kpi_id()) + LOGGER.debug(str(response)) + assert isinstance(response, KpiList) -# Test case that makes use of client fixture to test server's GetInstantKpi method -def test_get_kpidescritor_kpi(monitoring_client): # pylint: disable=redefined-outer-name - LOGGER.warning('test_getkpidescritor_kpi begin') - response = monitoring_client.SetKpi(create_kpi_request()) - # LOGGER.debug(str(response)) - response = monitoring_client.GetKpiDescriptor(response) - # LOGGER.debug(str(response)) - assert isinstance(response, KpiDescriptor) def test_sqlitedb_tools_insert_kpi(sql_db): # pylint: disable=redefined-outer-name LOGGER.warning('test_sqlitedb_tools_insert_kpi begin') -- GitLab From 3ca856bb6da82bfffdc589a15dcfc6b037b06c23 Mon Sep 17 00:00:00 2001 From: Javier Moreno Date: Mon, 19 Sep 2022 18:36:47 +0200 Subject: [PATCH 02/34] Updated last commit --- src/monitoring/tests/Messages.py | 5 +++++ src/monitoring/tests/test_unitary.py | 14 +++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/monitoring/tests/Messages.py b/src/monitoring/tests/Messages.py index 450f6accc..b463d900b 100644 --- a/src/monitoring/tests/Messages.py +++ b/src/monitoring/tests/Messages.py @@ -64,6 +64,11 @@ def include_kpi_request(kpi_id): _include_kpi_request.kpi_value.int32Val = 500 # pylint: disable=maybe-no-member return _include_kpi_request +def kpi_descriptor_list(): + _kpi_descriptor_list = monitoring_pb2.KpiDescriptorList() + + return _kpi_descriptor_list + def kpi_query(): _kpi_query = monitoring_pb2.KpiQuery() diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py index 50d58c98d..5dc94db31 100644 --- a/src/monitoring/tests/test_unitary.py +++ b/src/monitoring/tests/test_unitary.py @@ -28,7 +28,7 @@ from common.message_broker.Factory import get_messagebroker_backend, BackendEnum from common.message_broker.MessageBroker import MessageBroker from common.proto import monitoring_pb2 from common.proto.monitoring_pb2 import KpiId, KpiDescriptor, KpiList, SubsDescriptor, SubsIDList, AlarmID, \ - AlarmDescriptor, AlarmIDList, Kpi + AlarmDescriptor, AlarmIDList, Kpi, KpiDescriptorList from context.client.ContextClient import ContextClient from context.service.grpc_server.ContextService import ContextService @@ -46,7 +46,8 @@ from monitoring.service import SqliteTools, MetricsDBTools from monitoring.service.MonitoringService import MonitoringService from monitoring.service.EventTools import EventsDeviceCollector from monitoring.tests.Messages import create_kpi_request, include_kpi_request, monitor_kpi_request, \ - create_kpi_request_b, create_kpi_request_c, kpi_query, subs_descriptor, subs_id, alarm_descriptor, alarm_id, kpi_id + create_kpi_request_b, create_kpi_request_c, kpi_query, subs_descriptor, subs_id, alarm_descriptor, alarm_id, kpi_id, \ + kpi_descriptor_list from monitoring.tests.Objects import DEVICE_DEV1, DEVICE_DEV1_CONNECT_RULES, DEVICE_DEV1_UUID from monitoring.service.MonitoringServiceServicerImpl import LOGGER @@ -189,7 +190,7 @@ def test_delete_kpi(monitoring_client): # pylint: disable=redefined-outer-name LOGGER.debug(str(response)) assert isinstance(response, Empty) -# Test case that makes use of client fixture to test server's GetInstantKpi method +# Test case that makes use of client fixture to test server's GetKpiDescriptor method def test_get_kpidescritor(monitoring_client): # pylint: disable=redefined-outer-name LOGGER.warning('test_getkpidescritor_kpi begin') response = monitoring_client.SetKpi(create_kpi_request_c()) @@ -198,6 +199,13 @@ def test_get_kpidescritor(monitoring_client): # pylint: disable=redefined-outer- # LOGGER.debug(str(response)) assert isinstance(response, KpiDescriptor) +# Test case that makes use of client fixture to test server's GetKpiDescriptor method +def test_get_kpi_descriptor_list(monitoring_client): # pylint: disable=redefined-outer-name + LOGGER.warning('test_getkpidescritor_kpi begin') + response = monitoring_client.GetKpiDescriptorList(kpi_descriptor_list()) + # LOGGER.debug(str(response)) + assert isinstance(response, KpiDescriptorList) + # Test case that makes use of client fixture to test server's IncludeKpi method def test_include_kpi(monitoring_client): # pylint: disable=redefined-outer-name -- GitLab From 35bc93b7134b604cad6f4271f015b1187bd64c49 Mon Sep 17 00:00:00 2001 From: TeraFlowSDN Date: Tue, 20 Sep 2022 07:50:19 +0000 Subject: [PATCH 03/34] revert to previous commit --- .gitignore | 4 - .gitlab-ci.yml | 1 - deploy.sh | 107 +- expose_ingress_grpc.sh | 3 +- manifests/monitoringservice.yaml | 10 +- manifests/pathcompservice.yaml | 30 +- manifests/webuiservice.yaml | 2 +- open_dashboard.sh | 29 + open_webui.sh | 37 + proto/automation.proto | 7 +- proto/context.proto | 2 - proto/pathcomp.proto | 5 - scripts/old/deploy_in_kubernetes.sh | 2 +- scripts/run_tests_locally-pathcomp.sh | 28 + scripts/show_logs_automation.sh | 2 +- scripts/show_logs_compute.sh | 2 +- scripts/show_logs_context.sh | 2 +- scripts/show_logs_device.sh | 2 +- scripts/show_logs_monitoring.sh | 2 +- scripts/show_logs_service.sh | 2 +- scripts/show_logs_webui.sh | 2 +- show_deploy.sh | 2 +- .../automation/AutomationGatewayImpl.java | 30 +- .../automation/AutomationService.java | 5 - .../automation/AutomationServiceImpl.java | 53 +- .../automation/ContextSubscriber.java | 9 +- .../eu/teraflow/automation/Serializer.java | 63 - .../automation/device/DeviceGateway.java | 3 - .../automation/device/DeviceGatewayImpl.java | 11 - .../automation/device/DeviceService.java | 3 - .../automation/device/DeviceServiceImpl.java | 6 - .../teraflow/automation/model/DeviceRole.java | 6 - .../automation/model/DeviceRoleId.java | 6 - .../AutomationFunctionalServiceTest.java | 76 - .../automation/AutomationServiceTest.java | 61 +- .../automation/ContextSubscriberTest.java | 4 +- .../teraflow/automation/SerializerTest.java | 105 - .../grpc/automation/Automation.java | 890 +- .../grpc/automation/AutomationService.java | 2 +- .../automation/AutomationServiceBean.java | 2 +- .../automation/AutomationServiceClient.java | 2 +- .../automation/AutomationServiceGrpc.java | 24 +- .../MutinyAutomationServiceGrpc.java | 8 +- .../grpc/monitoring/Monitoring.java | 19414 ++++++++-------- .../grpc/monitoring/MonitoringService.java | 26 +- .../monitoring/MonitoringServiceBean.java | 69 +- .../monitoring/MonitoringServiceClient.java | 51 +- .../monitoring/MonitoringServiceGrpc.java | 797 +- .../MutinyMonitoringServiceGrpc.java | 266 +- .../target/kubernetes/kubernetes.yml | 12 +- src/common/DeviceTypes.py | 20 +- src/common/tools/object_factory/Constraint.py | 15 +- src/common/tools/object_factory/Device.py | 13 +- .../nbi_plugins/ietf_l2vpn/Constants.py | 2 +- src/compute/tests/Constants.py | 2 +- src/context/client/ContextClient.py | 14 - src/context/service/__main__.py | 2 +- src/context/service/database/ConfigModel.py | 2 +- .../service/database/ConstraintModel.py | 25 +- .../grpc_server/ContextServiceServicerImpl.py | 68 +- src/context/tests/Objects.py | 14 +- src/device/service/MonitoringLoops.py | 6 +- src/device/service/database/ContextModel.py | 20 +- src/device/service/database/TopologyModel.py | 18 +- src/device/service/drivers/__init__.py | 4 +- src/device/tests/test_unitary_emulated.py | 7 +- src/monitoring/service/__main__.py | 4 +- src/pathcomp/.gitlab-ci.yml | 109 +- src/pathcomp/Config.py | 13 + src/pathcomp/Dockerfile | 69 + src/pathcomp/client/PathCompClient.py | 53 + src/pathcomp/client/__init__.py | 14 + src/pathcomp/requirements.in | 1 + src/pathcomp/service/PathCompService.py | 28 + .../service/PathCompServiceServicerImpl.py | 85 + src/pathcomp/service/__init__.py | 14 + src/pathcomp/service/__main__.py | 65 + src/pathcomp/tests/.gitignore | 1 + .../tests/MockService_Dependencies.py | 58 + src/pathcomp/tests/Objects.py | 110 + src/pathcomp/tests/PrepareTestScenario.py | 65 + src/pathcomp/tests/__init__.py | 14 + src/pathcomp/tests/test_unitary.py | 95 + .../eu/teraflow/policy/PolicyServiceImpl.java | 142 +- .../java/eu/teraflow/policy/Serializer.java | 104 +- .../policy/model/PolicyRuleBasic.java | 6 +- .../policy/monitoring/MonitoringGateway.java | 14 +- .../monitoring/MonitoringGatewayImpl.java | 40 +- .../policy/monitoring/MonitoringService.java | 14 +- .../monitoring/MonitoringServiceImpl.java | 28 +- .../monitoring/model/AlarmDescriptor.java | 46 +- .../teraflow/policy/monitoring/model/Kpi.java | 8 +- .../monitoring/model/SubsDescriptor.java | 34 +- .../eu/teraflow/policy/SerializerTest.java | 161 +- .../grpc/monitoring/Monitoring.java | 19414 ++++++++-------- .../grpc/monitoring/MonitoringService.java | 26 +- .../monitoring/MonitoringServiceBean.java | 69 +- .../monitoring/MonitoringServiceClient.java | 51 +- .../monitoring/MonitoringServiceGrpc.java | 797 +- .../MutinyMonitoringServiceGrpc.java | 266 +- src/policy/target/kubernetes/kubernetes.yml | 89 + .../PathComputationElement.py | 8 +- src/service/tests/ServiceHandler_L3NM_EMU.py | 6 +- src/service/tests/ServiceHandler_L3NM_OC.py | 6 +- src/slice/requirements.in | 1 - src/slice/service/SliceServiceServicerImpl.py | 141 +- src/slice/service/__main__.py | 2 +- ...est_functional_create_interdomain_slice.py | 2 +- ...est_functional_delete_interdomain_slice.py | 2 +- src/tests/ofc22/descriptors_emulated.json | 34 +- src/tests/ofc22/run_test_01_bootstrap.sh | 4 - src/tests/ofc22/tests/LoadDescriptors.py | 2 +- src/tests/ofc22/tests/Objects.py | 4 +- .../ofc22/tests/test_functional_bootstrap.py | 2 +- .../ofc22/tests/test_functional_cleanup.py | 2 +- .../tests/test_functional_create_service.py | 4 +- .../tests/test_functional_delete_service.py | 4 +- .../topology_icons/Acknowledgements.txt | 4 +- .../emu-optical-line-system.png | Bin 0 -> 12869 bytes .../topology_icons/optical-line-system.png | Bin 0 -> 13777 bytes tutorial/1-2-install-microk8s.md | 11 +- tutorial/2-1-python-environment.md | 14 - tutorial/2-2-ofc22.md | 12 - 123 files changed, 22635 insertions(+), 22256 deletions(-) create mode 100755 open_dashboard.sh create mode 100755 open_webui.sh create mode 100755 scripts/run_tests_locally-pathcomp.sh create mode 100644 src/pathcomp/Config.py create mode 100644 src/pathcomp/Dockerfile create mode 100644 src/pathcomp/client/PathCompClient.py create mode 100644 src/pathcomp/client/__init__.py create mode 100644 src/pathcomp/requirements.in create mode 100644 src/pathcomp/service/PathCompService.py create mode 100644 src/pathcomp/service/PathCompServiceServicerImpl.py create mode 100644 src/pathcomp/service/__init__.py create mode 100644 src/pathcomp/service/__main__.py create mode 100644 src/pathcomp/tests/.gitignore create mode 100644 src/pathcomp/tests/MockService_Dependencies.py create mode 100644 src/pathcomp/tests/Objects.py create mode 100644 src/pathcomp/tests/PrepareTestScenario.py create mode 100644 src/pathcomp/tests/__init__.py create mode 100644 src/pathcomp/tests/test_unitary.py create mode 100644 src/policy/target/kubernetes/kubernetes.yml create mode 100644 src/webui/service/static/topology_icons/emu-optical-line-system.png create mode 100644 src/webui/service/static/topology_icons/optical-line-system.png diff --git a/.gitignore b/.gitignore index fa77a0954..7d70601f9 100644 --- a/.gitignore +++ b/.gitignore @@ -53,7 +53,6 @@ coverage.xml .pytest_cache/ .benchmarks/ cover/ -*_report.xml # Translations *.mo @@ -131,9 +130,6 @@ venv.bak/ # VSCode project settings .vscode/ -# Visual Studio project settings -/.vs - # Rope project settings .ropeproject diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3de792462..ffbf9e9f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,4 +41,3 @@ include: #- local: '/src/l3_attackmitigator/.gitlab-ci.yml' #- local: '/src/slice/.gitlab-ci.yml' #- local: '/src/interdomain/.gitlab-ci.yml' - - local: '/src/pathcomp/.gitlab-ci.yml' diff --git a/deploy.sh b/deploy.sh index 472b59753..172889c07 100755 --- a/deploy.sh +++ b/deploy.sh @@ -58,6 +58,18 @@ kubectl delete namespace $TFS_K8S_NAMESPACE kubectl create namespace $TFS_K8S_NAMESPACE printf "\n" +if [[ "$TFS_COMPONENTS" == *"monitoring"* ]]; then + echo "Creating secrets for InfluxDB..." + #TODO: make sure to change this when having a production deployment + kubectl create secret generic influxdb-secrets --namespace=$TFS_K8S_NAMESPACE \ + --from-literal=INFLUXDB_DB="monitoring" --from-literal=INFLUXDB_ADMIN_USER="teraflow" \ + --from-literal=INFLUXDB_ADMIN_PASSWORD="teraflow" --from-literal=INFLUXDB_HTTP_AUTH_ENABLED="True" + kubectl create secret generic monitoring-secrets --namespace=$TFS_K8S_NAMESPACE \ + --from-literal=INFLUXDB_DATABASE="monitoring" --from-literal=INFLUXDB_USER="teraflow" \ + --from-literal=INFLUXDB_PASSWORD="teraflow" --from-literal=INFLUXDB_HOSTNAME="localhost" + printf "\n" +fi + echo "Deploying components and collecting environment variables..." ENV_VARS_SCRIPT=tfs_runtime_env_vars.sh echo "# Environment variables for TeraFlowSDN deployment" > $ENV_VARS_SCRIPT @@ -74,80 +86,35 @@ for COMPONENT in $TFS_COMPONENTS; do if [ "$COMPONENT" == "automation" ] || [ "$COMPONENT" == "policy" ]; then docker build -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile ./src/"$COMPONENT"/ > "$BUILD_LOG" - elif [ "$COMPONENT" == "pathcomp" ]; then - BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}-frontend.log" - docker build -t "$COMPONENT-frontend:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/frontend/Dockerfile . >> "$BUILD_LOG" - - BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}-backend.log" - docker build -t "$COMPONENT-backend:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/backend/Dockerfile . >> "$BUILD_LOG" - # next command is redundant, but helpful to keep cache updated between rebuilds - docker build -t "$COMPONENT-backend:$TFS_IMAGE_TAG-builder" --target builder -f ./src/"$COMPONENT"/backend/Dockerfile . >> "$BUILD_LOG" - else + else docker build -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile . > "$BUILD_LOG" fi if [ -n "$TFS_REGISTRY_IMAGE" ]; then echo " Pushing Docker image to '$TFS_REGISTRY_IMAGE'..." - if [ "$COMPONENT" == "pathcomp" ]; then - TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-frontend.log" - docker tag "$COMPONENT-frontend:$TFS_IMAGE_TAG" "$IMAGE_URL-frontend" > "$TAG_LOG" + TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}.log" + docker tag "$IMAGE_NAME" "$IMAGE_URL" > "$TAG_LOG" - TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-backend.log" - docker tag "$COMPONENT-backend:$TFS_IMAGE_TAG" "$IMAGE_URL-backend" > "$TAG_LOG" - - PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-frontend.log" - docker push "$IMAGE_URL-frontend" > "$PUSH_LOG" - - PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-backend.log" - docker push "$IMAGE_URL-backend" > "$PUSH_LOG" - else - TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}.log" - docker tag "$IMAGE_NAME" "$IMAGE_URL" > "$TAG_LOG" - - PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}.log" - docker push "$IMAGE_URL" > "$PUSH_LOG" - fi + PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}.log" + docker push "$IMAGE_URL" > "$PUSH_LOG" fi echo " Adapting '$COMPONENT' manifest file..." MANIFEST="$TMP_MANIFESTS_FOLDER/${COMPONENT}service.yaml" cp ./manifests/"${COMPONENT}"service.yaml "$MANIFEST" + VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" | cut -d ":" -f3) if [ -n "$TFS_REGISTRY_IMAGE" ]; then # Registry is set - if [ "$COMPONENT" == "pathcomp" ]; then - VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-frontend:" "$MANIFEST" | cut -d ":" -f3) - sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-frontend:${VERSION}#image: $IMAGE_URL-frontend#g" "$MANIFEST" - - VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-backend:" "$MANIFEST" | cut -d ":" -f3) - sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-backend:${VERSION}#image: $IMAGE_URL-backend#g" "$MANIFEST" - - sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Always#g" "$MANIFEST" - else - VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" | cut -d ":" -f3) - sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST" - sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Always#g" "$MANIFEST" - fi + sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST" + sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Always#g" "$MANIFEST" else # Registry is not set - if [ "$COMPONENT" == "pathcomp" ]; then - VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-frontend:" "$MANIFEST" | cut -d ":" -f3) - sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-frontend:${VERSION}#image: $IMAGE_NAME-frontend#g" "$MANIFEST" - - VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-backend:" "$MANIFEST" | cut -d ":" -f3) - sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-backend:${VERSION}#image: $IMAGE_NAME-backend#g" "$MANIFEST" - - sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Never#g" "$MANIFEST" - else - VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" | cut -d ":" -f3) - sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT:${VERSION}#image: $IMAGE_NAME#g" "$MANIFEST" - sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Never#g" "$MANIFEST" - fi + sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT:${VERSION}#image: $IMAGE_NAME#g" "$MANIFEST" + sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Never#g" "$MANIFEST" fi - # TODO: harmonize names of the monitoring component - echo " Deploying '$COMPONENT' component to Kubernetes..." DEPLOY_LOG="$TMP_LOGS_FOLDER/deploy_${COMPONENT}.log" kubectl --namespace $TFS_K8S_NAMESPACE apply -f "$MANIFEST" > "$DEPLOY_LOG" @@ -202,12 +169,12 @@ if [[ "$TFS_COMPONENTS" == *"webui"* ]] && [[ "$TFS_COMPONENTS" == *"monitoring" echo "Configuring WebUI DataStores and Dashboards..." sleep 3 - # INFLUXDB_HOST="monitoringservice" - # INFLUXDB_PORT=$(kubectl --namespace $TFS_K8S_NAMESPACE get service/monitoringservice -o jsonpath='{.spec.ports[?(@.name=="influxdb")].port}') - # INFLUXDB_URL="http://${INFLUXDB_HOST}:${INFLUXDB_PORT}" - # INFLUXDB_USER=$(kubectl --namespace $TFS_K8S_NAMESPACE get secrets influxdb-secrets -o jsonpath='{.data.INFLUXDB_ADMIN_USER}' | base64 --decode) - # INFLUXDB_PASSWORD=$(kubectl --namespace $TFS_K8S_NAMESPACE get secrets influxdb-secrets -o jsonpath='{.data.INFLUXDB_ADMIN_PASSWORD}' | base64 --decode) - # INFLUXDB_DATABASE=$(kubectl --namespace $TFS_K8S_NAMESPACE get secrets influxdb-secrets -o jsonpath='{.data.INFLUXDB_DB}' | base64 --decode) + INFLUXDB_HOST="monitoringservice" + INFLUXDB_PORT=$(kubectl --namespace $TFS_K8S_NAMESPACE get service/monitoringservice -o jsonpath='{.spec.ports[?(@.name=="influxdb")].port}') + INFLUXDB_URL="http://${INFLUXDB_HOST}:${INFLUXDB_PORT}" + INFLUXDB_USER=$(kubectl --namespace $TFS_K8S_NAMESPACE get secrets influxdb-secrets -o jsonpath='{.data.INFLUXDB_ADMIN_USER}' | base64 --decode) + INFLUXDB_PASSWORD=$(kubectl --namespace $TFS_K8S_NAMESPACE get secrets influxdb-secrets -o jsonpath='{.data.INFLUXDB_ADMIN_PASSWORD}' | base64 --decode) + INFLUXDB_DATABASE=$(kubectl --namespace $TFS_K8S_NAMESPACE get secrets influxdb-secrets -o jsonpath='{.data.INFLUXDB_DB}' | base64 --decode) # Exposed through the ingress controller "tfs-ingress" GRAFANA_HOSTNAME="127.0.0.1" @@ -235,18 +202,18 @@ if [[ "$TFS_COMPONENTS" == *"webui"* ]] && [[ "$TFS_COMPONENTS" == *"monitoring" }' ${GRAFANA_URL_DEFAULT}/api/user/password echo + # Create InfluxDB DataSource # Ref: https://grafana.com/docs/grafana/latest/http_api/data_source/ - # TODO: replace user, password and database by variables to be saved - echo "Creating a datasource..." - curl -X POST -H "Content-Type: application/json" -H "Accept: application/json" -d '{ - "type" : "postgres", - "name" : "monitoringdb", + curl -X POST -H "Content-Type: application/json" -d '{ + "type" : "influxdb", + "name" : "InfluxDB", + "url" : "'"$INFLUXDB_URL"'", "access" : "proxy", - "user" : "admin", - "password" : "quest", + "basicAuth": false, + "user" : "'"$INFLUXDB_USER"'", + "password" : "'"$INFLUXDB_PASSWORD"'", "isDefault": true, - "database" : "qdb", - "sslmode" :"disable" + "database" : "'"$INFLUXDB_DATABASE"'" }' ${GRAFANA_URL_UPDATED}/api/datasources echo diff --git a/expose_ingress_grpc.sh b/expose_ingress_grpc.sh index e2667247a..8a4c83740 100755 --- a/expose_ingress_grpc.sh +++ b/expose_ingress_grpc.sh @@ -18,7 +18,7 @@ ######################################################################################################################## # If not already set, set the name of the Kubernetes namespace to deploy to. -export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"} +export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs-dev"} # If not already set, set the list of components you want to build images for, and deploy. export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device automation policy service compute monitoring dbscanserving opticalattackmitigator opticalcentralizedattackdetector webui"} @@ -32,7 +32,6 @@ for COMPONENT in $TFS_COMPONENTS; do echo "Processing '$COMPONENT' component..." SERVICE_GRPC_PORT=$(kubectl get service ${COMPONENT}service --namespace $TFS_K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.name=="grpc")].port}') - echo " '$COMPONENT' service port: $SERVICE_GRPC_PORT" if [ -z "${SERVICE_GRPC_PORT}" ]; then printf "\n" continue; diff --git a/manifests/monitoringservice.yaml b/manifests/monitoringservice.yaml index 3924ba2d1..f7ebdf7ac 100644 --- a/manifests/monitoringservice.yaml +++ b/manifests/monitoringservice.yaml @@ -84,11 +84,13 @@ spec: - name: METRICSDB_TABLE value: "monitoring" readinessProbe: - exec: - command: ["/bin/grpc_health_probe", "-addr=:7070"] + grpc: + port: 7070 + initialDelaySeconds: 5 livenessProbe: - exec: - command: ["/bin/grpc_health_probe", "-addr=:7070"] + grpc: + port: 7070 + initialDelaySeconds: 10 --- apiVersion: v1 kind: Service diff --git a/manifests/pathcompservice.yaml b/manifests/pathcompservice.yaml index d5939cb15..b5316e22f 100644 --- a/manifests/pathcompservice.yaml +++ b/manifests/pathcompservice.yaml @@ -27,8 +27,8 @@ spec: spec: terminationGracePeriodSeconds: 5 containers: - - name: frontend - image: registry.gitlab.com/teraflow-h2020/controller/pathcomp-frontend:latest + - name: server + image: registry.gitlab.com/teraflow-h2020/controller/pathcomp:latest imagePullPolicy: Always ports: - containerPort: 10020 @@ -48,28 +48,6 @@ spec: limits: cpu: 700m memory: 1024Mi - - name: backend - image: registry.gitlab.com/teraflow-h2020/controller/pathcomp-backend:latest - imagePullPolicy: Always - #readinessProbe: - # httpGet: - # path: /health - # port: 8081 - # initialDelaySeconds: 5 - # timeoutSeconds: 5 - #livenessProbe: - # httpGet: - # path: /health - # port: 8081 - # initialDelaySeconds: 5 - # timeoutSeconds: 5 - resources: - requests: - cpu: 250m - memory: 512Mi - limits: - cpu: 700m - memory: 1024Mi --- apiVersion: v1 kind: Service @@ -84,7 +62,3 @@ spec: protocol: TCP port: 10020 targetPort: 10020 - - name: http - protocol: TCP - port: 8081 - targetPort: 8081 diff --git a/manifests/webuiservice.yaml b/manifests/webuiservice.yaml index 0ebb81115..52fc75a98 100644 --- a/manifests/webuiservice.yaml +++ b/manifests/webuiservice.yaml @@ -40,7 +40,7 @@ spec: - name: LOG_LEVEL value: "DEBUG" - name: WEBUISERVICE_SERVICE_BASEURL_HTTP - value: "/" + value: "/webui" readinessProbe: httpGet: path: /healthz/ready diff --git a/open_dashboard.sh b/open_dashboard.sh new file mode 100755 index 000000000..8291a22c7 --- /dev/null +++ b/open_dashboard.sh @@ -0,0 +1,29 @@ +# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#/bin/bash + +# this script opens the dashboard + +K8S_NAMESPACE=${K8S_NAMESPACE:-'tf-dev'} + +GRAFANA_IP=$(kubectl get service/webuiservice -n ${K8S_NAMESPACE} -o jsonpath='{.spec.clusterIP}') +GRAFANA_PORT=$(kubectl get service webuiservice-public --namespace $K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.port==3000)].nodePort}') +URL=http://${GRAFANA_IP}:${GRAFANA_PORT} + +echo Opening Dashboard on URL ${URL} + +# curl -kL ${URL} + +python3 -m webbrowser ${URL} diff --git a/open_webui.sh b/open_webui.sh new file mode 100755 index 000000000..e4dfdb709 --- /dev/null +++ b/open_webui.sh @@ -0,0 +1,37 @@ +# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# this script opens the webui + +K8S_NAMESPACE=${K8S_NAMESPACE:-'tf-dev'} + +WEBUI_SERVICE_NAME="webuiservice-public" +WEBUI_PROTO=`kubectl get service ${WEBUI_SERVICE_NAME} -n ${K8S_NAMESPACE} -o jsonpath='{.spec.ports[0].name}'` +WEBUI_IP=`kubectl get service ${WEBUI_SERVICE_NAME} -n ${K8S_NAMESPACE} -o jsonpath='{.spec.clusterIP}'` +# WEBUI_PORT=$(kubectl get service ${WEBUI_SERVICE_NAME} --namespace $K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.port==8004)].nodePort}') +WEBUI_PORT=8004 +# GRAFANA_PORT=$(kubectl get service ${WEBUI_SERVICE_NAME} --namespace $K8S_NAMESPACE -o 'jsonpath={.spec.ports[?(@.port==3000)].nodePort}') +GRAFANA_PORT=3000 + +# Open WebUI +URL=${WEBUI_PROTO}://${WEBUI_IP}:${WEBUI_PORT} +echo Opening web UI on URL ${URL} +# curl -kL ${URL} +python3 -m webbrowser ${URL} + +# Open Dashboard +URL=${WEBUI_PROTO}://${WEBUI_IP}:${GRAFANA_PORT} +echo Opening Dashboard on URL ${URL} +# curl -kL ${URL} +python3 -m webbrowser ${URL} diff --git a/proto/automation.proto b/proto/automation.proto index 929723676..f41bef9e2 100644 --- a/proto/automation.proto +++ b/proto/automation.proto @@ -21,7 +21,7 @@ service AutomationService { rpc ZtpGetDeviceRole(DeviceRoleId) returns (DeviceRole) {} rpc ZtpGetDeviceRolesByDeviceId(context.DeviceId) returns (DeviceRoleList) {} rpc ZtpAdd(DeviceRole) returns (DeviceRoleState) {} - rpc ZtpUpdate(DeviceRoleConfig) returns (DeviceRoleState) {} + rpc ZtpUpdate(DeviceRole) returns (DeviceRoleState) {} rpc ZtpDelete(DeviceRole) returns (DeviceRoleState) {} rpc ZtpDeleteAll(context.Empty) returns (DeviceDeletionResult) {} } @@ -43,11 +43,6 @@ message DeviceRole { DeviceRoleType devRoleType = 2; } -message DeviceRoleConfig { - DeviceRole devRole = 1; - context.DeviceConfig devConfig = 2; -} - message DeviceRoleList { repeated DeviceRole devRole = 1; } diff --git a/proto/context.proto b/proto/context.proto index ab7dd5e69..866876175 100644 --- a/proto/context.proto +++ b/proto/context.proto @@ -51,7 +51,6 @@ service ContextService { rpc ListServices (ContextId ) returns ( ServiceList ) {} rpc GetService (ServiceId ) returns ( Service ) {} rpc SetService (Service ) returns ( ServiceId ) {} - rpc UnsetService (Service ) returns ( ServiceId ) {} rpc RemoveService (ServiceId ) returns ( Empty ) {} rpc GetServiceEvents (Empty ) returns (stream ServiceEvent ) {} @@ -59,7 +58,6 @@ service ContextService { rpc ListSlices (ContextId ) returns ( SliceList ) {} rpc GetSlice (SliceId ) returns ( Slice ) {} rpc SetSlice (Slice ) returns ( SliceId ) {} - rpc UnsetSlice (Slice ) returns ( SliceId ) {} rpc RemoveSlice (SliceId ) returns ( Empty ) {} rpc GetSliceEvents (Empty ) returns (stream SliceEvent ) {} diff --git a/proto/pathcomp.proto b/proto/pathcomp.proto index 08f33efe9..9eb650fb9 100644 --- a/proto/pathcomp.proto +++ b/proto/pathcomp.proto @@ -28,16 +28,11 @@ message Algorithm_KShortestPath { uint32 k_return = 2; } -message Algorithm_KDisjointPath { - uint32 num_disjoint = 1; -} - message PathCompRequest { repeated context.Service services = 1; oneof algorithm { Algorithm_ShortestPath shortest_path = 10; Algorithm_KShortestPath k_shortest_path = 11; - Algorithm_KDisjointPath k_disjoint_path = 12; } } diff --git a/scripts/old/deploy_in_kubernetes.sh b/scripts/old/deploy_in_kubernetes.sh index 89f45a548..5e16120bb 100755 --- a/scripts/old/deploy_in_kubernetes.sh +++ b/scripts/old/deploy_in_kubernetes.sh @@ -81,7 +81,7 @@ for COMPONENT in $COMPONENTS; do if [ "$COMPONENT" == "automation" ] || [ "$COMPONENT" == "policy" ]; then docker build -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile ./src/"$COMPONENT"/ > "$BUILD_LOG" else - docker build -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile . > "$BUILD_LOG" + docker build -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile ./src/ > "$BUILD_LOG" fi if [ -n "$REGISTRY_IMAGE" ]; then diff --git a/scripts/run_tests_locally-pathcomp.sh b/scripts/run_tests_locally-pathcomp.sh new file mode 100755 index 000000000..f56f47a8b --- /dev/null +++ b/scripts/run_tests_locally-pathcomp.sh @@ -0,0 +1,28 @@ +#!/bin/bash +# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +PROJECTDIR=`pwd` + +cd $PROJECTDIR/src +RCFILE=$PROJECTDIR/coverage/.coveragerc + +# Run unitary tests and analyze coverage of code at same time + +# Useful flags for pytest: +#-o log_cli=true -o log_file=service.log -o log_file_level=DEBUG + +coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \ + pathcomp/tests/test_unitary.py diff --git a/scripts/show_logs_automation.sh b/scripts/show_logs_automation.sh index 0c0615d99..8823f29c0 100755 --- a/scripts/show_logs_automation.sh +++ b/scripts/show_logs_automation.sh @@ -18,7 +18,7 @@ ######################################################################################################################## # If not already set, set the name of the Kubernetes namespace to deploy to. -export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"} +export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs-dev"} ######################################################################################################################## # Automated steps start here diff --git a/scripts/show_logs_compute.sh b/scripts/show_logs_compute.sh index 759918f11..5e061bb9e 100755 --- a/scripts/show_logs_compute.sh +++ b/scripts/show_logs_compute.sh @@ -18,7 +18,7 @@ ######################################################################################################################## # If not already set, set the name of the Kubernetes namespace to deploy to. -export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"} +export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs-dev"} ######################################################################################################################## # Automated steps start here diff --git a/scripts/show_logs_context.sh b/scripts/show_logs_context.sh index f4b6c620b..ece545a7e 100755 --- a/scripts/show_logs_context.sh +++ b/scripts/show_logs_context.sh @@ -18,7 +18,7 @@ ######################################################################################################################## # If not already set, set the name of the Kubernetes namespace to deploy to. -export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"} +export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs-dev"} ######################################################################################################################## # Automated steps start here diff --git a/scripts/show_logs_device.sh b/scripts/show_logs_device.sh index d3ef781c9..e1c2e4aa8 100755 --- a/scripts/show_logs_device.sh +++ b/scripts/show_logs_device.sh @@ -18,7 +18,7 @@ ######################################################################################################################## # If not already set, set the name of the Kubernetes namespace to deploy to. -export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"} +export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs-dev"} ######################################################################################################################## # Automated steps start here diff --git a/scripts/show_logs_monitoring.sh b/scripts/show_logs_monitoring.sh index bd37d0d14..597803512 100755 --- a/scripts/show_logs_monitoring.sh +++ b/scripts/show_logs_monitoring.sh @@ -18,7 +18,7 @@ ######################################################################################################################## # If not already set, set the name of the Kubernetes namespace to deploy to. -export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"} +export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs-dev"} ######################################################################################################################## # Automated steps start here diff --git a/scripts/show_logs_service.sh b/scripts/show_logs_service.sh index 6089d0ac6..251add7e1 100755 --- a/scripts/show_logs_service.sh +++ b/scripts/show_logs_service.sh @@ -18,7 +18,7 @@ ######################################################################################################################## # If not already set, set the name of the Kubernetes namespace to deploy to. -export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"} +export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs-dev"} ######################################################################################################################## # Automated steps start here diff --git a/scripts/show_logs_webui.sh b/scripts/show_logs_webui.sh index 38cffd624..c73f5f51a 100755 --- a/scripts/show_logs_webui.sh +++ b/scripts/show_logs_webui.sh @@ -18,7 +18,7 @@ ######################################################################################################################## # If not already set, set the name of the Kubernetes namespace to deploy to. -export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"} +export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs-dev"} ######################################################################################################################## # Automated steps start here diff --git a/show_deploy.sh b/show_deploy.sh index 68a5659aa..e894d44f3 100755 --- a/show_deploy.sh +++ b/show_deploy.sh @@ -18,7 +18,7 @@ ######################################################################################################################## # If not already set, set the name of the Kubernetes namespace to deploy to. -export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"} +export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs-dev"} ######################################################################################################################## # Automated steps start here diff --git a/src/automation/src/main/java/eu/teraflow/automation/AutomationGatewayImpl.java b/src/automation/src/main/java/eu/teraflow/automation/AutomationGatewayImpl.java index 6d672fdea..c160387c3 100644 --- a/src/automation/src/main/java/eu/teraflow/automation/AutomationGatewayImpl.java +++ b/src/automation/src/main/java/eu/teraflow/automation/AutomationGatewayImpl.java @@ -17,12 +17,9 @@ package eu.teraflow.automation; import automation.Automation; -import automation.Automation.DeviceRoleConfig; -import automation.Automation.DeviceRoleState; import context.ContextOuterClass; import eu.teraflow.automation.context.model.Device; import eu.teraflow.automation.model.DeviceRoleId; -import eu.teraflow.automation.model.DeviceState; import io.quarkus.grpc.GrpcService; import io.smallrye.mutiny.Uni; import javax.inject.Inject; @@ -59,19 +56,17 @@ public class AutomationGatewayImpl implements AutomationGateway { return automationService .addDevice(deviceId) .onItem() - .transform(device -> transformToDeviceRoleState(device, devRoleId, DeviceState.CREATED)); + .transform(device -> transformToDeviceRoleState(device, devRoleId)); } @Override - public Uni ztpUpdate(DeviceRoleConfig request) { - final var devRoleId = request.getDevRole().getDevRoleId().getDevRoleId().getUuid(); - final var deviceId = serializer.deserialize(request.getDevRole().getDevRoleId().getDevId()); - final var deviceConfig = serializer.deserialize(request.getDevConfig()); - - return automationService - .updateDevice(deviceId, deviceConfig) - .onItem() - .transform(device -> transformToDeviceRoleState(device, devRoleId, DeviceState.UPDATED)); + public Uni ztpUpdate(Automation.DeviceRole request) { + return Uni.createFrom() + .item( + () -> + Automation.DeviceRoleState.newBuilder() + .setDevRoleId(request.getDevRoleId()) + .build()); } @Override @@ -89,15 +84,16 @@ public class AutomationGatewayImpl implements AutomationGateway { return Uni.createFrom().item(() -> Automation.DeviceDeletionResult.newBuilder().build()); } - private Automation.DeviceRoleState transformToDeviceRoleState( - Device device, String devRoleId, DeviceState deviceState) { + // TODO When `DeviceRoleState` domain object will be created, move this method to Serializer class + // and create related tests + private Automation.DeviceRoleState transformToDeviceRoleState(Device device, String devRoleId) { + final var deviceRoleId = new DeviceRoleId(devRoleId, device.getDeviceId()); final var serializeDeviceRoleId = serializer.serialize(deviceRoleId); - final var serializedDeviceState = serializer.serialize(deviceState); return Automation.DeviceRoleState.newBuilder() .setDevRoleId(serializeDeviceRoleId) - .setDevRoleState(serializedDeviceState) + .setDevRoleState(Automation.ZtpDeviceState.ZTP_DEV_STATE_CREATED) .build(); } } diff --git a/src/automation/src/main/java/eu/teraflow/automation/AutomationService.java b/src/automation/src/main/java/eu/teraflow/automation/AutomationService.java index b9f34d8e4..5c8e95a44 100644 --- a/src/automation/src/main/java/eu/teraflow/automation/AutomationService.java +++ b/src/automation/src/main/java/eu/teraflow/automation/AutomationService.java @@ -17,14 +17,9 @@ package eu.teraflow.automation; import eu.teraflow.automation.context.model.Device; -import eu.teraflow.automation.context.model.DeviceConfig; import io.smallrye.mutiny.Uni; public interface AutomationService { Uni addDevice(String deviceId); - - Uni deleteDevice(String deviceId); - - Uni updateDevice(String deviceId, DeviceConfig deviceConfig); } diff --git a/src/automation/src/main/java/eu/teraflow/automation/AutomationServiceImpl.java b/src/automation/src/main/java/eu/teraflow/automation/AutomationServiceImpl.java index 773c99de6..13e566453 100644 --- a/src/automation/src/main/java/eu/teraflow/automation/AutomationServiceImpl.java +++ b/src/automation/src/main/java/eu/teraflow/automation/AutomationServiceImpl.java @@ -18,7 +18,6 @@ package eu.teraflow.automation; import eu.teraflow.automation.context.ContextService; import eu.teraflow.automation.context.model.Device; -import eu.teraflow.automation.context.model.DeviceConfig; import eu.teraflow.automation.device.DeviceService; import io.smallrye.mutiny.Uni; import javax.enterprise.context.ApplicationScoped; @@ -28,7 +27,6 @@ import org.jboss.logging.Logger; @ApplicationScoped public class AutomationServiceImpl implements AutomationService { private static final Logger LOGGER = Logger.getLogger(AutomationServiceImpl.class); - private static final String MESSAGE = "Retrieved %s"; private final DeviceService deviceService; private final ContextService contextService; @@ -45,13 +43,14 @@ public class AutomationServiceImpl implements AutomationService { final var deserializedDeviceUni = contextService.getDevice(deviceId); deserializedDeviceUni + // TODO fix subscribe .subscribe() .with( device -> { final var id = deviceId; if (!device.isEnabled()) { - LOGGER.infof(MESSAGE, device); + LOGGER.infof("Retrieved %s", device); final var initialConfiguration = deviceService.getInitialConfiguration(device.getDeviceId()); @@ -81,52 +80,4 @@ public class AutomationServiceImpl implements AutomationService { return deserializedDeviceUni; } - - @Override - public Uni deleteDevice(String deviceId) { - final var deserializedDeviceUni = contextService.getDevice(deviceId); - - deserializedDeviceUni - .subscribe() - .with( - device -> { - final var id = deviceId; - - LOGGER.infof(MESSAGE, device); - - final var empty = deviceService.deleteDevice(device.getDeviceId()); - - empty - .subscribe() - .with(emptyMessage -> LOGGER.infof("Device [%s] has been deleted.\n", id)); - }); - - return deserializedDeviceUni; - } - - @Override - public Uni updateDevice(String deviceId, DeviceConfig deviceConfig) { - final var deserializedDeviceUni = contextService.getDevice(deviceId); - - deserializedDeviceUni - .subscribe() - .with( - device -> { - final var id = deviceId; - - LOGGER.infof(MESSAGE, device); - device.setDeviceConfiguration(deviceConfig); - final var updatedDeviceIdUni = deviceService.configureDevice(device); - - updatedDeviceIdUni - .subscribe() - .with( - configuredDeviceId -> - LOGGER.infof( - "Device [%s] has been updated successfully with %s.\n", - id, deviceConfig)); - }); - - return deserializedDeviceUni; - } } diff --git a/src/automation/src/main/java/eu/teraflow/automation/ContextSubscriber.java b/src/automation/src/main/java/eu/teraflow/automation/ContextSubscriber.java index ce977d1ff..df5f14081 100644 --- a/src/automation/src/main/java/eu/teraflow/automation/ContextSubscriber.java +++ b/src/automation/src/main/java/eu/teraflow/automation/ContextSubscriber.java @@ -73,14 +73,9 @@ public class ContextSubscriber { LOGGER.infof("Received %s for device [%s]", event, deviceId); automationService.addDevice(deviceEvent.getDeviceId()); break; - case REMOVE: - LOGGER.infof("Received %s for device [%s]", event, deviceId); - automationService.deleteDevice(deviceEvent.getDeviceId()); - break; + case UPDATE: - // TODO a DeviceConfig object should be part of the DeviceEvent object in order - // for automationService.updateDevice() to be triggered automatically like - // addDevice(). + case REMOVE: case UNDEFINED: logWarningMessage(event, deviceId, eventType); break; diff --git a/src/automation/src/main/java/eu/teraflow/automation/Serializer.java b/src/automation/src/main/java/eu/teraflow/automation/Serializer.java index 4359d60db..2b163fdff 100644 --- a/src/automation/src/main/java/eu/teraflow/automation/Serializer.java +++ b/src/automation/src/main/java/eu/teraflow/automation/Serializer.java @@ -18,7 +18,6 @@ package eu.teraflow.automation; import acl.Acl; import automation.Automation; -import automation.Automation.ZtpDeviceState; import context.ContextOuterClass; import context.ContextOuterClass.ConfigRule_ACL; import context.ContextOuterClass.ConfigRule_Custom; @@ -45,7 +44,6 @@ import eu.teraflow.automation.context.model.DeviceConfig; import eu.teraflow.automation.context.model.DeviceDriverEnum; import eu.teraflow.automation.context.model.DeviceEvent; import eu.teraflow.automation.context.model.DeviceOperationalStatus; -import eu.teraflow.automation.context.model.Empty; import eu.teraflow.automation.context.model.EndPoint; import eu.teraflow.automation.context.model.EndPointId; import eu.teraflow.automation.context.model.Event; @@ -57,10 +55,8 @@ import eu.teraflow.automation.context.model.LocationTypeRegion; import eu.teraflow.automation.context.model.TopologyId; import eu.teraflow.automation.kpi_sample_types.model.KpiSampleType; import eu.teraflow.automation.model.DeviceRole; -import eu.teraflow.automation.model.DeviceRoleConfig; import eu.teraflow.automation.model.DeviceRoleId; import eu.teraflow.automation.model.DeviceRoleType; -import eu.teraflow.automation.model.DeviceState; import java.util.stream.Collectors; import javax.inject.Singleton; import kpi_sample_types.KpiSampleTypes; @@ -135,36 +131,6 @@ public class Serializer { } } - public Automation.ZtpDeviceState serialize(DeviceState deviceState) { - switch (deviceState) { - case CREATED: - return ZtpDeviceState.ZTP_DEV_STATE_CREATED; - case UPDATED: - return ZtpDeviceState.ZTP_DEV_STATE_UPDATED; - case DELETED: - return ZtpDeviceState.ZTP_DEV_STATE_DELETED; - case UNDEFINED: - return ZtpDeviceState.ZTP_DEV_STATE_UNDEFINED; - default: - return ZtpDeviceState.UNRECOGNIZED; - } - } - - public DeviceState deserialize(Automation.ZtpDeviceState serializedDeviceState) { - switch (serializedDeviceState) { - case ZTP_DEV_STATE_CREATED: - return DeviceState.CREATED; - case ZTP_DEV_STATE_UPDATED: - return DeviceState.UPDATED; - case ZTP_DEV_STATE_DELETED: - return DeviceState.DELETED; - case ZTP_DEV_STATE_UNDEFINED: - case UNRECOGNIZED: - default: - return DeviceState.UNDEFINED; - } - } - public Automation.DeviceRole serialize(DeviceRole deviceRole) { final var builder = Automation.DeviceRole.newBuilder(); final var serializedDeviceRoleId = serialize(deviceRole.getDeviceRoleId()); @@ -183,24 +149,6 @@ public class Serializer { return new DeviceRole(deviceRoleId, deviceRoleType); } - public Automation.DeviceRoleConfig serialize(DeviceRoleConfig deviceRoleConfig) { - final var builder = Automation.DeviceRoleConfig.newBuilder(); - final var serializedDeviceRole = serialize(deviceRoleConfig.getDeviceRole()); - final var serializedDeviceConfig = serialize(deviceRoleConfig.getDeviceConfig()); - - builder.setDevRole(serializedDeviceRole); - builder.setDevConfig(serializedDeviceConfig); - - return builder.build(); - } - - public DeviceRoleConfig deserialize(Automation.DeviceRoleConfig deviceRoleConfig) { - final var deviceRole = deserialize(deviceRoleConfig.getDevRole()); - final var deviceConfig = deserialize(deviceRoleConfig.getDevConfig()); - - return new DeviceRoleConfig(deviceRole, deviceConfig); - } - public ContextOuterClass.EventTypeEnum serialize(EventTypeEnum eventTypeEnum) { switch (eventTypeEnum) { case CREATE: @@ -972,17 +920,6 @@ public class Serializer { deviceEndPoints); } - public ContextOuterClass.Empty serializeEmpty(Empty empty) { - - final var builder = ContextOuterClass.Empty.newBuilder(); - - return builder.build(); - } - - public Empty deserializeEmpty(ContextOuterClass.Empty serializedEmpty) { - return new Empty(); - } - public Uuid serializeUuid(String uuid) { return Uuid.newBuilder().setUuid(uuid).build(); } diff --git a/src/automation/src/main/java/eu/teraflow/automation/device/DeviceGateway.java b/src/automation/src/main/java/eu/teraflow/automation/device/DeviceGateway.java index 5244f8ea6..8cbf0885b 100644 --- a/src/automation/src/main/java/eu/teraflow/automation/device/DeviceGateway.java +++ b/src/automation/src/main/java/eu/teraflow/automation/device/DeviceGateway.java @@ -18,13 +18,10 @@ package eu.teraflow.automation.device; import eu.teraflow.automation.context.model.Device; import eu.teraflow.automation.context.model.DeviceConfig; -import eu.teraflow.automation.context.model.Empty; import io.smallrye.mutiny.Uni; public interface DeviceGateway { Uni getInitialConfiguration(String deviceId); Uni configureDevice(Device device); - - Uni deleteDevice(String deviceId); } diff --git a/src/automation/src/main/java/eu/teraflow/automation/device/DeviceGatewayImpl.java b/src/automation/src/main/java/eu/teraflow/automation/device/DeviceGatewayImpl.java index f045833eb..7849e36e6 100644 --- a/src/automation/src/main/java/eu/teraflow/automation/device/DeviceGatewayImpl.java +++ b/src/automation/src/main/java/eu/teraflow/automation/device/DeviceGatewayImpl.java @@ -20,7 +20,6 @@ import device.DeviceService; import eu.teraflow.automation.Serializer; import eu.teraflow.automation.context.model.Device; import eu.teraflow.automation.context.model.DeviceConfig; -import eu.teraflow.automation.context.model.Empty; import io.quarkus.grpc.GrpcClient; import io.smallrye.mutiny.Uni; import javax.enterprise.context.ApplicationScoped; @@ -58,14 +57,4 @@ public class DeviceGatewayImpl implements DeviceGateway { .onItem() .transform(serializer::deserialize); } - - @Override - public Uni deleteDevice(String deviceId) { - final var serializedDeviceId = serializer.serializeDeviceId(deviceId); - - return deviceDelegate - .deleteDevice(serializedDeviceId) - .onItem() - .transform(serializer::deserializeEmpty); - } } diff --git a/src/automation/src/main/java/eu/teraflow/automation/device/DeviceService.java b/src/automation/src/main/java/eu/teraflow/automation/device/DeviceService.java index d9f03d612..229aea7df 100644 --- a/src/automation/src/main/java/eu/teraflow/automation/device/DeviceService.java +++ b/src/automation/src/main/java/eu/teraflow/automation/device/DeviceService.java @@ -18,7 +18,6 @@ package eu.teraflow.automation.device; import eu.teraflow.automation.context.model.Device; import eu.teraflow.automation.context.model.DeviceConfig; -import eu.teraflow.automation.context.model.Empty; import io.smallrye.mutiny.Uni; public interface DeviceService { @@ -26,6 +25,4 @@ public interface DeviceService { Uni getInitialConfiguration(String deviceId); Uni configureDevice(Device device); - - Uni deleteDevice(String deviceId); } diff --git a/src/automation/src/main/java/eu/teraflow/automation/device/DeviceServiceImpl.java b/src/automation/src/main/java/eu/teraflow/automation/device/DeviceServiceImpl.java index e6a8fc675..d5dd6fc2b 100644 --- a/src/automation/src/main/java/eu/teraflow/automation/device/DeviceServiceImpl.java +++ b/src/automation/src/main/java/eu/teraflow/automation/device/DeviceServiceImpl.java @@ -18,7 +18,6 @@ package eu.teraflow.automation.device; import eu.teraflow.automation.context.model.Device; import eu.teraflow.automation.context.model.DeviceConfig; -import eu.teraflow.automation.context.model.Empty; import io.smallrye.mutiny.Uni; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; @@ -44,9 +43,4 @@ public class DeviceServiceImpl implements DeviceService { return deviceGateway.configureDevice(device); } - - @Override - public Uni deleteDevice(String deviceId) { - return deviceGateway.deleteDevice(deviceId); - } } diff --git a/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRole.java b/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRole.java index da2f1c80e..6dffcd1c0 100644 --- a/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRole.java +++ b/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRole.java @@ -34,10 +34,4 @@ public class DeviceRole { public DeviceRoleType getType() { return type; } - - @Override - public String toString() { - return String.format( - "%s:{%s, deviceRoleType:\"%s\"}", getClass().getSimpleName(), id, type.toString()); - } } diff --git a/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRoleId.java b/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRoleId.java index 064c4f1e6..b11f42ad0 100644 --- a/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRoleId.java +++ b/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRoleId.java @@ -33,10 +33,4 @@ public class DeviceRoleId { public String getDeviceId() { return deviceId; } - - @Override - public String toString() { - return String.format( - "%s:{id:\"%s\", deviceId:\"%s\"}", getClass().getSimpleName(), id, deviceId); - } } diff --git a/src/automation/src/test/java/eu/teraflow/automation/AutomationFunctionalServiceTest.java b/src/automation/src/test/java/eu/teraflow/automation/AutomationFunctionalServiceTest.java index 75045288c..e250a905c 100644 --- a/src/automation/src/test/java/eu/teraflow/automation/AutomationFunctionalServiceTest.java +++ b/src/automation/src/test/java/eu/teraflow/automation/AutomationFunctionalServiceTest.java @@ -300,80 +300,4 @@ class AutomationFunctionalServiceTest { assertThat(deviceConfig.getDeviceId()).isEqualTo(deviceId); }); } - - @Test - void shouldDeleteDevice() { - final var uuidForDeviceRoleId = - ContextOuterClass.Uuid.newBuilder() - .setUuid(UUID.fromString("0f14d0ab-9608-7862-a9e4-5ed26688389b").toString()) - .build(); - - final var uuidForDeviceId = - ContextOuterClass.Uuid.newBuilder() - .setUuid(UUID.fromString("9f14d0ab-9608-7862-a9e4-5ed26688389c").toString()) - .build(); - - final var outDeviceId = - ContextOuterClass.DeviceId.newBuilder().setDeviceUuid(uuidForDeviceId).build(); - - final var outDeviceRoleId = - Automation.DeviceRoleId.newBuilder() - .setDevRoleId(uuidForDeviceRoleId) - .setDevId(outDeviceId) - .build(); - - String deviceId = outDeviceRoleId.getDevRoleId().toString(); - String deviceType = "cisco"; - - final var deviceDrivers = List.of(DeviceDriverEnum.IETF_NETWORK_TOPOLOGY, DeviceDriverEnum.P4); - - final var topologyIdA = new TopologyId("contextIdA", "idA"); - final var deviceIdA = "deviceIdA"; - final var idA = "idA"; - final var endPointIdA = new EndPointId(topologyIdA, deviceIdA, idA); - - final var endPointTypeA = "endPointTypeA"; - final var kpiSampleTypesA = - List.of(KpiSampleType.BYTES_RECEIVED, KpiSampleType.BYTES_TRANSMITTED); - final var locationTypeRegionA = new LocationTypeRegion("ATH"); - final var locationA = new Location(locationTypeRegionA); - final var endPointA = - new EndPointBuilder(endPointIdA, endPointTypeA, kpiSampleTypesA) - .location(locationA) - .build(); - - final var topologyIdB = new TopologyId("contextIdB", "idB"); - final var deviceIdB = "deviceIdB"; - final var idB = "idB"; - final var endPointIdB = new EndPointId(topologyIdB, deviceIdB, idB); - final var endPointTypeB = "endPointTypeB"; - final var kpiSampleTypesB = - List.of(KpiSampleType.BYTES_RECEIVED, KpiSampleType.BYTES_TRANSMITTED); - final var locationTypeRegionB = new LocationTypeRegion("ATH"); - final var locationB = new Location(locationTypeRegionB); - final var endPointB = - new EndPointBuilder(endPointIdB, endPointTypeB, kpiSampleTypesB) - .location(locationB) - .build(); - - final var endPoints = List.of(endPointA, endPointB); - - Device device = - new Device( - deviceId, deviceType, DeviceOperationalStatus.DISABLED, deviceDrivers, endPoints); - Uni deviceUni = Uni.createFrom().item(device); - - Mockito.when(contextGateway.getDevice(Mockito.any())).thenReturn(deviceUni); - - final var deletedDevice = automationService.deleteDevice(deviceId); - - Assertions.assertThat(deletedDevice).isNotNull(); - - deletedDevice - .subscribe() - .with( - removedDevice -> { - assertThat(removedDevice).isEqualTo(deletedDevice); - }); - } } diff --git a/src/automation/src/test/java/eu/teraflow/automation/AutomationServiceTest.java b/src/automation/src/test/java/eu/teraflow/automation/AutomationServiceTest.java index 85ed170ef..b1a70a7e0 100644 --- a/src/automation/src/test/java/eu/teraflow/automation/AutomationServiceTest.java +++ b/src/automation/src/test/java/eu/teraflow/automation/AutomationServiceTest.java @@ -38,7 +38,6 @@ import eu.teraflow.automation.context.model.TopologyId; import eu.teraflow.automation.device.DeviceGateway; import eu.teraflow.automation.kpi_sample_types.model.KpiSampleType; import eu.teraflow.automation.model.DeviceRole; -import eu.teraflow.automation.model.DeviceRoleConfig; import eu.teraflow.automation.model.DeviceRoleId; import eu.teraflow.automation.model.DeviceRoleType; import io.quarkus.grpc.GrpcClient; @@ -161,68 +160,16 @@ class AutomationServiceTest { @Test void shouldUpdateDeviceRole() throws ExecutionException, InterruptedException, TimeoutException { CompletableFuture message = new CompletableFuture<>(); - final var DEVICE_ID = "0f14d0ab-9608-7862-a9e4-5ed26688389b"; final var DEVICE_ROLE_ID = "0f14d0ab-9608-7862-a9e4-5ed26688389a"; - final var DEVICE_TYPE = "ztp"; - - final var deviceDrivers = List.of(DeviceDriverEnum.IETF_NETWORK_TOPOLOGY, DeviceDriverEnum.P4); - - final var topologyIdA = new TopologyId("contextIdA", "idA"); - final var deviceIdA = "deviceIdA"; - final var idA = "idA"; - final var endPointIdA = new EndPointId(topologyIdA, deviceIdA, idA); - - final var endPointTypeA = "endPointTypeA"; - final var kpiSampleTypesA = - List.of(KpiSampleType.BYTES_RECEIVED, KpiSampleType.BYTES_TRANSMITTED); - final var locationTypeRegionA = new LocationTypeRegion("ATH"); - final var locationA = new Location(locationTypeRegionA); - final var endPointA = - new EndPointBuilder(endPointIdA, endPointTypeA, kpiSampleTypesA) - .location(locationA) - .build(); - - final var topologyIdB = new TopologyId("contextIdB", "idB"); - final var deviceIdB = "deviceIdB"; - final var idB = "idB"; - final var endPointIdB = new EndPointId(topologyIdB, deviceIdB, idB); - final var endPointTypeB = "endPointTypeB"; - final var kpiSampleTypesB = - List.of(KpiSampleType.BYTES_RECEIVED, KpiSampleType.BYTES_TRANSMITTED); - final var locationTypeRegionB = new LocationTypeRegion("ATH"); - final var locationB = new Location(locationTypeRegionB); - final var endPointB = - new EndPointBuilder(endPointIdB, endPointTypeB, kpiSampleTypesB) - .location(locationB) - .build(); - - final var endPoints = List.of(endPointA, endPointB); - - final var emptyDeviceConfig = new DeviceConfig(List.of()); - final var device = - new Device( - DEVICE_ID, - DEVICE_TYPE, - emptyDeviceConfig, - DeviceOperationalStatus.ENABLED, - deviceDrivers, - endPoints); - Mockito.when(contextGateway.getDevice(Mockito.any())).thenReturn(Uni.createFrom().item(device)); final var deviceRoleId = new DeviceRoleId(DEVICE_ROLE_ID, DEVICE_ID); - final var deviceRole = new DeviceRole(deviceRoleId, DeviceRoleType.DEV_OPS); - - final var configRuleCustomA = new ConfigRuleCustom("resourceKeyA", "resourceValueA"); - final var configRuleTypeA = new ConfigRuleTypeCustom(configRuleCustomA); - final var deviceConfig = - new DeviceConfig(List.of(new ConfigRule(ConfigActionEnum.SET, configRuleTypeA))); - - final var deviceRoleConfig = new DeviceRoleConfig(deviceRole, deviceConfig); - final var serializedDeviceRoleConfig = serializer.serialize(deviceRoleConfig); + final var deviceRoleType = DeviceRoleType.DEV_CONF; + final var deviceRole = new DeviceRole(deviceRoleId, deviceRoleType); + final var serializedDeviceRole = serializer.serialize(deviceRole); client - .ztpUpdate(serializedDeviceRoleConfig) + .ztpUpdate(serializedDeviceRole) .subscribe() .with( deviceRoleState -> { diff --git a/src/automation/src/test/java/eu/teraflow/automation/ContextSubscriberTest.java b/src/automation/src/test/java/eu/teraflow/automation/ContextSubscriberTest.java index 6f8834a1f..e8a97d792 100644 --- a/src/automation/src/test/java/eu/teraflow/automation/ContextSubscriberTest.java +++ b/src/automation/src/test/java/eu/teraflow/automation/ContextSubscriberTest.java @@ -61,7 +61,6 @@ class ContextSubscriberTest { contextSubscriber.listenForDeviceEvents(); - verify(automationService, times(0)).deleteDevice(deviceId); verify(automationService, times(1)).addDevice(deviceId); } @@ -96,7 +95,7 @@ class ContextSubscriberTest { } @Test - void shouldCallRemoveDeviceUponRemoveEvent() { + void shouldNotCallAddDeviceUponRemoveEvent() { final var uuidForDeviceRoleId = ContextOuterClass.Uuid.newBuilder().setUuid(UUID_FOR_DEVICE_ROLE_ID).build(); @@ -123,7 +122,6 @@ class ContextSubscriberTest { contextSubscriber.listenForDeviceEvents(); verify(automationService, times(0)).addDevice(deviceId); - verify(automationService, times(1)).deleteDevice(deviceId); } @Test diff --git a/src/automation/src/test/java/eu/teraflow/automation/SerializerTest.java b/src/automation/src/test/java/eu/teraflow/automation/SerializerTest.java index 74cdc0060..74f8f301c 100644 --- a/src/automation/src/test/java/eu/teraflow/automation/SerializerTest.java +++ b/src/automation/src/test/java/eu/teraflow/automation/SerializerTest.java @@ -21,7 +21,6 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import acl.Acl; import automation.Automation; -import automation.Automation.ZtpDeviceState; import context.ContextOuterClass; import context.ContextOuterClass.DeviceId; import context.ContextOuterClass.DeviceOperationalStatusEnum; @@ -44,7 +43,6 @@ import eu.teraflow.automation.context.model.DeviceConfig; import eu.teraflow.automation.context.model.DeviceDriverEnum; import eu.teraflow.automation.context.model.DeviceEvent; import eu.teraflow.automation.context.model.DeviceOperationalStatus; -import eu.teraflow.automation.context.model.Empty; import eu.teraflow.automation.context.model.EndPoint.EndPointBuilder; import eu.teraflow.automation.context.model.EndPointId; import eu.teraflow.automation.context.model.Event; @@ -56,10 +54,8 @@ import eu.teraflow.automation.context.model.LocationTypeRegion; import eu.teraflow.automation.context.model.TopologyId; import eu.teraflow.automation.kpi_sample_types.model.KpiSampleType; import eu.teraflow.automation.model.DeviceRole; -import eu.teraflow.automation.model.DeviceRoleConfig; import eu.teraflow.automation.model.DeviceRoleId; import eu.teraflow.automation.model.DeviceRoleType; -import eu.teraflow.automation.model.DeviceState; import io.quarkus.test.junit.QuarkusTest; import java.util.List; import java.util.stream.Collectors; @@ -246,61 +242,6 @@ class SerializerTest { assertThat(deviceRole).usingRecursiveComparison().isEqualTo(expectedDeviceRole); } - @Test - void shouldSerializeDeviceRoleConfig() { - final var expectedDevRoleId = new DeviceRoleId("expectedDevRoleId", "expectedDeviceId"); - final var expectedDevRoleType = DeviceRoleType.DEV_OPS; - - final var deviceRole = new DeviceRole(expectedDevRoleId, expectedDevRoleType); - final var serializedDeviceRole = serializer.serialize(deviceRole); - - final var configRuleCustomA = new ConfigRuleCustom("resourceKeyA", "resourceValueA"); - final var configRuleTypeA = new ConfigRuleTypeCustom(configRuleCustomA); - final var deviceConfig = - new DeviceConfig(List.of(new ConfigRule(ConfigActionEnum.SET, configRuleTypeA))); - final var serializedDeviceConfig = serializer.serialize(deviceConfig); - - final var expectedDeviceRoleConfig = - Automation.DeviceRoleConfig.newBuilder() - .setDevRole(serializedDeviceRole) - .setDevConfig(serializedDeviceConfig) - .build(); - - final var deviceRoleConfig = new DeviceRoleConfig(deviceRole, deviceConfig); - final var serializedDeviceRoleConfig = serializer.serialize(deviceRoleConfig); - - assertThat(serializedDeviceRoleConfig) - .usingRecursiveComparison() - .isEqualTo(expectedDeviceRoleConfig); - } - - @Test - void shouldDeserializeDeviceRoleConfig() { - final var expectedDevRoleId = new DeviceRoleId("expectedDevRoleId", "expectedDeviceId"); - final var expectedDevRoleType = DeviceRoleType.DEV_OPS; - - final var deviceRole = new DeviceRole(expectedDevRoleId, expectedDevRoleType); - final var serializedDeviceRole = serializer.serialize(deviceRole); - - final var configRuleCustomA = new ConfigRuleCustom("resourceKeyA", "resourceValueA"); - final var configRuleTypeA = new ConfigRuleTypeCustom(configRuleCustomA); - final var deviceConfig = - new DeviceConfig(List.of(new ConfigRule(ConfigActionEnum.SET, configRuleTypeA))); - final var serializedDeviceConfig = serializer.serialize(deviceConfig); - - final var expectedDeviceRoleConfig = new DeviceRoleConfig(deviceRole, deviceConfig); - - final var serializedDeviceRoleConfig = - Automation.DeviceRoleConfig.newBuilder() - .setDevRole(serializedDeviceRole) - .setDevConfig(serializedDeviceConfig) - .build(); - - final var deviceRoleConfig = serializer.deserialize(serializedDeviceRoleConfig); - - assertThat(deviceRoleConfig).usingRecursiveComparison().isEqualTo(expectedDeviceRoleConfig); - } - private static Stream provideEventTypeEnum() { return Stream.of( Arguments.of(EventTypeEnum.CREATE, ContextOuterClass.EventTypeEnum.EVENTTYPE_CREATE), @@ -325,31 +266,6 @@ class SerializerTest { assertThat(eventType).isEqualTo(expectedEventType); } - private static Stream provideDeviceState() { - return Stream.of( - Arguments.of(DeviceState.CREATED, ZtpDeviceState.ZTP_DEV_STATE_CREATED), - Arguments.of(DeviceState.UPDATED, ZtpDeviceState.ZTP_DEV_STATE_UPDATED), - Arguments.of(DeviceState.DELETED, ZtpDeviceState.ZTP_DEV_STATE_DELETED), - Arguments.of(DeviceState.UNDEFINED, ZtpDeviceState.ZTP_DEV_STATE_UNDEFINED)); - } - - @ParameterizedTest - @MethodSource("provideDeviceState") - void shouldSerializeDeviceState( - DeviceState deviceState, ZtpDeviceState expectedSerializedDeviceState) { - final var serializedDeviceState = serializer.serialize(deviceState); - assertThat(serializedDeviceState.getNumber()) - .isEqualTo(expectedSerializedDeviceState.getNumber()); - } - - @ParameterizedTest - @MethodSource("provideDeviceState") - void shouldDeserializeDeviceState( - DeviceState expectedDeviceState, ZtpDeviceState serializedDeviceState) { - final var deviceState = serializer.deserialize(serializedDeviceState); - assertThat(deviceState).isEqualTo(expectedDeviceState); - } - @Test void shouldSerializeEvent() { final var timestamp = ContextOuterClass.Timestamp.newBuilder().setTimestamp(1).build(); @@ -1673,27 +1589,6 @@ class SerializerTest { assertThat(device).usingRecursiveComparison().isEqualTo(expectedDevice); } - @Test - void shouldSerializeEmpty() { - final var empty = new Empty(); - final var expectedEmpty = ContextOuterClass.Empty.newBuilder().build(); - - final var serializeEmpty = serializer.serializeEmpty(empty); - - assertThat(serializeEmpty).isEqualTo(expectedEmpty); - } - - @Test - void shouldDeserializeEmpty() { - final var expectedEmpty = new Empty(); - - final var serializedEmpty = serializer.serializeEmpty(expectedEmpty); - - final var empty = serializer.deserializeEmpty(serializedEmpty); - - assertThat(empty).usingRecursiveComparison().isEqualTo(expectedEmpty); - } - @Test void shouldSerializeUuid() { final var expectedUuid = "uuid"; diff --git a/src/automation/target/generated-sources/grpc/automation/Automation.java b/src/automation/target/generated-sources/grpc/automation/Automation.java index cd82f7423..f3918e0fc 100644 --- a/src/automation/target/generated-sources/grpc/automation/Automation.java +++ b/src/automation/target/generated-sources/grpc/automation/Automation.java @@ -1818,830 +1818,6 @@ public final class Automation { } - public interface DeviceRoleConfigOrBuilder extends - // @@protoc_insertion_point(interface_extends:automation.DeviceRoleConfig) - com.google.protobuf.MessageOrBuilder { - - /** - * .automation.DeviceRole devRole = 1; - * @return Whether the devRole field is set. - */ - boolean hasDevRole(); - /** - * .automation.DeviceRole devRole = 1; - * @return The devRole. - */ - automation.Automation.DeviceRole getDevRole(); - /** - * .automation.DeviceRole devRole = 1; - */ - automation.Automation.DeviceRoleOrBuilder getDevRoleOrBuilder(); - - /** - * .context.DeviceConfig devConfig = 2; - * @return Whether the devConfig field is set. - */ - boolean hasDevConfig(); - /** - * .context.DeviceConfig devConfig = 2; - * @return The devConfig. - */ - context.ContextOuterClass.DeviceConfig getDevConfig(); - /** - * .context.DeviceConfig devConfig = 2; - */ - context.ContextOuterClass.DeviceConfigOrBuilder getDevConfigOrBuilder(); - } - /** - * Protobuf type {@code automation.DeviceRoleConfig} - */ - public static final class DeviceRoleConfig extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:automation.DeviceRoleConfig) - DeviceRoleConfigOrBuilder { - private static final long serialVersionUID = 0L; - // Use DeviceRoleConfig.newBuilder() to construct. - private DeviceRoleConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) { - super(builder); - } - private DeviceRoleConfig() { - } - - @java.lang.Override - @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { - return new DeviceRoleConfig(); - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private DeviceRoleConfig( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - automation.Automation.DeviceRole.Builder subBuilder = null; - if (devRole_ != null) { - subBuilder = devRole_.toBuilder(); - } - devRole_ = input.readMessage(automation.Automation.DeviceRole.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(devRole_); - devRole_ = subBuilder.buildPartial(); - } - - break; - } - case 18: { - context.ContextOuterClass.DeviceConfig.Builder subBuilder = null; - if (devConfig_ != null) { - subBuilder = devConfig_.toBuilder(); - } - devConfig_ = input.readMessage(context.ContextOuterClass.DeviceConfig.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(devConfig_); - devConfig_ = subBuilder.buildPartial(); - } - - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return automation.Automation.internal_static_automation_DeviceRoleConfig_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return automation.Automation.internal_static_automation_DeviceRoleConfig_fieldAccessorTable - .ensureFieldAccessorsInitialized( - automation.Automation.DeviceRoleConfig.class, automation.Automation.DeviceRoleConfig.Builder.class); - } - - public static final int DEVROLE_FIELD_NUMBER = 1; - private automation.Automation.DeviceRole devRole_; - /** - * .automation.DeviceRole devRole = 1; - * @return Whether the devRole field is set. - */ - @java.lang.Override - public boolean hasDevRole() { - return devRole_ != null; - } - /** - * .automation.DeviceRole devRole = 1; - * @return The devRole. - */ - @java.lang.Override - public automation.Automation.DeviceRole getDevRole() { - return devRole_ == null ? automation.Automation.DeviceRole.getDefaultInstance() : devRole_; - } - /** - * .automation.DeviceRole devRole = 1; - */ - @java.lang.Override - public automation.Automation.DeviceRoleOrBuilder getDevRoleOrBuilder() { - return getDevRole(); - } - - public static final int DEVCONFIG_FIELD_NUMBER = 2; - private context.ContextOuterClass.DeviceConfig devConfig_; - /** - * .context.DeviceConfig devConfig = 2; - * @return Whether the devConfig field is set. - */ - @java.lang.Override - public boolean hasDevConfig() { - return devConfig_ != null; - } - /** - * .context.DeviceConfig devConfig = 2; - * @return The devConfig. - */ - @java.lang.Override - public context.ContextOuterClass.DeviceConfig getDevConfig() { - return devConfig_ == null ? context.ContextOuterClass.DeviceConfig.getDefaultInstance() : devConfig_; - } - /** - * .context.DeviceConfig devConfig = 2; - */ - @java.lang.Override - public context.ContextOuterClass.DeviceConfigOrBuilder getDevConfigOrBuilder() { - return getDevConfig(); - } - - private byte memoizedIsInitialized = -1; - @java.lang.Override - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - memoizedIsInitialized = 1; - return true; - } - - @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - if (devRole_ != null) { - output.writeMessage(1, getDevRole()); - } - if (devConfig_ != null) { - output.writeMessage(2, getDevConfig()); - } - unknownFields.writeTo(output); - } - - @java.lang.Override - public int getSerializedSize() { - int size = memoizedSize; - if (size != -1) return size; - - size = 0; - if (devRole_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getDevRole()); - } - if (devConfig_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, getDevConfig()); - } - size += unknownFields.getSerializedSize(); - memoizedSize = size; - return size; - } - - @java.lang.Override - public boolean equals(final java.lang.Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof automation.Automation.DeviceRoleConfig)) { - return super.equals(obj); - } - automation.Automation.DeviceRoleConfig other = (automation.Automation.DeviceRoleConfig) obj; - - if (hasDevRole() != other.hasDevRole()) return false; - if (hasDevRole()) { - if (!getDevRole() - .equals(other.getDevRole())) return false; - } - if (hasDevConfig() != other.hasDevConfig()) return false; - if (hasDevConfig()) { - if (!getDevConfig() - .equals(other.getDevConfig())) return false; - } - if (!unknownFields.equals(other.unknownFields)) return false; - return true; - } - - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; - } - int hash = 41; - hash = (19 * hash) + getDescriptor().hashCode(); - if (hasDevRole()) { - hash = (37 * hash) + DEVROLE_FIELD_NUMBER; - hash = (53 * hash) + getDevRole().hashCode(); - } - if (hasDevConfig()) { - hash = (37 * hash) + DEVCONFIG_FIELD_NUMBER; - hash = (53 * hash) + getDevConfig().hashCode(); - } - hash = (29 * hash) + unknownFields.hashCode(); - memoizedHashCode = hash; - return hash; - } - - public static automation.Automation.DeviceRoleConfig parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static automation.Automation.DeviceRoleConfig parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static automation.Automation.DeviceRoleConfig parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static automation.Automation.DeviceRoleConfig parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static automation.Automation.DeviceRoleConfig parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static automation.Automation.DeviceRoleConfig parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static automation.Automation.DeviceRoleConfig parseFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static automation.Automation.DeviceRoleConfig parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - public static automation.Automation.DeviceRoleConfig parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); - } - public static automation.Automation.DeviceRoleConfig parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); - } - public static automation.Automation.DeviceRoleConfig parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static automation.Automation.DeviceRoleConfig parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - - @java.lang.Override - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder() { - return DEFAULT_INSTANCE.toBuilder(); - } - public static Builder newBuilder(automation.Automation.DeviceRoleConfig prototype) { - return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); - } - @java.lang.Override - public Builder toBuilder() { - return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); - } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code automation.DeviceRoleConfig} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:automation.DeviceRoleConfig) - automation.Automation.DeviceRoleConfigOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return automation.Automation.internal_static_automation_DeviceRoleConfig_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return automation.Automation.internal_static_automation_DeviceRoleConfig_fieldAccessorTable - .ensureFieldAccessorsInitialized( - automation.Automation.DeviceRoleConfig.class, automation.Automation.DeviceRoleConfig.Builder.class); - } - - // Construct using automation.Automation.DeviceRoleConfig.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } - } - @java.lang.Override - public Builder clear() { - super.clear(); - if (devRoleBuilder_ == null) { - devRole_ = null; - } else { - devRole_ = null; - devRoleBuilder_ = null; - } - if (devConfigBuilder_ == null) { - devConfig_ = null; - } else { - devConfig_ = null; - devConfigBuilder_ = null; - } - return this; - } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return automation.Automation.internal_static_automation_DeviceRoleConfig_descriptor; - } - - @java.lang.Override - public automation.Automation.DeviceRoleConfig getDefaultInstanceForType() { - return automation.Automation.DeviceRoleConfig.getDefaultInstance(); - } - - @java.lang.Override - public automation.Automation.DeviceRoleConfig build() { - automation.Automation.DeviceRoleConfig result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - @java.lang.Override - public automation.Automation.DeviceRoleConfig buildPartial() { - automation.Automation.DeviceRoleConfig result = new automation.Automation.DeviceRoleConfig(this); - if (devRoleBuilder_ == null) { - result.devRole_ = devRole_; - } else { - result.devRole_ = devRoleBuilder_.build(); - } - if (devConfigBuilder_ == null) { - result.devConfig_ = devConfig_; - } else { - result.devConfig_ = devConfigBuilder_.build(); - } - onBuilt(); - return result; - } - - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof automation.Automation.DeviceRoleConfig) { - return mergeFrom((automation.Automation.DeviceRoleConfig)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(automation.Automation.DeviceRoleConfig other) { - if (other == automation.Automation.DeviceRoleConfig.getDefaultInstance()) return this; - if (other.hasDevRole()) { - mergeDevRole(other.getDevRole()); - } - if (other.hasDevConfig()) { - mergeDevConfig(other.getDevConfig()); - } - this.mergeUnknownFields(other.unknownFields); - onChanged(); - return this; - } - - @java.lang.Override - public final boolean isInitialized() { - return true; - } - - @java.lang.Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - automation.Automation.DeviceRoleConfig parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (automation.Automation.DeviceRoleConfig) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - private automation.Automation.DeviceRole devRole_; - private com.google.protobuf.SingleFieldBuilderV3< - automation.Automation.DeviceRole, automation.Automation.DeviceRole.Builder, automation.Automation.DeviceRoleOrBuilder> devRoleBuilder_; - /** - * .automation.DeviceRole devRole = 1; - * @return Whether the devRole field is set. - */ - public boolean hasDevRole() { - return devRoleBuilder_ != null || devRole_ != null; - } - /** - * .automation.DeviceRole devRole = 1; - * @return The devRole. - */ - public automation.Automation.DeviceRole getDevRole() { - if (devRoleBuilder_ == null) { - return devRole_ == null ? automation.Automation.DeviceRole.getDefaultInstance() : devRole_; - } else { - return devRoleBuilder_.getMessage(); - } - } - /** - * .automation.DeviceRole devRole = 1; - */ - public Builder setDevRole(automation.Automation.DeviceRole value) { - if (devRoleBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - devRole_ = value; - onChanged(); - } else { - devRoleBuilder_.setMessage(value); - } - - return this; - } - /** - * .automation.DeviceRole devRole = 1; - */ - public Builder setDevRole( - automation.Automation.DeviceRole.Builder builderForValue) { - if (devRoleBuilder_ == null) { - devRole_ = builderForValue.build(); - onChanged(); - } else { - devRoleBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .automation.DeviceRole devRole = 1; - */ - public Builder mergeDevRole(automation.Automation.DeviceRole value) { - if (devRoleBuilder_ == null) { - if (devRole_ != null) { - devRole_ = - automation.Automation.DeviceRole.newBuilder(devRole_).mergeFrom(value).buildPartial(); - } else { - devRole_ = value; - } - onChanged(); - } else { - devRoleBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .automation.DeviceRole devRole = 1; - */ - public Builder clearDevRole() { - if (devRoleBuilder_ == null) { - devRole_ = null; - onChanged(); - } else { - devRole_ = null; - devRoleBuilder_ = null; - } - - return this; - } - /** - * .automation.DeviceRole devRole = 1; - */ - public automation.Automation.DeviceRole.Builder getDevRoleBuilder() { - - onChanged(); - return getDevRoleFieldBuilder().getBuilder(); - } - /** - * .automation.DeviceRole devRole = 1; - */ - public automation.Automation.DeviceRoleOrBuilder getDevRoleOrBuilder() { - if (devRoleBuilder_ != null) { - return devRoleBuilder_.getMessageOrBuilder(); - } else { - return devRole_ == null ? - automation.Automation.DeviceRole.getDefaultInstance() : devRole_; - } - } - /** - * .automation.DeviceRole devRole = 1; - */ - private com.google.protobuf.SingleFieldBuilderV3< - automation.Automation.DeviceRole, automation.Automation.DeviceRole.Builder, automation.Automation.DeviceRoleOrBuilder> - getDevRoleFieldBuilder() { - if (devRoleBuilder_ == null) { - devRoleBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - automation.Automation.DeviceRole, automation.Automation.DeviceRole.Builder, automation.Automation.DeviceRoleOrBuilder>( - getDevRole(), - getParentForChildren(), - isClean()); - devRole_ = null; - } - return devRoleBuilder_; - } - - private context.ContextOuterClass.DeviceConfig devConfig_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.DeviceConfig, context.ContextOuterClass.DeviceConfig.Builder, context.ContextOuterClass.DeviceConfigOrBuilder> devConfigBuilder_; - /** - * .context.DeviceConfig devConfig = 2; - * @return Whether the devConfig field is set. - */ - public boolean hasDevConfig() { - return devConfigBuilder_ != null || devConfig_ != null; - } - /** - * .context.DeviceConfig devConfig = 2; - * @return The devConfig. - */ - public context.ContextOuterClass.DeviceConfig getDevConfig() { - if (devConfigBuilder_ == null) { - return devConfig_ == null ? context.ContextOuterClass.DeviceConfig.getDefaultInstance() : devConfig_; - } else { - return devConfigBuilder_.getMessage(); - } - } - /** - * .context.DeviceConfig devConfig = 2; - */ - public Builder setDevConfig(context.ContextOuterClass.DeviceConfig value) { - if (devConfigBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - devConfig_ = value; - onChanged(); - } else { - devConfigBuilder_.setMessage(value); - } - - return this; - } - /** - * .context.DeviceConfig devConfig = 2; - */ - public Builder setDevConfig( - context.ContextOuterClass.DeviceConfig.Builder builderForValue) { - if (devConfigBuilder_ == null) { - devConfig_ = builderForValue.build(); - onChanged(); - } else { - devConfigBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .context.DeviceConfig devConfig = 2; - */ - public Builder mergeDevConfig(context.ContextOuterClass.DeviceConfig value) { - if (devConfigBuilder_ == null) { - if (devConfig_ != null) { - devConfig_ = - context.ContextOuterClass.DeviceConfig.newBuilder(devConfig_).mergeFrom(value).buildPartial(); - } else { - devConfig_ = value; - } - onChanged(); - } else { - devConfigBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .context.DeviceConfig devConfig = 2; - */ - public Builder clearDevConfig() { - if (devConfigBuilder_ == null) { - devConfig_ = null; - onChanged(); - } else { - devConfig_ = null; - devConfigBuilder_ = null; - } - - return this; - } - /** - * .context.DeviceConfig devConfig = 2; - */ - public context.ContextOuterClass.DeviceConfig.Builder getDevConfigBuilder() { - - onChanged(); - return getDevConfigFieldBuilder().getBuilder(); - } - /** - * .context.DeviceConfig devConfig = 2; - */ - public context.ContextOuterClass.DeviceConfigOrBuilder getDevConfigOrBuilder() { - if (devConfigBuilder_ != null) { - return devConfigBuilder_.getMessageOrBuilder(); - } else { - return devConfig_ == null ? - context.ContextOuterClass.DeviceConfig.getDefaultInstance() : devConfig_; - } - } - /** - * .context.DeviceConfig devConfig = 2; - */ - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.DeviceConfig, context.ContextOuterClass.DeviceConfig.Builder, context.ContextOuterClass.DeviceConfigOrBuilder> - getDevConfigFieldBuilder() { - if (devConfigBuilder_ == null) { - devConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.DeviceConfig, context.ContextOuterClass.DeviceConfig.Builder, context.ContextOuterClass.DeviceConfigOrBuilder>( - getDevConfig(), - getParentForChildren(), - isClean()); - devConfig_ = null; - } - return devConfigBuilder_; - } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - - - // @@protoc_insertion_point(builder_scope:automation.DeviceRoleConfig) - } - - // @@protoc_insertion_point(class_scope:automation.DeviceRoleConfig) - private static final automation.Automation.DeviceRoleConfig DEFAULT_INSTANCE; - static { - DEFAULT_INSTANCE = new automation.Automation.DeviceRoleConfig(); - } - - public static automation.Automation.DeviceRoleConfig getDefaultInstance() { - return DEFAULT_INSTANCE; - } - - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public DeviceRoleConfig parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new DeviceRoleConfig(input, extensionRegistry); - } - }; - - public static com.google.protobuf.Parser parser() { - return PARSER; - } - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - @java.lang.Override - public automation.Automation.DeviceRoleConfig getDefaultInstanceForType() { - return DEFAULT_INSTANCE; - } - - } - public interface DeviceRoleListOrBuilder extends // @@protoc_insertion_point(interface_extends:automation.DeviceRoleList) com.google.protobuf.MessageOrBuilder { @@ -4811,11 +3987,6 @@ public final class Automation { private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_automation_DeviceRole_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_automation_DeviceRoleConfig_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_automation_DeviceRoleConfig_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_automation_DeviceRoleList_descriptor; private static final @@ -4845,32 +4016,29 @@ public final class Automation { "2\r.context.Uuid\022 \n\005devId\030\002 \001(\0132\021.context" + ".DeviceId\"j\n\nDeviceRole\022+\n\tdevRoleId\030\001 \001" + "(\0132\030.automation.DeviceRoleId\022/\n\013devRoleT" + - "ype\030\002 \001(\0162\032.automation.DeviceRoleType\"e\n" + - "\020DeviceRoleConfig\022\'\n\007devRole\030\001 \001(\0132\026.aut" + - "omation.DeviceRole\022(\n\tdevConfig\030\002 \001(\0132\025." + - "context.DeviceConfig\"9\n\016DeviceRoleList\022\'" + - "\n\007devRole\030\001 \003(\0132\026.automation.DeviceRole\"" + - "p\n\017DeviceRoleState\022+\n\tdevRoleId\030\001 \001(\0132\030." + - "automation.DeviceRoleId\0220\n\014devRoleState\030" + - "\002 \001(\0162\032.automation.ZtpDeviceState\"\'\n\024Dev" + - "iceDeletionResult\022\017\n\007deleted\030\001 \003(\t*H\n\016De" + - "viceRoleType\022\010\n\004NONE\020\000\022\013\n\007DEV_OPS\020\001\022\014\n\010D" + - "EV_CONF\020\002\022\021\n\rPIPELINE_CONF\020\003*~\n\016ZtpDevic" + - "eState\022\033\n\027ZTP_DEV_STATE_UNDEFINED\020\000\022\031\n\025Z" + - "TP_DEV_STATE_CREATED\020\001\022\031\n\025ZTP_DEV_STATE_" + - "UPDATED\020\002\022\031\n\025ZTP_DEV_STATE_DELETED\020\0032\276\003\n" + - "\021AutomationService\022F\n\020ZtpGetDeviceRole\022\030" + - ".automation.DeviceRoleId\032\026.automation.De" + - "viceRole\"\000\022N\n\033ZtpGetDeviceRolesByDeviceI" + - "d\022\021.context.DeviceId\032\032.automation.Device" + - "RoleList\"\000\022?\n\006ZtpAdd\022\026.automation.Device" + - "Role\032\033.automation.DeviceRoleState\"\000\022H\n\tZ" + - "tpUpdate\022\034.automation.DeviceRoleConfig\032\033" + - ".automation.DeviceRoleState\"\000\022B\n\tZtpDele" + - "te\022\026.automation.DeviceRole\032\033.automation." + - "DeviceRoleState\"\000\022B\n\014ZtpDeleteAll\022\016.cont" + - "ext.Empty\032 .automation.DeviceDeletionRes" + - "ult\"\000b\006proto3" + "ype\030\002 \001(\0162\032.automation.DeviceRoleType\"9\n" + + "\016DeviceRoleList\022\'\n\007devRole\030\001 \003(\0132\026.autom" + + "ation.DeviceRole\"p\n\017DeviceRoleState\022+\n\td" + + "evRoleId\030\001 \001(\0132\030.automation.DeviceRoleId" + + "\0220\n\014devRoleState\030\002 \001(\0162\032.automation.ZtpD" + + "eviceState\"\'\n\024DeviceDeletionResult\022\017\n\007de" + + "leted\030\001 \003(\t*H\n\016DeviceRoleType\022\010\n\004NONE\020\000\022" + + "\013\n\007DEV_OPS\020\001\022\014\n\010DEV_CONF\020\002\022\021\n\rPIPELINE_C" + + "ONF\020\003*~\n\016ZtpDeviceState\022\033\n\027ZTP_DEV_STATE" + + "_UNDEFINED\020\000\022\031\n\025ZTP_DEV_STATE_CREATED\020\001\022" + + "\031\n\025ZTP_DEV_STATE_UPDATED\020\002\022\031\n\025ZTP_DEV_ST" + + "ATE_DELETED\020\0032\270\003\n\021AutomationService\022F\n\020Z" + + "tpGetDeviceRole\022\030.automation.DeviceRoleI" + + "d\032\026.automation.DeviceRole\"\000\022N\n\033ZtpGetDev" + + "iceRolesByDeviceId\022\021.context.DeviceId\032\032." + + "automation.DeviceRoleList\"\000\022?\n\006ZtpAdd\022\026." + + "automation.DeviceRole\032\033.automation.Devic" + + "eRoleState\"\000\022B\n\tZtpUpdate\022\026.automation.D" + + "eviceRole\032\033.automation.DeviceRoleState\"\000" + + "\022B\n\tZtpDelete\022\026.automation.DeviceRole\032\033." + + "automation.DeviceRoleState\"\000\022B\n\014ZtpDelet" + + "eAll\022\016.context.Empty\032 .automation.Device" + + "DeletionResult\"\000b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -4889,26 +4057,20 @@ public final class Automation { com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_automation_DeviceRole_descriptor, new java.lang.String[] { "DevRoleId", "DevRoleType", }); - internal_static_automation_DeviceRoleConfig_descriptor = - getDescriptor().getMessageTypes().get(2); - internal_static_automation_DeviceRoleConfig_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_automation_DeviceRoleConfig_descriptor, - new java.lang.String[] { "DevRole", "DevConfig", }); internal_static_automation_DeviceRoleList_descriptor = - getDescriptor().getMessageTypes().get(3); + getDescriptor().getMessageTypes().get(2); internal_static_automation_DeviceRoleList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_automation_DeviceRoleList_descriptor, new java.lang.String[] { "DevRole", }); internal_static_automation_DeviceRoleState_descriptor = - getDescriptor().getMessageTypes().get(4); + getDescriptor().getMessageTypes().get(3); internal_static_automation_DeviceRoleState_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_automation_DeviceRoleState_descriptor, new java.lang.String[] { "DevRoleId", "DevRoleState", }); internal_static_automation_DeviceDeletionResult_descriptor = - getDescriptor().getMessageTypes().get(5); + getDescriptor().getMessageTypes().get(4); internal_static_automation_DeviceDeletionResult_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_automation_DeviceDeletionResult_descriptor, diff --git a/src/automation/target/generated-sources/grpc/automation/AutomationService.java b/src/automation/target/generated-sources/grpc/automation/AutomationService.java index 8ef578481..4df9e1098 100644 --- a/src/automation/target/generated-sources/grpc/automation/AutomationService.java +++ b/src/automation/target/generated-sources/grpc/automation/AutomationService.java @@ -14,7 +14,7 @@ public interface AutomationService extends MutinyService { io.smallrye.mutiny.Uni ztpAdd(automation.Automation.DeviceRole request); - io.smallrye.mutiny.Uni ztpUpdate(automation.Automation.DeviceRoleConfig request); + io.smallrye.mutiny.Uni ztpUpdate(automation.Automation.DeviceRole request); io.smallrye.mutiny.Uni ztpDelete(automation.Automation.DeviceRole request); diff --git a/src/automation/target/generated-sources/grpc/automation/AutomationServiceBean.java b/src/automation/target/generated-sources/grpc/automation/AutomationServiceBean.java index 3c7923a0c..74d420a1e 100644 --- a/src/automation/target/generated-sources/grpc/automation/AutomationServiceBean.java +++ b/src/automation/target/generated-sources/grpc/automation/AutomationServiceBean.java @@ -40,7 +40,7 @@ public class AutomationServiceBean extends MutinyAutomationServiceGrpc.Automatio } } @Override - public io.smallrye.mutiny.Uni ztpUpdate(automation.Automation.DeviceRoleConfig request) { + public io.smallrye.mutiny.Uni ztpUpdate(automation.Automation.DeviceRole request) { try { return delegate.ztpUpdate(request); } catch (UnsupportedOperationException e) { diff --git a/src/automation/target/generated-sources/grpc/automation/AutomationServiceClient.java b/src/automation/target/generated-sources/grpc/automation/AutomationServiceClient.java index 13d13c431..9dcad532a 100644 --- a/src/automation/target/generated-sources/grpc/automation/AutomationServiceClient.java +++ b/src/automation/target/generated-sources/grpc/automation/AutomationServiceClient.java @@ -33,7 +33,7 @@ public class AutomationServiceClient implements AutomationService, MutinyClient< return stub.ztpAdd(request); } @Override - public io.smallrye.mutiny.Uni ztpUpdate(automation.Automation.DeviceRoleConfig request) { + public io.smallrye.mutiny.Uni ztpUpdate(automation.Automation.DeviceRole request) { return stub.ztpUpdate(request); } @Override diff --git a/src/automation/target/generated-sources/grpc/automation/AutomationServiceGrpc.java b/src/automation/target/generated-sources/grpc/automation/AutomationServiceGrpc.java index 841994ea7..25f5feaf3 100644 --- a/src/automation/target/generated-sources/grpc/automation/AutomationServiceGrpc.java +++ b/src/automation/target/generated-sources/grpc/automation/AutomationServiceGrpc.java @@ -107,27 +107,27 @@ public final class AutomationServiceGrpc { return getZtpAddMethod; } - private static volatile io.grpc.MethodDescriptor getZtpUpdateMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "ZtpUpdate", - requestType = automation.Automation.DeviceRoleConfig.class, + requestType = automation.Automation.DeviceRole.class, responseType = automation.Automation.DeviceRoleState.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getZtpUpdateMethod() { - io.grpc.MethodDescriptor getZtpUpdateMethod; + io.grpc.MethodDescriptor getZtpUpdateMethod; if ((getZtpUpdateMethod = AutomationServiceGrpc.getZtpUpdateMethod) == null) { synchronized (AutomationServiceGrpc.class) { if ((getZtpUpdateMethod = AutomationServiceGrpc.getZtpUpdateMethod) == null) { AutomationServiceGrpc.getZtpUpdateMethod = getZtpUpdateMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ZtpUpdate")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - automation.Automation.DeviceRoleConfig.getDefaultInstance())) + automation.Automation.DeviceRole.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( automation.Automation.DeviceRoleState.getDefaultInstance())) .setSchemaDescriptor(new AutomationServiceMethodDescriptorSupplier("ZtpUpdate")) @@ -271,7 +271,7 @@ public final class AutomationServiceGrpc { /** */ - public void ztpUpdate(automation.Automation.DeviceRoleConfig request, + public void ztpUpdate(automation.Automation.DeviceRole request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getZtpUpdateMethod(), responseObserver); } @@ -317,7 +317,7 @@ public final class AutomationServiceGrpc { getZtpUpdateMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - automation.Automation.DeviceRoleConfig, + automation.Automation.DeviceRole, automation.Automation.DeviceRoleState>( this, METHODID_ZTP_UPDATE))) .addMethod( @@ -378,7 +378,7 @@ public final class AutomationServiceGrpc { /** */ - public void ztpUpdate(automation.Automation.DeviceRoleConfig request, + public void ztpUpdate(automation.Automation.DeviceRole request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getZtpUpdateMethod(), getCallOptions()), request, responseObserver); @@ -438,7 +438,7 @@ public final class AutomationServiceGrpc { /** */ - public automation.Automation.DeviceRoleState ztpUpdate(automation.Automation.DeviceRoleConfig request) { + public automation.Automation.DeviceRoleState ztpUpdate(automation.Automation.DeviceRole request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getZtpUpdateMethod(), getCallOptions(), request); } @@ -499,7 +499,7 @@ public final class AutomationServiceGrpc { /** */ public com.google.common.util.concurrent.ListenableFuture ztpUpdate( - automation.Automation.DeviceRoleConfig request) { + automation.Automation.DeviceRole request) { return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getZtpUpdateMethod(), getCallOptions()), request); } @@ -558,7 +558,7 @@ public final class AutomationServiceGrpc { (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_ZTP_UPDATE: - serviceImpl.ztpUpdate((automation.Automation.DeviceRoleConfig) request, + serviceImpl.ztpUpdate((automation.Automation.DeviceRole) request, (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_ZTP_DELETE: diff --git a/src/automation/target/generated-sources/grpc/automation/MutinyAutomationServiceGrpc.java b/src/automation/target/generated-sources/grpc/automation/MutinyAutomationServiceGrpc.java index 64565286c..9b641fcdd 100644 --- a/src/automation/target/generated-sources/grpc/automation/MutinyAutomationServiceGrpc.java +++ b/src/automation/target/generated-sources/grpc/automation/MutinyAutomationServiceGrpc.java @@ -51,7 +51,7 @@ public final class MutinyAutomationServiceGrpc implements io.quarkus.grpc.runtim } - public io.smallrye.mutiny.Uni ztpUpdate(automation.Automation.DeviceRoleConfig request) { + public io.smallrye.mutiny.Uni ztpUpdate(automation.Automation.DeviceRole request) { return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::ztpUpdate); } @@ -98,7 +98,7 @@ public final class MutinyAutomationServiceGrpc implements io.quarkus.grpc.runtim } - public io.smallrye.mutiny.Uni ztpUpdate(automation.Automation.DeviceRoleConfig request) { + public io.smallrye.mutiny.Uni ztpUpdate(automation.Automation.DeviceRole request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } @@ -139,7 +139,7 @@ public final class MutinyAutomationServiceGrpc implements io.quarkus.grpc.runtim automation.AutomationServiceGrpc.getZtpUpdateMethod(), asyncUnaryCall( new MethodHandlers< - automation.Automation.DeviceRoleConfig, + automation.Automation.DeviceRole, automation.Automation.DeviceRoleState>( this, METHODID_ZTP_UPDATE, compression))) .addMethod( @@ -205,7 +205,7 @@ public final class MutinyAutomationServiceGrpc implements io.quarkus.grpc.runtim serviceImpl::ztpAdd); break; case METHODID_ZTP_UPDATE: - io.quarkus.grpc.runtime.ServerCalls.oneToOne((automation.Automation.DeviceRoleConfig) request, + io.quarkus.grpc.runtime.ServerCalls.oneToOne((automation.Automation.DeviceRole) request, (io.grpc.stub.StreamObserver) responseObserver, compression, serviceImpl::ztpUpdate); diff --git a/src/automation/target/generated-sources/grpc/monitoring/Monitoring.java b/src/automation/target/generated-sources/grpc/monitoring/Monitoring.java index 9d05f3da8..5d63d4aa4 100644 --- a/src/automation/target/generated-sources/grpc/monitoring/Monitoring.java +++ b/src/automation/target/generated-sources/grpc/monitoring/Monitoring.java @@ -19,124 +19,85 @@ public final class Monitoring { com.google.protobuf.MessageOrBuilder { /** - * .monitoring.KpiId kpi_id = 1; - * @return Whether the kpiId field is set. - */ - boolean hasKpiId(); - /** - * .monitoring.KpiId kpi_id = 1; - * @return The kpiId. - */ - monitoring.Monitoring.KpiId getKpiId(); - /** - * .monitoring.KpiId kpi_id = 1; - */ - monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder(); - - /** - * string kpi_description = 2; + * string kpi_description = 1; * @return The kpiDescription. */ java.lang.String getKpiDescription(); /** - * string kpi_description = 2; + * string kpi_description = 1; * @return The bytes for kpiDescription. */ com.google.protobuf.ByteString getKpiDescriptionBytes(); /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - java.util.List - getKpiIdListList(); - /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - monitoring.Monitoring.KpiId getKpiIdList(int index); - /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - int getKpiIdListCount(); - /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - java.util.List - getKpiIdListOrBuilderList(); - /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - monitoring.Monitoring.KpiIdOrBuilder getKpiIdListOrBuilder( - int index); - - /** - * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 2; * @return The enum numeric value on the wire for kpiSampleType. */ int getKpiSampleTypeValue(); /** - * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 2; * @return The kpiSampleType. */ kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType(); /** - * .context.DeviceId device_id = 5; + * .context.DeviceId device_id = 3; * @return Whether the deviceId field is set. */ boolean hasDeviceId(); /** - * .context.DeviceId device_id = 5; + * .context.DeviceId device_id = 3; * @return The deviceId. */ context.ContextOuterClass.DeviceId getDeviceId(); /** - * .context.DeviceId device_id = 5; + * .context.DeviceId device_id = 3; */ context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder(); /** - * .context.EndPointId endpoint_id = 6; + * .context.EndPointId endpoint_id = 4; * @return Whether the endpointId field is set. */ boolean hasEndpointId(); /** - * .context.EndPointId endpoint_id = 6; + * .context.EndPointId endpoint_id = 4; * @return The endpointId. */ context.ContextOuterClass.EndPointId getEndpointId(); /** - * .context.EndPointId endpoint_id = 6; + * .context.EndPointId endpoint_id = 4; */ context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder(); /** - * .context.ServiceId service_id = 7; + * .context.ServiceId service_id = 5; * @return Whether the serviceId field is set. */ boolean hasServiceId(); /** - * .context.ServiceId service_id = 7; + * .context.ServiceId service_id = 5; * @return The serviceId. */ context.ContextOuterClass.ServiceId getServiceId(); /** - * .context.ServiceId service_id = 7; + * .context.ServiceId service_id = 5; */ context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder(); /** - * .context.SliceId slice_id = 8; + * .context.SliceId slice_id = 6; * @return Whether the sliceId field is set. */ boolean hasSliceId(); /** - * .context.SliceId slice_id = 8; + * .context.SliceId slice_id = 6; * @return The sliceId. */ context.ContextOuterClass.SliceId getSliceId(); /** - * .context.SliceId slice_id = 8; + * .context.SliceId slice_id = 6; */ context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder(); } @@ -154,7 +115,6 @@ public final class Monitoring { } private KpiDescriptor() { kpiDescription_ = ""; - kpiIdList_ = java.util.Collections.emptyList(); kpiSampleType_ = 0; } @@ -178,7 +138,6 @@ public final class Monitoring { if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -190,40 +149,18 @@ public final class Monitoring { done = true; break; case 10: { - monitoring.Monitoring.KpiId.Builder subBuilder = null; - if (kpiId_ != null) { - subBuilder = kpiId_.toBuilder(); - } - kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(kpiId_); - kpiId_ = subBuilder.buildPartial(); - } - - break; - } - case 18: { java.lang.String s = input.readStringRequireUtf8(); kpiDescription_ = s; break; } - case 26: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - kpiIdList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - kpiIdList_.add( - input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry)); - break; - } - case 32: { + case 16: { int rawValue = input.readEnum(); kpiSampleType_ = rawValue; break; } - case 42: { + case 26: { context.ContextOuterClass.DeviceId.Builder subBuilder = null; if (deviceId_ != null) { subBuilder = deviceId_.toBuilder(); @@ -236,7 +173,7 @@ public final class Monitoring { break; } - case 50: { + case 34: { context.ContextOuterClass.EndPointId.Builder subBuilder = null; if (endpointId_ != null) { subBuilder = endpointId_.toBuilder(); @@ -249,7 +186,7 @@ public final class Monitoring { break; } - case 58: { + case 42: { context.ContextOuterClass.ServiceId.Builder subBuilder = null; if (serviceId_ != null) { subBuilder = serviceId_.toBuilder(); @@ -262,7 +199,7 @@ public final class Monitoring { break; } - case 66: { + case 50: { context.ContextOuterClass.SliceId.Builder subBuilder = null; if (sliceId_ != null) { subBuilder = sliceId_.toBuilder(); @@ -290,9 +227,6 @@ public final class Monitoring { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - kpiIdList_ = java.util.Collections.unmodifiableList(kpiIdList_); - } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -310,36 +244,10 @@ public final class Monitoring { monitoring.Monitoring.KpiDescriptor.class, monitoring.Monitoring.KpiDescriptor.Builder.class); } - public static final int KPI_ID_FIELD_NUMBER = 1; - private monitoring.Monitoring.KpiId kpiId_; - /** - * .monitoring.KpiId kpi_id = 1; - * @return Whether the kpiId field is set. - */ - @java.lang.Override - public boolean hasKpiId() { - return kpiId_ != null; - } - /** - * .monitoring.KpiId kpi_id = 1; - * @return The kpiId. - */ - @java.lang.Override - public monitoring.Monitoring.KpiId getKpiId() { - return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; - } - /** - * .monitoring.KpiId kpi_id = 1; - */ - @java.lang.Override - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { - return getKpiId(); - } - - public static final int KPI_DESCRIPTION_FIELD_NUMBER = 2; + public static final int KPI_DESCRIPTION_FIELD_NUMBER = 1; private volatile java.lang.Object kpiDescription_; /** - * string kpi_description = 2; + * string kpi_description = 1; * @return The kpiDescription. */ @java.lang.Override @@ -356,7 +264,7 @@ public final class Monitoring { } } /** - * string kpi_description = 2; + * string kpi_description = 1; * @return The bytes for kpiDescription. */ @java.lang.Override @@ -374,57 +282,17 @@ public final class Monitoring { } } - public static final int KPI_ID_LIST_FIELD_NUMBER = 3; - private java.util.List kpiIdList_; - /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - @java.lang.Override - public java.util.List getKpiIdListList() { - return kpiIdList_; - } - /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - @java.lang.Override - public java.util.List - getKpiIdListOrBuilderList() { - return kpiIdList_; - } - /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - @java.lang.Override - public int getKpiIdListCount() { - return kpiIdList_.size(); - } - /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - @java.lang.Override - public monitoring.Monitoring.KpiId getKpiIdList(int index) { - return kpiIdList_.get(index); - } - /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - @java.lang.Override - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdListOrBuilder( - int index) { - return kpiIdList_.get(index); - } - - public static final int KPI_SAMPLE_TYPE_FIELD_NUMBER = 4; + public static final int KPI_SAMPLE_TYPE_FIELD_NUMBER = 2; private int kpiSampleType_; /** - * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 2; * @return The enum numeric value on the wire for kpiSampleType. */ @java.lang.Override public int getKpiSampleTypeValue() { return kpiSampleType_; } /** - * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 2; * @return The kpiSampleType. */ @java.lang.Override public kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType() { @@ -433,10 +301,10 @@ public final class Monitoring { return result == null ? kpi_sample_types.KpiSampleTypes.KpiSampleType.UNRECOGNIZED : result; } - public static final int DEVICE_ID_FIELD_NUMBER = 5; + public static final int DEVICE_ID_FIELD_NUMBER = 3; private context.ContextOuterClass.DeviceId deviceId_; /** - * .context.DeviceId device_id = 5; + * .context.DeviceId device_id = 3; * @return Whether the deviceId field is set. */ @java.lang.Override @@ -444,7 +312,7 @@ public final class Monitoring { return deviceId_ != null; } /** - * .context.DeviceId device_id = 5; + * .context.DeviceId device_id = 3; * @return The deviceId. */ @java.lang.Override @@ -452,17 +320,17 @@ public final class Monitoring { return deviceId_ == null ? context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; } /** - * .context.DeviceId device_id = 5; + * .context.DeviceId device_id = 3; */ @java.lang.Override public context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder() { return getDeviceId(); } - public static final int ENDPOINT_ID_FIELD_NUMBER = 6; + public static final int ENDPOINT_ID_FIELD_NUMBER = 4; private context.ContextOuterClass.EndPointId endpointId_; /** - * .context.EndPointId endpoint_id = 6; + * .context.EndPointId endpoint_id = 4; * @return Whether the endpointId field is set. */ @java.lang.Override @@ -470,7 +338,7 @@ public final class Monitoring { return endpointId_ != null; } /** - * .context.EndPointId endpoint_id = 6; + * .context.EndPointId endpoint_id = 4; * @return The endpointId. */ @java.lang.Override @@ -478,17 +346,17 @@ public final class Monitoring { return endpointId_ == null ? context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; } /** - * .context.EndPointId endpoint_id = 6; + * .context.EndPointId endpoint_id = 4; */ @java.lang.Override public context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder() { return getEndpointId(); } - public static final int SERVICE_ID_FIELD_NUMBER = 7; + public static final int SERVICE_ID_FIELD_NUMBER = 5; private context.ContextOuterClass.ServiceId serviceId_; /** - * .context.ServiceId service_id = 7; + * .context.ServiceId service_id = 5; * @return Whether the serviceId field is set. */ @java.lang.Override @@ -496,7 +364,7 @@ public final class Monitoring { return serviceId_ != null; } /** - * .context.ServiceId service_id = 7; + * .context.ServiceId service_id = 5; * @return The serviceId. */ @java.lang.Override @@ -504,17 +372,17 @@ public final class Monitoring { return serviceId_ == null ? context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; } /** - * .context.ServiceId service_id = 7; + * .context.ServiceId service_id = 5; */ @java.lang.Override public context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder() { return getServiceId(); } - public static final int SLICE_ID_FIELD_NUMBER = 8; + public static final int SLICE_ID_FIELD_NUMBER = 6; private context.ContextOuterClass.SliceId sliceId_; /** - * .context.SliceId slice_id = 8; + * .context.SliceId slice_id = 6; * @return Whether the sliceId field is set. */ @java.lang.Override @@ -522,7 +390,7 @@ public final class Monitoring { return sliceId_ != null; } /** - * .context.SliceId slice_id = 8; + * .context.SliceId slice_id = 6; * @return The sliceId. */ @java.lang.Override @@ -530,7 +398,7 @@ public final class Monitoring { return sliceId_ == null ? context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; } /** - * .context.SliceId slice_id = 8; + * .context.SliceId slice_id = 6; */ @java.lang.Override public context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder() { @@ -551,29 +419,23 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (kpiId_ != null) { - output.writeMessage(1, getKpiId()); - } if (!getKpiDescriptionBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, kpiDescription_); - } - for (int i = 0; i < kpiIdList_.size(); i++) { - output.writeMessage(3, kpiIdList_.get(i)); + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, kpiDescription_); } if (kpiSampleType_ != kpi_sample_types.KpiSampleTypes.KpiSampleType.KPISAMPLETYPE_UNKNOWN.getNumber()) { - output.writeEnum(4, kpiSampleType_); + output.writeEnum(2, kpiSampleType_); } if (deviceId_ != null) { - output.writeMessage(5, getDeviceId()); + output.writeMessage(3, getDeviceId()); } if (endpointId_ != null) { - output.writeMessage(6, getEndpointId()); + output.writeMessage(4, getEndpointId()); } if (serviceId_ != null) { - output.writeMessage(7, getServiceId()); + output.writeMessage(5, getServiceId()); } if (sliceId_ != null) { - output.writeMessage(8, getSliceId()); + output.writeMessage(6, getSliceId()); } unknownFields.writeTo(output); } @@ -584,36 +446,28 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (kpiId_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getKpiId()); - } if (!getKpiDescriptionBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, kpiDescription_); - } - for (int i = 0; i < kpiIdList_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, kpiIdList_.get(i)); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, kpiDescription_); } if (kpiSampleType_ != kpi_sample_types.KpiSampleTypes.KpiSampleType.KPISAMPLETYPE_UNKNOWN.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(4, kpiSampleType_); + .computeEnumSize(2, kpiSampleType_); } if (deviceId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, getDeviceId()); + .computeMessageSize(3, getDeviceId()); } if (endpointId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, getEndpointId()); + .computeMessageSize(4, getEndpointId()); } if (serviceId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(7, getServiceId()); + .computeMessageSize(5, getServiceId()); } if (sliceId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, getSliceId()); + .computeMessageSize(6, getSliceId()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -630,15 +484,8 @@ public final class Monitoring { } monitoring.Monitoring.KpiDescriptor other = (monitoring.Monitoring.KpiDescriptor) obj; - if (hasKpiId() != other.hasKpiId()) return false; - if (hasKpiId()) { - if (!getKpiId() - .equals(other.getKpiId())) return false; - } if (!getKpiDescription() .equals(other.getKpiDescription())) return false; - if (!getKpiIdListList() - .equals(other.getKpiIdListList())) return false; if (kpiSampleType_ != other.kpiSampleType_) return false; if (hasDeviceId() != other.hasDeviceId()) return false; if (hasDeviceId()) { @@ -671,16 +518,8 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasKpiId()) { - hash = (37 * hash) + KPI_ID_FIELD_NUMBER; - hash = (53 * hash) + getKpiId().hashCode(); - } hash = (37 * hash) + KPI_DESCRIPTION_FIELD_NUMBER; hash = (53 * hash) + getKpiDescription().hashCode(); - if (getKpiIdListCount() > 0) { - hash = (37 * hash) + KPI_ID_LIST_FIELD_NUMBER; - hash = (53 * hash) + getKpiIdListList().hashCode(); - } hash = (37 * hash) + KPI_SAMPLE_TYPE_FIELD_NUMBER; hash = (53 * hash) + kpiSampleType_; if (hasDeviceId()) { @@ -827,26 +666,13 @@ public final class Monitoring { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getKpiIdListFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); - if (kpiIdBuilder_ == null) { - kpiId_ = null; - } else { - kpiId_ = null; - kpiIdBuilder_ = null; - } kpiDescription_ = ""; - if (kpiIdListBuilder_ == null) { - kpiIdList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - } else { - kpiIdListBuilder_.clear(); - } kpiSampleType_ = 0; if (deviceIdBuilder_ == null) { @@ -899,22 +725,7 @@ public final class Monitoring { @java.lang.Override public monitoring.Monitoring.KpiDescriptor buildPartial() { monitoring.Monitoring.KpiDescriptor result = new monitoring.Monitoring.KpiDescriptor(this); - int from_bitField0_ = bitField0_; - if (kpiIdBuilder_ == null) { - result.kpiId_ = kpiId_; - } else { - result.kpiId_ = kpiIdBuilder_.build(); - } result.kpiDescription_ = kpiDescription_; - if (kpiIdListBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { - kpiIdList_ = java.util.Collections.unmodifiableList(kpiIdList_); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.kpiIdList_ = kpiIdList_; - } else { - result.kpiIdList_ = kpiIdListBuilder_.build(); - } result.kpiSampleType_ = kpiSampleType_; if (deviceIdBuilder_ == null) { result.deviceId_ = deviceId_; @@ -984,39 +795,10 @@ public final class Monitoring { public Builder mergeFrom(monitoring.Monitoring.KpiDescriptor other) { if (other == monitoring.Monitoring.KpiDescriptor.getDefaultInstance()) return this; - if (other.hasKpiId()) { - mergeKpiId(other.getKpiId()); - } if (!other.getKpiDescription().isEmpty()) { kpiDescription_ = other.kpiDescription_; onChanged(); } - if (kpiIdListBuilder_ == null) { - if (!other.kpiIdList_.isEmpty()) { - if (kpiIdList_.isEmpty()) { - kpiIdList_ = other.kpiIdList_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureKpiIdListIsMutable(); - kpiIdList_.addAll(other.kpiIdList_); - } - onChanged(); - } - } else { - if (!other.kpiIdList_.isEmpty()) { - if (kpiIdListBuilder_.isEmpty()) { - kpiIdListBuilder_.dispose(); - kpiIdListBuilder_ = null; - kpiIdList_ = other.kpiIdList_; - bitField0_ = (bitField0_ & ~0x00000001); - kpiIdListBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getKpiIdListFieldBuilder() : null; - } else { - kpiIdListBuilder_.addAllMessages(other.kpiIdList_); - } - } - } if (other.kpiSampleType_ != 0) { setKpiSampleTypeValue(other.getKpiSampleTypeValue()); } @@ -1060,130 +842,10 @@ public final class Monitoring { } return this; } - private int bitField0_; - - private monitoring.Monitoring.KpiId kpiId_; - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; - /** - * .monitoring.KpiId kpi_id = 1; - * @return Whether the kpiId field is set. - */ - public boolean hasKpiId() { - return kpiIdBuilder_ != null || kpiId_ != null; - } - /** - * .monitoring.KpiId kpi_id = 1; - * @return The kpiId. - */ - public monitoring.Monitoring.KpiId getKpiId() { - if (kpiIdBuilder_ == null) { - return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; - } else { - return kpiIdBuilder_.getMessage(); - } - } - /** - * .monitoring.KpiId kpi_id = 1; - */ - public Builder setKpiId(monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - kpiId_ = value; - onChanged(); - } else { - kpiIdBuilder_.setMessage(value); - } - - return this; - } - /** - * .monitoring.KpiId kpi_id = 1; - */ - public Builder setKpiId( - monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdBuilder_ == null) { - kpiId_ = builderForValue.build(); - onChanged(); - } else { - kpiIdBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .monitoring.KpiId kpi_id = 1; - */ - public Builder mergeKpiId(monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (kpiId_ != null) { - kpiId_ = - monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial(); - } else { - kpiId_ = value; - } - onChanged(); - } else { - kpiIdBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .monitoring.KpiId kpi_id = 1; - */ - public Builder clearKpiId() { - if (kpiIdBuilder_ == null) { - kpiId_ = null; - onChanged(); - } else { - kpiId_ = null; - kpiIdBuilder_ = null; - } - - return this; - } - /** - * .monitoring.KpiId kpi_id = 1; - */ - public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() { - - onChanged(); - return getKpiIdFieldBuilder().getBuilder(); - } - /** - * .monitoring.KpiId kpi_id = 1; - */ - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { - if (kpiIdBuilder_ != null) { - return kpiIdBuilder_.getMessageOrBuilder(); - } else { - return kpiId_ == null ? - monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; - } - } - /** - * .monitoring.KpiId kpi_id = 1; - */ - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> - getKpiIdFieldBuilder() { - if (kpiIdBuilder_ == null) { - kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( - getKpiId(), - getParentForChildren(), - isClean()); - kpiId_ = null; - } - return kpiIdBuilder_; - } private java.lang.Object kpiDescription_ = ""; /** - * string kpi_description = 2; + * string kpi_description = 1; * @return The kpiDescription. */ public java.lang.String getKpiDescription() { @@ -1199,7 +861,7 @@ public final class Monitoring { } } /** - * string kpi_description = 2; + * string kpi_description = 1; * @return The bytes for kpiDescription. */ public com.google.protobuf.ByteString @@ -1216,7 +878,7 @@ public final class Monitoring { } } /** - * string kpi_description = 2; + * string kpi_description = 1; * @param value The kpiDescription to set. * @return This builder for chaining. */ @@ -1231,7 +893,7 @@ public final class Monitoring { return this; } /** - * string kpi_description = 2; + * string kpi_description = 1; * @return This builder for chaining. */ public Builder clearKpiDescription() { @@ -1241,7 +903,7 @@ public final class Monitoring { return this; } /** - * string kpi_description = 2; + * string kpi_description = 1; * @param value The bytes for kpiDescription to set. * @return This builder for chaining. */ @@ -1257,785 +919,545 @@ public final class Monitoring { return this; } - private java.util.List kpiIdList_ = - java.util.Collections.emptyList(); - private void ensureKpiIdListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - kpiIdList_ = new java.util.ArrayList(kpiIdList_); - bitField0_ |= 0x00000001; - } + private int kpiSampleType_ = 0; + /** + * .kpi_sample_types.KpiSampleType kpi_sample_type = 2; + * @return The enum numeric value on the wire for kpiSampleType. + */ + @java.lang.Override public int getKpiSampleTypeValue() { + return kpiSampleType_; } - - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdListBuilder_; - /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 2; + * @param value The enum numeric value on the wire for kpiSampleType to set. + * @return This builder for chaining. */ - public java.util.List getKpiIdListList() { - if (kpiIdListBuilder_ == null) { - return java.util.Collections.unmodifiableList(kpiIdList_); - } else { - return kpiIdListBuilder_.getMessageList(); - } + public Builder setKpiSampleTypeValue(int value) { + + kpiSampleType_ = value; + onChanged(); + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 2; + * @return The kpiSampleType. */ - public int getKpiIdListCount() { - if (kpiIdListBuilder_ == null) { - return kpiIdList_.size(); - } else { - return kpiIdListBuilder_.getCount(); + @java.lang.Override + public kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType() { + @SuppressWarnings("deprecation") + kpi_sample_types.KpiSampleTypes.KpiSampleType result = kpi_sample_types.KpiSampleTypes.KpiSampleType.valueOf(kpiSampleType_); + return result == null ? kpi_sample_types.KpiSampleTypes.KpiSampleType.UNRECOGNIZED : result; + } + /** + * .kpi_sample_types.KpiSampleType kpi_sample_type = 2; + * @param value The kpiSampleType to set. + * @return This builder for chaining. + */ + public Builder setKpiSampleType(kpi_sample_types.KpiSampleTypes.KpiSampleType value) { + if (value == null) { + throw new NullPointerException(); } + + kpiSampleType_ = value.getNumber(); + onChanged(); + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 2; + * @return This builder for chaining. */ - public monitoring.Monitoring.KpiId getKpiIdList(int index) { - if (kpiIdListBuilder_ == null) { - return kpiIdList_.get(index); + public Builder clearKpiSampleType() { + + kpiSampleType_ = 0; + onChanged(); + return this; + } + + private context.ContextOuterClass.DeviceId deviceId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder> deviceIdBuilder_; + /** + * .context.DeviceId device_id = 3; + * @return Whether the deviceId field is set. + */ + public boolean hasDeviceId() { + return deviceIdBuilder_ != null || deviceId_ != null; + } + /** + * .context.DeviceId device_id = 3; + * @return The deviceId. + */ + public context.ContextOuterClass.DeviceId getDeviceId() { + if (deviceIdBuilder_ == null) { + return deviceId_ == null ? context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; } else { - return kpiIdListBuilder_.getMessage(index); + return deviceIdBuilder_.getMessage(); } } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.DeviceId device_id = 3; */ - public Builder setKpiIdList( - int index, monitoring.Monitoring.KpiId value) { - if (kpiIdListBuilder_ == null) { + public Builder setDeviceId(context.ContextOuterClass.DeviceId value) { + if (deviceIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureKpiIdListIsMutable(); - kpiIdList_.set(index, value); + deviceId_ = value; onChanged(); } else { - kpiIdListBuilder_.setMessage(index, value); + deviceIdBuilder_.setMessage(value); } + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.DeviceId device_id = 3; */ - public Builder setKpiIdList( - int index, monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdListBuilder_ == null) { - ensureKpiIdListIsMutable(); - kpiIdList_.set(index, builderForValue.build()); + public Builder setDeviceId( + context.ContextOuterClass.DeviceId.Builder builderForValue) { + if (deviceIdBuilder_ == null) { + deviceId_ = builderForValue.build(); onChanged(); } else { - kpiIdListBuilder_.setMessage(index, builderForValue.build()); + deviceIdBuilder_.setMessage(builderForValue.build()); } + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.DeviceId device_id = 3; */ - public Builder addKpiIdList(monitoring.Monitoring.KpiId value) { - if (kpiIdListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); + public Builder mergeDeviceId(context.ContextOuterClass.DeviceId value) { + if (deviceIdBuilder_ == null) { + if (deviceId_ != null) { + deviceId_ = + context.ContextOuterClass.DeviceId.newBuilder(deviceId_).mergeFrom(value).buildPartial(); + } else { + deviceId_ = value; } - ensureKpiIdListIsMutable(); - kpiIdList_.add(value); onChanged(); } else { - kpiIdListBuilder_.addMessage(value); + deviceIdBuilder_.mergeFrom(value); } + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.DeviceId device_id = 3; */ - public Builder addKpiIdList( - int index, monitoring.Monitoring.KpiId value) { - if (kpiIdListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiIdListIsMutable(); - kpiIdList_.add(index, value); + public Builder clearDeviceId() { + if (deviceIdBuilder_ == null) { + deviceId_ = null; onChanged(); } else { - kpiIdListBuilder_.addMessage(index, value); + deviceId_ = null; + deviceIdBuilder_ = null; } + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.DeviceId device_id = 3; */ - public Builder addKpiIdList( - monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdListBuilder_ == null) { - ensureKpiIdListIsMutable(); - kpiIdList_.add(builderForValue.build()); - onChanged(); + public context.ContextOuterClass.DeviceId.Builder getDeviceIdBuilder() { + + onChanged(); + return getDeviceIdFieldBuilder().getBuilder(); + } + /** + * .context.DeviceId device_id = 3; + */ + public context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder() { + if (deviceIdBuilder_ != null) { + return deviceIdBuilder_.getMessageOrBuilder(); } else { - kpiIdListBuilder_.addMessage(builderForValue.build()); + return deviceId_ == null ? + context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; } - return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.DeviceId device_id = 3; */ - public Builder addKpiIdList( - int index, monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdListBuilder_ == null) { - ensureKpiIdListIsMutable(); - kpiIdList_.add(index, builderForValue.build()); - onChanged(); - } else { - kpiIdListBuilder_.addMessage(index, builderForValue.build()); + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder> + getDeviceIdFieldBuilder() { + if (deviceIdBuilder_ == null) { + deviceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder>( + getDeviceId(), + getParentForChildren(), + isClean()); + deviceId_ = null; } - return this; + return deviceIdBuilder_; } + + private context.ContextOuterClass.EndPointId endpointId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder> endpointIdBuilder_; /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.EndPointId endpoint_id = 4; + * @return Whether the endpointId field is set. */ - public Builder addAllKpiIdList( - java.lang.Iterable values) { - if (kpiIdListBuilder_ == null) { - ensureKpiIdListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, kpiIdList_); - onChanged(); + public boolean hasEndpointId() { + return endpointIdBuilder_ != null || endpointId_ != null; + } + /** + * .context.EndPointId endpoint_id = 4; + * @return The endpointId. + */ + public context.ContextOuterClass.EndPointId getEndpointId() { + if (endpointIdBuilder_ == null) { + return endpointId_ == null ? context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; } else { - kpiIdListBuilder_.addAllMessages(values); + return endpointIdBuilder_.getMessage(); } - return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.EndPointId endpoint_id = 4; */ - public Builder clearKpiIdList() { - if (kpiIdListBuilder_ == null) { - kpiIdList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + public Builder setEndpointId(context.ContextOuterClass.EndPointId value) { + if (endpointIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + endpointId_ = value; onChanged(); } else { - kpiIdListBuilder_.clear(); + endpointIdBuilder_.setMessage(value); } + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.EndPointId endpoint_id = 4; */ - public Builder removeKpiIdList(int index) { - if (kpiIdListBuilder_ == null) { - ensureKpiIdListIsMutable(); - kpiIdList_.remove(index); + public Builder setEndpointId( + context.ContextOuterClass.EndPointId.Builder builderForValue) { + if (endpointIdBuilder_ == null) { + endpointId_ = builderForValue.build(); onChanged(); } else { - kpiIdListBuilder_.remove(index); + endpointIdBuilder_.setMessage(builderForValue.build()); } + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - public monitoring.Monitoring.KpiId.Builder getKpiIdListBuilder( - int index) { - return getKpiIdListFieldBuilder().getBuilder(index); - } - /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.EndPointId endpoint_id = 4; */ - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdListOrBuilder( - int index) { - if (kpiIdListBuilder_ == null) { - return kpiIdList_.get(index); } else { - return kpiIdListBuilder_.getMessageOrBuilder(index); + public Builder mergeEndpointId(context.ContextOuterClass.EndPointId value) { + if (endpointIdBuilder_ == null) { + if (endpointId_ != null) { + endpointId_ = + context.ContextOuterClass.EndPointId.newBuilder(endpointId_).mergeFrom(value).buildPartial(); + } else { + endpointId_ = value; + } + onChanged(); + } else { + endpointIdBuilder_.mergeFrom(value); } + + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.EndPointId endpoint_id = 4; */ - public java.util.List - getKpiIdListOrBuilderList() { - if (kpiIdListBuilder_ != null) { - return kpiIdListBuilder_.getMessageOrBuilderList(); + public Builder clearEndpointId() { + if (endpointIdBuilder_ == null) { + endpointId_ = null; + onChanged(); } else { - return java.util.Collections.unmodifiableList(kpiIdList_); + endpointId_ = null; + endpointIdBuilder_ = null; } + + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.EndPointId endpoint_id = 4; */ - public monitoring.Monitoring.KpiId.Builder addKpiIdListBuilder() { - return getKpiIdListFieldBuilder().addBuilder( - monitoring.Monitoring.KpiId.getDefaultInstance()); + public context.ContextOuterClass.EndPointId.Builder getEndpointIdBuilder() { + + onChanged(); + return getEndpointIdFieldBuilder().getBuilder(); } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.EndPointId endpoint_id = 4; */ - public monitoring.Monitoring.KpiId.Builder addKpiIdListBuilder( - int index) { - return getKpiIdListFieldBuilder().addBuilder( - index, monitoring.Monitoring.KpiId.getDefaultInstance()); + public context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder() { + if (endpointIdBuilder_ != null) { + return endpointIdBuilder_.getMessageOrBuilder(); + } else { + return endpointId_ == null ? + context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; + } } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.EndPointId endpoint_id = 4; */ - public java.util.List - getKpiIdListBuilderList() { - return getKpiIdListFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> - getKpiIdListFieldBuilder() { - if (kpiIdListBuilder_ == null) { - kpiIdListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( - kpiIdList_, - ((bitField0_ & 0x00000001) != 0), + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder> + getEndpointIdFieldBuilder() { + if (endpointIdBuilder_ == null) { + endpointIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder>( + getEndpointId(), getParentForChildren(), isClean()); - kpiIdList_ = null; + endpointId_ = null; } - return kpiIdListBuilder_; + return endpointIdBuilder_; } - private int kpiSampleType_ = 0; + private context.ContextOuterClass.ServiceId serviceId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder> serviceIdBuilder_; /** - * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; - * @return The enum numeric value on the wire for kpiSampleType. + * .context.ServiceId service_id = 5; + * @return Whether the serviceId field is set. */ - @java.lang.Override public int getKpiSampleTypeValue() { - return kpiSampleType_; + public boolean hasServiceId() { + return serviceIdBuilder_ != null || serviceId_ != null; } /** - * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; - * @param value The enum numeric value on the wire for kpiSampleType to set. - * @return This builder for chaining. + * .context.ServiceId service_id = 5; + * @return The serviceId. */ - public Builder setKpiSampleTypeValue(int value) { - - kpiSampleType_ = value; - onChanged(); - return this; + public context.ContextOuterClass.ServiceId getServiceId() { + if (serviceIdBuilder_ == null) { + return serviceId_ == null ? context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; + } else { + return serviceIdBuilder_.getMessage(); + } } /** - * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; - * @return The kpiSampleType. + * .context.ServiceId service_id = 5; */ - @java.lang.Override - public kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType() { - @SuppressWarnings("deprecation") - kpi_sample_types.KpiSampleTypes.KpiSampleType result = kpi_sample_types.KpiSampleTypes.KpiSampleType.valueOf(kpiSampleType_); - return result == null ? kpi_sample_types.KpiSampleTypes.KpiSampleType.UNRECOGNIZED : result; + public Builder setServiceId(context.ContextOuterClass.ServiceId value) { + if (serviceIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + serviceId_ = value; + onChanged(); + } else { + serviceIdBuilder_.setMessage(value); + } + + return this; } /** - * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; - * @param value The kpiSampleType to set. - * @return This builder for chaining. - */ - public Builder setKpiSampleType(kpi_sample_types.KpiSampleTypes.KpiSampleType value) { - if (value == null) { - throw new NullPointerException(); - } - - kpiSampleType_ = value.getNumber(); - onChanged(); - return this; - } - /** - * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; - * @return This builder for chaining. - */ - public Builder clearKpiSampleType() { - - kpiSampleType_ = 0; - onChanged(); - return this; - } - - private context.ContextOuterClass.DeviceId deviceId_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder> deviceIdBuilder_; - /** - * .context.DeviceId device_id = 5; - * @return Whether the deviceId field is set. - */ - public boolean hasDeviceId() { - return deviceIdBuilder_ != null || deviceId_ != null; - } - /** - * .context.DeviceId device_id = 5; - * @return The deviceId. - */ - public context.ContextOuterClass.DeviceId getDeviceId() { - if (deviceIdBuilder_ == null) { - return deviceId_ == null ? context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; - } else { - return deviceIdBuilder_.getMessage(); - } - } - /** - * .context.DeviceId device_id = 5; - */ - public Builder setDeviceId(context.ContextOuterClass.DeviceId value) { - if (deviceIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - deviceId_ = value; - onChanged(); - } else { - deviceIdBuilder_.setMessage(value); - } - - return this; - } - /** - * .context.DeviceId device_id = 5; + * .context.ServiceId service_id = 5; */ - public Builder setDeviceId( - context.ContextOuterClass.DeviceId.Builder builderForValue) { - if (deviceIdBuilder_ == null) { - deviceId_ = builderForValue.build(); + public Builder setServiceId( + context.ContextOuterClass.ServiceId.Builder builderForValue) { + if (serviceIdBuilder_ == null) { + serviceId_ = builderForValue.build(); onChanged(); } else { - deviceIdBuilder_.setMessage(builderForValue.build()); + serviceIdBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .context.DeviceId device_id = 5; + * .context.ServiceId service_id = 5; */ - public Builder mergeDeviceId(context.ContextOuterClass.DeviceId value) { - if (deviceIdBuilder_ == null) { - if (deviceId_ != null) { - deviceId_ = - context.ContextOuterClass.DeviceId.newBuilder(deviceId_).mergeFrom(value).buildPartial(); + public Builder mergeServiceId(context.ContextOuterClass.ServiceId value) { + if (serviceIdBuilder_ == null) { + if (serviceId_ != null) { + serviceId_ = + context.ContextOuterClass.ServiceId.newBuilder(serviceId_).mergeFrom(value).buildPartial(); } else { - deviceId_ = value; + serviceId_ = value; } onChanged(); } else { - deviceIdBuilder_.mergeFrom(value); + serviceIdBuilder_.mergeFrom(value); } return this; } /** - * .context.DeviceId device_id = 5; + * .context.ServiceId service_id = 5; */ - public Builder clearDeviceId() { - if (deviceIdBuilder_ == null) { - deviceId_ = null; + public Builder clearServiceId() { + if (serviceIdBuilder_ == null) { + serviceId_ = null; onChanged(); } else { - deviceId_ = null; - deviceIdBuilder_ = null; + serviceId_ = null; + serviceIdBuilder_ = null; } return this; } /** - * .context.DeviceId device_id = 5; + * .context.ServiceId service_id = 5; */ - public context.ContextOuterClass.DeviceId.Builder getDeviceIdBuilder() { + public context.ContextOuterClass.ServiceId.Builder getServiceIdBuilder() { onChanged(); - return getDeviceIdFieldBuilder().getBuilder(); + return getServiceIdFieldBuilder().getBuilder(); } /** - * .context.DeviceId device_id = 5; + * .context.ServiceId service_id = 5; */ - public context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder() { - if (deviceIdBuilder_ != null) { - return deviceIdBuilder_.getMessageOrBuilder(); + public context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder() { + if (serviceIdBuilder_ != null) { + return serviceIdBuilder_.getMessageOrBuilder(); } else { - return deviceId_ == null ? - context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; + return serviceId_ == null ? + context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; } } /** - * .context.DeviceId device_id = 5; + * .context.ServiceId service_id = 5; */ private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder> - getDeviceIdFieldBuilder() { - if (deviceIdBuilder_ == null) { - deviceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder>( - getDeviceId(), + context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder> + getServiceIdFieldBuilder() { + if (serviceIdBuilder_ == null) { + serviceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder>( + getServiceId(), getParentForChildren(), isClean()); - deviceId_ = null; + serviceId_ = null; } - return deviceIdBuilder_; + return serviceIdBuilder_; } - private context.ContextOuterClass.EndPointId endpointId_; + private context.ContextOuterClass.SliceId sliceId_; private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder> endpointIdBuilder_; + context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder> sliceIdBuilder_; /** - * .context.EndPointId endpoint_id = 6; - * @return Whether the endpointId field is set. + * .context.SliceId slice_id = 6; + * @return Whether the sliceId field is set. */ - public boolean hasEndpointId() { - return endpointIdBuilder_ != null || endpointId_ != null; + public boolean hasSliceId() { + return sliceIdBuilder_ != null || sliceId_ != null; } /** - * .context.EndPointId endpoint_id = 6; - * @return The endpointId. + * .context.SliceId slice_id = 6; + * @return The sliceId. */ - public context.ContextOuterClass.EndPointId getEndpointId() { - if (endpointIdBuilder_ == null) { - return endpointId_ == null ? context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; + public context.ContextOuterClass.SliceId getSliceId() { + if (sliceIdBuilder_ == null) { + return sliceId_ == null ? context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; } else { - return endpointIdBuilder_.getMessage(); + return sliceIdBuilder_.getMessage(); } } /** - * .context.EndPointId endpoint_id = 6; + * .context.SliceId slice_id = 6; */ - public Builder setEndpointId(context.ContextOuterClass.EndPointId value) { - if (endpointIdBuilder_ == null) { + public Builder setSliceId(context.ContextOuterClass.SliceId value) { + if (sliceIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - endpointId_ = value; + sliceId_ = value; onChanged(); } else { - endpointIdBuilder_.setMessage(value); + sliceIdBuilder_.setMessage(value); } return this; } /** - * .context.EndPointId endpoint_id = 6; + * .context.SliceId slice_id = 6; */ - public Builder setEndpointId( - context.ContextOuterClass.EndPointId.Builder builderForValue) { - if (endpointIdBuilder_ == null) { - endpointId_ = builderForValue.build(); + public Builder setSliceId( + context.ContextOuterClass.SliceId.Builder builderForValue) { + if (sliceIdBuilder_ == null) { + sliceId_ = builderForValue.build(); onChanged(); } else { - endpointIdBuilder_.setMessage(builderForValue.build()); + sliceIdBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .context.EndPointId endpoint_id = 6; + * .context.SliceId slice_id = 6; */ - public Builder mergeEndpointId(context.ContextOuterClass.EndPointId value) { - if (endpointIdBuilder_ == null) { - if (endpointId_ != null) { - endpointId_ = - context.ContextOuterClass.EndPointId.newBuilder(endpointId_).mergeFrom(value).buildPartial(); + public Builder mergeSliceId(context.ContextOuterClass.SliceId value) { + if (sliceIdBuilder_ == null) { + if (sliceId_ != null) { + sliceId_ = + context.ContextOuterClass.SliceId.newBuilder(sliceId_).mergeFrom(value).buildPartial(); } else { - endpointId_ = value; + sliceId_ = value; } onChanged(); } else { - endpointIdBuilder_.mergeFrom(value); + sliceIdBuilder_.mergeFrom(value); } return this; } /** - * .context.EndPointId endpoint_id = 6; + * .context.SliceId slice_id = 6; */ - public Builder clearEndpointId() { - if (endpointIdBuilder_ == null) { - endpointId_ = null; + public Builder clearSliceId() { + if (sliceIdBuilder_ == null) { + sliceId_ = null; onChanged(); } else { - endpointId_ = null; - endpointIdBuilder_ = null; + sliceId_ = null; + sliceIdBuilder_ = null; } return this; } /** - * .context.EndPointId endpoint_id = 6; + * .context.SliceId slice_id = 6; */ - public context.ContextOuterClass.EndPointId.Builder getEndpointIdBuilder() { + public context.ContextOuterClass.SliceId.Builder getSliceIdBuilder() { onChanged(); - return getEndpointIdFieldBuilder().getBuilder(); + return getSliceIdFieldBuilder().getBuilder(); } /** - * .context.EndPointId endpoint_id = 6; + * .context.SliceId slice_id = 6; */ - public context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder() { - if (endpointIdBuilder_ != null) { - return endpointIdBuilder_.getMessageOrBuilder(); + public context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder() { + if (sliceIdBuilder_ != null) { + return sliceIdBuilder_.getMessageOrBuilder(); } else { - return endpointId_ == null ? - context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; + return sliceId_ == null ? + context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; } } /** - * .context.EndPointId endpoint_id = 6; + * .context.SliceId slice_id = 6; */ private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder> - getEndpointIdFieldBuilder() { - if (endpointIdBuilder_ == null) { - endpointIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder>( - getEndpointId(), + context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder> + getSliceIdFieldBuilder() { + if (sliceIdBuilder_ == null) { + sliceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder>( + getSliceId(), getParentForChildren(), isClean()); - endpointId_ = null; + sliceId_ = null; } - return endpointIdBuilder_; + return sliceIdBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); } - private context.ContextOuterClass.ServiceId serviceId_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder> serviceIdBuilder_; - /** - * .context.ServiceId service_id = 7; - * @return Whether the serviceId field is set. - */ - public boolean hasServiceId() { - return serviceIdBuilder_ != null || serviceId_ != null; - } - /** - * .context.ServiceId service_id = 7; - * @return The serviceId. - */ - public context.ContextOuterClass.ServiceId getServiceId() { - if (serviceIdBuilder_ == null) { - return serviceId_ == null ? context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; - } else { - return serviceIdBuilder_.getMessage(); - } - } - /** - * .context.ServiceId service_id = 7; - */ - public Builder setServiceId(context.ContextOuterClass.ServiceId value) { - if (serviceIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - serviceId_ = value; - onChanged(); - } else { - serviceIdBuilder_.setMessage(value); - } - - return this; - } - /** - * .context.ServiceId service_id = 7; - */ - public Builder setServiceId( - context.ContextOuterClass.ServiceId.Builder builderForValue) { - if (serviceIdBuilder_ == null) { - serviceId_ = builderForValue.build(); - onChanged(); - } else { - serviceIdBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .context.ServiceId service_id = 7; - */ - public Builder mergeServiceId(context.ContextOuterClass.ServiceId value) { - if (serviceIdBuilder_ == null) { - if (serviceId_ != null) { - serviceId_ = - context.ContextOuterClass.ServiceId.newBuilder(serviceId_).mergeFrom(value).buildPartial(); - } else { - serviceId_ = value; - } - onChanged(); - } else { - serviceIdBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .context.ServiceId service_id = 7; - */ - public Builder clearServiceId() { - if (serviceIdBuilder_ == null) { - serviceId_ = null; - onChanged(); - } else { - serviceId_ = null; - serviceIdBuilder_ = null; - } - - return this; - } - /** - * .context.ServiceId service_id = 7; - */ - public context.ContextOuterClass.ServiceId.Builder getServiceIdBuilder() { - - onChanged(); - return getServiceIdFieldBuilder().getBuilder(); - } - /** - * .context.ServiceId service_id = 7; - */ - public context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder() { - if (serviceIdBuilder_ != null) { - return serviceIdBuilder_.getMessageOrBuilder(); - } else { - return serviceId_ == null ? - context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; - } - } - /** - * .context.ServiceId service_id = 7; - */ - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder> - getServiceIdFieldBuilder() { - if (serviceIdBuilder_ == null) { - serviceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder>( - getServiceId(), - getParentForChildren(), - isClean()); - serviceId_ = null; - } - return serviceIdBuilder_; - } - - private context.ContextOuterClass.SliceId sliceId_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder> sliceIdBuilder_; - /** - * .context.SliceId slice_id = 8; - * @return Whether the sliceId field is set. - */ - public boolean hasSliceId() { - return sliceIdBuilder_ != null || sliceId_ != null; - } - /** - * .context.SliceId slice_id = 8; - * @return The sliceId. - */ - public context.ContextOuterClass.SliceId getSliceId() { - if (sliceIdBuilder_ == null) { - return sliceId_ == null ? context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; - } else { - return sliceIdBuilder_.getMessage(); - } - } - /** - * .context.SliceId slice_id = 8; - */ - public Builder setSliceId(context.ContextOuterClass.SliceId value) { - if (sliceIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - sliceId_ = value; - onChanged(); - } else { - sliceIdBuilder_.setMessage(value); - } - - return this; - } - /** - * .context.SliceId slice_id = 8; - */ - public Builder setSliceId( - context.ContextOuterClass.SliceId.Builder builderForValue) { - if (sliceIdBuilder_ == null) { - sliceId_ = builderForValue.build(); - onChanged(); - } else { - sliceIdBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .context.SliceId slice_id = 8; - */ - public Builder mergeSliceId(context.ContextOuterClass.SliceId value) { - if (sliceIdBuilder_ == null) { - if (sliceId_ != null) { - sliceId_ = - context.ContextOuterClass.SliceId.newBuilder(sliceId_).mergeFrom(value).buildPartial(); - } else { - sliceId_ = value; - } - onChanged(); - } else { - sliceIdBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .context.SliceId slice_id = 8; - */ - public Builder clearSliceId() { - if (sliceIdBuilder_ == null) { - sliceId_ = null; - onChanged(); - } else { - sliceId_ = null; - sliceIdBuilder_ = null; - } - - return this; - } - /** - * .context.SliceId slice_id = 8; - */ - public context.ContextOuterClass.SliceId.Builder getSliceIdBuilder() { - - onChanged(); - return getSliceIdFieldBuilder().getBuilder(); - } - /** - * .context.SliceId slice_id = 8; - */ - public context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder() { - if (sliceIdBuilder_ != null) { - return sliceIdBuilder_.getMessageOrBuilder(); - } else { - return sliceId_ == null ? - context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; - } - } - /** - * .context.SliceId slice_id = 8; - */ - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder> - getSliceIdFieldBuilder() { - if (sliceIdBuilder_ == null) { - sliceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder>( - getSliceId(), - getParentForChildren(), - isClean()); - sliceId_ = null; - } - return sliceIdBuilder_; - } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); } @@ -2079,61 +1501,140 @@ public final class Monitoring { } - public interface MonitorKpiRequestOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.MonitorKpiRequest) + public interface BundleKpiDescriptorOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.BundleKpiDescriptor) com.google.protobuf.MessageOrBuilder { /** - * .monitoring.KpiId kpi_id = 1; - * @return Whether the kpiId field is set. + * string kpi_description = 1; + * @return The kpiDescription. */ - boolean hasKpiId(); + java.lang.String getKpiDescription(); /** - * .monitoring.KpiId kpi_id = 1; - * @return The kpiId. + * string kpi_description = 1; + * @return The bytes for kpiDescription. */ - monitoring.Monitoring.KpiId getKpiId(); + com.google.protobuf.ByteString + getKpiDescriptionBytes(); + /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 2; */ - monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder(); - + java.util.List + getKpiIdListList(); /** - * float monitoring_window_s = 2; - * @return The monitoringWindowS. + * repeated .monitoring.KpiId kpi_id_list = 2; */ - float getMonitoringWindowS(); - + monitoring.Monitoring.KpiId getKpiIdList(int index); /** - * 
-     * Pending add field to reflect Available Device Protocols
-     *
- * - * float sampling_rate_s = 3; - * @return The samplingRateS. + * repeated .monitoring.KpiId kpi_id_list = 2; */ - float getSamplingRateS(); + int getKpiIdListCount(); + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + java.util.List + getKpiIdListOrBuilderList(); + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + monitoring.Monitoring.KpiIdOrBuilder getKpiIdListOrBuilder( + int index); + + /** + * .kpi_sample_types.KpiSampleType kpi_sample_type = 3; + * @return The enum numeric value on the wire for kpiSampleType. + */ + int getKpiSampleTypeValue(); + /** + * .kpi_sample_types.KpiSampleType kpi_sample_type = 3; + * @return The kpiSampleType. + */ + kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType(); + + /** + * .context.DeviceId device_id = 4; + * @return Whether the deviceId field is set. + */ + boolean hasDeviceId(); + /** + * .context.DeviceId device_id = 4; + * @return The deviceId. + */ + context.ContextOuterClass.DeviceId getDeviceId(); + /** + * .context.DeviceId device_id = 4; + */ + context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder(); + + /** + * .context.EndPointId endpoint_id = 5; + * @return Whether the endpointId field is set. + */ + boolean hasEndpointId(); + /** + * .context.EndPointId endpoint_id = 5; + * @return The endpointId. + */ + context.ContextOuterClass.EndPointId getEndpointId(); + /** + * .context.EndPointId endpoint_id = 5; + */ + context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder(); + + /** + * .context.ServiceId service_id = 6; + * @return Whether the serviceId field is set. + */ + boolean hasServiceId(); + /** + * .context.ServiceId service_id = 6; + * @return The serviceId. + */ + context.ContextOuterClass.ServiceId getServiceId(); + /** + * .context.ServiceId service_id = 6; + */ + context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder(); + + /** + * .context.SliceId slice_id = 7; + * @return Whether the sliceId field is set. + */ + boolean hasSliceId(); + /** + * .context.SliceId slice_id = 7; + * @return The sliceId. + */ + context.ContextOuterClass.SliceId getSliceId(); + /** + * .context.SliceId slice_id = 7; + */ + context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder(); } /** - * Protobuf type {@code monitoring.MonitorKpiRequest} + * Protobuf type {@code monitoring.BundleKpiDescriptor} */ - public static final class MonitorKpiRequest extends + public static final class BundleKpiDescriptor extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.MonitorKpiRequest) - MonitorKpiRequestOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.BundleKpiDescriptor) + BundleKpiDescriptorOrBuilder { private static final long serialVersionUID = 0L; - // Use MonitorKpiRequest.newBuilder() to construct. - private MonitorKpiRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use BundleKpiDescriptor.newBuilder() to construct. + private BundleKpiDescriptor(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private MonitorKpiRequest() { + private BundleKpiDescriptor() { + kpiDescription_ = ""; + kpiIdList_ = java.util.Collections.emptyList(); + kpiSampleType_ = 0; } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new MonitorKpiRequest(); + return new BundleKpiDescriptor(); } @java.lang.Override @@ -2141,7 +1642,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private MonitorKpiRequest( + private BundleKpiDescriptor( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -2149,6 +1650,7 @@ public final class Monitoring { if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } + int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -2160,26 +1662,76 @@ public final class Monitoring { done = true; break; case 10: { - monitoring.Monitoring.KpiId.Builder subBuilder = null; - if (kpiId_ != null) { - subBuilder = kpiId_.toBuilder(); + java.lang.String s = input.readStringRequireUtf8(); + + kpiDescription_ = s; + break; + } + case 18: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + kpiIdList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; } - kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry); + kpiIdList_.add( + input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry)); + break; + } + case 24: { + int rawValue = input.readEnum(); + + kpiSampleType_ = rawValue; + break; + } + case 34: { + context.ContextOuterClass.DeviceId.Builder subBuilder = null; + if (deviceId_ != null) { + subBuilder = deviceId_.toBuilder(); + } + deviceId_ = input.readMessage(context.ContextOuterClass.DeviceId.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(kpiId_); - kpiId_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(deviceId_); + deviceId_ = subBuilder.buildPartial(); } break; } - case 21: { + case 42: { + context.ContextOuterClass.EndPointId.Builder subBuilder = null; + if (endpointId_ != null) { + subBuilder = endpointId_.toBuilder(); + } + endpointId_ = input.readMessage(context.ContextOuterClass.EndPointId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(endpointId_); + endpointId_ = subBuilder.buildPartial(); + } - monitoringWindowS_ = input.readFloat(); break; } - case 29: { + case 50: { + context.ContextOuterClass.ServiceId.Builder subBuilder = null; + if (serviceId_ != null) { + subBuilder = serviceId_.toBuilder(); + } + serviceId_ = input.readMessage(context.ContextOuterClass.ServiceId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(serviceId_); + serviceId_ = subBuilder.buildPartial(); + } + + break; + } + case 58: { + context.ContextOuterClass.SliceId.Builder subBuilder = null; + if (sliceId_ != null) { + subBuilder = sliceId_.toBuilder(); + } + sliceId_ = input.readMessage(context.ContextOuterClass.SliceId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(sliceId_); + sliceId_ = subBuilder.buildPartial(); + } - samplingRateS_ = input.readFloat(); break; } default: { @@ -2197,99 +1749,263 @@ public final class Monitoring { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + kpiIdList_ = java.util.Collections.unmodifiableList(kpiIdList_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_descriptor; + return monitoring.Monitoring.internal_static_monitoring_BundleKpiDescriptor_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_BundleKpiDescriptor_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.MonitorKpiRequest.class, monitoring.Monitoring.MonitorKpiRequest.Builder.class); + monitoring.Monitoring.BundleKpiDescriptor.class, monitoring.Monitoring.BundleKpiDescriptor.Builder.class); } - public static final int KPI_ID_FIELD_NUMBER = 1; - private monitoring.Monitoring.KpiId kpiId_; + public static final int KPI_DESCRIPTION_FIELD_NUMBER = 1; + private volatile java.lang.Object kpiDescription_; /** - * .monitoring.KpiId kpi_id = 1; - * @return Whether the kpiId field is set. + * string kpi_description = 1; + * @return The kpiDescription. */ @java.lang.Override - public boolean hasKpiId() { - return kpiId_ != null; + public java.lang.String getKpiDescription() { + java.lang.Object ref = kpiDescription_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kpiDescription_ = s; + return s; + } } /** - * .monitoring.KpiId kpi_id = 1; - * @return The kpiId. + * string kpi_description = 1; + * @return The bytes for kpiDescription. */ @java.lang.Override - public monitoring.Monitoring.KpiId getKpiId() { - return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + public com.google.protobuf.ByteString + getKpiDescriptionBytes() { + java.lang.Object ref = kpiDescription_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + kpiDescription_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } } + + public static final int KPI_ID_LIST_FIELD_NUMBER = 2; + private java.util.List kpiIdList_; /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 2; */ @java.lang.Override - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { - return getKpiId(); + public java.util.List getKpiIdListList() { + return kpiIdList_; } - - public static final int MONITORING_WINDOW_S_FIELD_NUMBER = 2; - private float monitoringWindowS_; /** - * float monitoring_window_s = 2; - * @return The monitoringWindowS. + * repeated .monitoring.KpiId kpi_id_list = 2; */ @java.lang.Override - public float getMonitoringWindowS() { - return monitoringWindowS_; + public java.util.List + getKpiIdListOrBuilderList() { + return kpiIdList_; } - - public static final int SAMPLING_RATE_S_FIELD_NUMBER = 3; - private float samplingRateS_; /** - * 
-     * Pending add field to reflect Available Device Protocols
-     *
- * - * float sampling_rate_s = 3; - * @return The samplingRateS. + * repeated .monitoring.KpiId kpi_id_list = 2; */ @java.lang.Override - public float getSamplingRateS() { - return samplingRateS_; + public int getKpiIdListCount() { + return kpiIdList_.size(); } - - private byte memoizedIsInitialized = -1; + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ @java.lang.Override - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - memoizedIsInitialized = 1; - return true; + public monitoring.Monitoring.KpiId getKpiIdList(int index) { + return kpiIdList_.get(index); } - + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - if (kpiId_ != null) { - output.writeMessage(1, getKpiId()); - } - if (monitoringWindowS_ != 0F) { - output.writeFloat(2, monitoringWindowS_); - } - if (samplingRateS_ != 0F) { - output.writeFloat(3, samplingRateS_); - } - unknownFields.writeTo(output); + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdListOrBuilder( + int index) { + return kpiIdList_.get(index); + } + + public static final int KPI_SAMPLE_TYPE_FIELD_NUMBER = 3; + private int kpiSampleType_; + /** + * .kpi_sample_types.KpiSampleType kpi_sample_type = 3; + * @return The enum numeric value on the wire for kpiSampleType. + */ + @java.lang.Override public int getKpiSampleTypeValue() { + return kpiSampleType_; + } + /** + * .kpi_sample_types.KpiSampleType kpi_sample_type = 3; + * @return The kpiSampleType. + */ + @java.lang.Override public kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType() { + @SuppressWarnings("deprecation") + kpi_sample_types.KpiSampleTypes.KpiSampleType result = kpi_sample_types.KpiSampleTypes.KpiSampleType.valueOf(kpiSampleType_); + return result == null ? kpi_sample_types.KpiSampleTypes.KpiSampleType.UNRECOGNIZED : result; + } + + public static final int DEVICE_ID_FIELD_NUMBER = 4; + private context.ContextOuterClass.DeviceId deviceId_; + /** + * .context.DeviceId device_id = 4; + * @return Whether the deviceId field is set. + */ + @java.lang.Override + public boolean hasDeviceId() { + return deviceId_ != null; + } + /** + * .context.DeviceId device_id = 4; + * @return The deviceId. + */ + @java.lang.Override + public context.ContextOuterClass.DeviceId getDeviceId() { + return deviceId_ == null ? context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; + } + /** + * .context.DeviceId device_id = 4; + */ + @java.lang.Override + public context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder() { + return getDeviceId(); + } + + public static final int ENDPOINT_ID_FIELD_NUMBER = 5; + private context.ContextOuterClass.EndPointId endpointId_; + /** + * .context.EndPointId endpoint_id = 5; + * @return Whether the endpointId field is set. + */ + @java.lang.Override + public boolean hasEndpointId() { + return endpointId_ != null; + } + /** + * .context.EndPointId endpoint_id = 5; + * @return The endpointId. + */ + @java.lang.Override + public context.ContextOuterClass.EndPointId getEndpointId() { + return endpointId_ == null ? context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; + } + /** + * .context.EndPointId endpoint_id = 5; + */ + @java.lang.Override + public context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder() { + return getEndpointId(); + } + + public static final int SERVICE_ID_FIELD_NUMBER = 6; + private context.ContextOuterClass.ServiceId serviceId_; + /** + * .context.ServiceId service_id = 6; + * @return Whether the serviceId field is set. + */ + @java.lang.Override + public boolean hasServiceId() { + return serviceId_ != null; + } + /** + * .context.ServiceId service_id = 6; + * @return The serviceId. + */ + @java.lang.Override + public context.ContextOuterClass.ServiceId getServiceId() { + return serviceId_ == null ? context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; + } + /** + * .context.ServiceId service_id = 6; + */ + @java.lang.Override + public context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder() { + return getServiceId(); + } + + public static final int SLICE_ID_FIELD_NUMBER = 7; + private context.ContextOuterClass.SliceId sliceId_; + /** + * .context.SliceId slice_id = 7; + * @return Whether the sliceId field is set. + */ + @java.lang.Override + public boolean hasSliceId() { + return sliceId_ != null; + } + /** + * .context.SliceId slice_id = 7; + * @return The sliceId. + */ + @java.lang.Override + public context.ContextOuterClass.SliceId getSliceId() { + return sliceId_ == null ? context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; + } + /** + * .context.SliceId slice_id = 7; + */ + @java.lang.Override + public context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder() { + return getSliceId(); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!getKpiDescriptionBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, kpiDescription_); + } + for (int i = 0; i < kpiIdList_.size(); i++) { + output.writeMessage(2, kpiIdList_.get(i)); + } + if (kpiSampleType_ != kpi_sample_types.KpiSampleTypes.KpiSampleType.KPISAMPLETYPE_UNKNOWN.getNumber()) { + output.writeEnum(3, kpiSampleType_); + } + if (deviceId_ != null) { + output.writeMessage(4, getDeviceId()); + } + if (endpointId_ != null) { + output.writeMessage(5, getEndpointId()); + } + if (serviceId_ != null) { + output.writeMessage(6, getServiceId()); + } + if (sliceId_ != null) { + output.writeMessage(7, getSliceId()); + } + unknownFields.writeTo(output); } @java.lang.Override @@ -2298,17 +2014,32 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (kpiId_ != null) { + if (!getKpiDescriptionBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, kpiDescription_); + } + for (int i = 0; i < kpiIdList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getKpiId()); + .computeMessageSize(2, kpiIdList_.get(i)); } - if (monitoringWindowS_ != 0F) { + if (kpiSampleType_ != kpi_sample_types.KpiSampleTypes.KpiSampleType.KPISAMPLETYPE_UNKNOWN.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(2, monitoringWindowS_); + .computeEnumSize(3, kpiSampleType_); } - if (samplingRateS_ != 0F) { + if (deviceId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(3, samplingRateS_); + .computeMessageSize(4, getDeviceId()); + } + if (endpointId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, getEndpointId()); + } + if (serviceId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(6, getServiceId()); + } + if (sliceId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(7, getSliceId()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -2320,22 +2051,36 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.MonitorKpiRequest)) { + if (!(obj instanceof monitoring.Monitoring.BundleKpiDescriptor)) { return super.equals(obj); } - monitoring.Monitoring.MonitorKpiRequest other = (monitoring.Monitoring.MonitorKpiRequest) obj; + monitoring.Monitoring.BundleKpiDescriptor other = (monitoring.Monitoring.BundleKpiDescriptor) obj; - if (hasKpiId() != other.hasKpiId()) return false; - if (hasKpiId()) { - if (!getKpiId() - .equals(other.getKpiId())) return false; + if (!getKpiDescription() + .equals(other.getKpiDescription())) return false; + if (!getKpiIdListList() + .equals(other.getKpiIdListList())) return false; + if (kpiSampleType_ != other.kpiSampleType_) return false; + if (hasDeviceId() != other.hasDeviceId()) return false; + if (hasDeviceId()) { + if (!getDeviceId() + .equals(other.getDeviceId())) return false; + } + if (hasEndpointId() != other.hasEndpointId()) return false; + if (hasEndpointId()) { + if (!getEndpointId() + .equals(other.getEndpointId())) return false; + } + if (hasServiceId() != other.hasServiceId()) return false; + if (hasServiceId()) { + if (!getServiceId() + .equals(other.getServiceId())) return false; + } + if (hasSliceId() != other.hasSliceId()) return false; + if (hasSliceId()) { + if (!getSliceId() + .equals(other.getSliceId())) return false; } - if (java.lang.Float.floatToIntBits(getMonitoringWindowS()) - != java.lang.Float.floatToIntBits( - other.getMonitoringWindowS())) return false; - if (java.lang.Float.floatToIntBits(getSamplingRateS()) - != java.lang.Float.floatToIntBits( - other.getSamplingRateS())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -2347,84 +2092,98 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasKpiId()) { - hash = (37 * hash) + KPI_ID_FIELD_NUMBER; - hash = (53 * hash) + getKpiId().hashCode(); + hash = (37 * hash) + KPI_DESCRIPTION_FIELD_NUMBER; + hash = (53 * hash) + getKpiDescription().hashCode(); + if (getKpiIdListCount() > 0) { + hash = (37 * hash) + KPI_ID_LIST_FIELD_NUMBER; + hash = (53 * hash) + getKpiIdListList().hashCode(); + } + hash = (37 * hash) + KPI_SAMPLE_TYPE_FIELD_NUMBER; + hash = (53 * hash) + kpiSampleType_; + if (hasDeviceId()) { + hash = (37 * hash) + DEVICE_ID_FIELD_NUMBER; + hash = (53 * hash) + getDeviceId().hashCode(); + } + if (hasEndpointId()) { + hash = (37 * hash) + ENDPOINT_ID_FIELD_NUMBER; + hash = (53 * hash) + getEndpointId().hashCode(); + } + if (hasServiceId()) { + hash = (37 * hash) + SERVICE_ID_FIELD_NUMBER; + hash = (53 * hash) + getServiceId().hashCode(); + } + if (hasSliceId()) { + hash = (37 * hash) + SLICE_ID_FIELD_NUMBER; + hash = (53 * hash) + getSliceId().hashCode(); } - hash = (37 * hash) + MONITORING_WINDOW_S_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getMonitoringWindowS()); - hash = (37 * hash) + SAMPLING_RATE_S_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getSamplingRateS()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom( + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom( + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom( + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom( + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom(byte[] data) + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom( + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom( + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.MonitorKpiRequest parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.BundleKpiDescriptor parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.MonitorKpiRequest parseDelimitedFrom( + public static monitoring.Monitoring.BundleKpiDescriptor parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom( + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom( + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2437,7 +2196,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.MonitorKpiRequest prototype) { + public static Builder newBuilder(monitoring.Monitoring.BundleKpiDescriptor prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -2453,26 +2212,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.MonitorKpiRequest} + * Protobuf type {@code monitoring.BundleKpiDescriptor} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.MonitorKpiRequest) - monitoring.Monitoring.MonitorKpiRequestOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.BundleKpiDescriptor) + monitoring.Monitoring.BundleKpiDescriptorOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_descriptor; + return monitoring.Monitoring.internal_static_monitoring_BundleKpiDescriptor_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_BundleKpiDescriptor_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.MonitorKpiRequest.class, monitoring.Monitoring.MonitorKpiRequest.Builder.class); + monitoring.Monitoring.BundleKpiDescriptor.class, monitoring.Monitoring.BundleKpiDescriptor.Builder.class); } - // Construct using monitoring.Monitoring.MonitorKpiRequest.newBuilder() + // Construct using monitoring.Monitoring.BundleKpiDescriptor.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -2485,38 +2244,63 @@ public final class Monitoring { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { + getKpiIdListFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); - if (kpiIdBuilder_ == null) { - kpiId_ = null; - } else { - kpiId_ = null; - kpiIdBuilder_ = null; - } - monitoringWindowS_ = 0F; + kpiDescription_ = ""; - samplingRateS_ = 0F; + if (kpiIdListBuilder_ == null) { + kpiIdList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + kpiIdListBuilder_.clear(); + } + kpiSampleType_ = 0; + if (deviceIdBuilder_ == null) { + deviceId_ = null; + } else { + deviceId_ = null; + deviceIdBuilder_ = null; + } + if (endpointIdBuilder_ == null) { + endpointId_ = null; + } else { + endpointId_ = null; + endpointIdBuilder_ = null; + } + if (serviceIdBuilder_ == null) { + serviceId_ = null; + } else { + serviceId_ = null; + serviceIdBuilder_ = null; + } + if (sliceIdBuilder_ == null) { + sliceId_ = null; + } else { + sliceId_ = null; + sliceIdBuilder_ = null; + } return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_descriptor; + return monitoring.Monitoring.internal_static_monitoring_BundleKpiDescriptor_descriptor; } @java.lang.Override - public monitoring.Monitoring.MonitorKpiRequest getDefaultInstanceForType() { - return monitoring.Monitoring.MonitorKpiRequest.getDefaultInstance(); + public monitoring.Monitoring.BundleKpiDescriptor getDefaultInstanceForType() { + return monitoring.Monitoring.BundleKpiDescriptor.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.MonitorKpiRequest build() { - monitoring.Monitoring.MonitorKpiRequest result = buildPartial(); + public monitoring.Monitoring.BundleKpiDescriptor build() { + monitoring.Monitoring.BundleKpiDescriptor result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -2524,15 +2308,40 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.MonitorKpiRequest buildPartial() { - monitoring.Monitoring.MonitorKpiRequest result = new monitoring.Monitoring.MonitorKpiRequest(this); - if (kpiIdBuilder_ == null) { - result.kpiId_ = kpiId_; + public monitoring.Monitoring.BundleKpiDescriptor buildPartial() { + monitoring.Monitoring.BundleKpiDescriptor result = new monitoring.Monitoring.BundleKpiDescriptor(this); + int from_bitField0_ = bitField0_; + result.kpiDescription_ = kpiDescription_; + if (kpiIdListBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + kpiIdList_ = java.util.Collections.unmodifiableList(kpiIdList_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.kpiIdList_ = kpiIdList_; } else { - result.kpiId_ = kpiIdBuilder_.build(); + result.kpiIdList_ = kpiIdListBuilder_.build(); + } + result.kpiSampleType_ = kpiSampleType_; + if (deviceIdBuilder_ == null) { + result.deviceId_ = deviceId_; + } else { + result.deviceId_ = deviceIdBuilder_.build(); + } + if (endpointIdBuilder_ == null) { + result.endpointId_ = endpointId_; + } else { + result.endpointId_ = endpointIdBuilder_.build(); + } + if (serviceIdBuilder_ == null) { + result.serviceId_ = serviceId_; + } else { + result.serviceId_ = serviceIdBuilder_.build(); + } + if (sliceIdBuilder_ == null) { + result.sliceId_ = sliceId_; + } else { + result.sliceId_ = sliceIdBuilder_.build(); } - result.monitoringWindowS_ = monitoringWindowS_; - result.samplingRateS_ = samplingRateS_; onBuilt(); return result; } @@ -2571,24 +2380,60 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.MonitorKpiRequest) { - return mergeFrom((monitoring.Monitoring.MonitorKpiRequest)other); + if (other instanceof monitoring.Monitoring.BundleKpiDescriptor) { + return mergeFrom((monitoring.Monitoring.BundleKpiDescriptor)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.MonitorKpiRequest other) { - if (other == monitoring.Monitoring.MonitorKpiRequest.getDefaultInstance()) return this; - if (other.hasKpiId()) { - mergeKpiId(other.getKpiId()); + public Builder mergeFrom(monitoring.Monitoring.BundleKpiDescriptor other) { + if (other == monitoring.Monitoring.BundleKpiDescriptor.getDefaultInstance()) return this; + if (!other.getKpiDescription().isEmpty()) { + kpiDescription_ = other.kpiDescription_; + onChanged(); } - if (other.getMonitoringWindowS() != 0F) { - setMonitoringWindowS(other.getMonitoringWindowS()); + if (kpiIdListBuilder_ == null) { + if (!other.kpiIdList_.isEmpty()) { + if (kpiIdList_.isEmpty()) { + kpiIdList_ = other.kpiIdList_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureKpiIdListIsMutable(); + kpiIdList_.addAll(other.kpiIdList_); + } + onChanged(); + } + } else { + if (!other.kpiIdList_.isEmpty()) { + if (kpiIdListBuilder_.isEmpty()) { + kpiIdListBuilder_.dispose(); + kpiIdListBuilder_ = null; + kpiIdList_ = other.kpiIdList_; + bitField0_ = (bitField0_ & ~0x00000001); + kpiIdListBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getKpiIdListFieldBuilder() : null; + } else { + kpiIdListBuilder_.addAllMessages(other.kpiIdList_); + } + } } - if (other.getSamplingRateS() != 0F) { - setSamplingRateS(other.getSamplingRateS()); + if (other.kpiSampleType_ != 0) { + setKpiSampleTypeValue(other.getKpiSampleTypeValue()); + } + if (other.hasDeviceId()) { + mergeDeviceId(other.getDeviceId()); + } + if (other.hasEndpointId()) { + mergeEndpointId(other.getEndpointId()); + } + if (other.hasServiceId()) { + mergeServiceId(other.getServiceId()); + } + if (other.hasSliceId()) { + mergeSliceId(other.getSliceId()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -2605,11 +2450,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.MonitorKpiRequest parsedMessage = null; + monitoring.Monitoring.BundleKpiDescriptor parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.MonitorKpiRequest) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.BundleKpiDescriptor) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -2618,377 +2463,1055 @@ public final class Monitoring { } return this; } + private int bitField0_; - private monitoring.Monitoring.KpiId kpiId_; - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; + private java.lang.Object kpiDescription_ = ""; /** - * .monitoring.KpiId kpi_id = 1; - * @return Whether the kpiId field is set. + * string kpi_description = 1; + * @return The kpiDescription. */ - public boolean hasKpiId() { - return kpiIdBuilder_ != null || kpiId_ != null; + public java.lang.String getKpiDescription() { + java.lang.Object ref = kpiDescription_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kpiDescription_ = s; + return s; + } else { + return (java.lang.String) ref; + } } /** - * .monitoring.KpiId kpi_id = 1; - * @return The kpiId. + * string kpi_description = 1; + * @return The bytes for kpiDescription. */ - public monitoring.Monitoring.KpiId getKpiId() { - if (kpiIdBuilder_ == null) { - return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + public com.google.protobuf.ByteString + getKpiDescriptionBytes() { + java.lang.Object ref = kpiDescription_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + kpiDescription_ = b; + return b; } else { - return kpiIdBuilder_.getMessage(); + return (com.google.protobuf.ByteString) ref; } } /** - * .monitoring.KpiId kpi_id = 1; + * string kpi_description = 1; + * @param value The kpiDescription to set. + * @return This builder for chaining. */ - public Builder setKpiId(monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - kpiId_ = value; - onChanged(); - } else { - kpiIdBuilder_.setMessage(value); - } - + public Builder setKpiDescription( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + kpiDescription_ = value; + onChanged(); return this; } /** - * .monitoring.KpiId kpi_id = 1; + * string kpi_description = 1; + * @return This builder for chaining. */ - public Builder setKpiId( - monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdBuilder_ == null) { - kpiId_ = builderForValue.build(); - onChanged(); - } else { - kpiIdBuilder_.setMessage(builderForValue.build()); - } - + public Builder clearKpiDescription() { + + kpiDescription_ = getDefaultInstance().getKpiDescription(); + onChanged(); return this; } /** - * .monitoring.KpiId kpi_id = 1; + * string kpi_description = 1; + * @param value The bytes for kpiDescription to set. + * @return This builder for chaining. */ - public Builder mergeKpiId(monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (kpiId_ != null) { - kpiId_ = - monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial(); - } else { - kpiId_ = value; - } - onChanged(); - } else { - kpiIdBuilder_.mergeFrom(value); - } - + public Builder setKpiDescriptionBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + kpiDescription_ = value; + onChanged(); return this; } + + private java.util.List kpiIdList_ = + java.util.Collections.emptyList(); + private void ensureKpiIdListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + kpiIdList_ = new java.util.ArrayList(kpiIdList_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdListBuilder_; + /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 2; */ - public Builder clearKpiId() { - if (kpiIdBuilder_ == null) { - kpiId_ = null; - onChanged(); + public java.util.List getKpiIdListList() { + if (kpiIdListBuilder_ == null) { + return java.util.Collections.unmodifiableList(kpiIdList_); } else { - kpiId_ = null; - kpiIdBuilder_ = null; + return kpiIdListBuilder_.getMessageList(); } - - return this; } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 2; */ - public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() { - - onChanged(); - return getKpiIdFieldBuilder().getBuilder(); + public int getKpiIdListCount() { + if (kpiIdListBuilder_ == null) { + return kpiIdList_.size(); + } else { + return kpiIdListBuilder_.getCount(); + } } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 2; */ - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { - if (kpiIdBuilder_ != null) { - return kpiIdBuilder_.getMessageOrBuilder(); + public monitoring.Monitoring.KpiId getKpiIdList(int index) { + if (kpiIdListBuilder_ == null) { + return kpiIdList_.get(index); } else { - return kpiId_ == null ? - monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + return kpiIdListBuilder_.getMessage(index); } } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 2; */ - private com.google.protobuf.SingleFieldBuilderV3< + public Builder setKpiIdList( + int index, monitoring.Monitoring.KpiId value) { + if (kpiIdListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiIdListIsMutable(); + kpiIdList_.set(index, value); + onChanged(); + } else { + kpiIdListBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public Builder setKpiIdList( + int index, monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + kpiIdList_.set(index, builderForValue.build()); + onChanged(); + } else { + kpiIdListBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public Builder addKpiIdList(monitoring.Monitoring.KpiId value) { + if (kpiIdListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiIdListIsMutable(); + kpiIdList_.add(value); + onChanged(); + } else { + kpiIdListBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public Builder addKpiIdList( + int index, monitoring.Monitoring.KpiId value) { + if (kpiIdListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiIdListIsMutable(); + kpiIdList_.add(index, value); + onChanged(); + } else { + kpiIdListBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public Builder addKpiIdList( + monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + kpiIdList_.add(builderForValue.build()); + onChanged(); + } else { + kpiIdListBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public Builder addKpiIdList( + int index, monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + kpiIdList_.add(index, builderForValue.build()); + onChanged(); + } else { + kpiIdListBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public Builder addAllKpiIdList( + java.lang.Iterable values) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, kpiIdList_); + onChanged(); + } else { + kpiIdListBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public Builder clearKpiIdList() { + if (kpiIdListBuilder_ == null) { + kpiIdList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + kpiIdListBuilder_.clear(); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public Builder removeKpiIdList(int index) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + kpiIdList_.remove(index); + onChanged(); + } else { + kpiIdListBuilder_.remove(index); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public monitoring.Monitoring.KpiId.Builder getKpiIdListBuilder( + int index) { + return getKpiIdListFieldBuilder().getBuilder(index); + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdListOrBuilder( + int index) { + if (kpiIdListBuilder_ == null) { + return kpiIdList_.get(index); } else { + return kpiIdListBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public java.util.List + getKpiIdListOrBuilderList() { + if (kpiIdListBuilder_ != null) { + return kpiIdListBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(kpiIdList_); + } + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public monitoring.Monitoring.KpiId.Builder addKpiIdListBuilder() { + return getKpiIdListFieldBuilder().addBuilder( + monitoring.Monitoring.KpiId.getDefaultInstance()); + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public monitoring.Monitoring.KpiId.Builder addKpiIdListBuilder( + int index) { + return getKpiIdListFieldBuilder().addBuilder( + index, monitoring.Monitoring.KpiId.getDefaultInstance()); + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public java.util.List + getKpiIdListBuilderList() { + return getKpiIdListFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> - getKpiIdFieldBuilder() { - if (kpiIdBuilder_ == null) { - kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getKpiIdListFieldBuilder() { + if (kpiIdListBuilder_ == null) { + kpiIdListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( - getKpiId(), + kpiIdList_, + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); - kpiId_ = null; + kpiIdList_ = null; } - return kpiIdBuilder_; + return kpiIdListBuilder_; } - private float monitoringWindowS_ ; - /** - * float monitoring_window_s = 2; - * @return The monitoringWindowS. - */ - @java.lang.Override - public float getMonitoringWindowS() { - return monitoringWindowS_; - } + private int kpiSampleType_ = 0; /** - * float monitoring_window_s = 2; - * @param value The monitoringWindowS to set. - * @return This builder for chaining. + * .kpi_sample_types.KpiSampleType kpi_sample_type = 3; + * @return The enum numeric value on the wire for kpiSampleType. */ - public Builder setMonitoringWindowS(float value) { - - monitoringWindowS_ = value; - onChanged(); - return this; + @java.lang.Override public int getKpiSampleTypeValue() { + return kpiSampleType_; } /** - * float monitoring_window_s = 2; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 3; + * @param value The enum numeric value on the wire for kpiSampleType to set. * @return This builder for chaining. */ - public Builder clearMonitoringWindowS() { + public Builder setKpiSampleTypeValue(int value) { - monitoringWindowS_ = 0F; + kpiSampleType_ = value; onChanged(); return this; } - - private float samplingRateS_ ; /** - * 
-       * Pending add field to reflect Available Device Protocols
-       *
- * - * float sampling_rate_s = 3; - * @return The samplingRateS. + * .kpi_sample_types.KpiSampleType kpi_sample_type = 3; + * @return The kpiSampleType. */ @java.lang.Override - public float getSamplingRateS() { - return samplingRateS_; + public kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType() { + @SuppressWarnings("deprecation") + kpi_sample_types.KpiSampleTypes.KpiSampleType result = kpi_sample_types.KpiSampleTypes.KpiSampleType.valueOf(kpiSampleType_); + return result == null ? kpi_sample_types.KpiSampleTypes.KpiSampleType.UNRECOGNIZED : result; } /** - * 
-       * Pending add field to reflect Available Device Protocols
-       *
- * - * float sampling_rate_s = 3; - * @param value The samplingRateS to set. + * .kpi_sample_types.KpiSampleType kpi_sample_type = 3; + * @param value The kpiSampleType to set. * @return This builder for chaining. */ - public Builder setSamplingRateS(float value) { + public Builder setKpiSampleType(kpi_sample_types.KpiSampleTypes.KpiSampleType value) { + if (value == null) { + throw new NullPointerException(); + } - samplingRateS_ = value; + kpiSampleType_ = value.getNumber(); onChanged(); return this; } /** - * 
-       * Pending add field to reflect Available Device Protocols
-       *
- * - * float sampling_rate_s = 3; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 3; * @return This builder for chaining. */ - public Builder clearSamplingRateS() { + public Builder clearKpiSampleType() { - samplingRateS_ = 0F; + kpiSampleType_ = 0; onChanged(); return this; } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); + + private context.ContextOuterClass.DeviceId deviceId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder> deviceIdBuilder_; + /** + * .context.DeviceId device_id = 4; + * @return Whether the deviceId field is set. + */ + public boolean hasDeviceId() { + return deviceIdBuilder_ != null || deviceId_ != null; + } + /** + * .context.DeviceId device_id = 4; + * @return The deviceId. + */ + public context.ContextOuterClass.DeviceId getDeviceId() { + if (deviceIdBuilder_ == null) { + return deviceId_ == null ? context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; + } else { + return deviceIdBuilder_.getMessage(); + } } + /** + * .context.DeviceId device_id = 4; + */ + public Builder setDeviceId(context.ContextOuterClass.DeviceId value) { + if (deviceIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + deviceId_ = value; + onChanged(); + } else { + deviceIdBuilder_.setMessage(value); + } - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); + return this; } + /** + * .context.DeviceId device_id = 4; + */ + public Builder setDeviceId( + context.ContextOuterClass.DeviceId.Builder builderForValue) { + if (deviceIdBuilder_ == null) { + deviceId_ = builderForValue.build(); + onChanged(); + } else { + deviceIdBuilder_.setMessage(builderForValue.build()); + } + return this; + } + /** + * .context.DeviceId device_id = 4; + */ + public Builder mergeDeviceId(context.ContextOuterClass.DeviceId value) { + if (deviceIdBuilder_ == null) { + if (deviceId_ != null) { + deviceId_ = + context.ContextOuterClass.DeviceId.newBuilder(deviceId_).mergeFrom(value).buildPartial(); + } else { + deviceId_ = value; + } + onChanged(); + } else { + deviceIdBuilder_.mergeFrom(value); + } - // @@protoc_insertion_point(builder_scope:monitoring.MonitorKpiRequest) - } + return this; + } + /** + * .context.DeviceId device_id = 4; + */ + public Builder clearDeviceId() { + if (deviceIdBuilder_ == null) { + deviceId_ = null; + onChanged(); + } else { + deviceId_ = null; + deviceIdBuilder_ = null; + } - // @@protoc_insertion_point(class_scope:monitoring.MonitorKpiRequest) - private static final monitoring.Monitoring.MonitorKpiRequest DEFAULT_INSTANCE; - static { - DEFAULT_INSTANCE = new monitoring.Monitoring.MonitorKpiRequest(); - } + return this; + } + /** + * .context.DeviceId device_id = 4; + */ + public context.ContextOuterClass.DeviceId.Builder getDeviceIdBuilder() { + + onChanged(); + return getDeviceIdFieldBuilder().getBuilder(); + } + /** + * .context.DeviceId device_id = 4; + */ + public context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder() { + if (deviceIdBuilder_ != null) { + return deviceIdBuilder_.getMessageOrBuilder(); + } else { + return deviceId_ == null ? + context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; + } + } + /** + * .context.DeviceId device_id = 4; + */ + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder> + getDeviceIdFieldBuilder() { + if (deviceIdBuilder_ == null) { + deviceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder>( + getDeviceId(), + getParentForChildren(), + isClean()); + deviceId_ = null; + } + return deviceIdBuilder_; + } - public static monitoring.Monitoring.MonitorKpiRequest getDefaultInstance() { - return DEFAULT_INSTANCE; - } + private context.ContextOuterClass.EndPointId endpointId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder> endpointIdBuilder_; + /** + * .context.EndPointId endpoint_id = 5; + * @return Whether the endpointId field is set. + */ + public boolean hasEndpointId() { + return endpointIdBuilder_ != null || endpointId_ != null; + } + /** + * .context.EndPointId endpoint_id = 5; + * @return The endpointId. + */ + public context.ContextOuterClass.EndPointId getEndpointId() { + if (endpointIdBuilder_ == null) { + return endpointId_ == null ? context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; + } else { + return endpointIdBuilder_.getMessage(); + } + } + /** + * .context.EndPointId endpoint_id = 5; + */ + public Builder setEndpointId(context.ContextOuterClass.EndPointId value) { + if (endpointIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + endpointId_ = value; + onChanged(); + } else { + endpointIdBuilder_.setMessage(value); + } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public MonitorKpiRequest parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new MonitorKpiRequest(input, extensionRegistry); + return this; } - }; + /** + * .context.EndPointId endpoint_id = 5; + */ + public Builder setEndpointId( + context.ContextOuterClass.EndPointId.Builder builderForValue) { + if (endpointIdBuilder_ == null) { + endpointId_ = builderForValue.build(); + onChanged(); + } else { + endpointIdBuilder_.setMessage(builderForValue.build()); + } - public static com.google.protobuf.Parser parser() { - return PARSER; - } + return this; + } + /** + * .context.EndPointId endpoint_id = 5; + */ + public Builder mergeEndpointId(context.ContextOuterClass.EndPointId value) { + if (endpointIdBuilder_ == null) { + if (endpointId_ != null) { + endpointId_ = + context.ContextOuterClass.EndPointId.newBuilder(endpointId_).mergeFrom(value).buildPartial(); + } else { + endpointId_ = value; + } + onChanged(); + } else { + endpointIdBuilder_.mergeFrom(value); + } - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } + return this; + } + /** + * .context.EndPointId endpoint_id = 5; + */ + public Builder clearEndpointId() { + if (endpointIdBuilder_ == null) { + endpointId_ = null; + onChanged(); + } else { + endpointId_ = null; + endpointIdBuilder_ = null; + } - @java.lang.Override - public monitoring.Monitoring.MonitorKpiRequest getDefaultInstanceForType() { - return DEFAULT_INSTANCE; - } + return this; + } + /** + * .context.EndPointId endpoint_id = 5; + */ + public context.ContextOuterClass.EndPointId.Builder getEndpointIdBuilder() { + + onChanged(); + return getEndpointIdFieldBuilder().getBuilder(); + } + /** + * .context.EndPointId endpoint_id = 5; + */ + public context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder() { + if (endpointIdBuilder_ != null) { + return endpointIdBuilder_.getMessageOrBuilder(); + } else { + return endpointId_ == null ? + context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; + } + } + /** + * .context.EndPointId endpoint_id = 5; + */ + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder> + getEndpointIdFieldBuilder() { + if (endpointIdBuilder_ == null) { + endpointIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder>( + getEndpointId(), + getParentForChildren(), + isClean()); + endpointId_ = null; + } + return endpointIdBuilder_; + } - } + private context.ContextOuterClass.ServiceId serviceId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder> serviceIdBuilder_; + /** + * .context.ServiceId service_id = 6; + * @return Whether the serviceId field is set. + */ + public boolean hasServiceId() { + return serviceIdBuilder_ != null || serviceId_ != null; + } + /** + * .context.ServiceId service_id = 6; + * @return The serviceId. + */ + public context.ContextOuterClass.ServiceId getServiceId() { + if (serviceIdBuilder_ == null) { + return serviceId_ == null ? context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; + } else { + return serviceIdBuilder_.getMessage(); + } + } + /** + * .context.ServiceId service_id = 6; + */ + public Builder setServiceId(context.ContextOuterClass.ServiceId value) { + if (serviceIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + serviceId_ = value; + onChanged(); + } else { + serviceIdBuilder_.setMessage(value); + } - public interface KpiQueryOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.KpiQuery) + return this; + } + /** + * .context.ServiceId service_id = 6; + */ + public Builder setServiceId( + context.ContextOuterClass.ServiceId.Builder builderForValue) { + if (serviceIdBuilder_ == null) { + serviceId_ = builderForValue.build(); + onChanged(); + } else { + serviceIdBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .context.ServiceId service_id = 6; + */ + public Builder mergeServiceId(context.ContextOuterClass.ServiceId value) { + if (serviceIdBuilder_ == null) { + if (serviceId_ != null) { + serviceId_ = + context.ContextOuterClass.ServiceId.newBuilder(serviceId_).mergeFrom(value).buildPartial(); + } else { + serviceId_ = value; + } + onChanged(); + } else { + serviceIdBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .context.ServiceId service_id = 6; + */ + public Builder clearServiceId() { + if (serviceIdBuilder_ == null) { + serviceId_ = null; + onChanged(); + } else { + serviceId_ = null; + serviceIdBuilder_ = null; + } + + return this; + } + /** + * .context.ServiceId service_id = 6; + */ + public context.ContextOuterClass.ServiceId.Builder getServiceIdBuilder() { + + onChanged(); + return getServiceIdFieldBuilder().getBuilder(); + } + /** + * .context.ServiceId service_id = 6; + */ + public context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder() { + if (serviceIdBuilder_ != null) { + return serviceIdBuilder_.getMessageOrBuilder(); + } else { + return serviceId_ == null ? + context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; + } + } + /** + * .context.ServiceId service_id = 6; + */ + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder> + getServiceIdFieldBuilder() { + if (serviceIdBuilder_ == null) { + serviceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder>( + getServiceId(), + getParentForChildren(), + isClean()); + serviceId_ = null; + } + return serviceIdBuilder_; + } + + private context.ContextOuterClass.SliceId sliceId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder> sliceIdBuilder_; + /** + * .context.SliceId slice_id = 7; + * @return Whether the sliceId field is set. + */ + public boolean hasSliceId() { + return sliceIdBuilder_ != null || sliceId_ != null; + } + /** + * .context.SliceId slice_id = 7; + * @return The sliceId. + */ + public context.ContextOuterClass.SliceId getSliceId() { + if (sliceIdBuilder_ == null) { + return sliceId_ == null ? context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; + } else { + return sliceIdBuilder_.getMessage(); + } + } + /** + * .context.SliceId slice_id = 7; + */ + public Builder setSliceId(context.ContextOuterClass.SliceId value) { + if (sliceIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + sliceId_ = value; + onChanged(); + } else { + sliceIdBuilder_.setMessage(value); + } + + return this; + } + /** + * .context.SliceId slice_id = 7; + */ + public Builder setSliceId( + context.ContextOuterClass.SliceId.Builder builderForValue) { + if (sliceIdBuilder_ == null) { + sliceId_ = builderForValue.build(); + onChanged(); + } else { + sliceIdBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .context.SliceId slice_id = 7; + */ + public Builder mergeSliceId(context.ContextOuterClass.SliceId value) { + if (sliceIdBuilder_ == null) { + if (sliceId_ != null) { + sliceId_ = + context.ContextOuterClass.SliceId.newBuilder(sliceId_).mergeFrom(value).buildPartial(); + } else { + sliceId_ = value; + } + onChanged(); + } else { + sliceIdBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .context.SliceId slice_id = 7; + */ + public Builder clearSliceId() { + if (sliceIdBuilder_ == null) { + sliceId_ = null; + onChanged(); + } else { + sliceId_ = null; + sliceIdBuilder_ = null; + } + + return this; + } + /** + * .context.SliceId slice_id = 7; + */ + public context.ContextOuterClass.SliceId.Builder getSliceIdBuilder() { + + onChanged(); + return getSliceIdFieldBuilder().getBuilder(); + } + /** + * .context.SliceId slice_id = 7; + */ + public context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder() { + if (sliceIdBuilder_ != null) { + return sliceIdBuilder_.getMessageOrBuilder(); + } else { + return sliceId_ == null ? + context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; + } + } + /** + * .context.SliceId slice_id = 7; + */ + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder> + getSliceIdFieldBuilder() { + if (sliceIdBuilder_ == null) { + sliceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder>( + getSliceId(), + getParentForChildren(), + isClean()); + sliceId_ = null; + } + return sliceIdBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:monitoring.BundleKpiDescriptor) + } + + // @@protoc_insertion_point(class_scope:monitoring.BundleKpiDescriptor) + private static final monitoring.Monitoring.BundleKpiDescriptor DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new monitoring.Monitoring.BundleKpiDescriptor(); + } + + public static monitoring.Monitoring.BundleKpiDescriptor getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public BundleKpiDescriptor parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new BundleKpiDescriptor(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public monitoring.Monitoring.BundleKpiDescriptor getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface EditedKpiDescriptorOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.EditedKpiDescriptor) com.google.protobuf.MessageOrBuilder { /** - * repeated .monitoring.KpiId kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; + * @return Whether the kpiId field is set. + */ + boolean hasKpiId(); + /** + * .monitoring.KpiId kpi_id = 1; + * @return The kpiId. + */ + monitoring.Monitoring.KpiId getKpiId(); + /** + * .monitoring.KpiId kpi_id = 1; + */ + monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder(); + + /** + * string kpi_description = 2; + * @return The kpiDescription. + */ + java.lang.String getKpiDescription(); + /** + * string kpi_description = 2; + * @return The bytes for kpiDescription. + */ + com.google.protobuf.ByteString + getKpiDescriptionBytes(); + + /** + * repeated .monitoring.KpiId kpi_id_list = 3; */ java.util.List - getKpiIdList(); + getKpiIdListList(); /** - * repeated .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 3; */ - monitoring.Monitoring.KpiId getKpiId(int index); + monitoring.Monitoring.KpiId getKpiIdList(int index); /** - * repeated .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 3; */ - int getKpiIdCount(); + int getKpiIdListCount(); /** - * repeated .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 3; */ java.util.List - getKpiIdOrBuilderList(); + getKpiIdListOrBuilderList(); /** - * repeated .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 3; */ - monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder( + monitoring.Monitoring.KpiIdOrBuilder getKpiIdListOrBuilder( int index); /** - * float monitoring_window_s = 2; - * @return The monitoringWindowS. + * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * @return The enum numeric value on the wire for kpiSampleType. */ - float getMonitoringWindowS(); + int getKpiSampleTypeValue(); + /** + * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * @return The kpiSampleType. + */ + kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType(); /** - * float sampling_rate_s = 3; - * @return The samplingRateS. + * .context.DeviceId device_id = 5; + * @return Whether the deviceId field is set. */ - float getSamplingRateS(); + boolean hasDeviceId(); + /** + * .context.DeviceId device_id = 5; + * @return The deviceId. + */ + context.ContextOuterClass.DeviceId getDeviceId(); + /** + * .context.DeviceId device_id = 5; + */ + context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder(); /** - * 
-     * used when you want something like "get the last N many samples
-     *
- * - * uint32 last_n_samples = 4; - * @return The lastNSamples. + * .context.EndPointId endpoint_id = 6; + * @return Whether the endpointId field is set. */ - int getLastNSamples(); + boolean hasEndpointId(); + /** + * .context.EndPointId endpoint_id = 6; + * @return The endpointId. + */ + context.ContextOuterClass.EndPointId getEndpointId(); + /** + * .context.EndPointId endpoint_id = 6; + */ + context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder(); /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; - * @return Whether the startTimestamp field is set. + * .context.ServiceId service_id = 7; + * @return Whether the serviceId field is set. */ - boolean hasStartTimestamp(); + boolean hasServiceId(); /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; - * @return The startTimestamp. + * .context.ServiceId service_id = 7; + * @return The serviceId. */ - context.ContextOuterClass.Timestamp getStartTimestamp(); + context.ContextOuterClass.ServiceId getServiceId(); /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; + * .context.ServiceId service_id = 7; */ - context.ContextOuterClass.TimestampOrBuilder getStartTimestampOrBuilder(); + context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder(); /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; - * @return Whether the endTimestamp field is set. + * .context.SliceId slice_id = 8; + * @return Whether the sliceId field is set. */ - boolean hasEndTimestamp(); + boolean hasSliceId(); /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; - * @return The endTimestamp. + * .context.SliceId slice_id = 8; + * @return The sliceId. */ - context.ContextOuterClass.Timestamp getEndTimestamp(); + context.ContextOuterClass.SliceId getSliceId(); /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; + * .context.SliceId slice_id = 8; */ - context.ContextOuterClass.TimestampOrBuilder getEndTimestampOrBuilder(); + context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder(); } /** - * Protobuf type {@code monitoring.KpiQuery} + * Protobuf type {@code monitoring.EditedKpiDescriptor} */ - public static final class KpiQuery extends + public static final class EditedKpiDescriptor extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.KpiQuery) - KpiQueryOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.EditedKpiDescriptor) + EditedKpiDescriptorOrBuilder { private static final long serialVersionUID = 0L; - // Use KpiQuery.newBuilder() to construct. - private KpiQuery(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use EditedKpiDescriptor.newBuilder() to construct. + private EditedKpiDescriptor(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private KpiQuery() { - kpiId_ = java.util.Collections.emptyList(); + private EditedKpiDescriptor() { + kpiDescription_ = ""; + kpiIdList_ = java.util.Collections.emptyList(); + kpiSampleType_ = 0; } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new KpiQuery(); + return new EditedKpiDescriptor(); } @java.lang.Override @@ -2996,7 +3519,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private KpiQuery( + private EditedKpiDescriptor( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -3015,52 +3538,88 @@ public final class Monitoring { case 0: done = true; break; - case 10: { + case 10: { + monitoring.Monitoring.KpiId.Builder subBuilder = null; + if (kpiId_ != null) { + subBuilder = kpiId_.toBuilder(); + } + kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(kpiId_); + kpiId_ = subBuilder.buildPartial(); + } + + break; + } + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + + kpiDescription_ = s; + break; + } + case 26: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - kpiId_ = new java.util.ArrayList(); + kpiIdList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - kpiId_.add( + kpiIdList_.add( input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry)); break; } - case 21: { + case 32: { + int rawValue = input.readEnum(); - monitoringWindowS_ = input.readFloat(); + kpiSampleType_ = rawValue; break; } - case 29: { + case 42: { + context.ContextOuterClass.DeviceId.Builder subBuilder = null; + if (deviceId_ != null) { + subBuilder = deviceId_.toBuilder(); + } + deviceId_ = input.readMessage(context.ContextOuterClass.DeviceId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(deviceId_); + deviceId_ = subBuilder.buildPartial(); + } - samplingRateS_ = input.readFloat(); break; } - case 32: { + case 50: { + context.ContextOuterClass.EndPointId.Builder subBuilder = null; + if (endpointId_ != null) { + subBuilder = endpointId_.toBuilder(); + } + endpointId_ = input.readMessage(context.ContextOuterClass.EndPointId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(endpointId_); + endpointId_ = subBuilder.buildPartial(); + } - lastNSamples_ = input.readUInt32(); break; } - case 42: { - context.ContextOuterClass.Timestamp.Builder subBuilder = null; - if (startTimestamp_ != null) { - subBuilder = startTimestamp_.toBuilder(); + case 58: { + context.ContextOuterClass.ServiceId.Builder subBuilder = null; + if (serviceId_ != null) { + subBuilder = serviceId_.toBuilder(); } - startTimestamp_ = input.readMessage(context.ContextOuterClass.Timestamp.parser(), extensionRegistry); + serviceId_ = input.readMessage(context.ContextOuterClass.ServiceId.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(startTimestamp_); - startTimestamp_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(serviceId_); + serviceId_ = subBuilder.buildPartial(); } break; } - case 50: { - context.ContextOuterClass.Timestamp.Builder subBuilder = null; - if (endTimestamp_ != null) { - subBuilder = endTimestamp_.toBuilder(); + case 66: { + context.ContextOuterClass.SliceId.Builder subBuilder = null; + if (sliceId_ != null) { + subBuilder = sliceId_.toBuilder(); } - endTimestamp_ = input.readMessage(context.ContextOuterClass.Timestamp.parser(), extensionRegistry); + sliceId_ = input.readMessage(context.ContextOuterClass.SliceId.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(endTimestamp_); - endTimestamp_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(sliceId_); + sliceId_ = subBuilder.buildPartial(); } break; @@ -3081,7 +3640,7 @@ public final class Monitoring { e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { - kpiId_ = java.util.Collections.unmodifiableList(kpiId_); + kpiIdList_ = java.util.Collections.unmodifiableList(kpiIdList_); } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -3089,1280 +3648,1732 @@ public final class Monitoring { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiQuery_descriptor; + return monitoring.Monitoring.internal_static_monitoring_EditedKpiDescriptor_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiQuery_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_EditedKpiDescriptor_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiQuery.class, monitoring.Monitoring.KpiQuery.Builder.class); + monitoring.Monitoring.EditedKpiDescriptor.class, monitoring.Monitoring.EditedKpiDescriptor.Builder.class); } public static final int KPI_ID_FIELD_NUMBER = 1; - private java.util.List kpiId_; + private monitoring.Monitoring.KpiId kpiId_; /** - * repeated .monitoring.KpiId kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; + * @return Whether the kpiId field is set. + */ + @java.lang.Override + public boolean hasKpiId() { + return kpiId_ != null; + } + /** + * .monitoring.KpiId kpi_id = 1; + * @return The kpiId. + */ + @java.lang.Override + public monitoring.Monitoring.KpiId getKpiId() { + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + } + /** + * .monitoring.KpiId kpi_id = 1; + */ + @java.lang.Override + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { + return getKpiId(); + } + + public static final int KPI_DESCRIPTION_FIELD_NUMBER = 2; + private volatile java.lang.Object kpiDescription_; + /** + * string kpi_description = 2; + * @return The kpiDescription. + */ + @java.lang.Override + public java.lang.String getKpiDescription() { + java.lang.Object ref = kpiDescription_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kpiDescription_ = s; + return s; + } + } + /** + * string kpi_description = 2; + * @return The bytes for kpiDescription. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getKpiDescriptionBytes() { + java.lang.Object ref = kpiDescription_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + kpiDescription_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int KPI_ID_LIST_FIELD_NUMBER = 3; + private java.util.List kpiIdList_; + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + @java.lang.Override + public java.util.List getKpiIdListList() { + return kpiIdList_; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + @java.lang.Override + public java.util.List + getKpiIdListOrBuilderList() { + return kpiIdList_; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + @java.lang.Override + public int getKpiIdListCount() { + return kpiIdList_.size(); + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + @java.lang.Override + public monitoring.Monitoring.KpiId getKpiIdList(int index) { + return kpiIdList_.get(index); + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + @java.lang.Override + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdListOrBuilder( + int index) { + return kpiIdList_.get(index); + } + + public static final int KPI_SAMPLE_TYPE_FIELD_NUMBER = 4; + private int kpiSampleType_; + /** + * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * @return The enum numeric value on the wire for kpiSampleType. + */ + @java.lang.Override public int getKpiSampleTypeValue() { + return kpiSampleType_; + } + /** + * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * @return The kpiSampleType. + */ + @java.lang.Override public kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType() { + @SuppressWarnings("deprecation") + kpi_sample_types.KpiSampleTypes.KpiSampleType result = kpi_sample_types.KpiSampleTypes.KpiSampleType.valueOf(kpiSampleType_); + return result == null ? kpi_sample_types.KpiSampleTypes.KpiSampleType.UNRECOGNIZED : result; + } + + public static final int DEVICE_ID_FIELD_NUMBER = 5; + private context.ContextOuterClass.DeviceId deviceId_; + /** + * .context.DeviceId device_id = 5; + * @return Whether the deviceId field is set. + */ + @java.lang.Override + public boolean hasDeviceId() { + return deviceId_ != null; + } + /** + * .context.DeviceId device_id = 5; + * @return The deviceId. + */ + @java.lang.Override + public context.ContextOuterClass.DeviceId getDeviceId() { + return deviceId_ == null ? context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; + } + /** + * .context.DeviceId device_id = 5; + */ + @java.lang.Override + public context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder() { + return getDeviceId(); + } + + public static final int ENDPOINT_ID_FIELD_NUMBER = 6; + private context.ContextOuterClass.EndPointId endpointId_; + /** + * .context.EndPointId endpoint_id = 6; + * @return Whether the endpointId field is set. + */ + @java.lang.Override + public boolean hasEndpointId() { + return endpointId_ != null; + } + /** + * .context.EndPointId endpoint_id = 6; + * @return The endpointId. + */ + @java.lang.Override + public context.ContextOuterClass.EndPointId getEndpointId() { + return endpointId_ == null ? context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; + } + /** + * .context.EndPointId endpoint_id = 6; + */ + @java.lang.Override + public context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder() { + return getEndpointId(); + } + + public static final int SERVICE_ID_FIELD_NUMBER = 7; + private context.ContextOuterClass.ServiceId serviceId_; + /** + * .context.ServiceId service_id = 7; + * @return Whether the serviceId field is set. + */ + @java.lang.Override + public boolean hasServiceId() { + return serviceId_ != null; + } + /** + * .context.ServiceId service_id = 7; + * @return The serviceId. */ @java.lang.Override - public java.util.List getKpiIdList() { - return kpiId_; + public context.ContextOuterClass.ServiceId getServiceId() { + return serviceId_ == null ? context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.ServiceId service_id = 7; */ @java.lang.Override - public java.util.List - getKpiIdOrBuilderList() { - return kpiId_; + public context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder() { + return getServiceId(); } + + public static final int SLICE_ID_FIELD_NUMBER = 8; + private context.ContextOuterClass.SliceId sliceId_; /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.SliceId slice_id = 8; + * @return Whether the sliceId field is set. */ @java.lang.Override - public int getKpiIdCount() { - return kpiId_.size(); + public boolean hasSliceId() { + return sliceId_ != null; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.SliceId slice_id = 8; + * @return The sliceId. */ @java.lang.Override - public monitoring.Monitoring.KpiId getKpiId(int index) { - return kpiId_.get(index); + public context.ContextOuterClass.SliceId getSliceId() { + return sliceId_ == null ? context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.SliceId slice_id = 8; */ @java.lang.Override - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder( - int index) { - return kpiId_.get(index); + public context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder() { + return getSliceId(); } - public static final int MONITORING_WINDOW_S_FIELD_NUMBER = 2; - private float monitoringWindowS_; - /** - * float monitoring_window_s = 2; - * @return The monitoringWindowS. - */ + private byte memoizedIsInitialized = -1; @java.lang.Override - public float getMonitoringWindowS() { - return monitoringWindowS_; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; } - public static final int SAMPLING_RATE_S_FIELD_NUMBER = 3; - private float samplingRateS_; - /** - * float sampling_rate_s = 3; - * @return The samplingRateS. - */ @java.lang.Override - public float getSamplingRateS() { - return samplingRateS_; + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (kpiId_ != null) { + output.writeMessage(1, getKpiId()); + } + if (!getKpiDescriptionBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, kpiDescription_); + } + for (int i = 0; i < kpiIdList_.size(); i++) { + output.writeMessage(3, kpiIdList_.get(i)); + } + if (kpiSampleType_ != kpi_sample_types.KpiSampleTypes.KpiSampleType.KPISAMPLETYPE_UNKNOWN.getNumber()) { + output.writeEnum(4, kpiSampleType_); + } + if (deviceId_ != null) { + output.writeMessage(5, getDeviceId()); + } + if (endpointId_ != null) { + output.writeMessage(6, getEndpointId()); + } + if (serviceId_ != null) { + output.writeMessage(7, getServiceId()); + } + if (sliceId_ != null) { + output.writeMessage(8, getSliceId()); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (kpiId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getKpiId()); + } + if (!getKpiDescriptionBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, kpiDescription_); + } + for (int i = 0; i < kpiIdList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, kpiIdList_.get(i)); + } + if (kpiSampleType_ != kpi_sample_types.KpiSampleTypes.KpiSampleType.KPISAMPLETYPE_UNKNOWN.getNumber()) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(4, kpiSampleType_); + } + if (deviceId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, getDeviceId()); + } + if (endpointId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(6, getEndpointId()); + } + if (serviceId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(7, getServiceId()); + } + if (sliceId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(8, getSliceId()); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof monitoring.Monitoring.EditedKpiDescriptor)) { + return super.equals(obj); + } + monitoring.Monitoring.EditedKpiDescriptor other = (monitoring.Monitoring.EditedKpiDescriptor) obj; + + if (hasKpiId() != other.hasKpiId()) return false; + if (hasKpiId()) { + if (!getKpiId() + .equals(other.getKpiId())) return false; + } + if (!getKpiDescription() + .equals(other.getKpiDescription())) return false; + if (!getKpiIdListList() + .equals(other.getKpiIdListList())) return false; + if (kpiSampleType_ != other.kpiSampleType_) return false; + if (hasDeviceId() != other.hasDeviceId()) return false; + if (hasDeviceId()) { + if (!getDeviceId() + .equals(other.getDeviceId())) return false; + } + if (hasEndpointId() != other.hasEndpointId()) return false; + if (hasEndpointId()) { + if (!getEndpointId() + .equals(other.getEndpointId())) return false; + } + if (hasServiceId() != other.hasServiceId()) return false; + if (hasServiceId()) { + if (!getServiceId() + .equals(other.getServiceId())) return false; + } + if (hasSliceId() != other.hasSliceId()) return false; + if (hasSliceId()) { + if (!getSliceId() + .equals(other.getSliceId())) return false; + } + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasKpiId()) { + hash = (37 * hash) + KPI_ID_FIELD_NUMBER; + hash = (53 * hash) + getKpiId().hashCode(); + } + hash = (37 * hash) + KPI_DESCRIPTION_FIELD_NUMBER; + hash = (53 * hash) + getKpiDescription().hashCode(); + if (getKpiIdListCount() > 0) { + hash = (37 * hash) + KPI_ID_LIST_FIELD_NUMBER; + hash = (53 * hash) + getKpiIdListList().hashCode(); + } + hash = (37 * hash) + KPI_SAMPLE_TYPE_FIELD_NUMBER; + hash = (53 * hash) + kpiSampleType_; + if (hasDeviceId()) { + hash = (37 * hash) + DEVICE_ID_FIELD_NUMBER; + hash = (53 * hash) + getDeviceId().hashCode(); + } + if (hasEndpointId()) { + hash = (37 * hash) + ENDPOINT_ID_FIELD_NUMBER; + hash = (53 * hash) + getEndpointId().hashCode(); + } + if (hasServiceId()) { + hash = (37 * hash) + SERVICE_ID_FIELD_NUMBER; + hash = (53 * hash) + getServiceId().hashCode(); + } + if (hasSliceId()) { + hash = (37 * hash) + SLICE_ID_FIELD_NUMBER; + hash = (53 * hash) + getSliceId().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - - public static final int LAST_N_SAMPLES_FIELD_NUMBER = 4; - private int lastNSamples_; - /** - * 
-     * used when you want something like "get the last N many samples
-     *
- * - * uint32 last_n_samples = 4; - * @return The lastNSamples. - */ - @java.lang.Override - public int getLastNSamples() { - return lastNSamples_; + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } - public static final int START_TIMESTAMP_FIELD_NUMBER = 5; - private context.ContextOuterClass.Timestamp startTimestamp_; - /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; - * @return Whether the startTimestamp field is set. - */ @java.lang.Override - public boolean hasStartTimestamp() { - return startTimestamp_ != null; + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); } - /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; - * @return The startTimestamp. - */ - @java.lang.Override - public context.ContextOuterClass.Timestamp getStartTimestamp() { - return startTimestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : startTimestamp_; + public static Builder newBuilder(monitoring.Monitoring.EditedKpiDescriptor prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; - */ @java.lang.Override - public context.ContextOuterClass.TimestampOrBuilder getStartTimestampOrBuilder() { - return getStartTimestamp(); + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } - public static final int END_TIMESTAMP_FIELD_NUMBER = 6; - private context.ContextOuterClass.Timestamp endTimestamp_; - /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; - * @return Whether the endTimestamp field is set. - */ - @java.lang.Override - public boolean hasEndTimestamp() { - return endTimestamp_ != null; - } - /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; - * @return The endTimestamp. - */ @java.lang.Override - public context.ContextOuterClass.Timestamp getEndTimestamp() { - return endTimestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : endTimestamp_; + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; } /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; + * Protobuf type {@code monitoring.EditedKpiDescriptor} */ - @java.lang.Override - public context.ContextOuterClass.TimestampOrBuilder getEndTimestampOrBuilder() { - return getEndTimestamp(); - } + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:monitoring.EditedKpiDescriptor) + monitoring.Monitoring.EditedKpiDescriptorOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return monitoring.Monitoring.internal_static_monitoring_EditedKpiDescriptor_descriptor; + } - private byte memoizedIsInitialized = -1; - @java.lang.Override - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return monitoring.Monitoring.internal_static_monitoring_EditedKpiDescriptor_fieldAccessorTable + .ensureFieldAccessorsInitialized( + monitoring.Monitoring.EditedKpiDescriptor.class, monitoring.Monitoring.EditedKpiDescriptor.Builder.class); + } - memoizedIsInitialized = 1; - return true; - } + // Construct using monitoring.Monitoring.EditedKpiDescriptor.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } - @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - for (int i = 0; i < kpiId_.size(); i++) { - output.writeMessage(1, kpiId_.get(i)); + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); } - if (monitoringWindowS_ != 0F) { - output.writeFloat(2, monitoringWindowS_); + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getKpiIdListFieldBuilder(); + } } - if (samplingRateS_ != 0F) { - output.writeFloat(3, samplingRateS_); + @java.lang.Override + public Builder clear() { + super.clear(); + if (kpiIdBuilder_ == null) { + kpiId_ = null; + } else { + kpiId_ = null; + kpiIdBuilder_ = null; + } + kpiDescription_ = ""; + + if (kpiIdListBuilder_ == null) { + kpiIdList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + kpiIdListBuilder_.clear(); + } + kpiSampleType_ = 0; + + if (deviceIdBuilder_ == null) { + deviceId_ = null; + } else { + deviceId_ = null; + deviceIdBuilder_ = null; + } + if (endpointIdBuilder_ == null) { + endpointId_ = null; + } else { + endpointId_ = null; + endpointIdBuilder_ = null; + } + if (serviceIdBuilder_ == null) { + serviceId_ = null; + } else { + serviceId_ = null; + serviceIdBuilder_ = null; + } + if (sliceIdBuilder_ == null) { + sliceId_ = null; + } else { + sliceId_ = null; + sliceIdBuilder_ = null; + } + return this; } - if (lastNSamples_ != 0) { - output.writeUInt32(4, lastNSamples_); + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return monitoring.Monitoring.internal_static_monitoring_EditedKpiDescriptor_descriptor; } - if (startTimestamp_ != null) { - output.writeMessage(5, getStartTimestamp()); + + @java.lang.Override + public monitoring.Monitoring.EditedKpiDescriptor getDefaultInstanceForType() { + return monitoring.Monitoring.EditedKpiDescriptor.getDefaultInstance(); } - if (endTimestamp_ != null) { - output.writeMessage(6, getEndTimestamp()); + + @java.lang.Override + public monitoring.Monitoring.EditedKpiDescriptor build() { + monitoring.Monitoring.EditedKpiDescriptor result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; } - unknownFields.writeTo(output); - } - @java.lang.Override - public int getSerializedSize() { - int size = memoizedSize; - if (size != -1) return size; + @java.lang.Override + public monitoring.Monitoring.EditedKpiDescriptor buildPartial() { + monitoring.Monitoring.EditedKpiDescriptor result = new monitoring.Monitoring.EditedKpiDescriptor(this); + int from_bitField0_ = bitField0_; + if (kpiIdBuilder_ == null) { + result.kpiId_ = kpiId_; + } else { + result.kpiId_ = kpiIdBuilder_.build(); + } + result.kpiDescription_ = kpiDescription_; + if (kpiIdListBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + kpiIdList_ = java.util.Collections.unmodifiableList(kpiIdList_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.kpiIdList_ = kpiIdList_; + } else { + result.kpiIdList_ = kpiIdListBuilder_.build(); + } + result.kpiSampleType_ = kpiSampleType_; + if (deviceIdBuilder_ == null) { + result.deviceId_ = deviceId_; + } else { + result.deviceId_ = deviceIdBuilder_.build(); + } + if (endpointIdBuilder_ == null) { + result.endpointId_ = endpointId_; + } else { + result.endpointId_ = endpointIdBuilder_.build(); + } + if (serviceIdBuilder_ == null) { + result.serviceId_ = serviceId_; + } else { + result.serviceId_ = serviceIdBuilder_.build(); + } + if (sliceIdBuilder_ == null) { + result.sliceId_ = sliceId_; + } else { + result.sliceId_ = sliceIdBuilder_.build(); + } + onBuilt(); + return result; + } - size = 0; - for (int i = 0; i < kpiId_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, kpiId_.get(i)); + @java.lang.Override + public Builder clone() { + return super.clone(); } - if (monitoringWindowS_ != 0F) { - size += com.google.protobuf.CodedOutputStream - .computeFloatSize(2, monitoringWindowS_); + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); } - if (samplingRateS_ != 0F) { - size += com.google.protobuf.CodedOutputStream - .computeFloatSize(3, samplingRateS_); + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); } - if (lastNSamples_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, lastNSamples_); + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); } - if (startTimestamp_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, getStartTimestamp()); + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); } - if (endTimestamp_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, getEndTimestamp()); + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof monitoring.Monitoring.EditedKpiDescriptor) { + return mergeFrom((monitoring.Monitoring.EditedKpiDescriptor)other); + } else { + super.mergeFrom(other); + return this; + } } - size += unknownFields.getSerializedSize(); - memoizedSize = size; - return size; - } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof monitoring.Monitoring.KpiQuery)) { - return super.equals(obj); + public Builder mergeFrom(monitoring.Monitoring.EditedKpiDescriptor other) { + if (other == monitoring.Monitoring.EditedKpiDescriptor.getDefaultInstance()) return this; + if (other.hasKpiId()) { + mergeKpiId(other.getKpiId()); + } + if (!other.getKpiDescription().isEmpty()) { + kpiDescription_ = other.kpiDescription_; + onChanged(); + } + if (kpiIdListBuilder_ == null) { + if (!other.kpiIdList_.isEmpty()) { + if (kpiIdList_.isEmpty()) { + kpiIdList_ = other.kpiIdList_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureKpiIdListIsMutable(); + kpiIdList_.addAll(other.kpiIdList_); + } + onChanged(); + } + } else { + if (!other.kpiIdList_.isEmpty()) { + if (kpiIdListBuilder_.isEmpty()) { + kpiIdListBuilder_.dispose(); + kpiIdListBuilder_ = null; + kpiIdList_ = other.kpiIdList_; + bitField0_ = (bitField0_ & ~0x00000001); + kpiIdListBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getKpiIdListFieldBuilder() : null; + } else { + kpiIdListBuilder_.addAllMessages(other.kpiIdList_); + } + } + } + if (other.kpiSampleType_ != 0) { + setKpiSampleTypeValue(other.getKpiSampleTypeValue()); + } + if (other.hasDeviceId()) { + mergeDeviceId(other.getDeviceId()); + } + if (other.hasEndpointId()) { + mergeEndpointId(other.getEndpointId()); + } + if (other.hasServiceId()) { + mergeServiceId(other.getServiceId()); + } + if (other.hasSliceId()) { + mergeSliceId(other.getSliceId()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; } - monitoring.Monitoring.KpiQuery other = (monitoring.Monitoring.KpiQuery) obj; - if (!getKpiIdList() - .equals(other.getKpiIdList())) return false; - if (java.lang.Float.floatToIntBits(getMonitoringWindowS()) - != java.lang.Float.floatToIntBits( - other.getMonitoringWindowS())) return false; - if (java.lang.Float.floatToIntBits(getSamplingRateS()) - != java.lang.Float.floatToIntBits( - other.getSamplingRateS())) return false; - if (getLastNSamples() - != other.getLastNSamples()) return false; - if (hasStartTimestamp() != other.hasStartTimestamp()) return false; - if (hasStartTimestamp()) { - if (!getStartTimestamp() - .equals(other.getStartTimestamp())) return false; - } - if (hasEndTimestamp() != other.hasEndTimestamp()) return false; - if (hasEndTimestamp()) { - if (!getEndTimestamp() - .equals(other.getEndTimestamp())) return false; + @java.lang.Override + public final boolean isInitialized() { + return true; } - if (!unknownFields.equals(other.unknownFields)) return false; - return true; - } - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; - } - int hash = 41; - hash = (19 * hash) + getDescriptor().hashCode(); - if (getKpiIdCount() > 0) { - hash = (37 * hash) + KPI_ID_FIELD_NUMBER; - hash = (53 * hash) + getKpiIdList().hashCode(); + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + monitoring.Monitoring.EditedKpiDescriptor parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (monitoring.Monitoring.EditedKpiDescriptor) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; } - hash = (37 * hash) + MONITORING_WINDOW_S_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getMonitoringWindowS()); - hash = (37 * hash) + SAMPLING_RATE_S_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getSamplingRateS()); - hash = (37 * hash) + LAST_N_SAMPLES_FIELD_NUMBER; - hash = (53 * hash) + getLastNSamples(); - if (hasStartTimestamp()) { - hash = (37 * hash) + START_TIMESTAMP_FIELD_NUMBER; - hash = (53 * hash) + getStartTimestamp().hashCode(); + private int bitField0_; + + private monitoring.Monitoring.KpiId kpiId_; + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; + /** + * .monitoring.KpiId kpi_id = 1; + * @return Whether the kpiId field is set. + */ + public boolean hasKpiId() { + return kpiIdBuilder_ != null || kpiId_ != null; } - if (hasEndTimestamp()) { - hash = (37 * hash) + END_TIMESTAMP_FIELD_NUMBER; - hash = (53 * hash) + getEndTimestamp().hashCode(); + /** + * .monitoring.KpiId kpi_id = 1; + * @return The kpiId. + */ + public monitoring.Monitoring.KpiId getKpiId() { + if (kpiIdBuilder_ == null) { + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + } else { + return kpiIdBuilder_.getMessage(); + } } - hash = (29 * hash) + unknownFields.hashCode(); - memoizedHashCode = hash; - return hash; - } - - public static monitoring.Monitoring.KpiQuery parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static monitoring.Monitoring.KpiQuery parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static monitoring.Monitoring.KpiQuery parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static monitoring.Monitoring.KpiQuery parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static monitoring.Monitoring.KpiQuery parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static monitoring.Monitoring.KpiQuery parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static monitoring.Monitoring.KpiQuery parseFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static monitoring.Monitoring.KpiQuery parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - public static monitoring.Monitoring.KpiQuery parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); - } - public static monitoring.Monitoring.KpiQuery parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); - } - public static monitoring.Monitoring.KpiQuery parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static monitoring.Monitoring.KpiQuery parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - - @java.lang.Override - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder() { - return DEFAULT_INSTANCE.toBuilder(); - } - public static Builder newBuilder(monitoring.Monitoring.KpiQuery prototype) { - return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); - } - @java.lang.Override - public Builder toBuilder() { - return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); - } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code monitoring.KpiQuery} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.KpiQuery) - monitoring.Monitoring.KpiQueryOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiQuery_descriptor; + /** + * .monitoring.KpiId kpi_id = 1; + */ + public Builder setKpiId(monitoring.Monitoring.KpiId value) { + if (kpiIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + kpiId_ = value; + onChanged(); + } else { + kpiIdBuilder_.setMessage(value); + } + + return this; } + /** + * .monitoring.KpiId kpi_id = 1; + */ + public Builder setKpiId( + monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdBuilder_ == null) { + kpiId_ = builderForValue.build(); + onChanged(); + } else { + kpiIdBuilder_.setMessage(builderForValue.build()); + } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiQuery_fieldAccessorTable - .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiQuery.class, monitoring.Monitoring.KpiQuery.Builder.class); + return this; } + /** + * .monitoring.KpiId kpi_id = 1; + */ + public Builder mergeKpiId(monitoring.Monitoring.KpiId value) { + if (kpiIdBuilder_ == null) { + if (kpiId_ != null) { + kpiId_ = + monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial(); + } else { + kpiId_ = value; + } + onChanged(); + } else { + kpiIdBuilder_.mergeFrom(value); + } - // Construct using monitoring.Monitoring.KpiQuery.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); + return this; } + /** + * .monitoring.KpiId kpi_id = 1; + */ + public Builder clearKpiId() { + if (kpiIdBuilder_ == null) { + kpiId_ = null; + onChanged(); + } else { + kpiId_ = null; + kpiIdBuilder_ = null; + } - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); + return this; } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getKpiIdFieldBuilder(); + /** + * .monitoring.KpiId kpi_id = 1; + */ + public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() { + + onChanged(); + return getKpiIdFieldBuilder().getBuilder(); + } + /** + * .monitoring.KpiId kpi_id = 1; + */ + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { + if (kpiIdBuilder_ != null) { + return kpiIdBuilder_.getMessageOrBuilder(); + } else { + return kpiId_ == null ? + monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } } - @java.lang.Override - public Builder clear() { - super.clear(); + /** + * .monitoring.KpiId kpi_id = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> + getKpiIdFieldBuilder() { if (kpiIdBuilder_ == null) { - kpiId_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( + getKpiId(), + getParentForChildren(), + isClean()); + kpiId_ = null; + } + return kpiIdBuilder_; + } + + private java.lang.Object kpiDescription_ = ""; + /** + * string kpi_description = 2; + * @return The kpiDescription. + */ + public java.lang.String getKpiDescription() { + java.lang.Object ref = kpiDescription_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kpiDescription_ = s; + return s; } else { - kpiIdBuilder_.clear(); + return (java.lang.String) ref; } - monitoringWindowS_ = 0F; + } + /** + * string kpi_description = 2; + * @return The bytes for kpiDescription. + */ + public com.google.protobuf.ByteString + getKpiDescriptionBytes() { + java.lang.Object ref = kpiDescription_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + kpiDescription_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string kpi_description = 2; + * @param value The kpiDescription to set. + * @return This builder for chaining. + */ + public Builder setKpiDescription( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + kpiDescription_ = value; + onChanged(); + return this; + } + /** + * string kpi_description = 2; + * @return This builder for chaining. + */ + public Builder clearKpiDescription() { + + kpiDescription_ = getDefaultInstance().getKpiDescription(); + onChanged(); + return this; + } + /** + * string kpi_description = 2; + * @param value The bytes for kpiDescription to set. + * @return This builder for chaining. + */ + public Builder setKpiDescriptionBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + kpiDescription_ = value; + onChanged(); + return this; + } - samplingRateS_ = 0F; + private java.util.List kpiIdList_ = + java.util.Collections.emptyList(); + private void ensureKpiIdListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + kpiIdList_ = new java.util.ArrayList(kpiIdList_); + bitField0_ |= 0x00000001; + } + } - lastNSamples_ = 0; + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdListBuilder_; - if (startTimestampBuilder_ == null) { - startTimestamp_ = null; + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public java.util.List getKpiIdListList() { + if (kpiIdListBuilder_ == null) { + return java.util.Collections.unmodifiableList(kpiIdList_); + } else { + return kpiIdListBuilder_.getMessageList(); + } + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public int getKpiIdListCount() { + if (kpiIdListBuilder_ == null) { + return kpiIdList_.size(); + } else { + return kpiIdListBuilder_.getCount(); + } + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public monitoring.Monitoring.KpiId getKpiIdList(int index) { + if (kpiIdListBuilder_ == null) { + return kpiIdList_.get(index); + } else { + return kpiIdListBuilder_.getMessage(index); + } + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public Builder setKpiIdList( + int index, monitoring.Monitoring.KpiId value) { + if (kpiIdListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiIdListIsMutable(); + kpiIdList_.set(index, value); + onChanged(); + } else { + kpiIdListBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public Builder setKpiIdList( + int index, monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + kpiIdList_.set(index, builderForValue.build()); + onChanged(); } else { - startTimestamp_ = null; - startTimestampBuilder_ = null; + kpiIdListBuilder_.setMessage(index, builderForValue.build()); } - if (endTimestampBuilder_ == null) { - endTimestamp_ = null; + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public Builder addKpiIdList(monitoring.Monitoring.KpiId value) { + if (kpiIdListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiIdListIsMutable(); + kpiIdList_.add(value); + onChanged(); } else { - endTimestamp_ = null; - endTimestampBuilder_ = null; + kpiIdListBuilder_.addMessage(value); } return this; } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_KpiQuery_descriptor; - } - - @java.lang.Override - public monitoring.Monitoring.KpiQuery getDefaultInstanceForType() { - return monitoring.Monitoring.KpiQuery.getDefaultInstance(); - } - - @java.lang.Override - public monitoring.Monitoring.KpiQuery build() { - monitoring.Monitoring.KpiQuery result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - @java.lang.Override - public monitoring.Monitoring.KpiQuery buildPartial() { - monitoring.Monitoring.KpiQuery result = new monitoring.Monitoring.KpiQuery(this); - int from_bitField0_ = bitField0_; - if (kpiIdBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { - kpiId_ = java.util.Collections.unmodifiableList(kpiId_); - bitField0_ = (bitField0_ & ~0x00000001); + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public Builder addKpiIdList( + int index, monitoring.Monitoring.KpiId value) { + if (kpiIdListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); } - result.kpiId_ = kpiId_; + ensureKpiIdListIsMutable(); + kpiIdList_.add(index, value); + onChanged(); } else { - result.kpiId_ = kpiIdBuilder_.build(); + kpiIdListBuilder_.addMessage(index, value); } - result.monitoringWindowS_ = monitoringWindowS_; - result.samplingRateS_ = samplingRateS_; - result.lastNSamples_ = lastNSamples_; - if (startTimestampBuilder_ == null) { - result.startTimestamp_ = startTimestamp_; + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public Builder addKpiIdList( + monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + kpiIdList_.add(builderForValue.build()); + onChanged(); } else { - result.startTimestamp_ = startTimestampBuilder_.build(); + kpiIdListBuilder_.addMessage(builderForValue.build()); } - if (endTimestampBuilder_ == null) { - result.endTimestamp_ = endTimestamp_; + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public Builder addKpiIdList( + int index, monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + kpiIdList_.add(index, builderForValue.build()); + onChanged(); } else { - result.endTimestamp_ = endTimestampBuilder_.build(); + kpiIdListBuilder_.addMessage(index, builderForValue.build()); } - onBuilt(); - return result; - } - - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); + return this; } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.KpiQuery) { - return mergeFrom((monitoring.Monitoring.KpiQuery)other); + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public Builder addAllKpiIdList( + java.lang.Iterable values) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, kpiIdList_); + onChanged(); } else { - super.mergeFrom(other); - return this; + kpiIdListBuilder_.addAllMessages(values); } + return this; } - - public Builder mergeFrom(monitoring.Monitoring.KpiQuery other) { - if (other == monitoring.Monitoring.KpiQuery.getDefaultInstance()) return this; - if (kpiIdBuilder_ == null) { - if (!other.kpiId_.isEmpty()) { - if (kpiId_.isEmpty()) { - kpiId_ = other.kpiId_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureKpiIdIsMutable(); - kpiId_.addAll(other.kpiId_); - } - onChanged(); - } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public Builder clearKpiIdList() { + if (kpiIdListBuilder_ == null) { + kpiIdList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); } else { - if (!other.kpiId_.isEmpty()) { - if (kpiIdBuilder_.isEmpty()) { - kpiIdBuilder_.dispose(); - kpiIdBuilder_ = null; - kpiId_ = other.kpiId_; - bitField0_ = (bitField0_ & ~0x00000001); - kpiIdBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getKpiIdFieldBuilder() : null; - } else { - kpiIdBuilder_.addAllMessages(other.kpiId_); - } - } - } - if (other.getMonitoringWindowS() != 0F) { - setMonitoringWindowS(other.getMonitoringWindowS()); - } - if (other.getSamplingRateS() != 0F) { - setSamplingRateS(other.getSamplingRateS()); - } - if (other.getLastNSamples() != 0) { - setLastNSamples(other.getLastNSamples()); - } - if (other.hasStartTimestamp()) { - mergeStartTimestamp(other.getStartTimestamp()); + kpiIdListBuilder_.clear(); } - if (other.hasEndTimestamp()) { - mergeEndTimestamp(other.getEndTimestamp()); + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public Builder removeKpiIdList(int index) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + kpiIdList_.remove(index); + onChanged(); + } else { + kpiIdListBuilder_.remove(index); } - this.mergeUnknownFields(other.unknownFields); - onChanged(); return this; } - - @java.lang.Override - public final boolean isInitialized() { - return true; + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public monitoring.Monitoring.KpiId.Builder getKpiIdListBuilder( + int index) { + return getKpiIdListFieldBuilder().getBuilder(index); } - - @java.lang.Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - monitoring.Monitoring.KpiQuery parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.KpiQuery) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdListOrBuilder( + int index) { + if (kpiIdListBuilder_ == null) { + return kpiIdList_.get(index); } else { + return kpiIdListBuilder_.getMessageOrBuilder(index); } - return this; } - private int bitField0_; - - private java.util.List kpiId_ = - java.util.Collections.emptyList(); - private void ensureKpiIdIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - kpiId_ = new java.util.ArrayList(kpiId_); - bitField0_ |= 0x00000001; - } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public java.util.List + getKpiIdListOrBuilderList() { + if (kpiIdListBuilder_ != null) { + return kpiIdListBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(kpiIdList_); + } + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public monitoring.Monitoring.KpiId.Builder addKpiIdListBuilder() { + return getKpiIdListFieldBuilder().addBuilder( + monitoring.Monitoring.KpiId.getDefaultInstance()); } - - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; - /** - * repeated .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 3; */ - public java.util.List getKpiIdList() { - if (kpiIdBuilder_ == null) { - return java.util.Collections.unmodifiableList(kpiId_); - } else { - return kpiIdBuilder_.getMessageList(); - } + public monitoring.Monitoring.KpiId.Builder addKpiIdListBuilder( + int index) { + return getKpiIdListFieldBuilder().addBuilder( + index, monitoring.Monitoring.KpiId.getDefaultInstance()); } /** - * repeated .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 3; */ - public int getKpiIdCount() { - if (kpiIdBuilder_ == null) { - return kpiId_.size(); - } else { - return kpiIdBuilder_.getCount(); + public java.util.List + getKpiIdListBuilderList() { + return getKpiIdListFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> + getKpiIdListFieldBuilder() { + if (kpiIdListBuilder_ == null) { + kpiIdListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( + kpiIdList_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + kpiIdList_ = null; } + return kpiIdListBuilder_; } + + private int kpiSampleType_ = 0; /** - * repeated .monitoring.KpiId kpi_id = 1; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * @return The enum numeric value on the wire for kpiSampleType. */ - public monitoring.Monitoring.KpiId getKpiId(int index) { - if (kpiIdBuilder_ == null) { - return kpiId_.get(index); - } else { - return kpiIdBuilder_.getMessage(index); - } + @java.lang.Override public int getKpiSampleTypeValue() { + return kpiSampleType_; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * @param value The enum numeric value on the wire for kpiSampleType to set. + * @return This builder for chaining. */ - public Builder setKpiId( - int index, monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiIdIsMutable(); - kpiId_.set(index, value); - onChanged(); - } else { - kpiIdBuilder_.setMessage(index, value); - } + public Builder setKpiSampleTypeValue(int value) { + + kpiSampleType_ = value; + onChanged(); return this; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * @return The kpiSampleType. */ - public Builder setKpiId( - int index, monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - kpiId_.set(index, builderForValue.build()); - onChanged(); - } else { - kpiIdBuilder_.setMessage(index, builderForValue.build()); - } - return this; + @java.lang.Override + public kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType() { + @SuppressWarnings("deprecation") + kpi_sample_types.KpiSampleTypes.KpiSampleType result = kpi_sample_types.KpiSampleTypes.KpiSampleType.valueOf(kpiSampleType_); + return result == null ? kpi_sample_types.KpiSampleTypes.KpiSampleType.UNRECOGNIZED : result; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * @param value The kpiSampleType to set. + * @return This builder for chaining. */ - public Builder addKpiId(monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiIdIsMutable(); - kpiId_.add(value); - onChanged(); - } else { - kpiIdBuilder_.addMessage(value); + public Builder setKpiSampleType(kpi_sample_types.KpiSampleTypes.KpiSampleType value) { + if (value == null) { + throw new NullPointerException(); } + + kpiSampleType_ = value.getNumber(); + onChanged(); return this; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * @return This builder for chaining. */ - public Builder addKpiId( - int index, monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiIdIsMutable(); - kpiId_.add(index, value); - onChanged(); - } else { - kpiIdBuilder_.addMessage(index, value); - } + public Builder clearKpiSampleType() { + + kpiSampleType_ = 0; + onChanged(); return this; } + + private context.ContextOuterClass.DeviceId deviceId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder> deviceIdBuilder_; /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.DeviceId device_id = 5; + * @return Whether the deviceId field is set. */ - public Builder addKpiId( - monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - kpiId_.add(builderForValue.build()); - onChanged(); - } else { - kpiIdBuilder_.addMessage(builderForValue.build()); - } - return this; + public boolean hasDeviceId() { + return deviceIdBuilder_ != null || deviceId_ != null; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.DeviceId device_id = 5; + * @return The deviceId. */ - public Builder addKpiId( - int index, monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - kpiId_.add(index, builderForValue.build()); - onChanged(); + public context.ContextOuterClass.DeviceId getDeviceId() { + if (deviceIdBuilder_ == null) { + return deviceId_ == null ? context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; } else { - kpiIdBuilder_.addMessage(index, builderForValue.build()); + return deviceIdBuilder_.getMessage(); } - return this; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.DeviceId device_id = 5; */ - public Builder addAllKpiId( - java.lang.Iterable values) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, kpiId_); + public Builder setDeviceId(context.ContextOuterClass.DeviceId value) { + if (deviceIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + deviceId_ = value; onChanged(); } else { - kpiIdBuilder_.addAllMessages(values); + deviceIdBuilder_.setMessage(value); } + return this; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.DeviceId device_id = 5; */ - public Builder clearKpiId() { - if (kpiIdBuilder_ == null) { - kpiId_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + public Builder setDeviceId( + context.ContextOuterClass.DeviceId.Builder builderForValue) { + if (deviceIdBuilder_ == null) { + deviceId_ = builderForValue.build(); onChanged(); } else { - kpiIdBuilder_.clear(); + deviceIdBuilder_.setMessage(builderForValue.build()); } + return this; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.DeviceId device_id = 5; */ - public Builder removeKpiId(int index) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - kpiId_.remove(index); + public Builder mergeDeviceId(context.ContextOuterClass.DeviceId value) { + if (deviceIdBuilder_ == null) { + if (deviceId_ != null) { + deviceId_ = + context.ContextOuterClass.DeviceId.newBuilder(deviceId_).mergeFrom(value).buildPartial(); + } else { + deviceId_ = value; + } onChanged(); } else { - kpiIdBuilder_.remove(index); + deviceIdBuilder_.mergeFrom(value); } + return this; } /** - * repeated .monitoring.KpiId kpi_id = 1; - */ - public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder( - int index) { - return getKpiIdFieldBuilder().getBuilder(index); - } - /** - * repeated .monitoring.KpiId kpi_id = 1; - */ - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder( - int index) { - if (kpiIdBuilder_ == null) { - return kpiId_.get(index); } else { - return kpiIdBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.DeviceId device_id = 5; */ - public java.util.List - getKpiIdOrBuilderList() { - if (kpiIdBuilder_ != null) { - return kpiIdBuilder_.getMessageOrBuilderList(); + public Builder clearDeviceId() { + if (deviceIdBuilder_ == null) { + deviceId_ = null; + onChanged(); } else { - return java.util.Collections.unmodifiableList(kpiId_); + deviceId_ = null; + deviceIdBuilder_ = null; } + + return this; } /** - * repeated .monitoring.KpiId kpi_id = 1; - */ - public monitoring.Monitoring.KpiId.Builder addKpiIdBuilder() { - return getKpiIdFieldBuilder().addBuilder( - monitoring.Monitoring.KpiId.getDefaultInstance()); - } - /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.DeviceId device_id = 5; */ - public monitoring.Monitoring.KpiId.Builder addKpiIdBuilder( - int index) { - return getKpiIdFieldBuilder().addBuilder( - index, monitoring.Monitoring.KpiId.getDefaultInstance()); + public context.ContextOuterClass.DeviceId.Builder getDeviceIdBuilder() { + + onChanged(); + return getDeviceIdFieldBuilder().getBuilder(); } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.DeviceId device_id = 5; */ - public java.util.List - getKpiIdBuilderList() { - return getKpiIdFieldBuilder().getBuilderList(); + public context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder() { + if (deviceIdBuilder_ != null) { + return deviceIdBuilder_.getMessageOrBuilder(); + } else { + return deviceId_ == null ? + context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; + } } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> - getKpiIdFieldBuilder() { - if (kpiIdBuilder_ == null) { - kpiIdBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( - kpiId_, - ((bitField0_ & 0x00000001) != 0), + /** + * .context.DeviceId device_id = 5; + */ + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder> + getDeviceIdFieldBuilder() { + if (deviceIdBuilder_ == null) { + deviceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder>( + getDeviceId(), getParentForChildren(), isClean()); - kpiId_ = null; + deviceId_ = null; } - return kpiIdBuilder_; + return deviceIdBuilder_; } - private float monitoringWindowS_ ; + private context.ContextOuterClass.EndPointId endpointId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder> endpointIdBuilder_; /** - * float monitoring_window_s = 2; - * @return The monitoringWindowS. + * .context.EndPointId endpoint_id = 6; + * @return Whether the endpointId field is set. */ - @java.lang.Override - public float getMonitoringWindowS() { - return monitoringWindowS_; + public boolean hasEndpointId() { + return endpointIdBuilder_ != null || endpointId_ != null; } /** - * float monitoring_window_s = 2; - * @param value The monitoringWindowS to set. - * @return This builder for chaining. + * .context.EndPointId endpoint_id = 6; + * @return The endpointId. */ - public Builder setMonitoringWindowS(float value) { - - monitoringWindowS_ = value; - onChanged(); - return this; + public context.ContextOuterClass.EndPointId getEndpointId() { + if (endpointIdBuilder_ == null) { + return endpointId_ == null ? context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; + } else { + return endpointIdBuilder_.getMessage(); + } } /** - * float monitoring_window_s = 2; - * @return This builder for chaining. + * .context.EndPointId endpoint_id = 6; */ - public Builder clearMonitoringWindowS() { - - monitoringWindowS_ = 0F; - onChanged(); + public Builder setEndpointId(context.ContextOuterClass.EndPointId value) { + if (endpointIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + endpointId_ = value; + onChanged(); + } else { + endpointIdBuilder_.setMessage(value); + } + return this; } - - private float samplingRateS_ ; /** - * float sampling_rate_s = 3; - * @return The samplingRateS. + * .context.EndPointId endpoint_id = 6; */ - @java.lang.Override - public float getSamplingRateS() { - return samplingRateS_; + public Builder setEndpointId( + context.ContextOuterClass.EndPointId.Builder builderForValue) { + if (endpointIdBuilder_ == null) { + endpointId_ = builderForValue.build(); + onChanged(); + } else { + endpointIdBuilder_.setMessage(builderForValue.build()); + } + + return this; } /** - * float sampling_rate_s = 3; - * @param value The samplingRateS to set. - * @return This builder for chaining. + * .context.EndPointId endpoint_id = 6; */ - public Builder setSamplingRateS(float value) { - - samplingRateS_ = value; - onChanged(); + public Builder mergeEndpointId(context.ContextOuterClass.EndPointId value) { + if (endpointIdBuilder_ == null) { + if (endpointId_ != null) { + endpointId_ = + context.ContextOuterClass.EndPointId.newBuilder(endpointId_).mergeFrom(value).buildPartial(); + } else { + endpointId_ = value; + } + onChanged(); + } else { + endpointIdBuilder_.mergeFrom(value); + } + return this; } /** - * float sampling_rate_s = 3; - * @return This builder for chaining. + * .context.EndPointId endpoint_id = 6; */ - public Builder clearSamplingRateS() { - - samplingRateS_ = 0F; - onChanged(); + public Builder clearEndpointId() { + if (endpointIdBuilder_ == null) { + endpointId_ = null; + onChanged(); + } else { + endpointId_ = null; + endpointIdBuilder_ = null; + } + return this; } - - private int lastNSamples_ ; /** - * 
-       * used when you want something like "get the last N many samples
-       *
- * - * uint32 last_n_samples = 4; - * @return The lastNSamples. + * .context.EndPointId endpoint_id = 6; */ - @java.lang.Override - public int getLastNSamples() { - return lastNSamples_; + public context.ContextOuterClass.EndPointId.Builder getEndpointIdBuilder() { + + onChanged(); + return getEndpointIdFieldBuilder().getBuilder(); } /** - * 
-       * used when you want something like "get the last N many samples
-       *
- * - * uint32 last_n_samples = 4; - * @param value The lastNSamples to set. - * @return This builder for chaining. + * .context.EndPointId endpoint_id = 6; */ - public Builder setLastNSamples(int value) { - - lastNSamples_ = value; - onChanged(); - return this; + public context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder() { + if (endpointIdBuilder_ != null) { + return endpointIdBuilder_.getMessageOrBuilder(); + } else { + return endpointId_ == null ? + context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; + } } /** - * 
-       * used when you want something like "get the last N many samples
-       *
- * - * uint32 last_n_samples = 4; - * @return This builder for chaining. + * .context.EndPointId endpoint_id = 6; */ - public Builder clearLastNSamples() { - - lastNSamples_ = 0; - onChanged(); - return this; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder> + getEndpointIdFieldBuilder() { + if (endpointIdBuilder_ == null) { + endpointIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder>( + getEndpointId(), + getParentForChildren(), + isClean()); + endpointId_ = null; + } + return endpointIdBuilder_; } - private context.ContextOuterClass.Timestamp startTimestamp_; + private context.ContextOuterClass.ServiceId serviceId_; private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> startTimestampBuilder_; + context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder> serviceIdBuilder_; /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; - * @return Whether the startTimestamp field is set. + * .context.ServiceId service_id = 7; + * @return Whether the serviceId field is set. */ - public boolean hasStartTimestamp() { - return startTimestampBuilder_ != null || startTimestamp_ != null; + public boolean hasServiceId() { + return serviceIdBuilder_ != null || serviceId_ != null; } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; - * @return The startTimestamp. + * .context.ServiceId service_id = 7; + * @return The serviceId. */ - public context.ContextOuterClass.Timestamp getStartTimestamp() { - if (startTimestampBuilder_ == null) { - return startTimestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : startTimestamp_; + public context.ContextOuterClass.ServiceId getServiceId() { + if (serviceIdBuilder_ == null) { + return serviceId_ == null ? context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; } else { - return startTimestampBuilder_.getMessage(); + return serviceIdBuilder_.getMessage(); } } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * .context.ServiceId service_id = 7; */ - public Builder setStartTimestamp(context.ContextOuterClass.Timestamp value) { - if (startTimestampBuilder_ == null) { + public Builder setServiceId(context.ContextOuterClass.ServiceId value) { + if (serviceIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - startTimestamp_ = value; + serviceId_ = value; onChanged(); } else { - startTimestampBuilder_.setMessage(value); + serviceIdBuilder_.setMessage(value); } return this; } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * .context.ServiceId service_id = 7; */ - public Builder setStartTimestamp( - context.ContextOuterClass.Timestamp.Builder builderForValue) { - if (startTimestampBuilder_ == null) { - startTimestamp_ = builderForValue.build(); + public Builder setServiceId( + context.ContextOuterClass.ServiceId.Builder builderForValue) { + if (serviceIdBuilder_ == null) { + serviceId_ = builderForValue.build(); onChanged(); } else { - startTimestampBuilder_.setMessage(builderForValue.build()); + serviceIdBuilder_.setMessage(builderForValue.build()); } return this; } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * .context.ServiceId service_id = 7; */ - public Builder mergeStartTimestamp(context.ContextOuterClass.Timestamp value) { - if (startTimestampBuilder_ == null) { - if (startTimestamp_ != null) { - startTimestamp_ = - context.ContextOuterClass.Timestamp.newBuilder(startTimestamp_).mergeFrom(value).buildPartial(); + public Builder mergeServiceId(context.ContextOuterClass.ServiceId value) { + if (serviceIdBuilder_ == null) { + if (serviceId_ != null) { + serviceId_ = + context.ContextOuterClass.ServiceId.newBuilder(serviceId_).mergeFrom(value).buildPartial(); } else { - startTimestamp_ = value; + serviceId_ = value; } onChanged(); } else { - startTimestampBuilder_.mergeFrom(value); + serviceIdBuilder_.mergeFrom(value); } return this; } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * .context.ServiceId service_id = 7; */ - public Builder clearStartTimestamp() { - if (startTimestampBuilder_ == null) { - startTimestamp_ = null; + public Builder clearServiceId() { + if (serviceIdBuilder_ == null) { + serviceId_ = null; onChanged(); } else { - startTimestamp_ = null; - startTimestampBuilder_ = null; + serviceId_ = null; + serviceIdBuilder_ = null; } return this; } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * .context.ServiceId service_id = 7; */ - public context.ContextOuterClass.Timestamp.Builder getStartTimestampBuilder() { + public context.ContextOuterClass.ServiceId.Builder getServiceIdBuilder() { onChanged(); - return getStartTimestampFieldBuilder().getBuilder(); + return getServiceIdFieldBuilder().getBuilder(); } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * .context.ServiceId service_id = 7; */ - public context.ContextOuterClass.TimestampOrBuilder getStartTimestampOrBuilder() { - if (startTimestampBuilder_ != null) { - return startTimestampBuilder_.getMessageOrBuilder(); + public context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder() { + if (serviceIdBuilder_ != null) { + return serviceIdBuilder_.getMessageOrBuilder(); } else { - return startTimestamp_ == null ? - context.ContextOuterClass.Timestamp.getDefaultInstance() : startTimestamp_; + return serviceId_ == null ? + context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; } } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * .context.ServiceId service_id = 7; */ private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> - getStartTimestampFieldBuilder() { - if (startTimestampBuilder_ == null) { - startTimestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>( - getStartTimestamp(), + context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder> + getServiceIdFieldBuilder() { + if (serviceIdBuilder_ == null) { + serviceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder>( + getServiceId(), getParentForChildren(), isClean()); - startTimestamp_ = null; + serviceId_ = null; } - return startTimestampBuilder_; + return serviceIdBuilder_; } - private context.ContextOuterClass.Timestamp endTimestamp_; + private context.ContextOuterClass.SliceId sliceId_; private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> endTimestampBuilder_; + context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder> sliceIdBuilder_; /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; - * @return Whether the endTimestamp field is set. + * .context.SliceId slice_id = 8; + * @return Whether the sliceId field is set. */ - public boolean hasEndTimestamp() { - return endTimestampBuilder_ != null || endTimestamp_ != null; + public boolean hasSliceId() { + return sliceIdBuilder_ != null || sliceId_ != null; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; - * @return The endTimestamp. + * .context.SliceId slice_id = 8; + * @return The sliceId. */ - public context.ContextOuterClass.Timestamp getEndTimestamp() { - if (endTimestampBuilder_ == null) { - return endTimestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : endTimestamp_; + public context.ContextOuterClass.SliceId getSliceId() { + if (sliceIdBuilder_ == null) { + return sliceId_ == null ? context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; } else { - return endTimestampBuilder_.getMessage(); + return sliceIdBuilder_.getMessage(); } } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * .context.SliceId slice_id = 8; */ - public Builder setEndTimestamp(context.ContextOuterClass.Timestamp value) { - if (endTimestampBuilder_ == null) { + public Builder setSliceId(context.ContextOuterClass.SliceId value) { + if (sliceIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - endTimestamp_ = value; + sliceId_ = value; onChanged(); } else { - endTimestampBuilder_.setMessage(value); + sliceIdBuilder_.setMessage(value); } return this; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * .context.SliceId slice_id = 8; */ - public Builder setEndTimestamp( - context.ContextOuterClass.Timestamp.Builder builderForValue) { - if (endTimestampBuilder_ == null) { - endTimestamp_ = builderForValue.build(); + public Builder setSliceId( + context.ContextOuterClass.SliceId.Builder builderForValue) { + if (sliceIdBuilder_ == null) { + sliceId_ = builderForValue.build(); onChanged(); } else { - endTimestampBuilder_.setMessage(builderForValue.build()); + sliceIdBuilder_.setMessage(builderForValue.build()); } return this; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * .context.SliceId slice_id = 8; */ - public Builder mergeEndTimestamp(context.ContextOuterClass.Timestamp value) { - if (endTimestampBuilder_ == null) { - if (endTimestamp_ != null) { - endTimestamp_ = - context.ContextOuterClass.Timestamp.newBuilder(endTimestamp_).mergeFrom(value).buildPartial(); + public Builder mergeSliceId(context.ContextOuterClass.SliceId value) { + if (sliceIdBuilder_ == null) { + if (sliceId_ != null) { + sliceId_ = + context.ContextOuterClass.SliceId.newBuilder(sliceId_).mergeFrom(value).buildPartial(); } else { - endTimestamp_ = value; + sliceId_ = value; } onChanged(); } else { - endTimestampBuilder_.mergeFrom(value); + sliceIdBuilder_.mergeFrom(value); } return this; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * .context.SliceId slice_id = 8; */ - public Builder clearEndTimestamp() { - if (endTimestampBuilder_ == null) { - endTimestamp_ = null; + public Builder clearSliceId() { + if (sliceIdBuilder_ == null) { + sliceId_ = null; onChanged(); } else { - endTimestamp_ = null; - endTimestampBuilder_ = null; + sliceId_ = null; + sliceIdBuilder_ = null; } return this; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * .context.SliceId slice_id = 8; */ - public context.ContextOuterClass.Timestamp.Builder getEndTimestampBuilder() { + public context.ContextOuterClass.SliceId.Builder getSliceIdBuilder() { onChanged(); - return getEndTimestampFieldBuilder().getBuilder(); + return getSliceIdFieldBuilder().getBuilder(); } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * .context.SliceId slice_id = 8; */ - public context.ContextOuterClass.TimestampOrBuilder getEndTimestampOrBuilder() { - if (endTimestampBuilder_ != null) { - return endTimestampBuilder_.getMessageOrBuilder(); + public context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder() { + if (sliceIdBuilder_ != null) { + return sliceIdBuilder_.getMessageOrBuilder(); } else { - return endTimestamp_ == null ? - context.ContextOuterClass.Timestamp.getDefaultInstance() : endTimestamp_; + return sliceId_ == null ? + context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; } } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * .context.SliceId slice_id = 8; */ private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> - getEndTimestampFieldBuilder() { - if (endTimestampBuilder_ == null) { - endTimestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>( - getEndTimestamp(), + context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder> + getSliceIdFieldBuilder() { + if (sliceIdBuilder_ == null) { + sliceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder>( + getSliceId(), getParentForChildren(), isClean()); - endTimestamp_ = null; + sliceId_ = null; } - return endTimestampBuilder_; + return sliceIdBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -4377,85 +5388,101 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.KpiQuery) + // @@protoc_insertion_point(builder_scope:monitoring.EditedKpiDescriptor) } - // @@protoc_insertion_point(class_scope:monitoring.KpiQuery) - private static final monitoring.Monitoring.KpiQuery DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.EditedKpiDescriptor) + private static final monitoring.Monitoring.EditedKpiDescriptor DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.KpiQuery(); + DEFAULT_INSTANCE = new monitoring.Monitoring.EditedKpiDescriptor(); } - public static monitoring.Monitoring.KpiQuery getDefaultInstance() { + public static monitoring.Monitoring.EditedKpiDescriptor getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public KpiQuery parsePartialFrom( + public EditedKpiDescriptor parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new KpiQuery(input, extensionRegistry); + return new EditedKpiDescriptor(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.KpiQuery getDefaultInstanceForType() { + public monitoring.Monitoring.EditedKpiDescriptor getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface KpiIdOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.KpiId) + public interface MonitorKpiRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.MonitorKpiRequest) com.google.protobuf.MessageOrBuilder { /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; * @return Whether the kpiId field is set. */ boolean hasKpiId(); /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; * @return The kpiId. */ - context.ContextOuterClass.Uuid getKpiId(); + monitoring.Monitoring.KpiId getKpiId(); /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - context.ContextOuterClass.UuidOrBuilder getKpiIdOrBuilder(); + monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder(); + + /** + * float monitoring_window_s = 2; + * @return The monitoringWindowS. + */ + float getMonitoringWindowS(); + + /** + * 
+     * Pending add field to reflect Available Device Protocols
+     *
+ * + * float sampling_rate_s = 3; + * @return The samplingRateS. + */ + float getSamplingRateS(); } /** - * Protobuf type {@code monitoring.KpiId} + * Protobuf type {@code monitoring.MonitorKpiRequest} */ - public static final class KpiId extends + public static final class MonitorKpiRequest extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.KpiId) - KpiIdOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.MonitorKpiRequest) + MonitorKpiRequestOrBuilder { private static final long serialVersionUID = 0L; - // Use KpiId.newBuilder() to construct. - private KpiId(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use MonitorKpiRequest.newBuilder() to construct. + private MonitorKpiRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private KpiId() { + private MonitorKpiRequest() { } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new KpiId(); + return new MonitorKpiRequest(); } @java.lang.Override @@ -4463,7 +5490,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private KpiId( + private MonitorKpiRequest( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -4482,11 +5509,11 @@ public final class Monitoring { done = true; break; case 10: { - context.ContextOuterClass.Uuid.Builder subBuilder = null; + monitoring.Monitoring.KpiId.Builder subBuilder = null; if (kpiId_ != null) { subBuilder = kpiId_.toBuilder(); } - kpiId_ = input.readMessage(context.ContextOuterClass.Uuid.parser(), extensionRegistry); + kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(kpiId_); kpiId_ = subBuilder.buildPartial(); @@ -4494,6 +5521,16 @@ public final class Monitoring { break; } + case 21: { + + monitoringWindowS_ = input.readFloat(); + break; + } + case 29: { + + samplingRateS_ = input.readFloat(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -4515,21 +5552,21 @@ public final class Monitoring { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiId_descriptor; + return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiId_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiId.class, monitoring.Monitoring.KpiId.Builder.class); + monitoring.Monitoring.MonitorKpiRequest.class, monitoring.Monitoring.MonitorKpiRequest.Builder.class); } public static final int KPI_ID_FIELD_NUMBER = 1; - private context.ContextOuterClass.Uuid kpiId_; + private monitoring.Monitoring.KpiId kpiId_; /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; * @return Whether the kpiId field is set. */ @java.lang.Override @@ -4537,21 +5574,47 @@ public final class Monitoring { return kpiId_ != null; } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; * @return The kpiId. */ @java.lang.Override - public context.ContextOuterClass.Uuid getKpiId() { - return kpiId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : kpiId_; + public monitoring.Monitoring.KpiId getKpiId() { + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; */ @java.lang.Override - public context.ContextOuterClass.UuidOrBuilder getKpiIdOrBuilder() { + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { return getKpiId(); } + public static final int MONITORING_WINDOW_S_FIELD_NUMBER = 2; + private float monitoringWindowS_; + /** + * float monitoring_window_s = 2; + * @return The monitoringWindowS. + */ + @java.lang.Override + public float getMonitoringWindowS() { + return monitoringWindowS_; + } + + public static final int SAMPLING_RATE_S_FIELD_NUMBER = 3; + private float samplingRateS_; + /** + * 
+     * Pending add field to reflect Available Device Protocols
+     *
+ * + * float sampling_rate_s = 3; + * @return The samplingRateS. + */ + @java.lang.Override + public float getSamplingRateS() { + return samplingRateS_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -4569,6 +5632,12 @@ public final class Monitoring { if (kpiId_ != null) { output.writeMessage(1, getKpiId()); } + if (monitoringWindowS_ != 0F) { + output.writeFloat(2, monitoringWindowS_); + } + if (samplingRateS_ != 0F) { + output.writeFloat(3, samplingRateS_); + } unknownFields.writeTo(output); } @@ -4582,6 +5651,14 @@ public final class Monitoring { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, getKpiId()); } + if (monitoringWindowS_ != 0F) { + size += com.google.protobuf.CodedOutputStream + .computeFloatSize(2, monitoringWindowS_); + } + if (samplingRateS_ != 0F) { + size += com.google.protobuf.CodedOutputStream + .computeFloatSize(3, samplingRateS_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -4592,16 +5669,22 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.KpiId)) { + if (!(obj instanceof monitoring.Monitoring.MonitorKpiRequest)) { return super.equals(obj); } - monitoring.Monitoring.KpiId other = (monitoring.Monitoring.KpiId) obj; + monitoring.Monitoring.MonitorKpiRequest other = (monitoring.Monitoring.MonitorKpiRequest) obj; if (hasKpiId() != other.hasKpiId()) return false; if (hasKpiId()) { if (!getKpiId() .equals(other.getKpiId())) return false; } + if (java.lang.Float.floatToIntBits(getMonitoringWindowS()) + != java.lang.Float.floatToIntBits( + other.getMonitoringWindowS())) return false; + if (java.lang.Float.floatToIntBits(getSamplingRateS()) + != java.lang.Float.floatToIntBits( + other.getSamplingRateS())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -4617,74 +5700,80 @@ public final class Monitoring { hash = (37 * hash) + KPI_ID_FIELD_NUMBER; hash = (53 * hash) + getKpiId().hashCode(); } + hash = (37 * hash) + MONITORING_WINDOW_S_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getMonitoringWindowS()); + hash = (37 * hash) + SAMPLING_RATE_S_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getSamplingRateS()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.KpiId parseFrom( + public static monitoring.Monitoring.MonitorKpiRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiId parseFrom( + public static monitoring.Monitoring.MonitorKpiRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiId parseFrom( + public static monitoring.Monitoring.MonitorKpiRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiId parseFrom( + public static monitoring.Monitoring.MonitorKpiRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiId parseFrom(byte[] data) + public static monitoring.Monitoring.MonitorKpiRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiId parseFrom( + public static monitoring.Monitoring.MonitorKpiRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiId parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.MonitorKpiRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiId parseFrom( + public static monitoring.Monitoring.MonitorKpiRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiId parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.MonitorKpiRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiId parseDelimitedFrom( + public static monitoring.Monitoring.MonitorKpiRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiId parseFrom( + public static monitoring.Monitoring.MonitorKpiRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiId parseFrom( + public static monitoring.Monitoring.MonitorKpiRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4697,7 +5786,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.KpiId prototype) { + public static Builder newBuilder(monitoring.Monitoring.MonitorKpiRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -4713,26 +5802,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.KpiId} + * Protobuf type {@code monitoring.MonitorKpiRequest} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.KpiId) - monitoring.Monitoring.KpiIdOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.MonitorKpiRequest) + monitoring.Monitoring.MonitorKpiRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiId_descriptor; + return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiId_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiId.class, monitoring.Monitoring.KpiId.Builder.class); + monitoring.Monitoring.MonitorKpiRequest.class, monitoring.Monitoring.MonitorKpiRequest.Builder.class); } - // Construct using monitoring.Monitoring.KpiId.newBuilder() + // Construct using monitoring.Monitoring.MonitorKpiRequest.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -4756,23 +5845,27 @@ public final class Monitoring { kpiId_ = null; kpiIdBuilder_ = null; } + monitoringWindowS_ = 0F; + + samplingRateS_ = 0F; + return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_KpiId_descriptor; + return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_descriptor; } @java.lang.Override - public monitoring.Monitoring.KpiId getDefaultInstanceForType() { - return monitoring.Monitoring.KpiId.getDefaultInstance(); + public monitoring.Monitoring.MonitorKpiRequest getDefaultInstanceForType() { + return monitoring.Monitoring.MonitorKpiRequest.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.KpiId build() { - monitoring.Monitoring.KpiId result = buildPartial(); + public monitoring.Monitoring.MonitorKpiRequest build() { + monitoring.Monitoring.MonitorKpiRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -4780,13 +5873,15 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.KpiId buildPartial() { - monitoring.Monitoring.KpiId result = new monitoring.Monitoring.KpiId(this); + public monitoring.Monitoring.MonitorKpiRequest buildPartial() { + monitoring.Monitoring.MonitorKpiRequest result = new monitoring.Monitoring.MonitorKpiRequest(this); if (kpiIdBuilder_ == null) { result.kpiId_ = kpiId_; } else { result.kpiId_ = kpiIdBuilder_.build(); } + result.monitoringWindowS_ = monitoringWindowS_; + result.samplingRateS_ = samplingRateS_; onBuilt(); return result; } @@ -4825,19 +5920,25 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.KpiId) { - return mergeFrom((monitoring.Monitoring.KpiId)other); + if (other instanceof monitoring.Monitoring.MonitorKpiRequest) { + return mergeFrom((monitoring.Monitoring.MonitorKpiRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.KpiId other) { - if (other == monitoring.Monitoring.KpiId.getDefaultInstance()) return this; + public Builder mergeFrom(monitoring.Monitoring.MonitorKpiRequest other) { + if (other == monitoring.Monitoring.MonitorKpiRequest.getDefaultInstance()) return this; if (other.hasKpiId()) { mergeKpiId(other.getKpiId()); } + if (other.getMonitoringWindowS() != 0F) { + setMonitoringWindowS(other.getMonitoringWindowS()); + } + if (other.getSamplingRateS() != 0F) { + setSamplingRateS(other.getSamplingRateS()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -4853,11 +5954,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.KpiId parsedMessage = null; + monitoring.Monitoring.MonitorKpiRequest parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.KpiId) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.MonitorKpiRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -4867,31 +5968,31 @@ public final class Monitoring { return this; } - private context.ContextOuterClass.Uuid kpiId_; + private monitoring.Monitoring.KpiId kpiId_; private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> kpiIdBuilder_; + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; * @return Whether the kpiId field is set. */ public boolean hasKpiId() { return kpiIdBuilder_ != null || kpiId_ != null; } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; * @return The kpiId. */ - public context.ContextOuterClass.Uuid getKpiId() { + public monitoring.Monitoring.KpiId getKpiId() { if (kpiIdBuilder_ == null) { - return kpiId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : kpiId_; + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } else { return kpiIdBuilder_.getMessage(); } } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public Builder setKpiId(context.ContextOuterClass.Uuid value) { + public Builder setKpiId(monitoring.Monitoring.KpiId value) { if (kpiIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -4905,10 +6006,10 @@ public final class Monitoring { return this; } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; */ public Builder setKpiId( - context.ContextOuterClass.Uuid.Builder builderForValue) { + monitoring.Monitoring.KpiId.Builder builderForValue) { if (kpiIdBuilder_ == null) { kpiId_ = builderForValue.build(); onChanged(); @@ -4919,13 +6020,13 @@ public final class Monitoring { return this; } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public Builder mergeKpiId(context.ContextOuterClass.Uuid value) { + public Builder mergeKpiId(monitoring.Monitoring.KpiId value) { if (kpiIdBuilder_ == null) { if (kpiId_ != null) { kpiId_ = - context.ContextOuterClass.Uuid.newBuilder(kpiId_).mergeFrom(value).buildPartial(); + monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial(); } else { kpiId_ = value; } @@ -4937,7 +6038,7 @@ public final class Monitoring { return this; } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; */ public Builder clearKpiId() { if (kpiIdBuilder_ == null) { @@ -4951,33 +6052,33 @@ public final class Monitoring { return this; } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public context.ContextOuterClass.Uuid.Builder getKpiIdBuilder() { + public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() { onChanged(); return getKpiIdFieldBuilder().getBuilder(); } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public context.ContextOuterClass.UuidOrBuilder getKpiIdOrBuilder() { + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { if (kpiIdBuilder_ != null) { return kpiIdBuilder_.getMessageOrBuilder(); } else { return kpiId_ == null ? - context.ContextOuterClass.Uuid.getDefaultInstance() : kpiId_; + monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> getKpiIdFieldBuilder() { if (kpiIdBuilder_ == null) { kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder>( + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( getKpiId(), getParentForChildren(), isClean()); @@ -4985,6 +6086,80 @@ public final class Monitoring { } return kpiIdBuilder_; } + + private float monitoringWindowS_ ; + /** + * float monitoring_window_s = 2; + * @return The monitoringWindowS. + */ + @java.lang.Override + public float getMonitoringWindowS() { + return monitoringWindowS_; + } + /** + * float monitoring_window_s = 2; + * @param value The monitoringWindowS to set. + * @return This builder for chaining. + */ + public Builder setMonitoringWindowS(float value) { + + monitoringWindowS_ = value; + onChanged(); + return this; + } + /** + * float monitoring_window_s = 2; + * @return This builder for chaining. + */ + public Builder clearMonitoringWindowS() { + + monitoringWindowS_ = 0F; + onChanged(); + return this; + } + + private float samplingRateS_ ; + /** + * 
+       * Pending add field to reflect Available Device Protocols
+       *
+ * + * float sampling_rate_s = 3; + * @return The samplingRateS. + */ + @java.lang.Override + public float getSamplingRateS() { + return samplingRateS_; + } + /** + * 
+       * Pending add field to reflect Available Device Protocols
+       *
+ * + * float sampling_rate_s = 3; + * @param value The samplingRateS to set. + * @return This builder for chaining. + */ + public Builder setSamplingRateS(float value) { + + samplingRateS_ = value; + onChanged(); + return this; + } + /** + * 
+       * Pending add field to reflect Available Device Protocols
+       *
+ * + * float sampling_rate_s = 3; + * @return This builder for chaining. + */ + public Builder clearSamplingRateS() { + + samplingRateS_ = 0F; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -4998,115 +6173,159 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.KpiId) + // @@protoc_insertion_point(builder_scope:monitoring.MonitorKpiRequest) } - // @@protoc_insertion_point(class_scope:monitoring.KpiId) - private static final monitoring.Monitoring.KpiId DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.MonitorKpiRequest) + private static final monitoring.Monitoring.MonitorKpiRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.KpiId(); + DEFAULT_INSTANCE = new monitoring.Monitoring.MonitorKpiRequest(); } - public static monitoring.Monitoring.KpiId getDefaultInstance() { + public static monitoring.Monitoring.MonitorKpiRequest getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public KpiId parsePartialFrom( + public MonitorKpiRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new KpiId(input, extensionRegistry); + return new MonitorKpiRequest(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.KpiId getDefaultInstanceForType() { + public monitoring.Monitoring.MonitorKpiRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface KpiOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.Kpi) + public interface KpiQueryOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.KpiQuery) com.google.protobuf.MessageOrBuilder { /** - * .monitoring.KpiId kpi_id = 1; - * @return Whether the kpiId field is set. + * repeated .monitoring.KpiId kpi_id = 1; */ - boolean hasKpiId(); + java.util.List + getKpiIdList(); /** - * .monitoring.KpiId kpi_id = 1; - * @return The kpiId. + * repeated .monitoring.KpiId kpi_id = 1; + */ + monitoring.Monitoring.KpiId getKpiId(int index); + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + int getKpiIdCount(); + /** + * repeated .monitoring.KpiId kpi_id = 1; */ - monitoring.Monitoring.KpiId getKpiId(); + java.util.List + getKpiIdOrBuilderList(); /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id = 1; */ - monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder(); + monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder( + int index); /** - * .context.Timestamp timestamp = 2; - * @return Whether the timestamp field is set. + * float monitoring_window_s = 2; + * @return The monitoringWindowS. */ - boolean hasTimestamp(); + float getMonitoringWindowS(); + /** - * .context.Timestamp timestamp = 2; - * @return The timestamp. + * float sampling_rate_s = 3; + * @return The samplingRateS. */ - context.ContextOuterClass.Timestamp getTimestamp(); + float getSamplingRateS(); + /** - * .context.Timestamp timestamp = 2; + * 
+     * used when you want something like "get the last N many samples
+     *
+ * + * uint32 last_n_samples = 4; + * @return The lastNSamples. */ - context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder(); + int getLastNSamples(); /** - * .monitoring.KpiValue kpi_value = 3; - * @return Whether the kpiValue field is set. + * 
+     * used when you want something like "get the samples since X date/time"
+     *
+ * + * string start_date = 5; + * @return The startDate. */ - boolean hasKpiValue(); + java.lang.String getStartDate(); /** - * .monitoring.KpiValue kpi_value = 3; - * @return The kpiValue. + * 
+     * used when you want something like "get the samples since X date/time"
+     *
+ * + * string start_date = 5; + * @return The bytes for startDate. */ - monitoring.Monitoring.KpiValue getKpiValue(); + com.google.protobuf.ByteString + getStartDateBytes(); + /** - * .monitoring.KpiValue kpi_value = 3; + * 
+     * used when you want something like "get the samples until X date/time"
+     *
+ * + * string end_date = 6; + * @return The endDate. */ - monitoring.Monitoring.KpiValueOrBuilder getKpiValueOrBuilder(); + java.lang.String getEndDate(); + /** + * 
+     * used when you want something like "get the samples until X date/time"
+     *
+ * + * string end_date = 6; + * @return The bytes for endDate. + */ + com.google.protobuf.ByteString + getEndDateBytes(); } /** - * Protobuf type {@code monitoring.Kpi} + * Protobuf type {@code monitoring.KpiQuery} */ - public static final class Kpi extends + public static final class KpiQuery extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.Kpi) - KpiOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.KpiQuery) + KpiQueryOrBuilder { private static final long serialVersionUID = 0L; - // Use Kpi.newBuilder() to construct. - private Kpi(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use KpiQuery.newBuilder() to construct. + private KpiQuery(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private Kpi() { + private KpiQuery() { + kpiId_ = java.util.Collections.emptyList(); + startDate_ = ""; + endDate_ = ""; } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new Kpi(); + return new KpiQuery(); } @java.lang.Override @@ -5114,7 +6333,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private Kpi( + private KpiQuery( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -5122,6 +6341,7 @@ public final class Monitoring { if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } + int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -5133,42 +6353,39 @@ public final class Monitoring { done = true; break; case 10: { - monitoring.Monitoring.KpiId.Builder subBuilder = null; - if (kpiId_ != null) { - subBuilder = kpiId_.toBuilder(); - } - kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(kpiId_); - kpiId_ = subBuilder.buildPartial(); + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + kpiId_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; } + kpiId_.add( + input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry)); + break; + } + case 21: { + monitoringWindowS_ = input.readFloat(); break; } - case 18: { - context.ContextOuterClass.Timestamp.Builder subBuilder = null; - if (timestamp_ != null) { - subBuilder = timestamp_.toBuilder(); - } - timestamp_ = input.readMessage(context.ContextOuterClass.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(timestamp_); - timestamp_ = subBuilder.buildPartial(); - } + case 29: { + samplingRateS_ = input.readFloat(); break; } - case 26: { - monitoring.Monitoring.KpiValue.Builder subBuilder = null; - if (kpiValue_ != null) { - subBuilder = kpiValue_.toBuilder(); - } - kpiValue_ = input.readMessage(monitoring.Monitoring.KpiValue.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(kpiValue_); - kpiValue_ = subBuilder.buildPartial(); - } + case 32: { + + lastNSamples_ = input.readUInt32(); + break; + } + case 42: { + java.lang.String s = input.readStringRequireUtf8(); + + startDate_ = s; + break; + } + case 50: { + java.lang.String s = input.readStringRequireUtf8(); + endDate_ = s; break; } default: { @@ -5186,99 +6403,193 @@ public final class Monitoring { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + kpiId_ = java.util.Collections.unmodifiableList(kpiId_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_Kpi_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiQuery_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_Kpi_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiQuery_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.Kpi.class, monitoring.Monitoring.Kpi.Builder.class); + monitoring.Monitoring.KpiQuery.class, monitoring.Monitoring.KpiQuery.Builder.class); } public static final int KPI_ID_FIELD_NUMBER = 1; - private monitoring.Monitoring.KpiId kpiId_; + private java.util.List kpiId_; /** - * .monitoring.KpiId kpi_id = 1; - * @return Whether the kpiId field is set. + * repeated .monitoring.KpiId kpi_id = 1; */ @java.lang.Override - public boolean hasKpiId() { - return kpiId_ != null; + public java.util.List getKpiIdList() { + return kpiId_; } /** - * .monitoring.KpiId kpi_id = 1; - * @return The kpiId. + * repeated .monitoring.KpiId kpi_id = 1; */ @java.lang.Override - public monitoring.Monitoring.KpiId getKpiId() { - return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + public java.util.List + getKpiIdOrBuilderList() { + return kpiId_; } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id = 1; */ @java.lang.Override - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { - return getKpiId(); + public int getKpiIdCount() { + return kpiId_.size(); + } + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + @java.lang.Override + public monitoring.Monitoring.KpiId getKpiId(int index) { + return kpiId_.get(index); + } + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + @java.lang.Override + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder( + int index) { + return kpiId_.get(index); } - public static final int TIMESTAMP_FIELD_NUMBER = 2; - private context.ContextOuterClass.Timestamp timestamp_; + public static final int MONITORING_WINDOW_S_FIELD_NUMBER = 2; + private float monitoringWindowS_; /** - * .context.Timestamp timestamp = 2; - * @return Whether the timestamp field is set. + * float monitoring_window_s = 2; + * @return The monitoringWindowS. */ @java.lang.Override - public boolean hasTimestamp() { - return timestamp_ != null; + public float getMonitoringWindowS() { + return monitoringWindowS_; } + + public static final int SAMPLING_RATE_S_FIELD_NUMBER = 3; + private float samplingRateS_; /** - * .context.Timestamp timestamp = 2; - * @return The timestamp. + * float sampling_rate_s = 3; + * @return The samplingRateS. */ @java.lang.Override - public context.ContextOuterClass.Timestamp getTimestamp() { - return timestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_; + public float getSamplingRateS() { + return samplingRateS_; } + + public static final int LAST_N_SAMPLES_FIELD_NUMBER = 4; + private int lastNSamples_; /** - * .context.Timestamp timestamp = 2; + * 
+     * used when you want something like "get the last N many samples
+     *
+ * + * uint32 last_n_samples = 4; + * @return The lastNSamples. */ @java.lang.Override - public context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder() { - return getTimestamp(); + public int getLastNSamples() { + return lastNSamples_; } - public static final int KPI_VALUE_FIELD_NUMBER = 3; - private monitoring.Monitoring.KpiValue kpiValue_; + public static final int START_DATE_FIELD_NUMBER = 5; + private volatile java.lang.Object startDate_; /** - * .monitoring.KpiValue kpi_value = 3; - * @return Whether the kpiValue field is set. + * 
+     * used when you want something like "get the samples since X date/time"
+     *
+ * + * string start_date = 5; + * @return The startDate. */ @java.lang.Override - public boolean hasKpiValue() { - return kpiValue_ != null; + public java.lang.String getStartDate() { + java.lang.Object ref = startDate_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + startDate_ = s; + return s; + } } /** - * .monitoring.KpiValue kpi_value = 3; - * @return The kpiValue. + * 
+     * used when you want something like "get the samples since X date/time"
+     *
+ * + * string start_date = 5; + * @return The bytes for startDate. */ @java.lang.Override - public monitoring.Monitoring.KpiValue getKpiValue() { - return kpiValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiValue_; + public com.google.protobuf.ByteString + getStartDateBytes() { + java.lang.Object ref = startDate_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + startDate_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } } + + public static final int END_DATE_FIELD_NUMBER = 6; + private volatile java.lang.Object endDate_; /** - * .monitoring.KpiValue kpi_value = 3; + * 
+     * used when you want something like "get the samples until X date/time"
+     *
+ * + * string end_date = 6; + * @return The endDate. */ @java.lang.Override - public monitoring.Monitoring.KpiValueOrBuilder getKpiValueOrBuilder() { - return getKpiValue(); + public java.lang.String getEndDate() { + java.lang.Object ref = endDate_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + endDate_ = s; + return s; + } + } + /** + * 
+     * used when you want something like "get the samples until X date/time"
+     *
+ * + * string end_date = 6; + * @return The bytes for endDate. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getEndDateBytes() { + java.lang.Object ref = endDate_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + endDate_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } } private byte memoizedIsInitialized = -1; @@ -5295,14 +6606,23 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (kpiId_ != null) { - output.writeMessage(1, getKpiId()); + for (int i = 0; i < kpiId_.size(); i++) { + output.writeMessage(1, kpiId_.get(i)); } - if (timestamp_ != null) { - output.writeMessage(2, getTimestamp()); + if (monitoringWindowS_ != 0F) { + output.writeFloat(2, monitoringWindowS_); } - if (kpiValue_ != null) { - output.writeMessage(3, getKpiValue()); + if (samplingRateS_ != 0F) { + output.writeFloat(3, samplingRateS_); + } + if (lastNSamples_ != 0) { + output.writeUInt32(4, lastNSamples_); + } + if (!getStartDateBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, startDate_); + } + if (!getEndDateBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 6, endDate_); } unknownFields.writeTo(output); } @@ -5313,17 +6633,27 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (kpiId_ != null) { + for (int i = 0; i < kpiId_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getKpiId()); + .computeMessageSize(1, kpiId_.get(i)); + } + if (monitoringWindowS_ != 0F) { + size += com.google.protobuf.CodedOutputStream + .computeFloatSize(2, monitoringWindowS_); } - if (timestamp_ != null) { + if (samplingRateS_ != 0F) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, getTimestamp()); + .computeFloatSize(3, samplingRateS_); } - if (kpiValue_ != null) { + if (lastNSamples_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, getKpiValue()); + .computeUInt32Size(4, lastNSamples_); + } + if (!getStartDateBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, startDate_); + } + if (!getEndDateBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, endDate_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -5335,26 +6665,25 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.Kpi)) { + if (!(obj instanceof monitoring.Monitoring.KpiQuery)) { return super.equals(obj); } - monitoring.Monitoring.Kpi other = (monitoring.Monitoring.Kpi) obj; + monitoring.Monitoring.KpiQuery other = (monitoring.Monitoring.KpiQuery) obj; - if (hasKpiId() != other.hasKpiId()) return false; - if (hasKpiId()) { - if (!getKpiId() - .equals(other.getKpiId())) return false; - } - if (hasTimestamp() != other.hasTimestamp()) return false; - if (hasTimestamp()) { - if (!getTimestamp() - .equals(other.getTimestamp())) return false; - } - if (hasKpiValue() != other.hasKpiValue()) return false; - if (hasKpiValue()) { - if (!getKpiValue() - .equals(other.getKpiValue())) return false; - } + if (!getKpiIdList() + .equals(other.getKpiIdList())) return false; + if (java.lang.Float.floatToIntBits(getMonitoringWindowS()) + != java.lang.Float.floatToIntBits( + other.getMonitoringWindowS())) return false; + if (java.lang.Float.floatToIntBits(getSamplingRateS()) + != java.lang.Float.floatToIntBits( + other.getSamplingRateS())) return false; + if (getLastNSamples() + != other.getLastNSamples()) return false; + if (!getStartDate() + .equals(other.getStartDate())) return false; + if (!getEndDate() + .equals(other.getEndDate())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -5366,86 +6695,90 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasKpiId()) { + if (getKpiIdCount() > 0) { hash = (37 * hash) + KPI_ID_FIELD_NUMBER; - hash = (53 * hash) + getKpiId().hashCode(); - } - if (hasTimestamp()) { - hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER; - hash = (53 * hash) + getTimestamp().hashCode(); - } - if (hasKpiValue()) { - hash = (37 * hash) + KPI_VALUE_FIELD_NUMBER; - hash = (53 * hash) + getKpiValue().hashCode(); + hash = (53 * hash) + getKpiIdList().hashCode(); } + hash = (37 * hash) + MONITORING_WINDOW_S_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getMonitoringWindowS()); + hash = (37 * hash) + SAMPLING_RATE_S_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getSamplingRateS()); + hash = (37 * hash) + LAST_N_SAMPLES_FIELD_NUMBER; + hash = (53 * hash) + getLastNSamples(); + hash = (37 * hash) + START_DATE_FIELD_NUMBER; + hash = (53 * hash) + getStartDate().hashCode(); + hash = (37 * hash) + END_DATE_FIELD_NUMBER; + hash = (53 * hash) + getEndDate().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.Kpi parseFrom( + public static monitoring.Monitoring.KpiQuery parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.Kpi parseFrom( + public static monitoring.Monitoring.KpiQuery parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.Kpi parseFrom( + public static monitoring.Monitoring.KpiQuery parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.Kpi parseFrom( + public static monitoring.Monitoring.KpiQuery parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.Kpi parseFrom(byte[] data) + public static monitoring.Monitoring.KpiQuery parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.Kpi parseFrom( + public static monitoring.Monitoring.KpiQuery parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.Kpi parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiQuery parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.Kpi parseFrom( + public static monitoring.Monitoring.KpiQuery parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.Kpi parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiQuery parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.Kpi parseDelimitedFrom( + public static monitoring.Monitoring.KpiQuery parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.Kpi parseFrom( + public static monitoring.Monitoring.KpiQuery parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.Kpi parseFrom( + public static monitoring.Monitoring.KpiQuery parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -5458,7 +6791,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.Kpi prototype) { + public static Builder newBuilder(monitoring.Monitoring.KpiQuery prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -5474,26 +6807,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.Kpi} + * Protobuf type {@code monitoring.KpiQuery} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.Kpi) - monitoring.Monitoring.KpiOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.KpiQuery) + monitoring.Monitoring.KpiQueryOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_Kpi_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiQuery_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_Kpi_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiQuery_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.Kpi.class, monitoring.Monitoring.Kpi.Builder.class); + monitoring.Monitoring.KpiQuery.class, monitoring.Monitoring.KpiQuery.Builder.class); } - // Construct using monitoring.Monitoring.Kpi.newBuilder() + // Construct using monitoring.Monitoring.KpiQuery.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -5506,46 +6839,45 @@ public final class Monitoring { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { + getKpiIdFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); if (kpiIdBuilder_ == null) { - kpiId_ = null; - } else { - kpiId_ = null; - kpiIdBuilder_ = null; - } - if (timestampBuilder_ == null) { - timestamp_ = null; - } else { - timestamp_ = null; - timestampBuilder_ = null; - } - if (kpiValueBuilder_ == null) { - kpiValue_ = null; + kpiId_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); } else { - kpiValue_ = null; - kpiValueBuilder_ = null; + kpiIdBuilder_.clear(); } + monitoringWindowS_ = 0F; + + samplingRateS_ = 0F; + + lastNSamples_ = 0; + + startDate_ = ""; + + endDate_ = ""; + return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_Kpi_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiQuery_descriptor; } @java.lang.Override - public monitoring.Monitoring.Kpi getDefaultInstanceForType() { - return monitoring.Monitoring.Kpi.getDefaultInstance(); + public monitoring.Monitoring.KpiQuery getDefaultInstanceForType() { + return monitoring.Monitoring.KpiQuery.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.Kpi build() { - monitoring.Monitoring.Kpi result = buildPartial(); + public monitoring.Monitoring.KpiQuery build() { + monitoring.Monitoring.KpiQuery result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -5553,23 +6885,23 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.Kpi buildPartial() { - monitoring.Monitoring.Kpi result = new monitoring.Monitoring.Kpi(this); + public monitoring.Monitoring.KpiQuery buildPartial() { + monitoring.Monitoring.KpiQuery result = new monitoring.Monitoring.KpiQuery(this); + int from_bitField0_ = bitField0_; if (kpiIdBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + kpiId_ = java.util.Collections.unmodifiableList(kpiId_); + bitField0_ = (bitField0_ & ~0x00000001); + } result.kpiId_ = kpiId_; } else { result.kpiId_ = kpiIdBuilder_.build(); } - if (timestampBuilder_ == null) { - result.timestamp_ = timestamp_; - } else { - result.timestamp_ = timestampBuilder_.build(); - } - if (kpiValueBuilder_ == null) { - result.kpiValue_ = kpiValue_; - } else { - result.kpiValue_ = kpiValueBuilder_.build(); - } + result.monitoringWindowS_ = monitoringWindowS_; + result.samplingRateS_ = samplingRateS_; + result.lastNSamples_ = lastNSamples_; + result.startDate_ = startDate_; + result.endDate_ = endDate_; onBuilt(); return result; } @@ -5608,24 +6940,58 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.Kpi) { - return mergeFrom((monitoring.Monitoring.Kpi)other); + if (other instanceof monitoring.Monitoring.KpiQuery) { + return mergeFrom((monitoring.Monitoring.KpiQuery)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.Kpi other) { - if (other == monitoring.Monitoring.Kpi.getDefaultInstance()) return this; - if (other.hasKpiId()) { - mergeKpiId(other.getKpiId()); + public Builder mergeFrom(monitoring.Monitoring.KpiQuery other) { + if (other == monitoring.Monitoring.KpiQuery.getDefaultInstance()) return this; + if (kpiIdBuilder_ == null) { + if (!other.kpiId_.isEmpty()) { + if (kpiId_.isEmpty()) { + kpiId_ = other.kpiId_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureKpiIdIsMutable(); + kpiId_.addAll(other.kpiId_); + } + onChanged(); + } + } else { + if (!other.kpiId_.isEmpty()) { + if (kpiIdBuilder_.isEmpty()) { + kpiIdBuilder_.dispose(); + kpiIdBuilder_ = null; + kpiId_ = other.kpiId_; + bitField0_ = (bitField0_ & ~0x00000001); + kpiIdBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getKpiIdFieldBuilder() : null; + } else { + kpiIdBuilder_.addAllMessages(other.kpiId_); + } + } } - if (other.hasTimestamp()) { - mergeTimestamp(other.getTimestamp()); + if (other.getMonitoringWindowS() != 0F) { + setMonitoringWindowS(other.getMonitoringWindowS()); } - if (other.hasKpiValue()) { - mergeKpiValue(other.getKpiValue()); + if (other.getSamplingRateS() != 0F) { + setSamplingRateS(other.getSamplingRateS()); + } + if (other.getLastNSamples() != 0) { + setLastNSamples(other.getLastNSamples()); + } + if (!other.getStartDate().isEmpty()) { + startDate_ = other.startDate_; + onChanged(); + } + if (!other.getEndDate().isEmpty()) { + endDate_ = other.endDate_; + onChanged(); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -5642,11 +7008,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.Kpi parsedMessage = null; + monitoring.Monitoring.KpiQuery parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.Kpi) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.KpiQuery) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -5655,119 +7021,241 @@ public final class Monitoring { } return this; } - - private monitoring.Monitoring.KpiId kpiId_; - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; + private int bitField0_; + + private java.util.List kpiId_ = + java.util.Collections.emptyList(); + private void ensureKpiIdIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + kpiId_ = new java.util.ArrayList(kpiId_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; + + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + public java.util.List getKpiIdList() { + if (kpiIdBuilder_ == null) { + return java.util.Collections.unmodifiableList(kpiId_); + } else { + return kpiIdBuilder_.getMessageList(); + } + } + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + public int getKpiIdCount() { + if (kpiIdBuilder_ == null) { + return kpiId_.size(); + } else { + return kpiIdBuilder_.getCount(); + } + } + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + public monitoring.Monitoring.KpiId getKpiId(int index) { + if (kpiIdBuilder_ == null) { + return kpiId_.get(index); + } else { + return kpiIdBuilder_.getMessage(index); + } + } + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + public Builder setKpiId( + int index, monitoring.Monitoring.KpiId value) { + if (kpiIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiIdIsMutable(); + kpiId_.set(index, value); + onChanged(); + } else { + kpiIdBuilder_.setMessage(index, value); + } + return this; + } /** - * .monitoring.KpiId kpi_id = 1; - * @return Whether the kpiId field is set. + * repeated .monitoring.KpiId kpi_id = 1; */ - public boolean hasKpiId() { - return kpiIdBuilder_ != null || kpiId_ != null; + public Builder setKpiId( + int index, monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdBuilder_ == null) { + ensureKpiIdIsMutable(); + kpiId_.set(index, builderForValue.build()); + onChanged(); + } else { + kpiIdBuilder_.setMessage(index, builderForValue.build()); + } + return this; } /** - * .monitoring.KpiId kpi_id = 1; - * @return The kpiId. + * repeated .monitoring.KpiId kpi_id = 1; */ - public monitoring.Monitoring.KpiId getKpiId() { + public Builder addKpiId(monitoring.Monitoring.KpiId value) { if (kpiIdBuilder_ == null) { - return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + if (value == null) { + throw new NullPointerException(); + } + ensureKpiIdIsMutable(); + kpiId_.add(value); + onChanged(); } else { - return kpiIdBuilder_.getMessage(); + kpiIdBuilder_.addMessage(value); } + return this; } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id = 1; */ - public Builder setKpiId(monitoring.Monitoring.KpiId value) { + public Builder addKpiId( + int index, monitoring.Monitoring.KpiId value) { if (kpiIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - kpiId_ = value; + ensureKpiIdIsMutable(); + kpiId_.add(index, value); onChanged(); } else { - kpiIdBuilder_.setMessage(value); + kpiIdBuilder_.addMessage(index, value); } - return this; } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id = 1; */ - public Builder setKpiId( + public Builder addKpiId( monitoring.Monitoring.KpiId.Builder builderForValue) { if (kpiIdBuilder_ == null) { - kpiId_ = builderForValue.build(); + ensureKpiIdIsMutable(); + kpiId_.add(builderForValue.build()); onChanged(); } else { - kpiIdBuilder_.setMessage(builderForValue.build()); + kpiIdBuilder_.addMessage(builderForValue.build()); } - return this; } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id = 1; */ - public Builder mergeKpiId(monitoring.Monitoring.KpiId value) { + public Builder addKpiId( + int index, monitoring.Monitoring.KpiId.Builder builderForValue) { if (kpiIdBuilder_ == null) { - if (kpiId_ != null) { - kpiId_ = - monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial(); - } else { - kpiId_ = value; - } + ensureKpiIdIsMutable(); + kpiId_.add(index, builderForValue.build()); onChanged(); } else { - kpiIdBuilder_.mergeFrom(value); + kpiIdBuilder_.addMessage(index, builderForValue.build()); } - return this; } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id = 1; + */ + public Builder addAllKpiId( + java.lang.Iterable values) { + if (kpiIdBuilder_ == null) { + ensureKpiIdIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, kpiId_); + onChanged(); + } else { + kpiIdBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id = 1; */ public Builder clearKpiId() { if (kpiIdBuilder_ == null) { - kpiId_ = null; + kpiId_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { - kpiId_ = null; - kpiIdBuilder_ = null; + kpiIdBuilder_.clear(); } - return this; } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id = 1; */ - public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() { - - onChanged(); - return getKpiIdFieldBuilder().getBuilder(); + public Builder removeKpiId(int index) { + if (kpiIdBuilder_ == null) { + ensureKpiIdIsMutable(); + kpiId_.remove(index); + onChanged(); + } else { + kpiIdBuilder_.remove(index); + } + return this; } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id = 1; */ - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { + public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder( + int index) { + return getKpiIdFieldBuilder().getBuilder(index); + } + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder( + int index) { + if (kpiIdBuilder_ == null) { + return kpiId_.get(index); } else { + return kpiIdBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + public java.util.List + getKpiIdOrBuilderList() { if (kpiIdBuilder_ != null) { - return kpiIdBuilder_.getMessageOrBuilder(); + return kpiIdBuilder_.getMessageOrBuilderList(); } else { - return kpiId_ == null ? - monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + return java.util.Collections.unmodifiableList(kpiId_); } } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id = 1; */ - private com.google.protobuf.SingleFieldBuilderV3< + public monitoring.Monitoring.KpiId.Builder addKpiIdBuilder() { + return getKpiIdFieldBuilder().addBuilder( + monitoring.Monitoring.KpiId.getDefaultInstance()); + } + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + public monitoring.Monitoring.KpiId.Builder addKpiIdBuilder( + int index) { + return getKpiIdFieldBuilder().addBuilder( + index, monitoring.Monitoring.KpiId.getDefaultInstance()); + } + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + public java.util.List + getKpiIdBuilderList() { + return getKpiIdFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> getKpiIdFieldBuilder() { if (kpiIdBuilder_ == null) { - kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + kpiIdBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( - getKpiId(), + kpiId_, + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); kpiId_ = null; @@ -5775,242 +7263,301 @@ public final class Monitoring { return kpiIdBuilder_; } - private context.ContextOuterClass.Timestamp timestamp_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> timestampBuilder_; + private float monitoringWindowS_ ; /** - * .context.Timestamp timestamp = 2; - * @return Whether the timestamp field is set. + * float monitoring_window_s = 2; + * @return The monitoringWindowS. */ - public boolean hasTimestamp() { - return timestampBuilder_ != null || timestamp_ != null; + @java.lang.Override + public float getMonitoringWindowS() { + return monitoringWindowS_; } /** - * .context.Timestamp timestamp = 2; - * @return The timestamp. + * float monitoring_window_s = 2; + * @param value The monitoringWindowS to set. + * @return This builder for chaining. */ - public context.ContextOuterClass.Timestamp getTimestamp() { - if (timestampBuilder_ == null) { - return timestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_; - } else { - return timestampBuilder_.getMessage(); - } + public Builder setMonitoringWindowS(float value) { + + monitoringWindowS_ = value; + onChanged(); + return this; } /** - * .context.Timestamp timestamp = 2; + * float monitoring_window_s = 2; + * @return This builder for chaining. */ - public Builder setTimestamp(context.ContextOuterClass.Timestamp value) { - if (timestampBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - timestamp_ = value; - onChanged(); - } else { - timestampBuilder_.setMessage(value); - } - + public Builder clearMonitoringWindowS() { + + monitoringWindowS_ = 0F; + onChanged(); return this; } + + private float samplingRateS_ ; + /** + * float sampling_rate_s = 3; + * @return The samplingRateS. + */ + @java.lang.Override + public float getSamplingRateS() { + return samplingRateS_; + } /** - * .context.Timestamp timestamp = 2; + * float sampling_rate_s = 3; + * @param value The samplingRateS to set. + * @return This builder for chaining. */ - public Builder setTimestamp( - context.ContextOuterClass.Timestamp.Builder builderForValue) { - if (timestampBuilder_ == null) { - timestamp_ = builderForValue.build(); - onChanged(); - } else { - timestampBuilder_.setMessage(builderForValue.build()); - } - + public Builder setSamplingRateS(float value) { + + samplingRateS_ = value; + onChanged(); return this; } /** - * .context.Timestamp timestamp = 2; + * float sampling_rate_s = 3; + * @return This builder for chaining. */ - public Builder mergeTimestamp(context.ContextOuterClass.Timestamp value) { - if (timestampBuilder_ == null) { - if (timestamp_ != null) { - timestamp_ = - context.ContextOuterClass.Timestamp.newBuilder(timestamp_).mergeFrom(value).buildPartial(); - } else { - timestamp_ = value; - } - onChanged(); - } else { - timestampBuilder_.mergeFrom(value); - } - + public Builder clearSamplingRateS() { + + samplingRateS_ = 0F; + onChanged(); return this; } + + private int lastNSamples_ ; /** - * .context.Timestamp timestamp = 2; + * 
+       * used when you want something like "get the last N many samples
+       *
+ * + * uint32 last_n_samples = 4; + * @return The lastNSamples. */ - public Builder clearTimestamp() { - if (timestampBuilder_ == null) { - timestamp_ = null; - onChanged(); - } else { - timestamp_ = null; - timestampBuilder_ = null; - } - + @java.lang.Override + public int getLastNSamples() { + return lastNSamples_; + } + /** + * 
+       * used when you want something like "get the last N many samples
+       *
+ * + * uint32 last_n_samples = 4; + * @param value The lastNSamples to set. + * @return This builder for chaining. + */ + public Builder setLastNSamples(int value) { + + lastNSamples_ = value; + onChanged(); return this; } /** - * .context.Timestamp timestamp = 2; + * 
+       * used when you want something like "get the last N many samples
+       *
+ * + * uint32 last_n_samples = 4; + * @return This builder for chaining. */ - public context.ContextOuterClass.Timestamp.Builder getTimestampBuilder() { + public Builder clearLastNSamples() { + lastNSamples_ = 0; onChanged(); - return getTimestampFieldBuilder().getBuilder(); + return this; } + + private java.lang.Object startDate_ = ""; /** - * .context.Timestamp timestamp = 2; + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 5; + * @return The startDate. */ - public context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder() { - if (timestampBuilder_ != null) { - return timestampBuilder_.getMessageOrBuilder(); + public java.lang.String getStartDate() { + java.lang.Object ref = startDate_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + startDate_ = s; + return s; } else { - return timestamp_ == null ? - context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_; + return (java.lang.String) ref; } } /** - * .context.Timestamp timestamp = 2; + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 5; + * @return The bytes for startDate. */ - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> - getTimestampFieldBuilder() { - if (timestampBuilder_ == null) { - timestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>( - getTimestamp(), - getParentForChildren(), - isClean()); - timestamp_ = null; + public com.google.protobuf.ByteString + getStartDateBytes() { + java.lang.Object ref = startDate_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + startDate_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; } - return timestampBuilder_; } - - private monitoring.Monitoring.KpiValue kpiValue_; - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> kpiValueBuilder_; /** - * .monitoring.KpiValue kpi_value = 3; - * @return Whether the kpiValue field is set. + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 5; + * @param value The startDate to set. + * @return This builder for chaining. */ - public boolean hasKpiValue() { - return kpiValueBuilder_ != null || kpiValue_ != null; + public Builder setStartDate( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + startDate_ = value; + onChanged(); + return this; } /** - * .monitoring.KpiValue kpi_value = 3; - * @return The kpiValue. + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 5; + * @return This builder for chaining. */ - public monitoring.Monitoring.KpiValue getKpiValue() { - if (kpiValueBuilder_ == null) { - return kpiValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiValue_; - } else { - return kpiValueBuilder_.getMessage(); - } + public Builder clearStartDate() { + + startDate_ = getDefaultInstance().getStartDate(); + onChanged(); + return this; } /** - * .monitoring.KpiValue kpi_value = 3; + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 5; + * @param value The bytes for startDate to set. + * @return This builder for chaining. */ - public Builder setKpiValue(monitoring.Monitoring.KpiValue value) { - if (kpiValueBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - kpiValue_ = value; - onChanged(); - } else { - kpiValueBuilder_.setMessage(value); - } - + public Builder setStartDateBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + startDate_ = value; + onChanged(); return this; } + + private java.lang.Object endDate_ = ""; /** - * .monitoring.KpiValue kpi_value = 3; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 6; + * @return The endDate. */ - public Builder setKpiValue( - monitoring.Monitoring.KpiValue.Builder builderForValue) { - if (kpiValueBuilder_ == null) { - kpiValue_ = builderForValue.build(); - onChanged(); + public java.lang.String getEndDate() { + java.lang.Object ref = endDate_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + endDate_ = s; + return s; } else { - kpiValueBuilder_.setMessage(builderForValue.build()); + return (java.lang.String) ref; } - - return this; } /** - * .monitoring.KpiValue kpi_value = 3; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 6; + * @return The bytes for endDate. */ - public Builder mergeKpiValue(monitoring.Monitoring.KpiValue value) { - if (kpiValueBuilder_ == null) { - if (kpiValue_ != null) { - kpiValue_ = - monitoring.Monitoring.KpiValue.newBuilder(kpiValue_).mergeFrom(value).buildPartial(); - } else { - kpiValue_ = value; - } - onChanged(); + public com.google.protobuf.ByteString + getEndDateBytes() { + java.lang.Object ref = endDate_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + endDate_ = b; + return b; } else { - kpiValueBuilder_.mergeFrom(value); + return (com.google.protobuf.ByteString) ref; } - - return this; } /** - * .monitoring.KpiValue kpi_value = 3; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 6; + * @param value The endDate to set. + * @return This builder for chaining. */ - public Builder clearKpiValue() { - if (kpiValueBuilder_ == null) { - kpiValue_ = null; - onChanged(); - } else { - kpiValue_ = null; - kpiValueBuilder_ = null; - } - + public Builder setEndDate( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + endDate_ = value; + onChanged(); return this; } /** - * .monitoring.KpiValue kpi_value = 3; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 6; + * @return This builder for chaining. */ - public monitoring.Monitoring.KpiValue.Builder getKpiValueBuilder() { + public Builder clearEndDate() { + endDate_ = getDefaultInstance().getEndDate(); onChanged(); - return getKpiValueFieldBuilder().getBuilder(); - } - /** - * .monitoring.KpiValue kpi_value = 3; - */ - public monitoring.Monitoring.KpiValueOrBuilder getKpiValueOrBuilder() { - if (kpiValueBuilder_ != null) { - return kpiValueBuilder_.getMessageOrBuilder(); - } else { - return kpiValue_ == null ? - monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiValue_; - } + return this; } /** - * .monitoring.KpiValue kpi_value = 3; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 6; + * @param value The bytes for endDate to set. + * @return This builder for chaining. */ - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> - getKpiValueFieldBuilder() { - if (kpiValueBuilder_ == null) { - kpiValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder>( - getKpiValue(), - getParentForChildren(), - isClean()); - kpiValue_ = null; - } - return kpiValueBuilder_; + public Builder setEndDateBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + endDate_ = value; + onChanged(); + return this; } @java.lang.Override public final Builder setUnknownFields( @@ -6025,130 +7572,85 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.Kpi) + // @@protoc_insertion_point(builder_scope:monitoring.KpiQuery) } - // @@protoc_insertion_point(class_scope:monitoring.Kpi) - private static final monitoring.Monitoring.Kpi DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.KpiQuery) + private static final monitoring.Monitoring.KpiQuery DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.Kpi(); + DEFAULT_INSTANCE = new monitoring.Monitoring.KpiQuery(); } - public static monitoring.Monitoring.Kpi getDefaultInstance() { + public static monitoring.Monitoring.KpiQuery getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public Kpi parsePartialFrom( + public KpiQuery parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Kpi(input, extensionRegistry); + return new KpiQuery(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.Kpi getDefaultInstanceForType() { + public monitoring.Monitoring.KpiQuery getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface KpiValueRangeOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.KpiValueRange) + public interface KpiIdOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.KpiId) com.google.protobuf.MessageOrBuilder { /** - * .monitoring.KpiValue kpiMinValue = 1; - * @return Whether the kpiMinValue field is set. - */ - boolean hasKpiMinValue(); - /** - * .monitoring.KpiValue kpiMinValue = 1; - * @return The kpiMinValue. - */ - monitoring.Monitoring.KpiValue getKpiMinValue(); - /** - * .monitoring.KpiValue kpiMinValue = 1; - */ - monitoring.Monitoring.KpiValueOrBuilder getKpiMinValueOrBuilder(); - - /** - * .monitoring.KpiValue kpiMaxValue = 2; - * @return Whether the kpiMaxValue field is set. - */ - boolean hasKpiMaxValue(); - /** - * .monitoring.KpiValue kpiMaxValue = 2; - * @return The kpiMaxValue. - */ - monitoring.Monitoring.KpiValue getKpiMaxValue(); - /** - * .monitoring.KpiValue kpiMaxValue = 2; - */ - monitoring.Monitoring.KpiValueOrBuilder getKpiMaxValueOrBuilder(); - - /** - * 
-     * by default True
-     *
- * - * bool inRange = 3; - * @return The inRange. + * .context.Uuid kpi_id = 1; + * @return Whether the kpiId field is set. */ - boolean getInRange(); - + boolean hasKpiId(); /** - * 
-     * False is outside the interval
-     *
- * - * bool includeMinValue = 4; - * @return The includeMinValue. + * .context.Uuid kpi_id = 1; + * @return The kpiId. */ - boolean getIncludeMinValue(); - + context.ContextOuterClass.Uuid getKpiId(); /** - * 
-     * False is outside the interval
-     *
- * - * bool includeMaxValue = 5; - * @return The includeMaxValue. + * .context.Uuid kpi_id = 1; */ - boolean getIncludeMaxValue(); + context.ContextOuterClass.UuidOrBuilder getKpiIdOrBuilder(); } /** - * Protobuf type {@code monitoring.KpiValueRange} + * Protobuf type {@code monitoring.KpiId} */ - public static final class KpiValueRange extends + public static final class KpiId extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.KpiValueRange) - KpiValueRangeOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.KpiId) + KpiIdOrBuilder { private static final long serialVersionUID = 0L; - // Use KpiValueRange.newBuilder() to construct. - private KpiValueRange(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use KpiId.newBuilder() to construct. + private KpiId(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private KpiValueRange() { + private KpiId() { } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new KpiValueRange(); + return new KpiId(); } @java.lang.Override @@ -6156,7 +7658,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private KpiValueRange( + private KpiId( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -6175,46 +7677,18 @@ public final class Monitoring { done = true; break; case 10: { - monitoring.Monitoring.KpiValue.Builder subBuilder = null; - if (kpiMinValue_ != null) { - subBuilder = kpiMinValue_.toBuilder(); - } - kpiMinValue_ = input.readMessage(monitoring.Monitoring.KpiValue.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(kpiMinValue_); - kpiMinValue_ = subBuilder.buildPartial(); - } - - break; - } - case 18: { - monitoring.Monitoring.KpiValue.Builder subBuilder = null; - if (kpiMaxValue_ != null) { - subBuilder = kpiMaxValue_.toBuilder(); + context.ContextOuterClass.Uuid.Builder subBuilder = null; + if (kpiId_ != null) { + subBuilder = kpiId_.toBuilder(); } - kpiMaxValue_ = input.readMessage(monitoring.Monitoring.KpiValue.parser(), extensionRegistry); + kpiId_ = input.readMessage(context.ContextOuterClass.Uuid.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(kpiMaxValue_); - kpiMaxValue_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(kpiId_); + kpiId_ = subBuilder.buildPartial(); } break; } - case 24: { - - inRange_ = input.readBool(); - break; - } - case 32: { - - includeMinValue_ = input.readBool(); - break; - } - case 40: { - - includeMaxValue_ = input.readBool(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -6236,112 +7710,41 @@ public final class Monitoring { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiId_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiId_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiValueRange.class, monitoring.Monitoring.KpiValueRange.Builder.class); - } - - public static final int KPIMINVALUE_FIELD_NUMBER = 1; - private monitoring.Monitoring.KpiValue kpiMinValue_; - /** - * .monitoring.KpiValue kpiMinValue = 1; - * @return Whether the kpiMinValue field is set. - */ - @java.lang.Override - public boolean hasKpiMinValue() { - return kpiMinValue_ != null; - } - /** - * .monitoring.KpiValue kpiMinValue = 1; - * @return The kpiMinValue. - */ - @java.lang.Override - public monitoring.Monitoring.KpiValue getKpiMinValue() { - return kpiMinValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMinValue_; - } - /** - * .monitoring.KpiValue kpiMinValue = 1; - */ - @java.lang.Override - public monitoring.Monitoring.KpiValueOrBuilder getKpiMinValueOrBuilder() { - return getKpiMinValue(); - } - - public static final int KPIMAXVALUE_FIELD_NUMBER = 2; - private monitoring.Monitoring.KpiValue kpiMaxValue_; - /** - * .monitoring.KpiValue kpiMaxValue = 2; - * @return Whether the kpiMaxValue field is set. - */ - @java.lang.Override - public boolean hasKpiMaxValue() { - return kpiMaxValue_ != null; - } - /** - * .monitoring.KpiValue kpiMaxValue = 2; - * @return The kpiMaxValue. - */ - @java.lang.Override - public monitoring.Monitoring.KpiValue getKpiMaxValue() { - return kpiMaxValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMaxValue_; - } - /** - * .monitoring.KpiValue kpiMaxValue = 2; - */ - @java.lang.Override - public monitoring.Monitoring.KpiValueOrBuilder getKpiMaxValueOrBuilder() { - return getKpiMaxValue(); + monitoring.Monitoring.KpiId.class, monitoring.Monitoring.KpiId.Builder.class); } - public static final int INRANGE_FIELD_NUMBER = 3; - private boolean inRange_; + public static final int KPI_ID_FIELD_NUMBER = 1; + private context.ContextOuterClass.Uuid kpiId_; /** - * 
-     * by default True
-     *
- * - * bool inRange = 3; - * @return The inRange. + * .context.Uuid kpi_id = 1; + * @return Whether the kpiId field is set. */ @java.lang.Override - public boolean getInRange() { - return inRange_; + public boolean hasKpiId() { + return kpiId_ != null; } - - public static final int INCLUDEMINVALUE_FIELD_NUMBER = 4; - private boolean includeMinValue_; /** - * 
-     * False is outside the interval
-     *
- * - * bool includeMinValue = 4; - * @return The includeMinValue. + * .context.Uuid kpi_id = 1; + * @return The kpiId. */ @java.lang.Override - public boolean getIncludeMinValue() { - return includeMinValue_; + public context.ContextOuterClass.Uuid getKpiId() { + return kpiId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : kpiId_; } - - public static final int INCLUDEMAXVALUE_FIELD_NUMBER = 5; - private boolean includeMaxValue_; /** - * 
-     * False is outside the interval
-     *
- * - * bool includeMaxValue = 5; - * @return The includeMaxValue. + * .context.Uuid kpi_id = 1; */ @java.lang.Override - public boolean getIncludeMaxValue() { - return includeMaxValue_; + public context.ContextOuterClass.UuidOrBuilder getKpiIdOrBuilder() { + return getKpiId(); } private byte memoizedIsInitialized = -1; @@ -6358,20 +7761,8 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (kpiMinValue_ != null) { - output.writeMessage(1, getKpiMinValue()); - } - if (kpiMaxValue_ != null) { - output.writeMessage(2, getKpiMaxValue()); - } - if (inRange_ != false) { - output.writeBool(3, inRange_); - } - if (includeMinValue_ != false) { - output.writeBool(4, includeMinValue_); - } - if (includeMaxValue_ != false) { - output.writeBool(5, includeMaxValue_); + if (kpiId_ != null) { + output.writeMessage(1, getKpiId()); } unknownFields.writeTo(output); } @@ -6382,25 +7773,9 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (kpiMinValue_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getKpiMinValue()); - } - if (kpiMaxValue_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, getKpiMaxValue()); - } - if (inRange_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, inRange_); - } - if (includeMinValue_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(4, includeMinValue_); - } - if (includeMaxValue_ != false) { + if (kpiId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(5, includeMaxValue_); + .computeMessageSize(1, getKpiId()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -6412,27 +7787,16 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.KpiValueRange)) { + if (!(obj instanceof monitoring.Monitoring.KpiId)) { return super.equals(obj); } - monitoring.Monitoring.KpiValueRange other = (monitoring.Monitoring.KpiValueRange) obj; + monitoring.Monitoring.KpiId other = (monitoring.Monitoring.KpiId) obj; - if (hasKpiMinValue() != other.hasKpiMinValue()) return false; - if (hasKpiMinValue()) { - if (!getKpiMinValue() - .equals(other.getKpiMinValue())) return false; - } - if (hasKpiMaxValue() != other.hasKpiMaxValue()) return false; - if (hasKpiMaxValue()) { - if (!getKpiMaxValue() - .equals(other.getKpiMaxValue())) return false; + if (hasKpiId() != other.hasKpiId()) return false; + if (hasKpiId()) { + if (!getKpiId() + .equals(other.getKpiId())) return false; } - if (getInRange() - != other.getInRange()) return false; - if (getIncludeMinValue() - != other.getIncludeMinValue()) return false; - if (getIncludeMaxValue() - != other.getIncludeMaxValue()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -6444,91 +7808,78 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasKpiMinValue()) { - hash = (37 * hash) + KPIMINVALUE_FIELD_NUMBER; - hash = (53 * hash) + getKpiMinValue().hashCode(); - } - if (hasKpiMaxValue()) { - hash = (37 * hash) + KPIMAXVALUE_FIELD_NUMBER; - hash = (53 * hash) + getKpiMaxValue().hashCode(); + if (hasKpiId()) { + hash = (37 * hash) + KPI_ID_FIELD_NUMBER; + hash = (53 * hash) + getKpiId().hashCode(); } - hash = (37 * hash) + INRANGE_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getInRange()); - hash = (37 * hash) + INCLUDEMINVALUE_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIncludeMinValue()); - hash = (37 * hash) + INCLUDEMAXVALUE_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIncludeMaxValue()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.KpiValueRange parseFrom( + public static monitoring.Monitoring.KpiId parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiValueRange parseFrom( + public static monitoring.Monitoring.KpiId parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiValueRange parseFrom( + public static monitoring.Monitoring.KpiId parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiValueRange parseFrom( + public static monitoring.Monitoring.KpiId parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiValueRange parseFrom(byte[] data) + public static monitoring.Monitoring.KpiId parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiValueRange parseFrom( + public static monitoring.Monitoring.KpiId parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiValueRange parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiId parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiValueRange parseFrom( + public static monitoring.Monitoring.KpiId parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiValueRange parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiId parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiValueRange parseDelimitedFrom( + public static monitoring.Monitoring.KpiId parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiValueRange parseFrom( + public static monitoring.Monitoring.KpiId parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiValueRange parseFrom( + public static monitoring.Monitoring.KpiId parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -6541,7 +7892,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.KpiValueRange prototype) { + public static Builder newBuilder(monitoring.Monitoring.KpiId prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -6557,26 +7908,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.KpiValueRange} + * Protobuf type {@code monitoring.KpiId} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.KpiValueRange) - monitoring.Monitoring.KpiValueRangeOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.KpiId) + monitoring.Monitoring.KpiIdOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiId_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiId_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiValueRange.class, monitoring.Monitoring.KpiValueRange.Builder.class); + monitoring.Monitoring.KpiId.class, monitoring.Monitoring.KpiId.Builder.class); } - // Construct using monitoring.Monitoring.KpiValueRange.newBuilder() + // Construct using monitoring.Monitoring.KpiId.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -6586,528 +7937,248 @@ public final class Monitoring { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } - } - @java.lang.Override - public Builder clear() { - super.clear(); - if (kpiMinValueBuilder_ == null) { - kpiMinValue_ = null; - } else { - kpiMinValue_ = null; - kpiMinValueBuilder_ = null; - } - if (kpiMaxValueBuilder_ == null) { - kpiMaxValue_ = null; - } else { - kpiMaxValue_ = null; - kpiMaxValueBuilder_ = null; - } - inRange_ = false; - - includeMinValue_ = false; - - includeMaxValue_ = false; - - return this; - } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_descriptor; - } - - @java.lang.Override - public monitoring.Monitoring.KpiValueRange getDefaultInstanceForType() { - return monitoring.Monitoring.KpiValueRange.getDefaultInstance(); - } - - @java.lang.Override - public monitoring.Monitoring.KpiValueRange build() { - monitoring.Monitoring.KpiValueRange result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - @java.lang.Override - public monitoring.Monitoring.KpiValueRange buildPartial() { - monitoring.Monitoring.KpiValueRange result = new monitoring.Monitoring.KpiValueRange(this); - if (kpiMinValueBuilder_ == null) { - result.kpiMinValue_ = kpiMinValue_; - } else { - result.kpiMinValue_ = kpiMinValueBuilder_.build(); - } - if (kpiMaxValueBuilder_ == null) { - result.kpiMaxValue_ = kpiMaxValue_; - } else { - result.kpiMaxValue_ = kpiMaxValueBuilder_.build(); - } - result.inRange_ = inRange_; - result.includeMinValue_ = includeMinValue_; - result.includeMaxValue_ = includeMaxValue_; - onBuilt(); - return result; - } - - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.KpiValueRange) { - return mergeFrom((monitoring.Monitoring.KpiValueRange)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(monitoring.Monitoring.KpiValueRange other) { - if (other == monitoring.Monitoring.KpiValueRange.getDefaultInstance()) return this; - if (other.hasKpiMinValue()) { - mergeKpiMinValue(other.getKpiMinValue()); - } - if (other.hasKpiMaxValue()) { - mergeKpiMaxValue(other.getKpiMaxValue()); - } - if (other.getInRange() != false) { - setInRange(other.getInRange()); - } - if (other.getIncludeMinValue() != false) { - setIncludeMinValue(other.getIncludeMinValue()); - } - if (other.getIncludeMaxValue() != false) { - setIncludeMaxValue(other.getIncludeMaxValue()); - } - this.mergeUnknownFields(other.unknownFields); - onChanged(); - return this; - } - - @java.lang.Override - public final boolean isInitialized() { - return true; - } - - @java.lang.Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - monitoring.Monitoring.KpiValueRange parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.KpiValueRange) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - private monitoring.Monitoring.KpiValue kpiMinValue_; - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> kpiMinValueBuilder_; - /** - * .monitoring.KpiValue kpiMinValue = 1; - * @return Whether the kpiMinValue field is set. - */ - public boolean hasKpiMinValue() { - return kpiMinValueBuilder_ != null || kpiMinValue_ != null; - } - /** - * .monitoring.KpiValue kpiMinValue = 1; - * @return The kpiMinValue. - */ - public monitoring.Monitoring.KpiValue getKpiMinValue() { - if (kpiMinValueBuilder_ == null) { - return kpiMinValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMinValue_; - } else { - return kpiMinValueBuilder_.getMessage(); - } - } - /** - * .monitoring.KpiValue kpiMinValue = 1; - */ - public Builder setKpiMinValue(monitoring.Monitoring.KpiValue value) { - if (kpiMinValueBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - kpiMinValue_ = value; - onChanged(); - } else { - kpiMinValueBuilder_.setMessage(value); - } - - return this; - } - /** - * .monitoring.KpiValue kpiMinValue = 1; - */ - public Builder setKpiMinValue( - monitoring.Monitoring.KpiValue.Builder builderForValue) { - if (kpiMinValueBuilder_ == null) { - kpiMinValue_ = builderForValue.build(); - onChanged(); - } else { - kpiMinValueBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .monitoring.KpiValue kpiMinValue = 1; - */ - public Builder mergeKpiMinValue(monitoring.Monitoring.KpiValue value) { - if (kpiMinValueBuilder_ == null) { - if (kpiMinValue_ != null) { - kpiMinValue_ = - monitoring.Monitoring.KpiValue.newBuilder(kpiMinValue_).mergeFrom(value).buildPartial(); - } else { - kpiMinValue_ = value; - } - onChanged(); - } else { - kpiMinValueBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .monitoring.KpiValue kpiMinValue = 1; - */ - public Builder clearKpiMinValue() { - if (kpiMinValueBuilder_ == null) { - kpiMinValue_ = null; - onChanged(); - } else { - kpiMinValue_ = null; - kpiMinValueBuilder_ = null; - } - - return this; - } - /** - * .monitoring.KpiValue kpiMinValue = 1; - */ - public monitoring.Monitoring.KpiValue.Builder getKpiMinValueBuilder() { - - onChanged(); - return getKpiMinValueFieldBuilder().getBuilder(); + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } } - /** - * .monitoring.KpiValue kpiMinValue = 1; - */ - public monitoring.Monitoring.KpiValueOrBuilder getKpiMinValueOrBuilder() { - if (kpiMinValueBuilder_ != null) { - return kpiMinValueBuilder_.getMessageOrBuilder(); + @java.lang.Override + public Builder clear() { + super.clear(); + if (kpiIdBuilder_ == null) { + kpiId_ = null; } else { - return kpiMinValue_ == null ? - monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMinValue_; + kpiId_ = null; + kpiIdBuilder_ = null; } + return this; } - /** - * .monitoring.KpiValue kpiMinValue = 1; - */ - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> - getKpiMinValueFieldBuilder() { - if (kpiMinValueBuilder_ == null) { - kpiMinValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder>( - getKpiMinValue(), - getParentForChildren(), - isClean()); - kpiMinValue_ = null; - } - return kpiMinValueBuilder_; + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return monitoring.Monitoring.internal_static_monitoring_KpiId_descriptor; } - private monitoring.Monitoring.KpiValue kpiMaxValue_; - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> kpiMaxValueBuilder_; - /** - * .monitoring.KpiValue kpiMaxValue = 2; - * @return Whether the kpiMaxValue field is set. - */ - public boolean hasKpiMaxValue() { - return kpiMaxValueBuilder_ != null || kpiMaxValue_ != null; + @java.lang.Override + public monitoring.Monitoring.KpiId getDefaultInstanceForType() { + return monitoring.Monitoring.KpiId.getDefaultInstance(); } - /** - * .monitoring.KpiValue kpiMaxValue = 2; - * @return The kpiMaxValue. - */ - public monitoring.Monitoring.KpiValue getKpiMaxValue() { - if (kpiMaxValueBuilder_ == null) { - return kpiMaxValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMaxValue_; - } else { - return kpiMaxValueBuilder_.getMessage(); + + @java.lang.Override + public monitoring.Monitoring.KpiId build() { + monitoring.Monitoring.KpiId result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); } + return result; } - /** - * .monitoring.KpiValue kpiMaxValue = 2; - */ - public Builder setKpiMaxValue(monitoring.Monitoring.KpiValue value) { - if (kpiMaxValueBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - kpiMaxValue_ = value; - onChanged(); + + @java.lang.Override + public monitoring.Monitoring.KpiId buildPartial() { + monitoring.Monitoring.KpiId result = new monitoring.Monitoring.KpiId(this); + if (kpiIdBuilder_ == null) { + result.kpiId_ = kpiId_; } else { - kpiMaxValueBuilder_.setMessage(value); + result.kpiId_ = kpiIdBuilder_.build(); } + onBuilt(); + return result; + } - return this; + @java.lang.Override + public Builder clone() { + return super.clone(); } - /** - * .monitoring.KpiValue kpiMaxValue = 2; - */ - public Builder setKpiMaxValue( - monitoring.Monitoring.KpiValue.Builder builderForValue) { - if (kpiMaxValueBuilder_ == null) { - kpiMaxValue_ = builderForValue.build(); - onChanged(); + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof monitoring.Monitoring.KpiId) { + return mergeFrom((monitoring.Monitoring.KpiId)other); } else { - kpiMaxValueBuilder_.setMessage(builderForValue.build()); + super.mergeFrom(other); + return this; } + } + public Builder mergeFrom(monitoring.Monitoring.KpiId other) { + if (other == monitoring.Monitoring.KpiId.getDefaultInstance()) return this; + if (other.hasKpiId()) { + mergeKpiId(other.getKpiId()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); return this; } - /** - * .monitoring.KpiValue kpiMaxValue = 2; - */ - public Builder mergeKpiMaxValue(monitoring.Monitoring.KpiValue value) { - if (kpiMaxValueBuilder_ == null) { - if (kpiMaxValue_ != null) { - kpiMaxValue_ = - monitoring.Monitoring.KpiValue.newBuilder(kpiMaxValue_).mergeFrom(value).buildPartial(); - } else { - kpiMaxValue_ = value; - } - onChanged(); - } else { - kpiMaxValueBuilder_.mergeFrom(value); - } - return this; + @java.lang.Override + public final boolean isInitialized() { + return true; } - /** - * .monitoring.KpiValue kpiMaxValue = 2; - */ - public Builder clearKpiMaxValue() { - if (kpiMaxValueBuilder_ == null) { - kpiMaxValue_ = null; - onChanged(); - } else { - kpiMaxValue_ = null; - kpiMaxValueBuilder_ = null; - } + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + monitoring.Monitoring.KpiId parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (monitoring.Monitoring.KpiId) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } return this; } + + private context.ContextOuterClass.Uuid kpiId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> kpiIdBuilder_; /** - * .monitoring.KpiValue kpiMaxValue = 2; + * .context.Uuid kpi_id = 1; + * @return Whether the kpiId field is set. */ - public monitoring.Monitoring.KpiValue.Builder getKpiMaxValueBuilder() { - - onChanged(); - return getKpiMaxValueFieldBuilder().getBuilder(); + public boolean hasKpiId() { + return kpiIdBuilder_ != null || kpiId_ != null; } /** - * .monitoring.KpiValue kpiMaxValue = 2; + * .context.Uuid kpi_id = 1; + * @return The kpiId. */ - public monitoring.Monitoring.KpiValueOrBuilder getKpiMaxValueOrBuilder() { - if (kpiMaxValueBuilder_ != null) { - return kpiMaxValueBuilder_.getMessageOrBuilder(); + public context.ContextOuterClass.Uuid getKpiId() { + if (kpiIdBuilder_ == null) { + return kpiId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : kpiId_; } else { - return kpiMaxValue_ == null ? - monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMaxValue_; - } - } - /** - * .monitoring.KpiValue kpiMaxValue = 2; - */ - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> - getKpiMaxValueFieldBuilder() { - if (kpiMaxValueBuilder_ == null) { - kpiMaxValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder>( - getKpiMaxValue(), - getParentForChildren(), - isClean()); - kpiMaxValue_ = null; + return kpiIdBuilder_.getMessage(); } - return kpiMaxValueBuilder_; - } - - private boolean inRange_ ; - /** - * 
-       * by default True
-       *
- * - * bool inRange = 3; - * @return The inRange. - */ - @java.lang.Override - public boolean getInRange() { - return inRange_; - } - /** - * 
-       * by default True
-       *
- * - * bool inRange = 3; - * @param value The inRange to set. - * @return This builder for chaining. - */ - public Builder setInRange(boolean value) { - - inRange_ = value; - onChanged(); - return this; } /** - * 
-       * by default True
-       *
- * - * bool inRange = 3; - * @return This builder for chaining. + * .context.Uuid kpi_id = 1; */ - public Builder clearInRange() { - - inRange_ = false; - onChanged(); + public Builder setKpiId(context.ContextOuterClass.Uuid value) { + if (kpiIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + kpiId_ = value; + onChanged(); + } else { + kpiIdBuilder_.setMessage(value); + } + return this; } - - private boolean includeMinValue_ ; /** - * 
-       * False is outside the interval
-       *
- * - * bool includeMinValue = 4; - * @return The includeMinValue. + * .context.Uuid kpi_id = 1; */ - @java.lang.Override - public boolean getIncludeMinValue() { - return includeMinValue_; + public Builder setKpiId( + context.ContextOuterClass.Uuid.Builder builderForValue) { + if (kpiIdBuilder_ == null) { + kpiId_ = builderForValue.build(); + onChanged(); + } else { + kpiIdBuilder_.setMessage(builderForValue.build()); + } + + return this; } /** - * 
-       * False is outside the interval
-       *
- * - * bool includeMinValue = 4; - * @param value The includeMinValue to set. - * @return This builder for chaining. + * .context.Uuid kpi_id = 1; */ - public Builder setIncludeMinValue(boolean value) { - - includeMinValue_ = value; - onChanged(); + public Builder mergeKpiId(context.ContextOuterClass.Uuid value) { + if (kpiIdBuilder_ == null) { + if (kpiId_ != null) { + kpiId_ = + context.ContextOuterClass.Uuid.newBuilder(kpiId_).mergeFrom(value).buildPartial(); + } else { + kpiId_ = value; + } + onChanged(); + } else { + kpiIdBuilder_.mergeFrom(value); + } + return this; } /** - * 
-       * False is outside the interval
-       *
- * - * bool includeMinValue = 4; - * @return This builder for chaining. + * .context.Uuid kpi_id = 1; */ - public Builder clearIncludeMinValue() { - - includeMinValue_ = false; - onChanged(); + public Builder clearKpiId() { + if (kpiIdBuilder_ == null) { + kpiId_ = null; + onChanged(); + } else { + kpiId_ = null; + kpiIdBuilder_ = null; + } + return this; } - - private boolean includeMaxValue_ ; /** - * 
-       * False is outside the interval
-       *
- * - * bool includeMaxValue = 5; - * @return The includeMaxValue. + * .context.Uuid kpi_id = 1; */ - @java.lang.Override - public boolean getIncludeMaxValue() { - return includeMaxValue_; + public context.ContextOuterClass.Uuid.Builder getKpiIdBuilder() { + + onChanged(); + return getKpiIdFieldBuilder().getBuilder(); } /** - * 
-       * False is outside the interval
-       *
- * - * bool includeMaxValue = 5; - * @param value The includeMaxValue to set. - * @return This builder for chaining. + * .context.Uuid kpi_id = 1; */ - public Builder setIncludeMaxValue(boolean value) { - - includeMaxValue_ = value; - onChanged(); - return this; + public context.ContextOuterClass.UuidOrBuilder getKpiIdOrBuilder() { + if (kpiIdBuilder_ != null) { + return kpiIdBuilder_.getMessageOrBuilder(); + } else { + return kpiId_ == null ? + context.ContextOuterClass.Uuid.getDefaultInstance() : kpiId_; + } } /** - * 
-       * False is outside the interval
-       *
- * - * bool includeMaxValue = 5; - * @return This builder for chaining. + * .context.Uuid kpi_id = 1; */ - public Builder clearIncludeMaxValue() { - - includeMaxValue_ = false; - onChanged(); - return this; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> + getKpiIdFieldBuilder() { + if (kpiIdBuilder_ == null) { + kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder>( + getKpiId(), + getParentForChildren(), + isClean()); + kpiId_ = null; + } + return kpiIdBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -7122,155 +8193,113 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.KpiValueRange) + // @@protoc_insertion_point(builder_scope:monitoring.KpiId) } - // @@protoc_insertion_point(class_scope:monitoring.KpiValueRange) - private static final monitoring.Monitoring.KpiValueRange DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.KpiId) + private static final monitoring.Monitoring.KpiId DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.KpiValueRange(); + DEFAULT_INSTANCE = new monitoring.Monitoring.KpiId(); } - public static monitoring.Monitoring.KpiValueRange getDefaultInstance() { + public static monitoring.Monitoring.KpiId getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public KpiValueRange parsePartialFrom( + public KpiId parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new KpiValueRange(input, extensionRegistry); + return new KpiId(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.KpiValueRange getDefaultInstanceForType() { + public monitoring.Monitoring.KpiId getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface KpiValueOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.KpiValue) + public interface KpiOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.Kpi) com.google.protobuf.MessageOrBuilder { /** - * int32 int32Val = 1; - * @return Whether the int32Val field is set. - */ - boolean hasInt32Val(); - /** - * int32 int32Val = 1; - * @return The int32Val. - */ - int getInt32Val(); - - /** - * uint32 uint32Val = 2; - * @return Whether the uint32Val field is set. - */ - boolean hasUint32Val(); - /** - * uint32 uint32Val = 2; - * @return The uint32Val. - */ - int getUint32Val(); - - /** - * int64 int64Val = 3; - * @return Whether the int64Val field is set. - */ - boolean hasInt64Val(); - /** - * int64 int64Val = 3; - * @return The int64Val. + * .monitoring.KpiId kpi_id = 1; + * @return Whether the kpiId field is set. */ - long getInt64Val(); - + boolean hasKpiId(); /** - * uint64 uint64Val = 4; - * @return Whether the uint64Val field is set. + * .monitoring.KpiId kpi_id = 1; + * @return The kpiId. */ - boolean hasUint64Val(); + monitoring.Monitoring.KpiId getKpiId(); /** - * uint64 uint64Val = 4; - * @return The uint64Val. + * .monitoring.KpiId kpi_id = 1; */ - long getUint64Val(); + monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder(); /** - * float floatVal = 5; - * @return Whether the floatVal field is set. + * string timestamp = 2; + * @return The timestamp. */ - boolean hasFloatVal(); + java.lang.String getTimestamp(); /** - * float floatVal = 5; - * @return The floatVal. + * string timestamp = 2; + * @return The bytes for timestamp. */ - float getFloatVal(); + com.google.protobuf.ByteString + getTimestampBytes(); /** - * string stringVal = 6; - * @return Whether the stringVal field is set. - */ - boolean hasStringVal(); - /** - * string stringVal = 6; - * @return The stringVal. - */ - java.lang.String getStringVal(); - /** - * string stringVal = 6; - * @return The bytes for stringVal. + * .monitoring.KpiValue kpi_value = 3; + * @return Whether the kpiValue field is set. */ - com.google.protobuf.ByteString - getStringValBytes(); - + boolean hasKpiValue(); /** - * bool boolVal = 7; - * @return Whether the boolVal field is set. + * .monitoring.KpiValue kpi_value = 3; + * @return The kpiValue. */ - boolean hasBoolVal(); + monitoring.Monitoring.KpiValue getKpiValue(); /** - * bool boolVal = 7; - * @return The boolVal. + * .monitoring.KpiValue kpi_value = 3; */ - boolean getBoolVal(); - - public monitoring.Monitoring.KpiValue.ValueCase getValueCase(); + monitoring.Monitoring.KpiValueOrBuilder getKpiValueOrBuilder(); } /** - * Protobuf type {@code monitoring.KpiValue} + * Protobuf type {@code monitoring.Kpi} */ - public static final class KpiValue extends + public static final class Kpi extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.KpiValue) - KpiValueOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.Kpi) + KpiOrBuilder { private static final long serialVersionUID = 0L; - // Use KpiValue.newBuilder() to construct. - private KpiValue(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use Kpi.newBuilder() to construct. + private Kpi(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private KpiValue() { + private Kpi() { + timestamp_ = ""; } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new KpiValue(); + return new Kpi(); } @java.lang.Override @@ -7278,7 +8307,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private KpiValue( + private Kpi( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -7296,40 +8325,36 @@ public final class Monitoring { case 0: done = true; break; - case 8: { - valueCase_ = 1; - value_ = input.readInt32(); - break; - } - case 16: { - valueCase_ = 2; - value_ = input.readUInt32(); - break; - } - case 24: { - valueCase_ = 3; - value_ = input.readInt64(); - break; - } - case 32: { - valueCase_ = 4; - value_ = input.readUInt64(); - break; - } - case 45: { - valueCase_ = 5; - value_ = input.readFloat(); + case 10: { + monitoring.Monitoring.KpiId.Builder subBuilder = null; + if (kpiId_ != null) { + subBuilder = kpiId_.toBuilder(); + } + kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(kpiId_); + kpiId_ = subBuilder.buildPartial(); + } + break; } - case 50: { + case 18: { java.lang.String s = input.readStringRequireUtf8(); - valueCase_ = 6; - value_ = s; + + timestamp_ = s; break; } - case 56: { - valueCase_ = 7; - value_ = input.readBool(); + case 26: { + monitoring.Monitoring.KpiValue.Builder subBuilder = null; + if (kpiValue_ != null) { + subBuilder = kpiValue_.toBuilder(); + } + kpiValue_ = input.readMessage(monitoring.Monitoring.KpiValue.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(kpiValue_); + kpiValue_ = subBuilder.buildPartial(); + } + break; } default: { @@ -7353,244 +8378,105 @@ public final class Monitoring { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiValue_descriptor; + return monitoring.Monitoring.internal_static_monitoring_Kpi_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiValue_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_Kpi_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiValue.class, monitoring.Monitoring.KpiValue.Builder.class); - } - - private int valueCase_ = 0; - private java.lang.Object value_; - public enum ValueCase - implements com.google.protobuf.Internal.EnumLite, - com.google.protobuf.AbstractMessage.InternalOneOfEnum { - INT32VAL(1), - UINT32VAL(2), - INT64VAL(3), - UINT64VAL(4), - FLOATVAL(5), - STRINGVAL(6), - BOOLVAL(7), - VALUE_NOT_SET(0); - private final int value; - private ValueCase(int value) { - this.value = value; - } - /** - * @param value The number of the enum to look for. - * @return The enum associated with the given number. - * @deprecated Use {@link #forNumber(int)} instead. - */ - @java.lang.Deprecated - public static ValueCase valueOf(int value) { - return forNumber(value); - } - - public static ValueCase forNumber(int value) { - switch (value) { - case 1: return INT32VAL; - case 2: return UINT32VAL; - case 3: return INT64VAL; - case 4: return UINT64VAL; - case 5: return FLOATVAL; - case 6: return STRINGVAL; - case 7: return BOOLVAL; - case 0: return VALUE_NOT_SET; - default: return null; - } - } - public int getNumber() { - return this.value; - } - }; - - public ValueCase - getValueCase() { - return ValueCase.forNumber( - valueCase_); - } - - public static final int INT32VAL_FIELD_NUMBER = 1; - /** - * int32 int32Val = 1; - * @return Whether the int32Val field is set. - */ - @java.lang.Override - public boolean hasInt32Val() { - return valueCase_ == 1; - } - /** - * int32 int32Val = 1; - * @return The int32Val. - */ - @java.lang.Override - public int getInt32Val() { - if (valueCase_ == 1) { - return (java.lang.Integer) value_; - } - return 0; - } - - public static final int UINT32VAL_FIELD_NUMBER = 2; - /** - * uint32 uint32Val = 2; - * @return Whether the uint32Val field is set. - */ - @java.lang.Override - public boolean hasUint32Val() { - return valueCase_ == 2; - } - /** - * uint32 uint32Val = 2; - * @return The uint32Val. - */ - @java.lang.Override - public int getUint32Val() { - if (valueCase_ == 2) { - return (java.lang.Integer) value_; - } - return 0; + monitoring.Monitoring.Kpi.class, monitoring.Monitoring.Kpi.Builder.class); } - public static final int INT64VAL_FIELD_NUMBER = 3; - /** - * int64 int64Val = 3; - * @return Whether the int64Val field is set. - */ - @java.lang.Override - public boolean hasInt64Val() { - return valueCase_ == 3; - } + public static final int KPI_ID_FIELD_NUMBER = 1; + private monitoring.Monitoring.KpiId kpiId_; /** - * int64 int64Val = 3; - * @return The int64Val. + * .monitoring.KpiId kpi_id = 1; + * @return Whether the kpiId field is set. */ @java.lang.Override - public long getInt64Val() { - if (valueCase_ == 3) { - return (java.lang.Long) value_; - } - return 0L; + public boolean hasKpiId() { + return kpiId_ != null; } - - public static final int UINT64VAL_FIELD_NUMBER = 4; /** - * uint64 uint64Val = 4; - * @return Whether the uint64Val field is set. + * .monitoring.KpiId kpi_id = 1; + * @return The kpiId. */ @java.lang.Override - public boolean hasUint64Val() { - return valueCase_ == 4; + public monitoring.Monitoring.KpiId getKpiId() { + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } /** - * uint64 uint64Val = 4; - * @return The uint64Val. + * .monitoring.KpiId kpi_id = 1; */ @java.lang.Override - public long getUint64Val() { - if (valueCase_ == 4) { - return (java.lang.Long) value_; - } - return 0L; + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { + return getKpiId(); } - public static final int FLOATVAL_FIELD_NUMBER = 5; - /** - * float floatVal = 5; - * @return Whether the floatVal field is set. - */ - @java.lang.Override - public boolean hasFloatVal() { - return valueCase_ == 5; - } + public static final int TIMESTAMP_FIELD_NUMBER = 2; + private volatile java.lang.Object timestamp_; /** - * float floatVal = 5; - * @return The floatVal. + * string timestamp = 2; + * @return The timestamp. */ @java.lang.Override - public float getFloatVal() { - if (valueCase_ == 5) { - return (java.lang.Float) value_; - } - return 0F; - } - - public static final int STRINGVAL_FIELD_NUMBER = 6; - /** - * string stringVal = 6; - * @return Whether the stringVal field is set. - */ - public boolean hasStringVal() { - return valueCase_ == 6; - } - /** - * string stringVal = 6; - * @return The stringVal. - */ - public java.lang.String getStringVal() { - java.lang.Object ref = ""; - if (valueCase_ == 6) { - ref = value_; - } + public java.lang.String getTimestamp() { + java.lang.Object ref = timestamp_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - if (valueCase_ == 6) { - value_ = s; - } + timestamp_ = s; return s; } } /** - * string stringVal = 6; - * @return The bytes for stringVal. + * string timestamp = 2; + * @return The bytes for timestamp. */ + @java.lang.Override public com.google.protobuf.ByteString - getStringValBytes() { - java.lang.Object ref = ""; - if (valueCase_ == 6) { - ref = value_; - } + getTimestampBytes() { + java.lang.Object ref = timestamp_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - if (valueCase_ == 6) { - value_ = b; - } + timestamp_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - public static final int BOOLVAL_FIELD_NUMBER = 7; + public static final int KPI_VALUE_FIELD_NUMBER = 3; + private monitoring.Monitoring.KpiValue kpiValue_; /** - * bool boolVal = 7; - * @return Whether the boolVal field is set. + * .monitoring.KpiValue kpi_value = 3; + * @return Whether the kpiValue field is set. */ @java.lang.Override - public boolean hasBoolVal() { - return valueCase_ == 7; + public boolean hasKpiValue() { + return kpiValue_ != null; } /** - * bool boolVal = 7; - * @return The boolVal. + * .monitoring.KpiValue kpi_value = 3; + * @return The kpiValue. */ @java.lang.Override - public boolean getBoolVal() { - if (valueCase_ == 7) { - return (java.lang.Boolean) value_; - } - return false; + public monitoring.Monitoring.KpiValue getKpiValue() { + return kpiValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiValue_; + } + /** + * .monitoring.KpiValue kpi_value = 3; + */ + @java.lang.Override + public monitoring.Monitoring.KpiValueOrBuilder getKpiValueOrBuilder() { + return getKpiValue(); } private byte memoizedIsInitialized = -1; @@ -7607,32 +8493,14 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (valueCase_ == 1) { - output.writeInt32( - 1, (int)((java.lang.Integer) value_)); - } - if (valueCase_ == 2) { - output.writeUInt32( - 2, (int)((java.lang.Integer) value_)); - } - if (valueCase_ == 3) { - output.writeInt64( - 3, (long)((java.lang.Long) value_)); - } - if (valueCase_ == 4) { - output.writeUInt64( - 4, (long)((java.lang.Long) value_)); - } - if (valueCase_ == 5) { - output.writeFloat( - 5, (float)((java.lang.Float) value_)); + if (kpiId_ != null) { + output.writeMessage(1, getKpiId()); } - if (valueCase_ == 6) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 6, value_); + if (!getTimestampBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, timestamp_); } - if (valueCase_ == 7) { - output.writeBool( - 7, (boolean)((java.lang.Boolean) value_)); + if (kpiValue_ != null) { + output.writeMessage(3, getKpiValue()); } unknownFields.writeTo(output); } @@ -7643,38 +8511,16 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (valueCase_ == 1) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size( - 1, (int)((java.lang.Integer) value_)); - } - if (valueCase_ == 2) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size( - 2, (int)((java.lang.Integer) value_)); - } - if (valueCase_ == 3) { - size += com.google.protobuf.CodedOutputStream - .computeInt64Size( - 3, (long)((java.lang.Long) value_)); - } - if (valueCase_ == 4) { - size += com.google.protobuf.CodedOutputStream - .computeUInt64Size( - 4, (long)((java.lang.Long) value_)); - } - if (valueCase_ == 5) { + if (kpiId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize( - 5, (float)((java.lang.Float) value_)); + .computeMessageSize(1, getKpiId()); } - if (valueCase_ == 6) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, value_); + if (!getTimestampBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, timestamp_); } - if (valueCase_ == 7) { + if (kpiValue_ != null) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize( - 7, (boolean)((java.lang.Boolean) value_)); + .computeMessageSize(3, getKpiValue()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -7686,44 +8532,22 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.KpiValue)) { + if (!(obj instanceof monitoring.Monitoring.Kpi)) { return super.equals(obj); } - monitoring.Monitoring.KpiValue other = (monitoring.Monitoring.KpiValue) obj; + monitoring.Monitoring.Kpi other = (monitoring.Monitoring.Kpi) obj; - if (!getValueCase().equals(other.getValueCase())) return false; - switch (valueCase_) { - case 1: - if (getInt32Val() - != other.getInt32Val()) return false; - break; - case 2: - if (getUint32Val() - != other.getUint32Val()) return false; - break; - case 3: - if (getInt64Val() - != other.getInt64Val()) return false; - break; - case 4: - if (getUint64Val() - != other.getUint64Val()) return false; - break; - case 5: - if (java.lang.Float.floatToIntBits(getFloatVal()) - != java.lang.Float.floatToIntBits( - other.getFloatVal())) return false; - break; - case 6: - if (!getStringVal() - .equals(other.getStringVal())) return false; - break; - case 7: - if (getBoolVal() - != other.getBoolVal()) return false; - break; - case 0: - default: + if (hasKpiId() != other.hasKpiId()) return false; + if (hasKpiId()) { + if (!getKpiId() + .equals(other.getKpiId())) return false; + } + if (!getTimestamp() + .equals(other.getTimestamp())) return false; + if (hasKpiValue() != other.hasKpiValue()) return false; + if (hasKpiValue()) { + if (!getKpiValue() + .equals(other.getKpiValue())) return false; } if (!unknownFields.equals(other.unknownFields)) return false; return true; @@ -7736,110 +8560,84 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - switch (valueCase_) { - case 1: - hash = (37 * hash) + INT32VAL_FIELD_NUMBER; - hash = (53 * hash) + getInt32Val(); - break; - case 2: - hash = (37 * hash) + UINT32VAL_FIELD_NUMBER; - hash = (53 * hash) + getUint32Val(); - break; - case 3: - hash = (37 * hash) + INT64VAL_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getInt64Val()); - break; - case 4: - hash = (37 * hash) + UINT64VAL_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getUint64Val()); - break; - case 5: - hash = (37 * hash) + FLOATVAL_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getFloatVal()); - break; - case 6: - hash = (37 * hash) + STRINGVAL_FIELD_NUMBER; - hash = (53 * hash) + getStringVal().hashCode(); - break; - case 7: - hash = (37 * hash) + BOOLVAL_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getBoolVal()); - break; - case 0: - default: + if (hasKpiId()) { + hash = (37 * hash) + KPI_ID_FIELD_NUMBER; + hash = (53 * hash) + getKpiId().hashCode(); + } + hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER; + hash = (53 * hash) + getTimestamp().hashCode(); + if (hasKpiValue()) { + hash = (37 * hash) + KPI_VALUE_FIELD_NUMBER; + hash = (53 * hash) + getKpiValue().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.KpiValue parseFrom( + public static monitoring.Monitoring.Kpi parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiValue parseFrom( + public static monitoring.Monitoring.Kpi parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiValue parseFrom( + public static monitoring.Monitoring.Kpi parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiValue parseFrom( + public static monitoring.Monitoring.Kpi parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiValue parseFrom(byte[] data) + public static monitoring.Monitoring.Kpi parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiValue parseFrom( + public static monitoring.Monitoring.Kpi parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiValue parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.Kpi parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiValue parseFrom( + public static monitoring.Monitoring.Kpi parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiValue parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.Kpi parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiValue parseDelimitedFrom( + public static monitoring.Monitoring.Kpi parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiValue parseFrom( + public static monitoring.Monitoring.Kpi parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiValue parseFrom( + public static monitoring.Monitoring.Kpi parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -7852,7 +8650,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.KpiValue prototype) { + public static Builder newBuilder(monitoring.Monitoring.Kpi prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -7868,26 +8666,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.KpiValue} + * Protobuf type {@code monitoring.Kpi} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.KpiValue) - monitoring.Monitoring.KpiValueOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.Kpi) + monitoring.Monitoring.KpiOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiValue_descriptor; + return monitoring.Monitoring.internal_static_monitoring_Kpi_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiValue_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_Kpi_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiValue.class, monitoring.Monitoring.KpiValue.Builder.class); + monitoring.Monitoring.Kpi.class, monitoring.Monitoring.Kpi.Builder.class); } - // Construct using monitoring.Monitoring.KpiValue.newBuilder() + // Construct using monitoring.Monitoring.Kpi.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -7905,25 +8703,37 @@ public final class Monitoring { @java.lang.Override public Builder clear() { super.clear(); - valueCase_ = 0; - value_ = null; + if (kpiIdBuilder_ == null) { + kpiId_ = null; + } else { + kpiId_ = null; + kpiIdBuilder_ = null; + } + timestamp_ = ""; + + if (kpiValueBuilder_ == null) { + kpiValue_ = null; + } else { + kpiValue_ = null; + kpiValueBuilder_ = null; + } return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_KpiValue_descriptor; + return monitoring.Monitoring.internal_static_monitoring_Kpi_descriptor; } @java.lang.Override - public monitoring.Monitoring.KpiValue getDefaultInstanceForType() { - return monitoring.Monitoring.KpiValue.getDefaultInstance(); + public monitoring.Monitoring.Kpi getDefaultInstanceForType() { + return monitoring.Monitoring.Kpi.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.KpiValue build() { - monitoring.Monitoring.KpiValue result = buildPartial(); + public monitoring.Monitoring.Kpi build() { + monitoring.Monitoring.Kpi result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -7931,30 +8741,19 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.KpiValue buildPartial() { - monitoring.Monitoring.KpiValue result = new monitoring.Monitoring.KpiValue(this); - if (valueCase_ == 1) { - result.value_ = value_; - } - if (valueCase_ == 2) { - result.value_ = value_; - } - if (valueCase_ == 3) { - result.value_ = value_; - } - if (valueCase_ == 4) { - result.value_ = value_; - } - if (valueCase_ == 5) { - result.value_ = value_; - } - if (valueCase_ == 6) { - result.value_ = value_; + public monitoring.Monitoring.Kpi buildPartial() { + monitoring.Monitoring.Kpi result = new monitoring.Monitoring.Kpi(this); + if (kpiIdBuilder_ == null) { + result.kpiId_ = kpiId_; + } else { + result.kpiId_ = kpiIdBuilder_.build(); } - if (valueCase_ == 7) { - result.value_ = value_; + result.timestamp_ = timestamp_; + if (kpiValueBuilder_ == null) { + result.kpiValue_ = kpiValue_; + } else { + result.kpiValue_ = kpiValueBuilder_.build(); } - result.valueCase_ = valueCase_; onBuilt(); return result; } @@ -7993,50 +8792,25 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.KpiValue) { - return mergeFrom((monitoring.Monitoring.KpiValue)other); + if (other instanceof monitoring.Monitoring.Kpi) { + return mergeFrom((monitoring.Monitoring.Kpi)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.KpiValue other) { - if (other == monitoring.Monitoring.KpiValue.getDefaultInstance()) return this; - switch (other.getValueCase()) { - case INT32VAL: { - setInt32Val(other.getInt32Val()); - break; - } - case UINT32VAL: { - setUint32Val(other.getUint32Val()); - break; - } - case INT64VAL: { - setInt64Val(other.getInt64Val()); - break; - } - case UINT64VAL: { - setUint64Val(other.getUint64Val()); - break; - } - case FLOATVAL: { - setFloatVal(other.getFloatVal()); - break; - } - case STRINGVAL: { - valueCase_ = 6; - value_ = other.value_; - onChanged(); - break; - } - case BOOLVAL: { - setBoolVal(other.getBoolVal()); - break; - } - case VALUE_NOT_SET: { - break; - } + public Builder mergeFrom(monitoring.Monitoring.Kpi other) { + if (other == monitoring.Monitoring.Kpi.getDefaultInstance()) return this; + if (other.hasKpiId()) { + mergeKpiId(other.getKpiId()); + } + if (!other.getTimestamp().isEmpty()) { + timestamp_ = other.timestamp_; + onChanged(); + } + if (other.hasKpiValue()) { + mergeKpiValue(other.getKpiValue()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -8053,11 +8827,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.KpiValue parsedMessage = null; + monitoring.Monitoring.Kpi parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.KpiValue) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.Kpi) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -8066,364 +8840,320 @@ public final class Monitoring { } return this; } - private int valueCase_ = 0; - private java.lang.Object value_; - public ValueCase - getValueCase() { - return ValueCase.forNumber( - valueCase_); - } - - public Builder clearValue() { - valueCase_ = 0; - value_ = null; - onChanged(); - return this; - } - - - /** - * int32 int32Val = 1; - * @return Whether the int32Val field is set. - */ - public boolean hasInt32Val() { - return valueCase_ == 1; - } - /** - * int32 int32Val = 1; - * @return The int32Val. - */ - public int getInt32Val() { - if (valueCase_ == 1) { - return (java.lang.Integer) value_; - } - return 0; - } - /** - * int32 int32Val = 1; - * @param value The int32Val to set. - * @return This builder for chaining. - */ - public Builder setInt32Val(int value) { - valueCase_ = 1; - value_ = value; - onChanged(); - return this; - } - /** - * int32 int32Val = 1; - * @return This builder for chaining. - */ - public Builder clearInt32Val() { - if (valueCase_ == 1) { - valueCase_ = 0; - value_ = null; - onChanged(); - } - return this; - } - - /** - * uint32 uint32Val = 2; - * @return Whether the uint32Val field is set. - */ - public boolean hasUint32Val() { - return valueCase_ == 2; - } - /** - * uint32 uint32Val = 2; - * @return The uint32Val. - */ - public int getUint32Val() { - if (valueCase_ == 2) { - return (java.lang.Integer) value_; - } - return 0; - } - /** - * uint32 uint32Val = 2; - * @param value The uint32Val to set. - * @return This builder for chaining. - */ - public Builder setUint32Val(int value) { - valueCase_ = 2; - value_ = value; - onChanged(); - return this; - } - /** - * uint32 uint32Val = 2; - * @return This builder for chaining. - */ - public Builder clearUint32Val() { - if (valueCase_ == 2) { - valueCase_ = 0; - value_ = null; - onChanged(); - } - return this; - } + private monitoring.Monitoring.KpiId kpiId_; + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; /** - * int64 int64Val = 3; - * @return Whether the int64Val field is set. + * .monitoring.KpiId kpi_id = 1; + * @return Whether the kpiId field is set. */ - public boolean hasInt64Val() { - return valueCase_ == 3; + public boolean hasKpiId() { + return kpiIdBuilder_ != null || kpiId_ != null; } /** - * int64 int64Val = 3; - * @return The int64Val. + * .monitoring.KpiId kpi_id = 1; + * @return The kpiId. */ - public long getInt64Val() { - if (valueCase_ == 3) { - return (java.lang.Long) value_; + public monitoring.Monitoring.KpiId getKpiId() { + if (kpiIdBuilder_ == null) { + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + } else { + return kpiIdBuilder_.getMessage(); } - return 0L; - } - /** - * int64 int64Val = 3; - * @param value The int64Val to set. - * @return This builder for chaining. - */ - public Builder setInt64Val(long value) { - valueCase_ = 3; - value_ = value; - onChanged(); - return this; } /** - * int64 int64Val = 3; - * @return This builder for chaining. + * .monitoring.KpiId kpi_id = 1; */ - public Builder clearInt64Val() { - if (valueCase_ == 3) { - valueCase_ = 0; - value_ = null; + public Builder setKpiId(monitoring.Monitoring.KpiId value) { + if (kpiIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + kpiId_ = value; onChanged(); - } - return this; - } + } else { + kpiIdBuilder_.setMessage(value); + } - /** - * uint64 uint64Val = 4; - * @return Whether the uint64Val field is set. - */ - public boolean hasUint64Val() { - return valueCase_ == 4; + return this; } /** - * uint64 uint64Val = 4; - * @return The uint64Val. + * .monitoring.KpiId kpi_id = 1; */ - public long getUint64Val() { - if (valueCase_ == 4) { - return (java.lang.Long) value_; + public Builder setKpiId( + monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdBuilder_ == null) { + kpiId_ = builderForValue.build(); + onChanged(); + } else { + kpiIdBuilder_.setMessage(builderForValue.build()); } - return 0L; - } - /** - * uint64 uint64Val = 4; - * @param value The uint64Val to set. - * @return This builder for chaining. - */ - public Builder setUint64Val(long value) { - valueCase_ = 4; - value_ = value; - onChanged(); + return this; } /** - * uint64 uint64Val = 4; - * @return This builder for chaining. + * .monitoring.KpiId kpi_id = 1; */ - public Builder clearUint64Val() { - if (valueCase_ == 4) { - valueCase_ = 0; - value_ = null; + public Builder mergeKpiId(monitoring.Monitoring.KpiId value) { + if (kpiIdBuilder_ == null) { + if (kpiId_ != null) { + kpiId_ = + monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial(); + } else { + kpiId_ = value; + } onChanged(); + } else { + kpiIdBuilder_.mergeFrom(value); } - return this; - } - /** - * float floatVal = 5; - * @return Whether the floatVal field is set. - */ - public boolean hasFloatVal() { - return valueCase_ == 5; + return this; } /** - * float floatVal = 5; - * @return The floatVal. + * .monitoring.KpiId kpi_id = 1; */ - public float getFloatVal() { - if (valueCase_ == 5) { - return (java.lang.Float) value_; + public Builder clearKpiId() { + if (kpiIdBuilder_ == null) { + kpiId_ = null; + onChanged(); + } else { + kpiId_ = null; + kpiIdBuilder_ = null; } - return 0F; + + return this; } /** - * float floatVal = 5; - * @param value The floatVal to set. - * @return This builder for chaining. + * .monitoring.KpiId kpi_id = 1; */ - public Builder setFloatVal(float value) { - valueCase_ = 5; - value_ = value; + public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() { + onChanged(); - return this; + return getKpiIdFieldBuilder().getBuilder(); } /** - * float floatVal = 5; - * @return This builder for chaining. + * .monitoring.KpiId kpi_id = 1; */ - public Builder clearFloatVal() { - if (valueCase_ == 5) { - valueCase_ = 0; - value_ = null; - onChanged(); + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { + if (kpiIdBuilder_ != null) { + return kpiIdBuilder_.getMessageOrBuilder(); + } else { + return kpiId_ == null ? + monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } - return this; } - /** - * string stringVal = 6; - * @return Whether the stringVal field is set. + * .monitoring.KpiId kpi_id = 1; */ - @java.lang.Override - public boolean hasStringVal() { - return valueCase_ == 6; + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> + getKpiIdFieldBuilder() { + if (kpiIdBuilder_ == null) { + kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( + getKpiId(), + getParentForChildren(), + isClean()); + kpiId_ = null; + } + return kpiIdBuilder_; } + + private java.lang.Object timestamp_ = ""; /** - * string stringVal = 6; - * @return The stringVal. + * string timestamp = 2; + * @return The timestamp. */ - @java.lang.Override - public java.lang.String getStringVal() { - java.lang.Object ref = ""; - if (valueCase_ == 6) { - ref = value_; - } + public java.lang.String getTimestamp() { + java.lang.Object ref = timestamp_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - if (valueCase_ == 6) { - value_ = s; - } + timestamp_ = s; return s; } else { return (java.lang.String) ref; } } /** - * string stringVal = 6; - * @return The bytes for stringVal. + * string timestamp = 2; + * @return The bytes for timestamp. */ - @java.lang.Override public com.google.protobuf.ByteString - getStringValBytes() { - java.lang.Object ref = ""; - if (valueCase_ == 6) { - ref = value_; - } + getTimestampBytes() { + java.lang.Object ref = timestamp_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - if (valueCase_ == 6) { - value_ = b; - } + timestamp_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * string stringVal = 6; - * @param value The stringVal to set. + * string timestamp = 2; + * @param value The timestamp to set. * @return This builder for chaining. */ - public Builder setStringVal( + public Builder setTimestamp( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - valueCase_ = 6; - value_ = value; + + timestamp_ = value; onChanged(); return this; } /** - * string stringVal = 6; + * string timestamp = 2; * @return This builder for chaining. */ - public Builder clearStringVal() { - if (valueCase_ == 6) { - valueCase_ = 0; - value_ = null; - onChanged(); - } + public Builder clearTimestamp() { + + timestamp_ = getDefaultInstance().getTimestamp(); + onChanged(); return this; } /** - * string stringVal = 6; - * @param value The bytes for stringVal to set. + * string timestamp = 2; + * @param value The bytes for timestamp to set. * @return This builder for chaining. */ - public Builder setStringValBytes( + public Builder setTimestampBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - valueCase_ = 6; - value_ = value; + + timestamp_ = value; onChanged(); return this; } + private monitoring.Monitoring.KpiValue kpiValue_; + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> kpiValueBuilder_; /** - * bool boolVal = 7; - * @return Whether the boolVal field is set. + * .monitoring.KpiValue kpi_value = 3; + * @return Whether the kpiValue field is set. */ - public boolean hasBoolVal() { - return valueCase_ == 7; + public boolean hasKpiValue() { + return kpiValueBuilder_ != null || kpiValue_ != null; } /** - * bool boolVal = 7; - * @return The boolVal. + * .monitoring.KpiValue kpi_value = 3; + * @return The kpiValue. */ - public boolean getBoolVal() { - if (valueCase_ == 7) { - return (java.lang.Boolean) value_; + public monitoring.Monitoring.KpiValue getKpiValue() { + if (kpiValueBuilder_ == null) { + return kpiValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiValue_; + } else { + return kpiValueBuilder_.getMessage(); } - return false; } /** - * bool boolVal = 7; - * @param value The boolVal to set. - * @return This builder for chaining. + * .monitoring.KpiValue kpi_value = 3; */ - public Builder setBoolVal(boolean value) { - valueCase_ = 7; - value_ = value; - onChanged(); + public Builder setKpiValue(monitoring.Monitoring.KpiValue value) { + if (kpiValueBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + kpiValue_ = value; + onChanged(); + } else { + kpiValueBuilder_.setMessage(value); + } + return this; } /** - * bool boolVal = 7; - * @return This builder for chaining. + * .monitoring.KpiValue kpi_value = 3; */ - public Builder clearBoolVal() { - if (valueCase_ == 7) { - valueCase_ = 0; - value_ = null; + public Builder setKpiValue( + monitoring.Monitoring.KpiValue.Builder builderForValue) { + if (kpiValueBuilder_ == null) { + kpiValue_ = builderForValue.build(); + onChanged(); + } else { + kpiValueBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .monitoring.KpiValue kpi_value = 3; + */ + public Builder mergeKpiValue(monitoring.Monitoring.KpiValue value) { + if (kpiValueBuilder_ == null) { + if (kpiValue_ != null) { + kpiValue_ = + monitoring.Monitoring.KpiValue.newBuilder(kpiValue_).mergeFrom(value).buildPartial(); + } else { + kpiValue_ = value; + } + onChanged(); + } else { + kpiValueBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .monitoring.KpiValue kpi_value = 3; + */ + public Builder clearKpiValue() { + if (kpiValueBuilder_ == null) { + kpiValue_ = null; onChanged(); + } else { + kpiValue_ = null; + kpiValueBuilder_ = null; } + return this; } + /** + * .monitoring.KpiValue kpi_value = 3; + */ + public monitoring.Monitoring.KpiValue.Builder getKpiValueBuilder() { + + onChanged(); + return getKpiValueFieldBuilder().getBuilder(); + } + /** + * .monitoring.KpiValue kpi_value = 3; + */ + public monitoring.Monitoring.KpiValueOrBuilder getKpiValueOrBuilder() { + if (kpiValueBuilder_ != null) { + return kpiValueBuilder_.getMessageOrBuilder(); + } else { + return kpiValue_ == null ? + monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiValue_; + } + } + /** + * .monitoring.KpiValue kpi_value = 3; + */ + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> + getKpiValueFieldBuilder() { + if (kpiValueBuilder_ == null) { + kpiValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder>( + getKpiValue(), + getParentForChildren(), + isClean()); + kpiValue_ = null; + } + return kpiValueBuilder_; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -8437,95 +9167,100 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.KpiValue) + // @@protoc_insertion_point(builder_scope:monitoring.Kpi) } - // @@protoc_insertion_point(class_scope:monitoring.KpiValue) - private static final monitoring.Monitoring.KpiValue DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.Kpi) + private static final monitoring.Monitoring.Kpi DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.KpiValue(); + DEFAULT_INSTANCE = new monitoring.Monitoring.Kpi(); } - public static monitoring.Monitoring.KpiValue getDefaultInstance() { + public static monitoring.Monitoring.Kpi getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public KpiValue parsePartialFrom( + public Kpi parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new KpiValue(input, extensionRegistry); + return new Kpi(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.KpiValue getDefaultInstanceForType() { + public monitoring.Monitoring.Kpi getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface KpiListOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.KpiList) + public interface KpiValueRangeOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.KpiValueRange) com.google.protobuf.MessageOrBuilder { /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; + * @return Whether the kpiMinValue field is set. */ - java.util.List - getKpiListList(); + boolean hasKpiMinValue(); /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; + * @return The kpiMinValue. */ - monitoring.Monitoring.Kpi getKpiList(int index); + monitoring.Monitoring.KpiValue getKpiMinValue(); /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; */ - int getKpiListCount(); + monitoring.Monitoring.KpiValueOrBuilder getKpiMinValueOrBuilder(); + /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; + * @return Whether the kpiMaxValue field is set. */ - java.util.List - getKpiListOrBuilderList(); + boolean hasKpiMaxValue(); /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; + * @return The kpiMaxValue. */ - monitoring.Monitoring.KpiOrBuilder getKpiListOrBuilder( - int index); + monitoring.Monitoring.KpiValue getKpiMaxValue(); + /** + * .monitoring.KpiValue kpiMaxValue = 2; + */ + monitoring.Monitoring.KpiValueOrBuilder getKpiMaxValueOrBuilder(); } /** - * Protobuf type {@code monitoring.KpiList} + * Protobuf type {@code monitoring.KpiValueRange} */ - public static final class KpiList extends + public static final class KpiValueRange extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.KpiList) - KpiListOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.KpiValueRange) + KpiValueRangeOrBuilder { private static final long serialVersionUID = 0L; - // Use KpiList.newBuilder() to construct. - private KpiList(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use KpiValueRange.newBuilder() to construct. + private KpiValueRange(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private KpiList() { - kpiList_ = java.util.Collections.emptyList(); + private KpiValueRange() { } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new KpiList(); + return new KpiValueRange(); } @java.lang.Override @@ -8533,7 +9268,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private KpiList( + private KpiValueRange( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -8541,7 +9276,6 @@ public final class Monitoring { if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -8553,12 +9287,29 @@ public final class Monitoring { done = true; break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - kpiList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; + monitoring.Monitoring.KpiValue.Builder subBuilder = null; + if (kpiMinValue_ != null) { + subBuilder = kpiMinValue_.toBuilder(); } - kpiList_.add( - input.readMessage(monitoring.Monitoring.Kpi.parser(), extensionRegistry)); + kpiMinValue_ = input.readMessage(monitoring.Monitoring.KpiValue.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(kpiMinValue_); + kpiMinValue_ = subBuilder.buildPartial(); + } + + break; + } + case 18: { + monitoring.Monitoring.KpiValue.Builder subBuilder = null; + if (kpiMaxValue_ != null) { + subBuilder = kpiMaxValue_.toBuilder(); + } + kpiMaxValue_ = input.readMessage(monitoring.Monitoring.KpiValue.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(kpiMaxValue_); + kpiMaxValue_ = subBuilder.buildPartial(); + } + break; } default: { @@ -8576,64 +9327,73 @@ public final class Monitoring { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - kpiList_ = java.util.Collections.unmodifiableList(kpiList_); - } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiList_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiList_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiList.class, monitoring.Monitoring.KpiList.Builder.class); + monitoring.Monitoring.KpiValueRange.class, monitoring.Monitoring.KpiValueRange.Builder.class); } - public static final int KPI_LIST_FIELD_NUMBER = 1; - private java.util.List kpiList_; + public static final int KPIMINVALUE_FIELD_NUMBER = 1; + private monitoring.Monitoring.KpiValue kpiMinValue_; /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; + * @return Whether the kpiMinValue field is set. */ @java.lang.Override - public java.util.List getKpiListList() { - return kpiList_; + public boolean hasKpiMinValue() { + return kpiMinValue_ != null; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; + * @return The kpiMinValue. */ @java.lang.Override - public java.util.List - getKpiListOrBuilderList() { - return kpiList_; + public monitoring.Monitoring.KpiValue getKpiMinValue() { + return kpiMinValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMinValue_; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; */ @java.lang.Override - public int getKpiListCount() { - return kpiList_.size(); + public monitoring.Monitoring.KpiValueOrBuilder getKpiMinValueOrBuilder() { + return getKpiMinValue(); } + + public static final int KPIMAXVALUE_FIELD_NUMBER = 2; + private monitoring.Monitoring.KpiValue kpiMaxValue_; /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; + * @return Whether the kpiMaxValue field is set. */ @java.lang.Override - public monitoring.Monitoring.Kpi getKpiList(int index) { - return kpiList_.get(index); + public boolean hasKpiMaxValue() { + return kpiMaxValue_ != null; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; + * @return The kpiMaxValue. */ @java.lang.Override - public monitoring.Monitoring.KpiOrBuilder getKpiListOrBuilder( - int index) { - return kpiList_.get(index); + public monitoring.Monitoring.KpiValue getKpiMaxValue() { + return kpiMaxValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMaxValue_; + } + /** + * .monitoring.KpiValue kpiMaxValue = 2; + */ + @java.lang.Override + public monitoring.Monitoring.KpiValueOrBuilder getKpiMaxValueOrBuilder() { + return getKpiMaxValue(); } private byte memoizedIsInitialized = -1; @@ -8650,8 +9410,11 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - for (int i = 0; i < kpiList_.size(); i++) { - output.writeMessage(1, kpiList_.get(i)); + if (kpiMinValue_ != null) { + output.writeMessage(1, getKpiMinValue()); + } + if (kpiMaxValue_ != null) { + output.writeMessage(2, getKpiMaxValue()); } unknownFields.writeTo(output); } @@ -8662,9 +9425,13 @@ public final class Monitoring { if (size != -1) return size; size = 0; - for (int i = 0; i < kpiList_.size(); i++) { + if (kpiMinValue_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, kpiList_.get(i)); + .computeMessageSize(1, getKpiMinValue()); + } + if (kpiMaxValue_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, getKpiMaxValue()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -8676,13 +9443,21 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.KpiList)) { + if (!(obj instanceof monitoring.Monitoring.KpiValueRange)) { return super.equals(obj); } - monitoring.Monitoring.KpiList other = (monitoring.Monitoring.KpiList) obj; + monitoring.Monitoring.KpiValueRange other = (monitoring.Monitoring.KpiValueRange) obj; - if (!getKpiListList() - .equals(other.getKpiListList())) return false; + if (hasKpiMinValue() != other.hasKpiMinValue()) return false; + if (hasKpiMinValue()) { + if (!getKpiMinValue() + .equals(other.getKpiMinValue())) return false; + } + if (hasKpiMaxValue() != other.hasKpiMaxValue()) return false; + if (hasKpiMaxValue()) { + if (!getKpiMaxValue() + .equals(other.getKpiMaxValue())) return false; + } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -8694,78 +9469,82 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getKpiListCount() > 0) { - hash = (37 * hash) + KPI_LIST_FIELD_NUMBER; - hash = (53 * hash) + getKpiListList().hashCode(); + if (hasKpiMinValue()) { + hash = (37 * hash) + KPIMINVALUE_FIELD_NUMBER; + hash = (53 * hash) + getKpiMinValue().hashCode(); + } + if (hasKpiMaxValue()) { + hash = (37 * hash) + KPIMAXVALUE_FIELD_NUMBER; + hash = (53 * hash) + getKpiMaxValue().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.KpiList parseFrom( + public static monitoring.Monitoring.KpiValueRange parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiList parseFrom( + public static monitoring.Monitoring.KpiValueRange parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiList parseFrom( + public static monitoring.Monitoring.KpiValueRange parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiList parseFrom( + public static monitoring.Monitoring.KpiValueRange parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiList parseFrom(byte[] data) + public static monitoring.Monitoring.KpiValueRange parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiList parseFrom( + public static monitoring.Monitoring.KpiValueRange parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiList parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiValueRange parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiList parseFrom( + public static monitoring.Monitoring.KpiValueRange parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiList parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiValueRange parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiList parseDelimitedFrom( + public static monitoring.Monitoring.KpiValueRange parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiList parseFrom( + public static monitoring.Monitoring.KpiValueRange parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiList parseFrom( + public static monitoring.Monitoring.KpiValueRange parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -8778,7 +9557,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.KpiList prototype) { + public static Builder newBuilder(monitoring.Monitoring.KpiValueRange prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -8794,26 +9573,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.KpiList} + * Protobuf type {@code monitoring.KpiValueRange} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.KpiList) - monitoring.Monitoring.KpiListOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.KpiValueRange) + monitoring.Monitoring.KpiValueRangeOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiList_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiList_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiList.class, monitoring.Monitoring.KpiList.Builder.class); + monitoring.Monitoring.KpiValueRange.class, monitoring.Monitoring.KpiValueRange.Builder.class); } - // Construct using monitoring.Monitoring.KpiList.newBuilder() + // Construct using monitoring.Monitoring.KpiValueRange.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -8826,17 +9605,22 @@ public final class Monitoring { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getKpiListFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); - if (kpiListBuilder_ == null) { - kpiList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + if (kpiMinValueBuilder_ == null) { + kpiMinValue_ = null; } else { - kpiListBuilder_.clear(); + kpiMinValue_ = null; + kpiMinValueBuilder_ = null; + } + if (kpiMaxValueBuilder_ == null) { + kpiMaxValue_ = null; + } else { + kpiMaxValue_ = null; + kpiMaxValueBuilder_ = null; } return this; } @@ -8844,17 +9628,17 @@ public final class Monitoring { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_KpiList_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_descriptor; } @java.lang.Override - public monitoring.Monitoring.KpiList getDefaultInstanceForType() { - return monitoring.Monitoring.KpiList.getDefaultInstance(); + public monitoring.Monitoring.KpiValueRange getDefaultInstanceForType() { + return monitoring.Monitoring.KpiValueRange.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.KpiList build() { - monitoring.Monitoring.KpiList result = buildPartial(); + public monitoring.Monitoring.KpiValueRange build() { + monitoring.Monitoring.KpiValueRange result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -8862,17 +9646,17 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.KpiList buildPartial() { - monitoring.Monitoring.KpiList result = new monitoring.Monitoring.KpiList(this); - int from_bitField0_ = bitField0_; - if (kpiListBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { - kpiList_ = java.util.Collections.unmodifiableList(kpiList_); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.kpiList_ = kpiList_; + public monitoring.Monitoring.KpiValueRange buildPartial() { + monitoring.Monitoring.KpiValueRange result = new monitoring.Monitoring.KpiValueRange(this); + if (kpiMinValueBuilder_ == null) { + result.kpiMinValue_ = kpiMinValue_; } else { - result.kpiList_ = kpiListBuilder_.build(); + result.kpiMinValue_ = kpiMinValueBuilder_.build(); + } + if (kpiMaxValueBuilder_ == null) { + result.kpiMaxValue_ = kpiMaxValue_; + } else { + result.kpiMaxValue_ = kpiMaxValueBuilder_.build(); } onBuilt(); return result; @@ -8912,41 +9696,21 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.KpiList) { - return mergeFrom((monitoring.Monitoring.KpiList)other); + if (other instanceof monitoring.Monitoring.KpiValueRange) { + return mergeFrom((monitoring.Monitoring.KpiValueRange)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.KpiList other) { - if (other == monitoring.Monitoring.KpiList.getDefaultInstance()) return this; - if (kpiListBuilder_ == null) { - if (!other.kpiList_.isEmpty()) { - if (kpiList_.isEmpty()) { - kpiList_ = other.kpiList_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureKpiListIsMutable(); - kpiList_.addAll(other.kpiList_); - } - onChanged(); - } - } else { - if (!other.kpiList_.isEmpty()) { - if (kpiListBuilder_.isEmpty()) { - kpiListBuilder_.dispose(); - kpiListBuilder_ = null; - kpiList_ = other.kpiList_; - bitField0_ = (bitField0_ & ~0x00000001); - kpiListBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getKpiListFieldBuilder() : null; - } else { - kpiListBuilder_.addAllMessages(other.kpiList_); - } - } + public Builder mergeFrom(monitoring.Monitoring.KpiValueRange other) { + if (other == monitoring.Monitoring.KpiValueRange.getDefaultInstance()) return this; + if (other.hasKpiMinValue()) { + mergeKpiMinValue(other.getKpiMinValue()); + } + if (other.hasKpiMaxValue()) { + mergeKpiMaxValue(other.getKpiMaxValue()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -8963,11 +9727,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.KpiList parsedMessage = null; + monitoring.Monitoring.KpiValueRange parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.KpiList) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.KpiValueRange) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -8976,246 +9740,243 @@ public final class Monitoring { } return this; } - private int bitField0_; - - private java.util.List kpiList_ = - java.util.Collections.emptyList(); - private void ensureKpiListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - kpiList_ = new java.util.ArrayList(kpiList_); - bitField0_ |= 0x00000001; - } - } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.Kpi, monitoring.Monitoring.Kpi.Builder, monitoring.Monitoring.KpiOrBuilder> kpiListBuilder_; - - /** - * repeated .monitoring.Kpi kpi_list = 1; - */ - public java.util.List getKpiListList() { - if (kpiListBuilder_ == null) { - return java.util.Collections.unmodifiableList(kpiList_); - } else { - return kpiListBuilder_.getMessageList(); - } - } + private monitoring.Monitoring.KpiValue kpiMinValue_; + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> kpiMinValueBuilder_; /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; + * @return Whether the kpiMinValue field is set. */ - public int getKpiListCount() { - if (kpiListBuilder_ == null) { - return kpiList_.size(); - } else { - return kpiListBuilder_.getCount(); - } + public boolean hasKpiMinValue() { + return kpiMinValueBuilder_ != null || kpiMinValue_ != null; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; + * @return The kpiMinValue. */ - public monitoring.Monitoring.Kpi getKpiList(int index) { - if (kpiListBuilder_ == null) { - return kpiList_.get(index); + public monitoring.Monitoring.KpiValue getKpiMinValue() { + if (kpiMinValueBuilder_ == null) { + return kpiMinValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMinValue_; } else { - return kpiListBuilder_.getMessage(index); + return kpiMinValueBuilder_.getMessage(); } } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; */ - public Builder setKpiList( - int index, monitoring.Monitoring.Kpi value) { - if (kpiListBuilder_ == null) { + public Builder setKpiMinValue(monitoring.Monitoring.KpiValue value) { + if (kpiMinValueBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureKpiListIsMutable(); - kpiList_.set(index, value); + kpiMinValue_ = value; onChanged(); } else { - kpiListBuilder_.setMessage(index, value); + kpiMinValueBuilder_.setMessage(value); } + return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; */ - public Builder setKpiList( - int index, monitoring.Monitoring.Kpi.Builder builderForValue) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - kpiList_.set(index, builderForValue.build()); + public Builder setKpiMinValue( + monitoring.Monitoring.KpiValue.Builder builderForValue) { + if (kpiMinValueBuilder_ == null) { + kpiMinValue_ = builderForValue.build(); onChanged(); } else { - kpiListBuilder_.setMessage(index, builderForValue.build()); + kpiMinValueBuilder_.setMessage(builderForValue.build()); } + return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; */ - public Builder addKpiList(monitoring.Monitoring.Kpi value) { - if (kpiListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); + public Builder mergeKpiMinValue(monitoring.Monitoring.KpiValue value) { + if (kpiMinValueBuilder_ == null) { + if (kpiMinValue_ != null) { + kpiMinValue_ = + monitoring.Monitoring.KpiValue.newBuilder(kpiMinValue_).mergeFrom(value).buildPartial(); + } else { + kpiMinValue_ = value; } - ensureKpiListIsMutable(); - kpiList_.add(value); onChanged(); } else { - kpiListBuilder_.addMessage(value); + kpiMinValueBuilder_.mergeFrom(value); } + return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; */ - public Builder addKpiList( - int index, monitoring.Monitoring.Kpi value) { - if (kpiListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiListIsMutable(); - kpiList_.add(index, value); + public Builder clearKpiMinValue() { + if (kpiMinValueBuilder_ == null) { + kpiMinValue_ = null; onChanged(); } else { - kpiListBuilder_.addMessage(index, value); + kpiMinValue_ = null; + kpiMinValueBuilder_ = null; } + return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; */ - public Builder addKpiList( - monitoring.Monitoring.Kpi.Builder builderForValue) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - kpiList_.add(builderForValue.build()); - onChanged(); + public monitoring.Monitoring.KpiValue.Builder getKpiMinValueBuilder() { + + onChanged(); + return getKpiMinValueFieldBuilder().getBuilder(); + } + /** + * .monitoring.KpiValue kpiMinValue = 1; + */ + public monitoring.Monitoring.KpiValueOrBuilder getKpiMinValueOrBuilder() { + if (kpiMinValueBuilder_ != null) { + return kpiMinValueBuilder_.getMessageOrBuilder(); } else { - kpiListBuilder_.addMessage(builderForValue.build()); + return kpiMinValue_ == null ? + monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMinValue_; } - return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; */ - public Builder addKpiList( - int index, monitoring.Monitoring.Kpi.Builder builderForValue) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - kpiList_.add(index, builderForValue.build()); - onChanged(); + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> + getKpiMinValueFieldBuilder() { + if (kpiMinValueBuilder_ == null) { + kpiMinValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder>( + getKpiMinValue(), + getParentForChildren(), + isClean()); + kpiMinValue_ = null; + } + return kpiMinValueBuilder_; + } + + private monitoring.Monitoring.KpiValue kpiMaxValue_; + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> kpiMaxValueBuilder_; + /** + * .monitoring.KpiValue kpiMaxValue = 2; + * @return Whether the kpiMaxValue field is set. + */ + public boolean hasKpiMaxValue() { + return kpiMaxValueBuilder_ != null || kpiMaxValue_ != null; + } + /** + * .monitoring.KpiValue kpiMaxValue = 2; + * @return The kpiMaxValue. + */ + public monitoring.Monitoring.KpiValue getKpiMaxValue() { + if (kpiMaxValueBuilder_ == null) { + return kpiMaxValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMaxValue_; } else { - kpiListBuilder_.addMessage(index, builderForValue.build()); + return kpiMaxValueBuilder_.getMessage(); } - return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; */ - public Builder addAllKpiList( - java.lang.Iterable values) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, kpiList_); + public Builder setKpiMaxValue(monitoring.Monitoring.KpiValue value) { + if (kpiMaxValueBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + kpiMaxValue_ = value; onChanged(); } else { - kpiListBuilder_.addAllMessages(values); + kpiMaxValueBuilder_.setMessage(value); } + return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; */ - public Builder clearKpiList() { - if (kpiListBuilder_ == null) { - kpiList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + public Builder setKpiMaxValue( + monitoring.Monitoring.KpiValue.Builder builderForValue) { + if (kpiMaxValueBuilder_ == null) { + kpiMaxValue_ = builderForValue.build(); onChanged(); } else { - kpiListBuilder_.clear(); + kpiMaxValueBuilder_.setMessage(builderForValue.build()); } + return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; */ - public Builder removeKpiList(int index) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - kpiList_.remove(index); + public Builder mergeKpiMaxValue(monitoring.Monitoring.KpiValue value) { + if (kpiMaxValueBuilder_ == null) { + if (kpiMaxValue_ != null) { + kpiMaxValue_ = + monitoring.Monitoring.KpiValue.newBuilder(kpiMaxValue_).mergeFrom(value).buildPartial(); + } else { + kpiMaxValue_ = value; + } onChanged(); } else { - kpiListBuilder_.remove(index); + kpiMaxValueBuilder_.mergeFrom(value); } + return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; - */ - public monitoring.Monitoring.Kpi.Builder getKpiListBuilder( - int index) { - return getKpiListFieldBuilder().getBuilder(index); - } - /** - * repeated .monitoring.Kpi kpi_list = 1; - */ - public monitoring.Monitoring.KpiOrBuilder getKpiListOrBuilder( - int index) { - if (kpiListBuilder_ == null) { - return kpiList_.get(index); } else { - return kpiListBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; */ - public java.util.List - getKpiListOrBuilderList() { - if (kpiListBuilder_ != null) { - return kpiListBuilder_.getMessageOrBuilderList(); + public Builder clearKpiMaxValue() { + if (kpiMaxValueBuilder_ == null) { + kpiMaxValue_ = null; + onChanged(); } else { - return java.util.Collections.unmodifiableList(kpiList_); + kpiMaxValue_ = null; + kpiMaxValueBuilder_ = null; } + + return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; */ - public monitoring.Monitoring.Kpi.Builder addKpiListBuilder() { - return getKpiListFieldBuilder().addBuilder( - monitoring.Monitoring.Kpi.getDefaultInstance()); + public monitoring.Monitoring.KpiValue.Builder getKpiMaxValueBuilder() { + + onChanged(); + return getKpiMaxValueFieldBuilder().getBuilder(); } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; */ - public monitoring.Monitoring.Kpi.Builder addKpiListBuilder( - int index) { - return getKpiListFieldBuilder().addBuilder( - index, monitoring.Monitoring.Kpi.getDefaultInstance()); + public monitoring.Monitoring.KpiValueOrBuilder getKpiMaxValueOrBuilder() { + if (kpiMaxValueBuilder_ != null) { + return kpiMaxValueBuilder_.getMessageOrBuilder(); + } else { + return kpiMaxValue_ == null ? + monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMaxValue_; + } } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; */ - public java.util.List - getKpiListBuilderList() { - return getKpiListFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.Kpi, monitoring.Monitoring.Kpi.Builder, monitoring.Monitoring.KpiOrBuilder> - getKpiListFieldBuilder() { - if (kpiListBuilder_ == null) { - kpiListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.Kpi, monitoring.Monitoring.Kpi.Builder, monitoring.Monitoring.KpiOrBuilder>( - kpiList_, - ((bitField0_ & 0x00000001) != 0), + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> + getKpiMaxValueFieldBuilder() { + if (kpiMaxValueBuilder_ == null) { + kpiMaxValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder>( + getKpiMaxValue(), getParentForChildren(), isClean()); - kpiList_ = null; + kpiMaxValue_ = null; } - return kpiListBuilder_; + return kpiMaxValueBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -9230,95 +9991,122 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.KpiList) + // @@protoc_insertion_point(builder_scope:monitoring.KpiValueRange) } - // @@protoc_insertion_point(class_scope:monitoring.KpiList) - private static final monitoring.Monitoring.KpiList DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.KpiValueRange) + private static final monitoring.Monitoring.KpiValueRange DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.KpiList(); + DEFAULT_INSTANCE = new monitoring.Monitoring.KpiValueRange(); } - public static monitoring.Monitoring.KpiList getDefaultInstance() { + public static monitoring.Monitoring.KpiValueRange getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public KpiList parsePartialFrom( + public KpiValueRange parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new KpiList(input, extensionRegistry); + return new KpiValueRange(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.KpiList getDefaultInstanceForType() { + public monitoring.Monitoring.KpiValueRange getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface KpiDescriptorListOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptorList) + public interface KpiValueOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.KpiValue) com.google.protobuf.MessageOrBuilder { /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * uint32 intVal = 1; + * @return Whether the intVal field is set. */ - java.util.List - getKpiDescriptorListList(); + boolean hasIntVal(); /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * uint32 intVal = 1; + * @return The intVal. */ - monitoring.Monitoring.KpiDescriptor getKpiDescriptorList(int index); + int getIntVal(); + /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * float floatVal = 2; + * @return Whether the floatVal field is set. */ - int getKpiDescriptorListCount(); + boolean hasFloatVal(); /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * float floatVal = 2; + * @return The floatVal. */ - java.util.List - getKpiDescriptorListOrBuilderList(); + float getFloatVal(); + /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * string stringVal = 3; + * @return Whether the stringVal field is set. */ - monitoring.Monitoring.KpiDescriptorOrBuilder getKpiDescriptorListOrBuilder( - int index); + boolean hasStringVal(); + /** + * string stringVal = 3; + * @return The stringVal. + */ + java.lang.String getStringVal(); + /** + * string stringVal = 3; + * @return The bytes for stringVal. + */ + com.google.protobuf.ByteString + getStringValBytes(); + + /** + * bool boolVal = 4; + * @return Whether the boolVal field is set. + */ + boolean hasBoolVal(); + /** + * bool boolVal = 4; + * @return The boolVal. + */ + boolean getBoolVal(); + + public monitoring.Monitoring.KpiValue.ValueCase getValueCase(); } /** - * Protobuf type {@code monitoring.KpiDescriptorList} + * Protobuf type {@code monitoring.KpiValue} */ - public static final class KpiDescriptorList extends + public static final class KpiValue extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptorList) - KpiDescriptorListOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.KpiValue) + KpiValueOrBuilder { private static final long serialVersionUID = 0L; - // Use KpiDescriptorList.newBuilder() to construct. - private KpiDescriptorList(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use KpiValue.newBuilder() to construct. + private KpiValue(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private KpiDescriptorList() { - kpiDescriptorList_ = java.util.Collections.emptyList(); + private KpiValue() { } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new KpiDescriptorList(); + return new KpiValue(); } @java.lang.Override @@ -9326,7 +10114,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private KpiDescriptorList( + private KpiValue( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -9334,7 +10122,6 @@ public final class Monitoring { if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -9345,13 +10132,25 @@ public final class Monitoring { case 0: done = true; break; - case 10: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - kpiDescriptorList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - kpiDescriptorList_.add( - input.readMessage(monitoring.Monitoring.KpiDescriptor.parser(), extensionRegistry)); + case 8: { + valueCase_ = 1; + value_ = input.readUInt32(); + break; + } + case 21: { + valueCase_ = 2; + value_ = input.readFloat(); + break; + } + case 26: { + java.lang.String s = input.readStringRequireUtf8(); + valueCase_ = 3; + value_ = s; + break; + } + case 32: { + valueCase_ = 4; + value_ = input.readBool(); break; } default: { @@ -9369,64 +10168,181 @@ public final class Monitoring { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - kpiDescriptorList_ = java.util.Collections.unmodifiableList(kpiDescriptorList_); + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return monitoring.Monitoring.internal_static_monitoring_KpiValue_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return monitoring.Monitoring.internal_static_monitoring_KpiValue_fieldAccessorTable + .ensureFieldAccessorsInitialized( + monitoring.Monitoring.KpiValue.class, monitoring.Monitoring.KpiValue.Builder.class); + } + + private int valueCase_ = 0; + private java.lang.Object value_; + public enum ValueCase + implements com.google.protobuf.Internal.EnumLite, + com.google.protobuf.AbstractMessage.InternalOneOfEnum { + INTVAL(1), + FLOATVAL(2), + STRINGVAL(3), + BOOLVAL(4), + VALUE_NOT_SET(0); + private final int value; + private ValueCase(int value) { + this.value = value; + } + /** + * @param value The number of the enum to look for. + * @return The enum associated with the given number. + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static ValueCase valueOf(int value) { + return forNumber(value); + } + + public static ValueCase forNumber(int value) { + switch (value) { + case 1: return INTVAL; + case 2: return FLOATVAL; + case 3: return STRINGVAL; + case 4: return BOOLVAL; + case 0: return VALUE_NOT_SET; + default: return null; } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_descriptor; + public int getNumber() { + return this.value; + } + }; + + public ValueCase + getValueCase() { + return ValueCase.forNumber( + valueCase_); } + public static final int INTVAL_FIELD_NUMBER = 1; + /** + * uint32 intVal = 1; + * @return Whether the intVal field is set. + */ @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_fieldAccessorTable - .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiDescriptorList.class, monitoring.Monitoring.KpiDescriptorList.Builder.class); + public boolean hasIntVal() { + return valueCase_ == 1; } - - public static final int KPI_DESCRIPTOR_LIST_FIELD_NUMBER = 1; - private java.util.List kpiDescriptorList_; /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * uint32 intVal = 1; + * @return The intVal. */ @java.lang.Override - public java.util.List getKpiDescriptorListList() { - return kpiDescriptorList_; + public int getIntVal() { + if (valueCase_ == 1) { + return (java.lang.Integer) value_; + } + return 0; } + + public static final int FLOATVAL_FIELD_NUMBER = 2; /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * float floatVal = 2; + * @return Whether the floatVal field is set. */ @java.lang.Override - public java.util.List - getKpiDescriptorListOrBuilderList() { - return kpiDescriptorList_; + public boolean hasFloatVal() { + return valueCase_ == 2; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * float floatVal = 2; + * @return The floatVal. */ @java.lang.Override - public int getKpiDescriptorListCount() { - return kpiDescriptorList_.size(); + public float getFloatVal() { + if (valueCase_ == 2) { + return (java.lang.Float) value_; + } + return 0F; } + + public static final int STRINGVAL_FIELD_NUMBER = 3; /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * string stringVal = 3; + * @return Whether the stringVal field is set. + */ + public boolean hasStringVal() { + return valueCase_ == 3; + } + /** + * string stringVal = 3; + * @return The stringVal. + */ + public java.lang.String getStringVal() { + java.lang.Object ref = ""; + if (valueCase_ == 3) { + ref = value_; + } + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (valueCase_ == 3) { + value_ = s; + } + return s; + } + } + /** + * string stringVal = 3; + * @return The bytes for stringVal. + */ + public com.google.protobuf.ByteString + getStringValBytes() { + java.lang.Object ref = ""; + if (valueCase_ == 3) { + ref = value_; + } + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + if (valueCase_ == 3) { + value_ = b; + } + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int BOOLVAL_FIELD_NUMBER = 4; + /** + * bool boolVal = 4; + * @return Whether the boolVal field is set. */ @java.lang.Override - public monitoring.Monitoring.KpiDescriptor getKpiDescriptorList(int index) { - return kpiDescriptorList_.get(index); + public boolean hasBoolVal() { + return valueCase_ == 4; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * bool boolVal = 4; + * @return The boolVal. */ @java.lang.Override - public monitoring.Monitoring.KpiDescriptorOrBuilder getKpiDescriptorListOrBuilder( - int index) { - return kpiDescriptorList_.get(index); + public boolean getBoolVal() { + if (valueCase_ == 4) { + return (java.lang.Boolean) value_; + } + return false; } private byte memoizedIsInitialized = -1; @@ -9443,8 +10359,20 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - for (int i = 0; i < kpiDescriptorList_.size(); i++) { - output.writeMessage(1, kpiDescriptorList_.get(i)); + if (valueCase_ == 1) { + output.writeUInt32( + 1, (int)((java.lang.Integer) value_)); + } + if (valueCase_ == 2) { + output.writeFloat( + 2, (float)((java.lang.Float) value_)); + } + if (valueCase_ == 3) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, value_); + } + if (valueCase_ == 4) { + output.writeBool( + 4, (boolean)((java.lang.Boolean) value_)); } unknownFields.writeTo(output); } @@ -9455,9 +10383,23 @@ public final class Monitoring { if (size != -1) return size; size = 0; - for (int i = 0; i < kpiDescriptorList_.size(); i++) { + if (valueCase_ == 1) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, kpiDescriptorList_.get(i)); + .computeUInt32Size( + 1, (int)((java.lang.Integer) value_)); + } + if (valueCase_ == 2) { + size += com.google.protobuf.CodedOutputStream + .computeFloatSize( + 2, (float)((java.lang.Float) value_)); + } + if (valueCase_ == 3) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, value_); + } + if (valueCase_ == 4) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize( + 4, (boolean)((java.lang.Boolean) value_)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -9469,13 +10411,33 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.KpiDescriptorList)) { + if (!(obj instanceof monitoring.Monitoring.KpiValue)) { return super.equals(obj); } - monitoring.Monitoring.KpiDescriptorList other = (monitoring.Monitoring.KpiDescriptorList) obj; + monitoring.Monitoring.KpiValue other = (monitoring.Monitoring.KpiValue) obj; - if (!getKpiDescriptorListList() - .equals(other.getKpiDescriptorListList())) return false; + if (!getValueCase().equals(other.getValueCase())) return false; + switch (valueCase_) { + case 1: + if (getIntVal() + != other.getIntVal()) return false; + break; + case 2: + if (java.lang.Float.floatToIntBits(getFloatVal()) + != java.lang.Float.floatToIntBits( + other.getFloatVal())) return false; + break; + case 3: + if (!getStringVal() + .equals(other.getStringVal())) return false; + break; + case 4: + if (getBoolVal() + != other.getBoolVal()) return false; + break; + case 0: + default: + } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -9487,78 +10449,96 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getKpiDescriptorListCount() > 0) { - hash = (37 * hash) + KPI_DESCRIPTOR_LIST_FIELD_NUMBER; - hash = (53 * hash) + getKpiDescriptorListList().hashCode(); + switch (valueCase_) { + case 1: + hash = (37 * hash) + INTVAL_FIELD_NUMBER; + hash = (53 * hash) + getIntVal(); + break; + case 2: + hash = (37 * hash) + FLOATVAL_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getFloatVal()); + break; + case 3: + hash = (37 * hash) + STRINGVAL_FIELD_NUMBER; + hash = (53 * hash) + getStringVal().hashCode(); + break; + case 4: + hash = (37 * hash) + BOOLVAL_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getBoolVal()); + break; + case 0: + default: } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.KpiDescriptorList parseFrom( + public static monitoring.Monitoring.KpiValue parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiDescriptorList parseFrom( + public static monitoring.Monitoring.KpiValue parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiDescriptorList parseFrom( + public static monitoring.Monitoring.KpiValue parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiDescriptorList parseFrom( + public static monitoring.Monitoring.KpiValue parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiDescriptorList parseFrom(byte[] data) + public static monitoring.Monitoring.KpiValue parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiDescriptorList parseFrom( + public static monitoring.Monitoring.KpiValue parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiDescriptorList parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiValue parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiDescriptorList parseFrom( + public static monitoring.Monitoring.KpiValue parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiDescriptorList parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiValue parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiDescriptorList parseDelimitedFrom( + public static monitoring.Monitoring.KpiValue parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiDescriptorList parseFrom( + public static monitoring.Monitoring.KpiValue parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiDescriptorList parseFrom( + public static monitoring.Monitoring.KpiValue parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -9571,7 +10551,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.KpiDescriptorList prototype) { + public static Builder newBuilder(monitoring.Monitoring.KpiValue prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -9587,26 +10567,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.KpiDescriptorList} + * Protobuf type {@code monitoring.KpiValue} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptorList) - monitoring.Monitoring.KpiDescriptorListOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.KpiValue) + monitoring.Monitoring.KpiValueOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiValue_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiValue_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiDescriptorList.class, monitoring.Monitoring.KpiDescriptorList.Builder.class); + monitoring.Monitoring.KpiValue.class, monitoring.Monitoring.KpiValue.Builder.class); } - // Construct using monitoring.Monitoring.KpiDescriptorList.newBuilder() + // Construct using monitoring.Monitoring.KpiValue.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -9619,35 +10599,30 @@ public final class Monitoring { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getKpiDescriptorListFieldBuilder(); } } @java.lang.Override public Builder clear() { - super.clear(); - if (kpiDescriptorListBuilder_ == null) { - kpiDescriptorList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - } else { - kpiDescriptorListBuilder_.clear(); - } + super.clear(); + valueCase_ = 0; + value_ = null; return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiValue_descriptor; } @java.lang.Override - public monitoring.Monitoring.KpiDescriptorList getDefaultInstanceForType() { - return monitoring.Monitoring.KpiDescriptorList.getDefaultInstance(); + public monitoring.Monitoring.KpiValue getDefaultInstanceForType() { + return monitoring.Monitoring.KpiValue.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.KpiDescriptorList build() { - monitoring.Monitoring.KpiDescriptorList result = buildPartial(); + public monitoring.Monitoring.KpiValue build() { + monitoring.Monitoring.KpiValue result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -9655,18 +10630,21 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.KpiDescriptorList buildPartial() { - monitoring.Monitoring.KpiDescriptorList result = new monitoring.Monitoring.KpiDescriptorList(this); - int from_bitField0_ = bitField0_; - if (kpiDescriptorListBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { - kpiDescriptorList_ = java.util.Collections.unmodifiableList(kpiDescriptorList_); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.kpiDescriptorList_ = kpiDescriptorList_; - } else { - result.kpiDescriptorList_ = kpiDescriptorListBuilder_.build(); + public monitoring.Monitoring.KpiValue buildPartial() { + monitoring.Monitoring.KpiValue result = new monitoring.Monitoring.KpiValue(this); + if (valueCase_ == 1) { + result.value_ = value_; + } + if (valueCase_ == 2) { + result.value_ = value_; + } + if (valueCase_ == 3) { + result.value_ = value_; + } + if (valueCase_ == 4) { + result.value_ = value_; } + result.valueCase_ = valueCase_; onBuilt(); return result; } @@ -9705,40 +10683,37 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.KpiDescriptorList) { - return mergeFrom((monitoring.Monitoring.KpiDescriptorList)other); + if (other instanceof monitoring.Monitoring.KpiValue) { + return mergeFrom((monitoring.Monitoring.KpiValue)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.KpiDescriptorList other) { - if (other == monitoring.Monitoring.KpiDescriptorList.getDefaultInstance()) return this; - if (kpiDescriptorListBuilder_ == null) { - if (!other.kpiDescriptorList_.isEmpty()) { - if (kpiDescriptorList_.isEmpty()) { - kpiDescriptorList_ = other.kpiDescriptorList_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureKpiDescriptorListIsMutable(); - kpiDescriptorList_.addAll(other.kpiDescriptorList_); - } + public Builder mergeFrom(monitoring.Monitoring.KpiValue other) { + if (other == monitoring.Monitoring.KpiValue.getDefaultInstance()) return this; + switch (other.getValueCase()) { + case INTVAL: { + setIntVal(other.getIntVal()); + break; + } + case FLOATVAL: { + setFloatVal(other.getFloatVal()); + break; + } + case STRINGVAL: { + valueCase_ = 3; + value_ = other.value_; onChanged(); + break; } - } else { - if (!other.kpiDescriptorList_.isEmpty()) { - if (kpiDescriptorListBuilder_.isEmpty()) { - kpiDescriptorListBuilder_.dispose(); - kpiDescriptorListBuilder_ = null; - kpiDescriptorList_ = other.kpiDescriptorList_; - bitField0_ = (bitField0_ & ~0x00000001); - kpiDescriptorListBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getKpiDescriptorListFieldBuilder() : null; - } else { - kpiDescriptorListBuilder_.addAllMessages(other.kpiDescriptorList_); - } + case BOOLVAL: { + setBoolVal(other.getBoolVal()); + break; + } + case VALUE_NOT_SET: { + break; } } this.mergeUnknownFields(other.unknownFields); @@ -9756,11 +10731,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.KpiDescriptorList parsedMessage = null; + monitoring.Monitoring.KpiValue parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.KpiDescriptorList) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.KpiValue) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -9769,246 +10744,240 @@ public final class Monitoring { } return this; } - private int bitField0_; + private int valueCase_ = 0; + private java.lang.Object value_; + public ValueCase + getValueCase() { + return ValueCase.forNumber( + valueCase_); + } - private java.util.List kpiDescriptorList_ = - java.util.Collections.emptyList(); - private void ensureKpiDescriptorListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - kpiDescriptorList_ = new java.util.ArrayList(kpiDescriptorList_); - bitField0_ |= 0x00000001; - } + public Builder clearValue() { + valueCase_ = 0; + value_ = null; + onChanged(); + return this; } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiDescriptor, monitoring.Monitoring.KpiDescriptor.Builder, monitoring.Monitoring.KpiDescriptorOrBuilder> kpiDescriptorListBuilder_; /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * uint32 intVal = 1; + * @return Whether the intVal field is set. */ - public java.util.List getKpiDescriptorListList() { - if (kpiDescriptorListBuilder_ == null) { - return java.util.Collections.unmodifiableList(kpiDescriptorList_); - } else { - return kpiDescriptorListBuilder_.getMessageList(); - } + public boolean hasIntVal() { + return valueCase_ == 1; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * uint32 intVal = 1; + * @return The intVal. */ - public int getKpiDescriptorListCount() { - if (kpiDescriptorListBuilder_ == null) { - return kpiDescriptorList_.size(); - } else { - return kpiDescriptorListBuilder_.getCount(); + public int getIntVal() { + if (valueCase_ == 1) { + return (java.lang.Integer) value_; } + return 0; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * uint32 intVal = 1; + * @param value The intVal to set. + * @return This builder for chaining. */ - public monitoring.Monitoring.KpiDescriptor getKpiDescriptorList(int index) { - if (kpiDescriptorListBuilder_ == null) { - return kpiDescriptorList_.get(index); - } else { - return kpiDescriptorListBuilder_.getMessage(index); - } + public Builder setIntVal(int value) { + valueCase_ = 1; + value_ = value; + onChanged(); + return this; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * uint32 intVal = 1; + * @return This builder for chaining. */ - public Builder setKpiDescriptorList( - int index, monitoring.Monitoring.KpiDescriptor value) { - if (kpiDescriptorListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiDescriptorListIsMutable(); - kpiDescriptorList_.set(index, value); + public Builder clearIntVal() { + if (valueCase_ == 1) { + valueCase_ = 0; + value_ = null; onChanged(); - } else { - kpiDescriptorListBuilder_.setMessage(index, value); } return this; } + /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * float floatVal = 2; + * @return Whether the floatVal field is set. */ - public Builder setKpiDescriptorList( - int index, monitoring.Monitoring.KpiDescriptor.Builder builderForValue) { - if (kpiDescriptorListBuilder_ == null) { - ensureKpiDescriptorListIsMutable(); - kpiDescriptorList_.set(index, builderForValue.build()); - onChanged(); - } else { - kpiDescriptorListBuilder_.setMessage(index, builderForValue.build()); - } - return this; + public boolean hasFloatVal() { + return valueCase_ == 2; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * float floatVal = 2; + * @return The floatVal. */ - public Builder addKpiDescriptorList(monitoring.Monitoring.KpiDescriptor value) { - if (kpiDescriptorListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiDescriptorListIsMutable(); - kpiDescriptorList_.add(value); - onChanged(); - } else { - kpiDescriptorListBuilder_.addMessage(value); + public float getFloatVal() { + if (valueCase_ == 2) { + return (java.lang.Float) value_; } - return this; + return 0F; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * float floatVal = 2; + * @param value The floatVal to set. + * @return This builder for chaining. */ - public Builder addKpiDescriptorList( - int index, monitoring.Monitoring.KpiDescriptor value) { - if (kpiDescriptorListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiDescriptorListIsMutable(); - kpiDescriptorList_.add(index, value); - onChanged(); - } else { - kpiDescriptorListBuilder_.addMessage(index, value); - } + public Builder setFloatVal(float value) { + valueCase_ = 2; + value_ = value; + onChanged(); return this; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * float floatVal = 2; + * @return This builder for chaining. */ - public Builder addKpiDescriptorList( - monitoring.Monitoring.KpiDescriptor.Builder builderForValue) { - if (kpiDescriptorListBuilder_ == null) { - ensureKpiDescriptorListIsMutable(); - kpiDescriptorList_.add(builderForValue.build()); + public Builder clearFloatVal() { + if (valueCase_ == 2) { + valueCase_ = 0; + value_ = null; onChanged(); - } else { - kpiDescriptorListBuilder_.addMessage(builderForValue.build()); } return this; } + /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * string stringVal = 3; + * @return Whether the stringVal field is set. */ - public Builder addKpiDescriptorList( - int index, monitoring.Monitoring.KpiDescriptor.Builder builderForValue) { - if (kpiDescriptorListBuilder_ == null) { - ensureKpiDescriptorListIsMutable(); - kpiDescriptorList_.add(index, builderForValue.build()); - onChanged(); - } else { - kpiDescriptorListBuilder_.addMessage(index, builderForValue.build()); - } - return this; + @java.lang.Override + public boolean hasStringVal() { + return valueCase_ == 3; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * string stringVal = 3; + * @return The stringVal. */ - public Builder addAllKpiDescriptorList( - java.lang.Iterable values) { - if (kpiDescriptorListBuilder_ == null) { - ensureKpiDescriptorListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, kpiDescriptorList_); - onChanged(); + @java.lang.Override + public java.lang.String getStringVal() { + java.lang.Object ref = ""; + if (valueCase_ == 3) { + ref = value_; + } + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (valueCase_ == 3) { + value_ = s; + } + return s; } else { - kpiDescriptorListBuilder_.addAllMessages(values); + return (java.lang.String) ref; } - return this; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * string stringVal = 3; + * @return The bytes for stringVal. */ - public Builder clearKpiDescriptorList() { - if (kpiDescriptorListBuilder_ == null) { - kpiDescriptorList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); + @java.lang.Override + public com.google.protobuf.ByteString + getStringValBytes() { + java.lang.Object ref = ""; + if (valueCase_ == 3) { + ref = value_; + } + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + if (valueCase_ == 3) { + value_ = b; + } + return b; } else { - kpiDescriptorListBuilder_.clear(); + return (com.google.protobuf.ByteString) ref; } + } + /** + * string stringVal = 3; + * @param value The stringVal to set. + * @return This builder for chaining. + */ + public Builder setStringVal( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + valueCase_ = 3; + value_ = value; + onChanged(); return this; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * string stringVal = 3; + * @return This builder for chaining. */ - public Builder removeKpiDescriptorList(int index) { - if (kpiDescriptorListBuilder_ == null) { - ensureKpiDescriptorListIsMutable(); - kpiDescriptorList_.remove(index); + public Builder clearStringVal() { + if (valueCase_ == 3) { + valueCase_ = 0; + value_ = null; onChanged(); - } else { - kpiDescriptorListBuilder_.remove(index); } return this; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * string stringVal = 3; + * @param value The bytes for stringVal to set. + * @return This builder for chaining. */ - public monitoring.Monitoring.KpiDescriptor.Builder getKpiDescriptorListBuilder( - int index) { - return getKpiDescriptorListFieldBuilder().getBuilder(index); + public Builder setStringValBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + valueCase_ = 3; + value_ = value; + onChanged(); + return this; } + /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * bool boolVal = 4; + * @return Whether the boolVal field is set. */ - public monitoring.Monitoring.KpiDescriptorOrBuilder getKpiDescriptorListOrBuilder( - int index) { - if (kpiDescriptorListBuilder_ == null) { - return kpiDescriptorList_.get(index); } else { - return kpiDescriptorListBuilder_.getMessageOrBuilder(index); - } + public boolean hasBoolVal() { + return valueCase_ == 4; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * bool boolVal = 4; + * @return The boolVal. */ - public java.util.List - getKpiDescriptorListOrBuilderList() { - if (kpiDescriptorListBuilder_ != null) { - return kpiDescriptorListBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(kpiDescriptorList_); + public boolean getBoolVal() { + if (valueCase_ == 4) { + return (java.lang.Boolean) value_; } + return false; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; - */ - public monitoring.Monitoring.KpiDescriptor.Builder addKpiDescriptorListBuilder() { - return getKpiDescriptorListFieldBuilder().addBuilder( - monitoring.Monitoring.KpiDescriptor.getDefaultInstance()); - } - /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * bool boolVal = 4; + * @param value The boolVal to set. + * @return This builder for chaining. */ - public monitoring.Monitoring.KpiDescriptor.Builder addKpiDescriptorListBuilder( - int index) { - return getKpiDescriptorListFieldBuilder().addBuilder( - index, monitoring.Monitoring.KpiDescriptor.getDefaultInstance()); + public Builder setBoolVal(boolean value) { + valueCase_ = 4; + value_ = value; + onChanged(); + return this; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * bool boolVal = 4; + * @return This builder for chaining. */ - public java.util.List - getKpiDescriptorListBuilderList() { - return getKpiDescriptorListFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiDescriptor, monitoring.Monitoring.KpiDescriptor.Builder, monitoring.Monitoring.KpiDescriptorOrBuilder> - getKpiDescriptorListFieldBuilder() { - if (kpiDescriptorListBuilder_ == null) { - kpiDescriptorListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiDescriptor, monitoring.Monitoring.KpiDescriptor.Builder, monitoring.Monitoring.KpiDescriptorOrBuilder>( - kpiDescriptorList_, - ((bitField0_ & 0x00000001) != 0), - getParentForChildren(), - isClean()); - kpiDescriptorList_ = null; + public Builder clearBoolVal() { + if (valueCase_ == 4) { + valueCase_ = 0; + value_ = null; + onChanged(); } - return kpiDescriptorListBuilder_; + return this; } @java.lang.Override public final Builder setUnknownFields( @@ -10023,166 +10992,95 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.KpiDescriptorList) + // @@protoc_insertion_point(builder_scope:monitoring.KpiValue) } - // @@protoc_insertion_point(class_scope:monitoring.KpiDescriptorList) - private static final monitoring.Monitoring.KpiDescriptorList DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.KpiValue) + private static final monitoring.Monitoring.KpiValue DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.KpiDescriptorList(); + DEFAULT_INSTANCE = new monitoring.Monitoring.KpiValue(); } - public static monitoring.Monitoring.KpiDescriptorList getDefaultInstance() { + public static monitoring.Monitoring.KpiValue getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public KpiDescriptorList parsePartialFrom( + public KpiValue parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new KpiDescriptorList(input, extensionRegistry); + return new KpiValue(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.KpiDescriptorList getDefaultInstanceForType() { + public monitoring.Monitoring.KpiValue getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface SubsDescriptorOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.SubsDescriptor) + public interface KpiListOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.KpiList) com.google.protobuf.MessageOrBuilder { /** - * .monitoring.SubscriptionID subs_id = 1; - * @return Whether the subsId field is set. - */ - boolean hasSubsId(); - /** - * .monitoring.SubscriptionID subs_id = 1; - * @return The subsId. - */ - monitoring.Monitoring.SubscriptionID getSubsId(); - /** - * .monitoring.SubscriptionID subs_id = 1; - */ - monitoring.Monitoring.SubscriptionIDOrBuilder getSubsIdOrBuilder(); - - /** - * .monitoring.KpiId kpi_id = 2; - * @return Whether the kpiId field is set. - */ - boolean hasKpiId(); - /** - * .monitoring.KpiId kpi_id = 2; - * @return The kpiId. - */ - monitoring.Monitoring.KpiId getKpiId(); - /** - * .monitoring.KpiId kpi_id = 2; - */ - monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder(); - - /** - * float sampling_duration_s = 3; - * @return The samplingDurationS. - */ - float getSamplingDurationS(); - - /** - * float sampling_interval_s = 4; - * @return The samplingIntervalS. - */ - float getSamplingIntervalS(); - - /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; - * @return Whether the startTimestamp field is set. - */ - boolean hasStartTimestamp(); - /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; - * @return The startTimestamp. + * repeated .monitoring.Kpi kpi_list = 1; */ - context.ContextOuterClass.Timestamp getStartTimestamp(); + java.util.List + getKpiListList(); /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; + * repeated .monitoring.Kpi kpi_list = 1; */ - context.ContextOuterClass.TimestampOrBuilder getStartTimestampOrBuilder(); - + monitoring.Monitoring.Kpi getKpiList(int index); /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; - * @return Whether the endTimestamp field is set. + * repeated .monitoring.Kpi kpi_list = 1; */ - boolean hasEndTimestamp(); + int getKpiListCount(); /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; - * @return The endTimestamp. + * repeated .monitoring.Kpi kpi_list = 1; */ - context.ContextOuterClass.Timestamp getEndTimestamp(); + java.util.List + getKpiListOrBuilderList(); /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; + * repeated .monitoring.Kpi kpi_list = 1; */ - context.ContextOuterClass.TimestampOrBuilder getEndTimestampOrBuilder(); + monitoring.Monitoring.KpiOrBuilder getKpiListOrBuilder( + int index); } /** - * Protobuf type {@code monitoring.SubsDescriptor} + * Protobuf type {@code monitoring.KpiList} */ - public static final class SubsDescriptor extends + public static final class KpiList extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.SubsDescriptor) - SubsDescriptorOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.KpiList) + KpiListOrBuilder { private static final long serialVersionUID = 0L; - // Use SubsDescriptor.newBuilder() to construct. - private SubsDescriptor(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use KpiList.newBuilder() to construct. + private KpiList(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private SubsDescriptor() { + private KpiList() { + kpiList_ = java.util.Collections.emptyList(); } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new SubsDescriptor(); + return new KpiList(); } @java.lang.Override @@ -10190,7 +11088,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private SubsDescriptor( + private KpiList( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -10198,6 +11096,7 @@ public final class Monitoring { if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } + int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -10209,65 +11108,12 @@ public final class Monitoring { done = true; break; case 10: { - monitoring.Monitoring.SubscriptionID.Builder subBuilder = null; - if (subsId_ != null) { - subBuilder = subsId_.toBuilder(); - } - subsId_ = input.readMessage(monitoring.Monitoring.SubscriptionID.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(subsId_); - subsId_ = subBuilder.buildPartial(); - } - - break; - } - case 18: { - monitoring.Monitoring.KpiId.Builder subBuilder = null; - if (kpiId_ != null) { - subBuilder = kpiId_.toBuilder(); - } - kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(kpiId_); - kpiId_ = subBuilder.buildPartial(); - } - - break; - } - case 29: { - - samplingDurationS_ = input.readFloat(); - break; - } - case 37: { - - samplingIntervalS_ = input.readFloat(); - break; - } - case 42: { - context.ContextOuterClass.Timestamp.Builder subBuilder = null; - if (startTimestamp_ != null) { - subBuilder = startTimestamp_.toBuilder(); - } - startTimestamp_ = input.readMessage(context.ContextOuterClass.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(startTimestamp_); - startTimestamp_ = subBuilder.buildPartial(); - } - - break; - } - case 50: { - context.ContextOuterClass.Timestamp.Builder subBuilder = null; - if (endTimestamp_ != null) { - subBuilder = endTimestamp_.toBuilder(); - } - endTimestamp_ = input.readMessage(context.ContextOuterClass.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(endTimestamp_); - endTimestamp_ = subBuilder.buildPartial(); + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + kpiList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; } - + kpiList_.add( + input.readMessage(monitoring.Monitoring.Kpi.parser(), extensionRegistry)); break; } default: { @@ -10285,171 +11131,64 @@ public final class Monitoring { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + kpiList_ = java.util.Collections.unmodifiableList(kpiList_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiList_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiList_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.SubsDescriptor.class, monitoring.Monitoring.SubsDescriptor.Builder.class); - } - - public static final int SUBS_ID_FIELD_NUMBER = 1; - private monitoring.Monitoring.SubscriptionID subsId_; - /** - * .monitoring.SubscriptionID subs_id = 1; - * @return Whether the subsId field is set. - */ - @java.lang.Override - public boolean hasSubsId() { - return subsId_ != null; - } - /** - * .monitoring.SubscriptionID subs_id = 1; - * @return The subsId. - */ - @java.lang.Override - public monitoring.Monitoring.SubscriptionID getSubsId() { - return subsId_ == null ? monitoring.Monitoring.SubscriptionID.getDefaultInstance() : subsId_; - } - /** - * .monitoring.SubscriptionID subs_id = 1; - */ - @java.lang.Override - public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsIdOrBuilder() { - return getSubsId(); - } - - public static final int KPI_ID_FIELD_NUMBER = 2; - private monitoring.Monitoring.KpiId kpiId_; - /** - * .monitoring.KpiId kpi_id = 2; - * @return Whether the kpiId field is set. - */ - @java.lang.Override - public boolean hasKpiId() { - return kpiId_ != null; - } - /** - * .monitoring.KpiId kpi_id = 2; - * @return The kpiId. - */ - @java.lang.Override - public monitoring.Monitoring.KpiId getKpiId() { - return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; - } - /** - * .monitoring.KpiId kpi_id = 2; - */ - @java.lang.Override - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { - return getKpiId(); - } - - public static final int SAMPLING_DURATION_S_FIELD_NUMBER = 3; - private float samplingDurationS_; - /** - * float sampling_duration_s = 3; - * @return The samplingDurationS. - */ - @java.lang.Override - public float getSamplingDurationS() { - return samplingDurationS_; - } - - public static final int SAMPLING_INTERVAL_S_FIELD_NUMBER = 4; - private float samplingIntervalS_; - /** - * float sampling_interval_s = 4; - * @return The samplingIntervalS. - */ - @java.lang.Override - public float getSamplingIntervalS() { - return samplingIntervalS_; + monitoring.Monitoring.KpiList.class, monitoring.Monitoring.KpiList.Builder.class); } - public static final int START_TIMESTAMP_FIELD_NUMBER = 5; - private context.ContextOuterClass.Timestamp startTimestamp_; - /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; - * @return Whether the startTimestamp field is set. - */ - @java.lang.Override - public boolean hasStartTimestamp() { - return startTimestamp_ != null; - } + public static final int KPI_LIST_FIELD_NUMBER = 1; + private java.util.List kpiList_; /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; - * @return The startTimestamp. + * repeated .monitoring.Kpi kpi_list = 1; */ @java.lang.Override - public context.ContextOuterClass.Timestamp getStartTimestamp() { - return startTimestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : startTimestamp_; + public java.util.List getKpiListList() { + return kpiList_; } /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; + * repeated .monitoring.Kpi kpi_list = 1; */ @java.lang.Override - public context.ContextOuterClass.TimestampOrBuilder getStartTimestampOrBuilder() { - return getStartTimestamp(); + public java.util.List + getKpiListOrBuilderList() { + return kpiList_; } - - public static final int END_TIMESTAMP_FIELD_NUMBER = 6; - private context.ContextOuterClass.Timestamp endTimestamp_; /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; - * @return Whether the endTimestamp field is set. + * repeated .monitoring.Kpi kpi_list = 1; */ @java.lang.Override - public boolean hasEndTimestamp() { - return endTimestamp_ != null; + public int getKpiListCount() { + return kpiList_.size(); } /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; - * @return The endTimestamp. + * repeated .monitoring.Kpi kpi_list = 1; */ @java.lang.Override - public context.ContextOuterClass.Timestamp getEndTimestamp() { - return endTimestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : endTimestamp_; + public monitoring.Monitoring.Kpi getKpiList(int index) { + return kpiList_.get(index); } /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; + * repeated .monitoring.Kpi kpi_list = 1; */ @java.lang.Override - public context.ContextOuterClass.TimestampOrBuilder getEndTimestampOrBuilder() { - return getEndTimestamp(); + public monitoring.Monitoring.KpiOrBuilder getKpiListOrBuilder( + int index) { + return kpiList_.get(index); } private byte memoizedIsInitialized = -1; @@ -10466,23 +11205,8 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (subsId_ != null) { - output.writeMessage(1, getSubsId()); - } - if (kpiId_ != null) { - output.writeMessage(2, getKpiId()); - } - if (samplingDurationS_ != 0F) { - output.writeFloat(3, samplingDurationS_); - } - if (samplingIntervalS_ != 0F) { - output.writeFloat(4, samplingIntervalS_); - } - if (startTimestamp_ != null) { - output.writeMessage(5, getStartTimestamp()); - } - if (endTimestamp_ != null) { - output.writeMessage(6, getEndTimestamp()); + for (int i = 0; i < kpiList_.size(); i++) { + output.writeMessage(1, kpiList_.get(i)); } unknownFields.writeTo(output); } @@ -10493,29 +11217,9 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (subsId_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getSubsId()); - } - if (kpiId_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, getKpiId()); - } - if (samplingDurationS_ != 0F) { - size += com.google.protobuf.CodedOutputStream - .computeFloatSize(3, samplingDurationS_); - } - if (samplingIntervalS_ != 0F) { - size += com.google.protobuf.CodedOutputStream - .computeFloatSize(4, samplingIntervalS_); - } - if (startTimestamp_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, getStartTimestamp()); - } - if (endTimestamp_ != null) { + for (int i = 0; i < kpiList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, getEndTimestamp()); + .computeMessageSize(1, kpiList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -10527,37 +11231,13 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.SubsDescriptor)) { + if (!(obj instanceof monitoring.Monitoring.KpiList)) { return super.equals(obj); } - monitoring.Monitoring.SubsDescriptor other = (monitoring.Monitoring.SubsDescriptor) obj; + monitoring.Monitoring.KpiList other = (monitoring.Monitoring.KpiList) obj; - if (hasSubsId() != other.hasSubsId()) return false; - if (hasSubsId()) { - if (!getSubsId() - .equals(other.getSubsId())) return false; - } - if (hasKpiId() != other.hasKpiId()) return false; - if (hasKpiId()) { - if (!getKpiId() - .equals(other.getKpiId())) return false; - } - if (java.lang.Float.floatToIntBits(getSamplingDurationS()) - != java.lang.Float.floatToIntBits( - other.getSamplingDurationS())) return false; - if (java.lang.Float.floatToIntBits(getSamplingIntervalS()) - != java.lang.Float.floatToIntBits( - other.getSamplingIntervalS())) return false; - if (hasStartTimestamp() != other.hasStartTimestamp()) return false; - if (hasStartTimestamp()) { - if (!getStartTimestamp() - .equals(other.getStartTimestamp())) return false; - } - if (hasEndTimestamp() != other.hasEndTimestamp()) return false; - if (hasEndTimestamp()) { - if (!getEndTimestamp() - .equals(other.getEndTimestamp())) return false; - } + if (!getKpiListList() + .equals(other.getKpiListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -10569,96 +11249,78 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasSubsId()) { - hash = (37 * hash) + SUBS_ID_FIELD_NUMBER; - hash = (53 * hash) + getSubsId().hashCode(); - } - if (hasKpiId()) { - hash = (37 * hash) + KPI_ID_FIELD_NUMBER; - hash = (53 * hash) + getKpiId().hashCode(); - } - hash = (37 * hash) + SAMPLING_DURATION_S_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getSamplingDurationS()); - hash = (37 * hash) + SAMPLING_INTERVAL_S_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getSamplingIntervalS()); - if (hasStartTimestamp()) { - hash = (37 * hash) + START_TIMESTAMP_FIELD_NUMBER; - hash = (53 * hash) + getStartTimestamp().hashCode(); - } - if (hasEndTimestamp()) { - hash = (37 * hash) + END_TIMESTAMP_FIELD_NUMBER; - hash = (53 * hash) + getEndTimestamp().hashCode(); + if (getKpiListCount() > 0) { + hash = (37 * hash) + KPI_LIST_FIELD_NUMBER; + hash = (53 * hash) + getKpiListList().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.SubsDescriptor parseFrom( + public static monitoring.Monitoring.KpiList parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubsDescriptor parseFrom( + public static monitoring.Monitoring.KpiList parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubsDescriptor parseFrom( + public static monitoring.Monitoring.KpiList parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubsDescriptor parseFrom( + public static monitoring.Monitoring.KpiList parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubsDescriptor parseFrom(byte[] data) + public static monitoring.Monitoring.KpiList parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubsDescriptor parseFrom( + public static monitoring.Monitoring.KpiList parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubsDescriptor parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiList parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubsDescriptor parseFrom( + public static monitoring.Monitoring.KpiList parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.SubsDescriptor parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiList parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubsDescriptor parseDelimitedFrom( + public static monitoring.Monitoring.KpiList parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.SubsDescriptor parseFrom( + public static monitoring.Monitoring.KpiList parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubsDescriptor parseFrom( + public static monitoring.Monitoring.KpiList parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -10671,7 +11333,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.SubsDescriptor prototype) { + public static Builder newBuilder(monitoring.Monitoring.KpiList prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -10686,823 +11348,429 @@ public final class Monitoring { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code monitoring.SubsDescriptor} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.SubsDescriptor) - monitoring.Monitoring.SubsDescriptorOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_fieldAccessorTable - .ensureFieldAccessorsInitialized( - monitoring.Monitoring.SubsDescriptor.class, monitoring.Monitoring.SubsDescriptor.Builder.class); - } - - // Construct using monitoring.Monitoring.SubsDescriptor.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } - } - @java.lang.Override - public Builder clear() { - super.clear(); - if (subsIdBuilder_ == null) { - subsId_ = null; - } else { - subsId_ = null; - subsIdBuilder_ = null; - } - if (kpiIdBuilder_ == null) { - kpiId_ = null; - } else { - kpiId_ = null; - kpiIdBuilder_ = null; - } - samplingDurationS_ = 0F; - - samplingIntervalS_ = 0F; - - if (startTimestampBuilder_ == null) { - startTimestamp_ = null; - } else { - startTimestamp_ = null; - startTimestampBuilder_ = null; - } - if (endTimestampBuilder_ == null) { - endTimestamp_ = null; - } else { - endTimestamp_ = null; - endTimestampBuilder_ = null; - } - return this; - } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_descriptor; - } - - @java.lang.Override - public monitoring.Monitoring.SubsDescriptor getDefaultInstanceForType() { - return monitoring.Monitoring.SubsDescriptor.getDefaultInstance(); - } - - @java.lang.Override - public monitoring.Monitoring.SubsDescriptor build() { - monitoring.Monitoring.SubsDescriptor result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - @java.lang.Override - public monitoring.Monitoring.SubsDescriptor buildPartial() { - monitoring.Monitoring.SubsDescriptor result = new monitoring.Monitoring.SubsDescriptor(this); - if (subsIdBuilder_ == null) { - result.subsId_ = subsId_; - } else { - result.subsId_ = subsIdBuilder_.build(); - } - if (kpiIdBuilder_ == null) { - result.kpiId_ = kpiId_; - } else { - result.kpiId_ = kpiIdBuilder_.build(); - } - result.samplingDurationS_ = samplingDurationS_; - result.samplingIntervalS_ = samplingIntervalS_; - if (startTimestampBuilder_ == null) { - result.startTimestamp_ = startTimestamp_; - } else { - result.startTimestamp_ = startTimestampBuilder_.build(); - } - if (endTimestampBuilder_ == null) { - result.endTimestamp_ = endTimestamp_; - } else { - result.endTimestamp_ = endTimestampBuilder_.build(); - } - onBuilt(); - return result; - } - - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.SubsDescriptor) { - return mergeFrom((monitoring.Monitoring.SubsDescriptor)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(monitoring.Monitoring.SubsDescriptor other) { - if (other == monitoring.Monitoring.SubsDescriptor.getDefaultInstance()) return this; - if (other.hasSubsId()) { - mergeSubsId(other.getSubsId()); - } - if (other.hasKpiId()) { - mergeKpiId(other.getKpiId()); - } - if (other.getSamplingDurationS() != 0F) { - setSamplingDurationS(other.getSamplingDurationS()); - } - if (other.getSamplingIntervalS() != 0F) { - setSamplingIntervalS(other.getSamplingIntervalS()); - } - if (other.hasStartTimestamp()) { - mergeStartTimestamp(other.getStartTimestamp()); - } - if (other.hasEndTimestamp()) { - mergeEndTimestamp(other.getEndTimestamp()); - } - this.mergeUnknownFields(other.unknownFields); - onChanged(); - return this; - } - - @java.lang.Override - public final boolean isInitialized() { - return true; - } - - @java.lang.Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - monitoring.Monitoring.SubsDescriptor parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.SubsDescriptor) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - private monitoring.Monitoring.SubscriptionID subsId_; - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> subsIdBuilder_; - /** - * .monitoring.SubscriptionID subs_id = 1; - * @return Whether the subsId field is set. - */ - public boolean hasSubsId() { - return subsIdBuilder_ != null || subsId_ != null; - } - /** - * .monitoring.SubscriptionID subs_id = 1; - * @return The subsId. - */ - public monitoring.Monitoring.SubscriptionID getSubsId() { - if (subsIdBuilder_ == null) { - return subsId_ == null ? monitoring.Monitoring.SubscriptionID.getDefaultInstance() : subsId_; - } else { - return subsIdBuilder_.getMessage(); - } - } - /** - * .monitoring.SubscriptionID subs_id = 1; - */ - public Builder setSubsId(monitoring.Monitoring.SubscriptionID value) { - if (subsIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - subsId_ = value; - onChanged(); - } else { - subsIdBuilder_.setMessage(value); - } - - return this; - } - /** - * .monitoring.SubscriptionID subs_id = 1; - */ - public Builder setSubsId( - monitoring.Monitoring.SubscriptionID.Builder builderForValue) { - if (subsIdBuilder_ == null) { - subsId_ = builderForValue.build(); - onChanged(); - } else { - subsIdBuilder_.setMessage(builderForValue.build()); - } - - return this; + /** + * Protobuf type {@code monitoring.KpiList} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:monitoring.KpiList) + monitoring.Monitoring.KpiListOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return monitoring.Monitoring.internal_static_monitoring_KpiList_descriptor; } - /** - * .monitoring.SubscriptionID subs_id = 1; - */ - public Builder mergeSubsId(monitoring.Monitoring.SubscriptionID value) { - if (subsIdBuilder_ == null) { - if (subsId_ != null) { - subsId_ = - monitoring.Monitoring.SubscriptionID.newBuilder(subsId_).mergeFrom(value).buildPartial(); - } else { - subsId_ = value; - } - onChanged(); - } else { - subsIdBuilder_.mergeFrom(value); - } - return this; + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return monitoring.Monitoring.internal_static_monitoring_KpiList_fieldAccessorTable + .ensureFieldAccessorsInitialized( + monitoring.Monitoring.KpiList.class, monitoring.Monitoring.KpiList.Builder.class); } - /** - * .monitoring.SubscriptionID subs_id = 1; - */ - public Builder clearSubsId() { - if (subsIdBuilder_ == null) { - subsId_ = null; - onChanged(); - } else { - subsId_ = null; - subsIdBuilder_ = null; - } - return this; + // Construct using monitoring.Monitoring.KpiList.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); } - /** - * .monitoring.SubscriptionID subs_id = 1; - */ - public monitoring.Monitoring.SubscriptionID.Builder getSubsIdBuilder() { - - onChanged(); - return getSubsIdFieldBuilder().getBuilder(); + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); } - /** - * .monitoring.SubscriptionID subs_id = 1; - */ - public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsIdOrBuilder() { - if (subsIdBuilder_ != null) { - return subsIdBuilder_.getMessageOrBuilder(); - } else { - return subsId_ == null ? - monitoring.Monitoring.SubscriptionID.getDefaultInstance() : subsId_; + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getKpiListFieldBuilder(); } } - /** - * .monitoring.SubscriptionID subs_id = 1; - */ - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> - getSubsIdFieldBuilder() { - if (subsIdBuilder_ == null) { - subsIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder>( - getSubsId(), - getParentForChildren(), - isClean()); - subsId_ = null; + @java.lang.Override + public Builder clear() { + super.clear(); + if (kpiListBuilder_ == null) { + kpiList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + kpiListBuilder_.clear(); } - return subsIdBuilder_; + return this; } - private monitoring.Monitoring.KpiId kpiId_; - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; - /** - * .monitoring.KpiId kpi_id = 2; - * @return Whether the kpiId field is set. - */ - public boolean hasKpiId() { - return kpiIdBuilder_ != null || kpiId_ != null; - } - /** - * .monitoring.KpiId kpi_id = 2; - * @return The kpiId. - */ - public monitoring.Monitoring.KpiId getKpiId() { - if (kpiIdBuilder_ == null) { - return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; - } else { - return kpiIdBuilder_.getMessage(); - } + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return monitoring.Monitoring.internal_static_monitoring_KpiList_descriptor; } - /** - * .monitoring.KpiId kpi_id = 2; - */ - public Builder setKpiId(monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - kpiId_ = value; - onChanged(); - } else { - kpiIdBuilder_.setMessage(value); - } - return this; + @java.lang.Override + public monitoring.Monitoring.KpiList getDefaultInstanceForType() { + return monitoring.Monitoring.KpiList.getDefaultInstance(); } - /** - * .monitoring.KpiId kpi_id = 2; - */ - public Builder setKpiId( - monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdBuilder_ == null) { - kpiId_ = builderForValue.build(); - onChanged(); - } else { - kpiIdBuilder_.setMessage(builderForValue.build()); - } - return this; + @java.lang.Override + public monitoring.Monitoring.KpiList build() { + monitoring.Monitoring.KpiList result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; } - /** - * .monitoring.KpiId kpi_id = 2; - */ - public Builder mergeKpiId(monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (kpiId_ != null) { - kpiId_ = - monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial(); - } else { - kpiId_ = value; + + @java.lang.Override + public monitoring.Monitoring.KpiList buildPartial() { + monitoring.Monitoring.KpiList result = new monitoring.Monitoring.KpiList(this); + int from_bitField0_ = bitField0_; + if (kpiListBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + kpiList_ = java.util.Collections.unmodifiableList(kpiList_); + bitField0_ = (bitField0_ & ~0x00000001); } - onChanged(); + result.kpiList_ = kpiList_; } else { - kpiIdBuilder_.mergeFrom(value); + result.kpiList_ = kpiListBuilder_.build(); } - - return this; + onBuilt(); + return result; } - /** - * .monitoring.KpiId kpi_id = 2; - */ - public Builder clearKpiId() { - if (kpiIdBuilder_ == null) { - kpiId_ = null; - onChanged(); - } else { - kpiId_ = null; - kpiIdBuilder_ = null; - } - return this; + @java.lang.Override + public Builder clone() { + return super.clone(); } - /** - * .monitoring.KpiId kpi_id = 2; - */ - public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() { - - onChanged(); - return getKpiIdFieldBuilder().getBuilder(); + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); } - /** - * .monitoring.KpiId kpi_id = 2; - */ - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { - if (kpiIdBuilder_ != null) { - return kpiIdBuilder_.getMessageOrBuilder(); - } else { - return kpiId_ == null ? - monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; - } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); } - /** - * .monitoring.KpiId kpi_id = 2; - */ - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> - getKpiIdFieldBuilder() { - if (kpiIdBuilder_ == null) { - kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( - getKpiId(), - getParentForChildren(), - isClean()); - kpiId_ = null; - } - return kpiIdBuilder_; + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); } - - private float samplingDurationS_ ; - /** - * float sampling_duration_s = 3; - * @return The samplingDurationS. - */ @java.lang.Override - public float getSamplingDurationS() { - return samplingDurationS_; + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); } - /** - * float sampling_duration_s = 3; - * @param value The samplingDurationS to set. - * @return This builder for chaining. - */ - public Builder setSamplingDurationS(float value) { - - samplingDurationS_ = value; - onChanged(); - return this; + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); } - /** - * float sampling_duration_s = 3; - * @return This builder for chaining. - */ - public Builder clearSamplingDurationS() { - - samplingDurationS_ = 0F; + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof monitoring.Monitoring.KpiList) { + return mergeFrom((monitoring.Monitoring.KpiList)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(monitoring.Monitoring.KpiList other) { + if (other == monitoring.Monitoring.KpiList.getDefaultInstance()) return this; + if (kpiListBuilder_ == null) { + if (!other.kpiList_.isEmpty()) { + if (kpiList_.isEmpty()) { + kpiList_ = other.kpiList_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureKpiListIsMutable(); + kpiList_.addAll(other.kpiList_); + } + onChanged(); + } + } else { + if (!other.kpiList_.isEmpty()) { + if (kpiListBuilder_.isEmpty()) { + kpiListBuilder_.dispose(); + kpiListBuilder_ = null; + kpiList_ = other.kpiList_; + bitField0_ = (bitField0_ & ~0x00000001); + kpiListBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getKpiListFieldBuilder() : null; + } else { + kpiListBuilder_.addAllMessages(other.kpiList_); + } + } + } + this.mergeUnknownFields(other.unknownFields); onChanged(); return this; } - private float samplingIntervalS_ ; - /** - * float sampling_interval_s = 4; - * @return The samplingIntervalS. - */ @java.lang.Override - public float getSamplingIntervalS() { - return samplingIntervalS_; + public final boolean isInitialized() { + return true; } - /** - * float sampling_interval_s = 4; - * @param value The samplingIntervalS to set. - * @return This builder for chaining. - */ - public Builder setSamplingIntervalS(float value) { - - samplingIntervalS_ = value; - onChanged(); + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + monitoring.Monitoring.KpiList parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (monitoring.Monitoring.KpiList) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } return this; } + private int bitField0_; + + private java.util.List kpiList_ = + java.util.Collections.emptyList(); + private void ensureKpiListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + kpiList_ = new java.util.ArrayList(kpiList_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.Kpi, monitoring.Monitoring.Kpi.Builder, monitoring.Monitoring.KpiOrBuilder> kpiListBuilder_; + /** - * float sampling_interval_s = 4; - * @return This builder for chaining. + * repeated .monitoring.Kpi kpi_list = 1; */ - public Builder clearSamplingIntervalS() { - - samplingIntervalS_ = 0F; - onChanged(); - return this; + public java.util.List getKpiListList() { + if (kpiListBuilder_ == null) { + return java.util.Collections.unmodifiableList(kpiList_); + } else { + return kpiListBuilder_.getMessageList(); + } } - - private context.ContextOuterClass.Timestamp startTimestamp_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> startTimestampBuilder_; /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; - * @return Whether the startTimestamp field is set. + * repeated .monitoring.Kpi kpi_list = 1; */ - public boolean hasStartTimestamp() { - return startTimestampBuilder_ != null || startTimestamp_ != null; + public int getKpiListCount() { + if (kpiListBuilder_ == null) { + return kpiList_.size(); + } else { + return kpiListBuilder_.getCount(); + } } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; - * @return The startTimestamp. + * repeated .monitoring.Kpi kpi_list = 1; */ - public context.ContextOuterClass.Timestamp getStartTimestamp() { - if (startTimestampBuilder_ == null) { - return startTimestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : startTimestamp_; + public monitoring.Monitoring.Kpi getKpiList(int index) { + if (kpiListBuilder_ == null) { + return kpiList_.get(index); } else { - return startTimestampBuilder_.getMessage(); + return kpiListBuilder_.getMessage(index); } } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * repeated .monitoring.Kpi kpi_list = 1; */ - public Builder setStartTimestamp(context.ContextOuterClass.Timestamp value) { - if (startTimestampBuilder_ == null) { + public Builder setKpiList( + int index, monitoring.Monitoring.Kpi value) { + if (kpiListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - startTimestamp_ = value; + ensureKpiListIsMutable(); + kpiList_.set(index, value); onChanged(); } else { - startTimestampBuilder_.setMessage(value); + kpiListBuilder_.setMessage(index, value); } - return this; } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * repeated .monitoring.Kpi kpi_list = 1; */ - public Builder setStartTimestamp( - context.ContextOuterClass.Timestamp.Builder builderForValue) { - if (startTimestampBuilder_ == null) { - startTimestamp_ = builderForValue.build(); + public Builder setKpiList( + int index, monitoring.Monitoring.Kpi.Builder builderForValue) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + kpiList_.set(index, builderForValue.build()); onChanged(); } else { - startTimestampBuilder_.setMessage(builderForValue.build()); + kpiListBuilder_.setMessage(index, builderForValue.build()); } - return this; } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * repeated .monitoring.Kpi kpi_list = 1; */ - public Builder mergeStartTimestamp(context.ContextOuterClass.Timestamp value) { - if (startTimestampBuilder_ == null) { - if (startTimestamp_ != null) { - startTimestamp_ = - context.ContextOuterClass.Timestamp.newBuilder(startTimestamp_).mergeFrom(value).buildPartial(); - } else { - startTimestamp_ = value; + public Builder addKpiList(monitoring.Monitoring.Kpi value) { + if (kpiListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); } + ensureKpiListIsMutable(); + kpiList_.add(value); onChanged(); } else { - startTimestampBuilder_.mergeFrom(value); + kpiListBuilder_.addMessage(value); } - return this; } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * repeated .monitoring.Kpi kpi_list = 1; */ - public Builder clearStartTimestamp() { - if (startTimestampBuilder_ == null) { - startTimestamp_ = null; + public Builder addKpiList( + int index, monitoring.Monitoring.Kpi value) { + if (kpiListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiListIsMutable(); + kpiList_.add(index, value); onChanged(); } else { - startTimestamp_ = null; - startTimestampBuilder_ = null; + kpiListBuilder_.addMessage(index, value); } - return this; } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; - */ - public context.ContextOuterClass.Timestamp.Builder getStartTimestampBuilder() { - - onChanged(); - return getStartTimestampFieldBuilder().getBuilder(); - } - /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; - */ - public context.ContextOuterClass.TimestampOrBuilder getStartTimestampOrBuilder() { - if (startTimestampBuilder_ != null) { - return startTimestampBuilder_.getMessageOrBuilder(); - } else { - return startTimestamp_ == null ? - context.ContextOuterClass.Timestamp.getDefaultInstance() : startTimestamp_; - } - } - /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; - */ - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> - getStartTimestampFieldBuilder() { - if (startTimestampBuilder_ == null) { - startTimestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>( - getStartTimestamp(), - getParentForChildren(), - isClean()); - startTimestamp_ = null; - } - return startTimestampBuilder_; - } - - private context.ContextOuterClass.Timestamp endTimestamp_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> endTimestampBuilder_; - /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; - * @return Whether the endTimestamp field is set. - */ - public boolean hasEndTimestamp() { - return endTimestampBuilder_ != null || endTimestamp_ != null; - } - /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; - * @return The endTimestamp. + * repeated .monitoring.Kpi kpi_list = 1; */ - public context.ContextOuterClass.Timestamp getEndTimestamp() { - if (endTimestampBuilder_ == null) { - return endTimestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : endTimestamp_; + public Builder addKpiList( + monitoring.Monitoring.Kpi.Builder builderForValue) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + kpiList_.add(builderForValue.build()); + onChanged(); } else { - return endTimestampBuilder_.getMessage(); + kpiListBuilder_.addMessage(builderForValue.build()); } + return this; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * repeated .monitoring.Kpi kpi_list = 1; */ - public Builder setEndTimestamp(context.ContextOuterClass.Timestamp value) { - if (endTimestampBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - endTimestamp_ = value; + public Builder addKpiList( + int index, monitoring.Monitoring.Kpi.Builder builderForValue) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + kpiList_.add(index, builderForValue.build()); onChanged(); } else { - endTimestampBuilder_.setMessage(value); + kpiListBuilder_.addMessage(index, builderForValue.build()); } - return this; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * repeated .monitoring.Kpi kpi_list = 1; */ - public Builder setEndTimestamp( - context.ContextOuterClass.Timestamp.Builder builderForValue) { - if (endTimestampBuilder_ == null) { - endTimestamp_ = builderForValue.build(); + public Builder addAllKpiList( + java.lang.Iterable values) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, kpiList_); onChanged(); } else { - endTimestampBuilder_.setMessage(builderForValue.build()); + kpiListBuilder_.addAllMessages(values); } - return this; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * repeated .monitoring.Kpi kpi_list = 1; */ - public Builder mergeEndTimestamp(context.ContextOuterClass.Timestamp value) { - if (endTimestampBuilder_ == null) { - if (endTimestamp_ != null) { - endTimestamp_ = - context.ContextOuterClass.Timestamp.newBuilder(endTimestamp_).mergeFrom(value).buildPartial(); - } else { - endTimestamp_ = value; - } + public Builder clearKpiList() { + if (kpiListBuilder_ == null) { + kpiList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { - endTimestampBuilder_.mergeFrom(value); + kpiListBuilder_.clear(); } - return this; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * repeated .monitoring.Kpi kpi_list = 1; */ - public Builder clearEndTimestamp() { - if (endTimestampBuilder_ == null) { - endTimestamp_ = null; + public Builder removeKpiList(int index) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + kpiList_.remove(index); onChanged(); } else { - endTimestamp_ = null; - endTimestampBuilder_ = null; + kpiListBuilder_.remove(index); } - return this; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * repeated .monitoring.Kpi kpi_list = 1; */ - public context.ContextOuterClass.Timestamp.Builder getEndTimestampBuilder() { - - onChanged(); - return getEndTimestampFieldBuilder().getBuilder(); + public monitoring.Monitoring.Kpi.Builder getKpiListBuilder( + int index) { + return getKpiListFieldBuilder().getBuilder(index); } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * repeated .monitoring.Kpi kpi_list = 1; + */ + public monitoring.Monitoring.KpiOrBuilder getKpiListOrBuilder( + int index) { + if (kpiListBuilder_ == null) { + return kpiList_.get(index); } else { + return kpiListBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .monitoring.Kpi kpi_list = 1; */ - public context.ContextOuterClass.TimestampOrBuilder getEndTimestampOrBuilder() { - if (endTimestampBuilder_ != null) { - return endTimestampBuilder_.getMessageOrBuilder(); + public java.util.List + getKpiListOrBuilderList() { + if (kpiListBuilder_ != null) { + return kpiListBuilder_.getMessageOrBuilderList(); } else { - return endTimestamp_ == null ? - context.ContextOuterClass.Timestamp.getDefaultInstance() : endTimestamp_; + return java.util.Collections.unmodifiableList(kpiList_); } } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * repeated .monitoring.Kpi kpi_list = 1; */ - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> - getEndTimestampFieldBuilder() { - if (endTimestampBuilder_ == null) { - endTimestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>( - getEndTimestamp(), + public monitoring.Monitoring.Kpi.Builder addKpiListBuilder() { + return getKpiListFieldBuilder().addBuilder( + monitoring.Monitoring.Kpi.getDefaultInstance()); + } + /** + * repeated .monitoring.Kpi kpi_list = 1; + */ + public monitoring.Monitoring.Kpi.Builder addKpiListBuilder( + int index) { + return getKpiListFieldBuilder().addBuilder( + index, monitoring.Monitoring.Kpi.getDefaultInstance()); + } + /** + * repeated .monitoring.Kpi kpi_list = 1; + */ + public java.util.List + getKpiListBuilderList() { + return getKpiListFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.Kpi, monitoring.Monitoring.Kpi.Builder, monitoring.Monitoring.KpiOrBuilder> + getKpiListFieldBuilder() { + if (kpiListBuilder_ == null) { + kpiListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.Kpi, monitoring.Monitoring.Kpi.Builder, monitoring.Monitoring.KpiOrBuilder>( + kpiList_, + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); - endTimestamp_ = null; + kpiList_ = null; } - return endTimestampBuilder_; + return kpiListBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -11517,85 +11785,95 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.SubsDescriptor) + // @@protoc_insertion_point(builder_scope:monitoring.KpiList) } - // @@protoc_insertion_point(class_scope:monitoring.SubsDescriptor) - private static final monitoring.Monitoring.SubsDescriptor DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.KpiList) + private static final monitoring.Monitoring.KpiList DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.SubsDescriptor(); + DEFAULT_INSTANCE = new monitoring.Monitoring.KpiList(); } - public static monitoring.Monitoring.SubsDescriptor getDefaultInstance() { + public static monitoring.Monitoring.KpiList getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public SubsDescriptor parsePartialFrom( + public KpiList parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SubsDescriptor(input, extensionRegistry); + return new KpiList(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.SubsDescriptor getDefaultInstanceForType() { + public monitoring.Monitoring.KpiList getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface SubscriptionIDOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.SubscriptionID) + public interface KpiDescriptorListOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptorList) com.google.protobuf.MessageOrBuilder { /** - * .context.Uuid subs_id = 1; - * @return Whether the subsId field is set. + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - boolean hasSubsId(); + java.util.List + getKpiDescriptorListList(); /** - * .context.Uuid subs_id = 1; - * @return The subsId. + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - context.ContextOuterClass.Uuid getSubsId(); + monitoring.Monitoring.KpiDescriptor getKpiDescriptorList(int index); /** - * .context.Uuid subs_id = 1; + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - context.ContextOuterClass.UuidOrBuilder getSubsIdOrBuilder(); + int getKpiDescriptorListCount(); + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + java.util.List + getKpiDescriptorListOrBuilderList(); + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + monitoring.Monitoring.KpiDescriptorOrBuilder getKpiDescriptorListOrBuilder( + int index); } /** - * Protobuf type {@code monitoring.SubscriptionID} + * Protobuf type {@code monitoring.KpiDescriptorList} */ - public static final class SubscriptionID extends + public static final class KpiDescriptorList extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.SubscriptionID) - SubscriptionIDOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptorList) + KpiDescriptorListOrBuilder { private static final long serialVersionUID = 0L; - // Use SubscriptionID.newBuilder() to construct. - private SubscriptionID(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use KpiDescriptorList.newBuilder() to construct. + private KpiDescriptorList(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private SubscriptionID() { + private KpiDescriptorList() { + kpiDescriptorList_ = java.util.Collections.emptyList(); } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new SubscriptionID(); + return new KpiDescriptorList(); } @java.lang.Override @@ -11603,7 +11881,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private SubscriptionID( + private KpiDescriptorList( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -11611,6 +11889,7 @@ public final class Monitoring { if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } + int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -11622,16 +11901,12 @@ public final class Monitoring { done = true; break; case 10: { - context.ContextOuterClass.Uuid.Builder subBuilder = null; - if (subsId_ != null) { - subBuilder = subsId_.toBuilder(); - } - subsId_ = input.readMessage(context.ContextOuterClass.Uuid.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(subsId_); - subsId_ = subBuilder.buildPartial(); + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + kpiDescriptorList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; } - + kpiDescriptorList_.add( + input.readMessage(monitoring.Monitoring.KpiDescriptor.parser(), extensionRegistry)); break; } default: { @@ -11649,47 +11924,64 @@ public final class Monitoring { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + kpiDescriptorList_ = java.util.Collections.unmodifiableList(kpiDescriptorList_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.SubscriptionID.class, monitoring.Monitoring.SubscriptionID.Builder.class); + monitoring.Monitoring.KpiDescriptorList.class, monitoring.Monitoring.KpiDescriptorList.Builder.class); } - public static final int SUBS_ID_FIELD_NUMBER = 1; - private context.ContextOuterClass.Uuid subsId_; + public static final int KPI_DESCRIPTOR_LIST_FIELD_NUMBER = 1; + private java.util.List kpiDescriptorList_; /** - * .context.Uuid subs_id = 1; - * @return Whether the subsId field is set. + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ @java.lang.Override - public boolean hasSubsId() { - return subsId_ != null; + public java.util.List getKpiDescriptorListList() { + return kpiDescriptorList_; } /** - * .context.Uuid subs_id = 1; - * @return The subsId. + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ @java.lang.Override - public context.ContextOuterClass.Uuid getSubsId() { - return subsId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : subsId_; + public java.util.List + getKpiDescriptorListOrBuilderList() { + return kpiDescriptorList_; } /** - * .context.Uuid subs_id = 1; + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ @java.lang.Override - public context.ContextOuterClass.UuidOrBuilder getSubsIdOrBuilder() { - return getSubsId(); + public int getKpiDescriptorListCount() { + return kpiDescriptorList_.size(); + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + @java.lang.Override + public monitoring.Monitoring.KpiDescriptor getKpiDescriptorList(int index) { + return kpiDescriptorList_.get(index); + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + @java.lang.Override + public monitoring.Monitoring.KpiDescriptorOrBuilder getKpiDescriptorListOrBuilder( + int index) { + return kpiDescriptorList_.get(index); } private byte memoizedIsInitialized = -1; @@ -11706,8 +11998,8 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (subsId_ != null) { - output.writeMessage(1, getSubsId()); + for (int i = 0; i < kpiDescriptorList_.size(); i++) { + output.writeMessage(1, kpiDescriptorList_.get(i)); } unknownFields.writeTo(output); } @@ -11718,9 +12010,9 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (subsId_ != null) { + for (int i = 0; i < kpiDescriptorList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getSubsId()); + .computeMessageSize(1, kpiDescriptorList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -11732,16 +12024,13 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.SubscriptionID)) { + if (!(obj instanceof monitoring.Monitoring.KpiDescriptorList)) { return super.equals(obj); } - monitoring.Monitoring.SubscriptionID other = (monitoring.Monitoring.SubscriptionID) obj; + monitoring.Monitoring.KpiDescriptorList other = (monitoring.Monitoring.KpiDescriptorList) obj; - if (hasSubsId() != other.hasSubsId()) return false; - if (hasSubsId()) { - if (!getSubsId() - .equals(other.getSubsId())) return false; - } + if (!getKpiDescriptorListList() + .equals(other.getKpiDescriptorListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -11753,78 +12042,78 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasSubsId()) { - hash = (37 * hash) + SUBS_ID_FIELD_NUMBER; - hash = (53 * hash) + getSubsId().hashCode(); + if (getKpiDescriptorListCount() > 0) { + hash = (37 * hash) + KPI_DESCRIPTOR_LIST_FIELD_NUMBER; + hash = (53 * hash) + getKpiDescriptorListList().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.SubscriptionID parseFrom( + public static monitoring.Monitoring.KpiDescriptorList parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubscriptionID parseFrom( + public static monitoring.Monitoring.KpiDescriptorList parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubscriptionID parseFrom( + public static monitoring.Monitoring.KpiDescriptorList parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubscriptionID parseFrom( + public static monitoring.Monitoring.KpiDescriptorList parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubscriptionID parseFrom(byte[] data) + public static monitoring.Monitoring.KpiDescriptorList parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubscriptionID parseFrom( + public static monitoring.Monitoring.KpiDescriptorList parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubscriptionID parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiDescriptorList parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubscriptionID parseFrom( + public static monitoring.Monitoring.KpiDescriptorList parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.SubscriptionID parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiDescriptorList parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubscriptionID parseDelimitedFrom( + public static monitoring.Monitoring.KpiDescriptorList parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.SubscriptionID parseFrom( + public static monitoring.Monitoring.KpiDescriptorList parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubscriptionID parseFrom( + public static monitoring.Monitoring.KpiDescriptorList parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -11837,7 +12126,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.SubscriptionID prototype) { + public static Builder newBuilder(monitoring.Monitoring.KpiDescriptorList prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -11853,26 +12142,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.SubscriptionID} + * Protobuf type {@code monitoring.KpiDescriptorList} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.SubscriptionID) - monitoring.Monitoring.SubscriptionIDOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptorList) + monitoring.Monitoring.KpiDescriptorListOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.SubscriptionID.class, monitoring.Monitoring.SubscriptionID.Builder.class); + monitoring.Monitoring.KpiDescriptorList.class, monitoring.Monitoring.KpiDescriptorList.Builder.class); } - // Construct using monitoring.Monitoring.SubscriptionID.newBuilder() + // Construct using monitoring.Monitoring.KpiDescriptorList.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -11885,16 +12174,17 @@ public final class Monitoring { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { + getKpiDescriptorListFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); - if (subsIdBuilder_ == null) { - subsId_ = null; + if (kpiDescriptorListBuilder_ == null) { + kpiDescriptorList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); } else { - subsId_ = null; - subsIdBuilder_ = null; + kpiDescriptorListBuilder_.clear(); } return this; } @@ -11902,17 +12192,17 @@ public final class Monitoring { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_descriptor; } @java.lang.Override - public monitoring.Monitoring.SubscriptionID getDefaultInstanceForType() { - return monitoring.Monitoring.SubscriptionID.getDefaultInstance(); + public monitoring.Monitoring.KpiDescriptorList getDefaultInstanceForType() { + return monitoring.Monitoring.KpiDescriptorList.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.SubscriptionID build() { - monitoring.Monitoring.SubscriptionID result = buildPartial(); + public monitoring.Monitoring.KpiDescriptorList build() { + monitoring.Monitoring.KpiDescriptorList result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -11920,12 +12210,17 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.SubscriptionID buildPartial() { - monitoring.Monitoring.SubscriptionID result = new monitoring.Monitoring.SubscriptionID(this); - if (subsIdBuilder_ == null) { - result.subsId_ = subsId_; + public monitoring.Monitoring.KpiDescriptorList buildPartial() { + monitoring.Monitoring.KpiDescriptorList result = new monitoring.Monitoring.KpiDescriptorList(this); + int from_bitField0_ = bitField0_; + if (kpiDescriptorListBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + kpiDescriptorList_ = java.util.Collections.unmodifiableList(kpiDescriptorList_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.kpiDescriptorList_ = kpiDescriptorList_; } else { - result.subsId_ = subsIdBuilder_.build(); + result.kpiDescriptorList_ = kpiDescriptorListBuilder_.build(); } onBuilt(); return result; @@ -11965,18 +12260,41 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.SubscriptionID) { - return mergeFrom((monitoring.Monitoring.SubscriptionID)other); + if (other instanceof monitoring.Monitoring.KpiDescriptorList) { + return mergeFrom((monitoring.Monitoring.KpiDescriptorList)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.SubscriptionID other) { - if (other == monitoring.Monitoring.SubscriptionID.getDefaultInstance()) return this; - if (other.hasSubsId()) { - mergeSubsId(other.getSubsId()); + public Builder mergeFrom(monitoring.Monitoring.KpiDescriptorList other) { + if (other == monitoring.Monitoring.KpiDescriptorList.getDefaultInstance()) return this; + if (kpiDescriptorListBuilder_ == null) { + if (!other.kpiDescriptorList_.isEmpty()) { + if (kpiDescriptorList_.isEmpty()) { + kpiDescriptorList_ = other.kpiDescriptorList_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureKpiDescriptorListIsMutable(); + kpiDescriptorList_.addAll(other.kpiDescriptorList_); + } + onChanged(); + } + } else { + if (!other.kpiDescriptorList_.isEmpty()) { + if (kpiDescriptorListBuilder_.isEmpty()) { + kpiDescriptorListBuilder_.dispose(); + kpiDescriptorListBuilder_ = null; + kpiDescriptorList_ = other.kpiDescriptorList_; + bitField0_ = (bitField0_ & ~0x00000001); + kpiDescriptorListBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getKpiDescriptorListFieldBuilder() : null; + } else { + kpiDescriptorListBuilder_.addAllMessages(other.kpiDescriptorList_); + } + } } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -11993,11 +12311,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.SubscriptionID parsedMessage = null; + monitoring.Monitoring.KpiDescriptorList parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.SubscriptionID) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.KpiDescriptorList) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -12006,124 +12324,246 @@ public final class Monitoring { } return this; } + private int bitField0_; + + private java.util.List kpiDescriptorList_ = + java.util.Collections.emptyList(); + private void ensureKpiDescriptorListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + kpiDescriptorList_ = new java.util.ArrayList(kpiDescriptorList_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiDescriptor, monitoring.Monitoring.KpiDescriptor.Builder, monitoring.Monitoring.KpiDescriptorOrBuilder> kpiDescriptorListBuilder_; - private context.ContextOuterClass.Uuid subsId_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> subsIdBuilder_; /** - * .context.Uuid subs_id = 1; - * @return Whether the subsId field is set. + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - public boolean hasSubsId() { - return subsIdBuilder_ != null || subsId_ != null; + public java.util.List getKpiDescriptorListList() { + if (kpiDescriptorListBuilder_ == null) { + return java.util.Collections.unmodifiableList(kpiDescriptorList_); + } else { + return kpiDescriptorListBuilder_.getMessageList(); + } } /** - * .context.Uuid subs_id = 1; - * @return The subsId. + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - public context.ContextOuterClass.Uuid getSubsId() { - if (subsIdBuilder_ == null) { - return subsId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : subsId_; + public int getKpiDescriptorListCount() { + if (kpiDescriptorListBuilder_ == null) { + return kpiDescriptorList_.size(); } else { - return subsIdBuilder_.getMessage(); + return kpiDescriptorListBuilder_.getCount(); } } /** - * .context.Uuid subs_id = 1; + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - public Builder setSubsId(context.ContextOuterClass.Uuid value) { - if (subsIdBuilder_ == null) { + public monitoring.Monitoring.KpiDescriptor getKpiDescriptorList(int index) { + if (kpiDescriptorListBuilder_ == null) { + return kpiDescriptorList_.get(index); + } else { + return kpiDescriptorListBuilder_.getMessage(index); + } + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + public Builder setKpiDescriptorList( + int index, monitoring.Monitoring.KpiDescriptor value) { + if (kpiDescriptorListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - subsId_ = value; + ensureKpiDescriptorListIsMutable(); + kpiDescriptorList_.set(index, value); onChanged(); } else { - subsIdBuilder_.setMessage(value); + kpiDescriptorListBuilder_.setMessage(index, value); } - return this; } /** - * .context.Uuid subs_id = 1; + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - public Builder setSubsId( - context.ContextOuterClass.Uuid.Builder builderForValue) { - if (subsIdBuilder_ == null) { - subsId_ = builderForValue.build(); + public Builder setKpiDescriptorList( + int index, monitoring.Monitoring.KpiDescriptor.Builder builderForValue) { + if (kpiDescriptorListBuilder_ == null) { + ensureKpiDescriptorListIsMutable(); + kpiDescriptorList_.set(index, builderForValue.build()); + onChanged(); + } else { + kpiDescriptorListBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + public Builder addKpiDescriptorList(monitoring.Monitoring.KpiDescriptor value) { + if (kpiDescriptorListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiDescriptorListIsMutable(); + kpiDescriptorList_.add(value); + onChanged(); + } else { + kpiDescriptorListBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + public Builder addKpiDescriptorList( + int index, monitoring.Monitoring.KpiDescriptor value) { + if (kpiDescriptorListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiDescriptorListIsMutable(); + kpiDescriptorList_.add(index, value); + onChanged(); + } else { + kpiDescriptorListBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + public Builder addKpiDescriptorList( + monitoring.Monitoring.KpiDescriptor.Builder builderForValue) { + if (kpiDescriptorListBuilder_ == null) { + ensureKpiDescriptorListIsMutable(); + kpiDescriptorList_.add(builderForValue.build()); + onChanged(); + } else { + kpiDescriptorListBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + public Builder addKpiDescriptorList( + int index, monitoring.Monitoring.KpiDescriptor.Builder builderForValue) { + if (kpiDescriptorListBuilder_ == null) { + ensureKpiDescriptorListIsMutable(); + kpiDescriptorList_.add(index, builderForValue.build()); + onChanged(); + } else { + kpiDescriptorListBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + public Builder addAllKpiDescriptorList( + java.lang.Iterable values) { + if (kpiDescriptorListBuilder_ == null) { + ensureKpiDescriptorListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, kpiDescriptorList_); onChanged(); } else { - subsIdBuilder_.setMessage(builderForValue.build()); + kpiDescriptorListBuilder_.addAllMessages(values); } - return this; } /** - * .context.Uuid subs_id = 1; + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - public Builder mergeSubsId(context.ContextOuterClass.Uuid value) { - if (subsIdBuilder_ == null) { - if (subsId_ != null) { - subsId_ = - context.ContextOuterClass.Uuid.newBuilder(subsId_).mergeFrom(value).buildPartial(); - } else { - subsId_ = value; - } + public Builder clearKpiDescriptorList() { + if (kpiDescriptorListBuilder_ == null) { + kpiDescriptorList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { - subsIdBuilder_.mergeFrom(value); + kpiDescriptorListBuilder_.clear(); } - return this; } /** - * .context.Uuid subs_id = 1; + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - public Builder clearSubsId() { - if (subsIdBuilder_ == null) { - subsId_ = null; + public Builder removeKpiDescriptorList(int index) { + if (kpiDescriptorListBuilder_ == null) { + ensureKpiDescriptorListIsMutable(); + kpiDescriptorList_.remove(index); onChanged(); } else { - subsId_ = null; - subsIdBuilder_ = null; + kpiDescriptorListBuilder_.remove(index); } - return this; } /** - * .context.Uuid subs_id = 1; + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - public context.ContextOuterClass.Uuid.Builder getSubsIdBuilder() { - - onChanged(); - return getSubsIdFieldBuilder().getBuilder(); + public monitoring.Monitoring.KpiDescriptor.Builder getKpiDescriptorListBuilder( + int index) { + return getKpiDescriptorListFieldBuilder().getBuilder(index); } /** - * .context.Uuid subs_id = 1; + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - public context.ContextOuterClass.UuidOrBuilder getSubsIdOrBuilder() { - if (subsIdBuilder_ != null) { - return subsIdBuilder_.getMessageOrBuilder(); + public monitoring.Monitoring.KpiDescriptorOrBuilder getKpiDescriptorListOrBuilder( + int index) { + if (kpiDescriptorListBuilder_ == null) { + return kpiDescriptorList_.get(index); } else { + return kpiDescriptorListBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + public java.util.List + getKpiDescriptorListOrBuilderList() { + if (kpiDescriptorListBuilder_ != null) { + return kpiDescriptorListBuilder_.getMessageOrBuilderList(); } else { - return subsId_ == null ? - context.ContextOuterClass.Uuid.getDefaultInstance() : subsId_; + return java.util.Collections.unmodifiableList(kpiDescriptorList_); } } /** - * .context.Uuid subs_id = 1; + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> - getSubsIdFieldBuilder() { - if (subsIdBuilder_ == null) { - subsIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder>( - getSubsId(), + public monitoring.Monitoring.KpiDescriptor.Builder addKpiDescriptorListBuilder() { + return getKpiDescriptorListFieldBuilder().addBuilder( + monitoring.Monitoring.KpiDescriptor.getDefaultInstance()); + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + public monitoring.Monitoring.KpiDescriptor.Builder addKpiDescriptorListBuilder( + int index) { + return getKpiDescriptorListFieldBuilder().addBuilder( + index, monitoring.Monitoring.KpiDescriptor.getDefaultInstance()); + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + public java.util.List + getKpiDescriptorListBuilderList() { + return getKpiDescriptorListFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiDescriptor, monitoring.Monitoring.KpiDescriptor.Builder, monitoring.Monitoring.KpiDescriptorOrBuilder> + getKpiDescriptorListFieldBuilder() { + if (kpiDescriptorListBuilder_ == null) { + kpiDescriptorListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiDescriptor, monitoring.Monitoring.KpiDescriptor.Builder, monitoring.Monitoring.KpiDescriptorOrBuilder>( + kpiDescriptorList_, + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); - subsId_ = null; + kpiDescriptorList_ = null; } - return subsIdBuilder_; + return kpiDescriptorListBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -12138,110 +12578,139 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.SubscriptionID) + // @@protoc_insertion_point(builder_scope:monitoring.KpiDescriptorList) } - // @@protoc_insertion_point(class_scope:monitoring.SubscriptionID) - private static final monitoring.Monitoring.SubscriptionID DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.KpiDescriptorList) + private static final monitoring.Monitoring.KpiDescriptorList DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.SubscriptionID(); + DEFAULT_INSTANCE = new monitoring.Monitoring.KpiDescriptorList(); } - public static monitoring.Monitoring.SubscriptionID getDefaultInstance() { + public static monitoring.Monitoring.KpiDescriptorList getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public SubscriptionID parsePartialFrom( + public KpiDescriptorList parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SubscriptionID(input, extensionRegistry); + return new KpiDescriptorList(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.SubscriptionID getDefaultInstanceForType() { + public monitoring.Monitoring.KpiDescriptorList getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface SubsResponseOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.SubsResponse) + public interface SubsDescriptorOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.SubsDescriptor) com.google.protobuf.MessageOrBuilder { /** - * .monitoring.SubscriptionID subs_id = 1; - * @return Whether the subsId field is set. + * .monitoring.KpiId kpi_id = 1; + * @return Whether the kpiId field is set. */ - boolean hasSubsId(); + boolean hasKpiId(); /** - * .monitoring.SubscriptionID subs_id = 1; - * @return The subsId. + * .monitoring.KpiId kpi_id = 1; + * @return The kpiId. */ - monitoring.Monitoring.SubscriptionID getSubsId(); + monitoring.Monitoring.KpiId getKpiId(); /** - * .monitoring.SubscriptionID subs_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - monitoring.Monitoring.SubscriptionIDOrBuilder getSubsIdOrBuilder(); + monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder(); /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_duration_s = 2; + * @return The samplingDurationS. */ - java.util.List - getKpiListList(); + float getSamplingDurationS(); + /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_interval_s = 3; + * @return The samplingIntervalS. */ - monitoring.Monitoring.KpiList getKpiList(int index); + float getSamplingIntervalS(); + /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+     * used when you want something like "get the samples since X date/time"
+     *
+ * + * string start_date = 4; + * @return The startDate. */ - int getKpiListCount(); + java.lang.String getStartDate(); /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+     * used when you want something like "get the samples since X date/time"
+     *
+ * + * string start_date = 4; + * @return The bytes for startDate. */ - java.util.List - getKpiListOrBuilderList(); + com.google.protobuf.ByteString + getStartDateBytes(); + /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+     * used when you want something like "get the samples until X date/time"
+     *
+ * + * string end_date = 5; + * @return The endDate. */ - monitoring.Monitoring.KpiListOrBuilder getKpiListOrBuilder( - int index); + java.lang.String getEndDate(); + /** + * 
+     * used when you want something like "get the samples until X date/time"
+     *
+ * + * string end_date = 5; + * @return The bytes for endDate. + */ + com.google.protobuf.ByteString + getEndDateBytes(); } /** - * Protobuf type {@code monitoring.SubsResponse} + * Protobuf type {@code monitoring.SubsDescriptor} */ - public static final class SubsResponse extends + public static final class SubsDescriptor extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.SubsResponse) - SubsResponseOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.SubsDescriptor) + SubsDescriptorOrBuilder { private static final long serialVersionUID = 0L; - // Use SubsResponse.newBuilder() to construct. - private SubsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use SubsDescriptor.newBuilder() to construct. + private SubsDescriptor(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private SubsResponse() { - kpiList_ = java.util.Collections.emptyList(); + private SubsDescriptor() { + startDate_ = ""; + endDate_ = ""; } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new SubsResponse(); + return new SubsDescriptor(); } @java.lang.Override @@ -12249,7 +12718,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private SubsResponse( + private SubsDescriptor( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -12257,7 +12726,6 @@ public final class Monitoring { if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -12269,25 +12737,38 @@ public final class Monitoring { done = true; break; case 10: { - monitoring.Monitoring.SubscriptionID.Builder subBuilder = null; - if (subsId_ != null) { - subBuilder = subsId_.toBuilder(); + monitoring.Monitoring.KpiId.Builder subBuilder = null; + if (kpiId_ != null) { + subBuilder = kpiId_.toBuilder(); } - subsId_ = input.readMessage(monitoring.Monitoring.SubscriptionID.parser(), extensionRegistry); + kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(subsId_); - subsId_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(kpiId_); + kpiId_ = subBuilder.buildPartial(); } break; } - case 18: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - kpiList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - kpiList_.add( - input.readMessage(monitoring.Monitoring.KpiList.parser(), extensionRegistry)); + case 21: { + + samplingDurationS_ = input.readFloat(); + break; + } + case 29: { + + samplingIntervalS_ = input.readFloat(); + break; + } + case 34: { + java.lang.String s = input.readStringRequireUtf8(); + + startDate_ = s; + break; + } + case 42: { + java.lang.String s = input.readStringRequireUtf8(); + + endDate_ = s; break; } default: { @@ -12305,90 +12786,161 @@ public final class Monitoring { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - kpiList_ = java.util.Collections.unmodifiableList(kpiList_); - } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_SubsResponse_descriptor; + return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_SubsResponse_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.SubsResponse.class, monitoring.Monitoring.SubsResponse.Builder.class); + monitoring.Monitoring.SubsDescriptor.class, monitoring.Monitoring.SubsDescriptor.Builder.class); } - public static final int SUBS_ID_FIELD_NUMBER = 1; - private monitoring.Monitoring.SubscriptionID subsId_; + public static final int KPI_ID_FIELD_NUMBER = 1; + private monitoring.Monitoring.KpiId kpiId_; /** - * .monitoring.SubscriptionID subs_id = 1; - * @return Whether the subsId field is set. + * .monitoring.KpiId kpi_id = 1; + * @return Whether the kpiId field is set. */ @java.lang.Override - public boolean hasSubsId() { - return subsId_ != null; + public boolean hasKpiId() { + return kpiId_ != null; } /** - * .monitoring.SubscriptionID subs_id = 1; - * @return The subsId. + * .monitoring.KpiId kpi_id = 1; + * @return The kpiId. */ @java.lang.Override - public monitoring.Monitoring.SubscriptionID getSubsId() { - return subsId_ == null ? monitoring.Monitoring.SubscriptionID.getDefaultInstance() : subsId_; + public monitoring.Monitoring.KpiId getKpiId() { + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } /** - * .monitoring.SubscriptionID subs_id = 1; + * .monitoring.KpiId kpi_id = 1; */ @java.lang.Override - public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsIdOrBuilder() { - return getSubsId(); + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { + return getKpiId(); } - public static final int KPI_LIST_FIELD_NUMBER = 2; - private java.util.List kpiList_; + public static final int SAMPLING_DURATION_S_FIELD_NUMBER = 2; + private float samplingDurationS_; /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_duration_s = 2; + * @return The samplingDurationS. */ @java.lang.Override - public java.util.List getKpiListList() { - return kpiList_; + public float getSamplingDurationS() { + return samplingDurationS_; } + + public static final int SAMPLING_INTERVAL_S_FIELD_NUMBER = 3; + private float samplingIntervalS_; /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_interval_s = 3; + * @return The samplingIntervalS. */ @java.lang.Override - public java.util.List - getKpiListOrBuilderList() { - return kpiList_; + public float getSamplingIntervalS() { + return samplingIntervalS_; } + + public static final int START_DATE_FIELD_NUMBER = 4; + private volatile java.lang.Object startDate_; /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+     * used when you want something like "get the samples since X date/time"
+     *
+ * + * string start_date = 4; + * @return The startDate. */ @java.lang.Override - public int getKpiListCount() { - return kpiList_.size(); + public java.lang.String getStartDate() { + java.lang.Object ref = startDate_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + startDate_ = s; + return s; + } } /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+     * used when you want something like "get the samples since X date/time"
+     *
+ * + * string start_date = 4; + * @return The bytes for startDate. */ @java.lang.Override - public monitoring.Monitoring.KpiList getKpiList(int index) { - return kpiList_.get(index); + public com.google.protobuf.ByteString + getStartDateBytes() { + java.lang.Object ref = startDate_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + startDate_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } } + + public static final int END_DATE_FIELD_NUMBER = 5; + private volatile java.lang.Object endDate_; /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+     * used when you want something like "get the samples until X date/time"
+     *
+ * + * string end_date = 5; + * @return The endDate. */ @java.lang.Override - public monitoring.Monitoring.KpiListOrBuilder getKpiListOrBuilder( - int index) { - return kpiList_.get(index); + public java.lang.String getEndDate() { + java.lang.Object ref = endDate_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + endDate_ = s; + return s; + } + } + /** + * 
+     * used when you want something like "get the samples until X date/time"
+     *
+ * + * string end_date = 5; + * @return The bytes for endDate. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getEndDateBytes() { + java.lang.Object ref = endDate_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + endDate_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } } private byte memoizedIsInitialized = -1; @@ -12405,11 +12957,20 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (subsId_ != null) { - output.writeMessage(1, getSubsId()); + if (kpiId_ != null) { + output.writeMessage(1, getKpiId()); } - for (int i = 0; i < kpiList_.size(); i++) { - output.writeMessage(2, kpiList_.get(i)); + if (samplingDurationS_ != 0F) { + output.writeFloat(2, samplingDurationS_); + } + if (samplingIntervalS_ != 0F) { + output.writeFloat(3, samplingIntervalS_); + } + if (!getStartDateBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 4, startDate_); + } + if (!getEndDateBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, endDate_); } unknownFields.writeTo(output); } @@ -12420,13 +12981,23 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (subsId_ != null) { + if (kpiId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getSubsId()); + .computeMessageSize(1, getKpiId()); } - for (int i = 0; i < kpiList_.size(); i++) { + if (samplingDurationS_ != 0F) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, kpiList_.get(i)); + .computeFloatSize(2, samplingDurationS_); + } + if (samplingIntervalS_ != 0F) { + size += com.google.protobuf.CodedOutputStream + .computeFloatSize(3, samplingIntervalS_); + } + if (!getStartDateBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, startDate_); + } + if (!getEndDateBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, endDate_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -12438,18 +13009,26 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.SubsResponse)) { + if (!(obj instanceof monitoring.Monitoring.SubsDescriptor)) { return super.equals(obj); } - monitoring.Monitoring.SubsResponse other = (monitoring.Monitoring.SubsResponse) obj; + monitoring.Monitoring.SubsDescriptor other = (monitoring.Monitoring.SubsDescriptor) obj; - if (hasSubsId() != other.hasSubsId()) return false; - if (hasSubsId()) { - if (!getSubsId() - .equals(other.getSubsId())) return false; + if (hasKpiId() != other.hasKpiId()) return false; + if (hasKpiId()) { + if (!getKpiId() + .equals(other.getKpiId())) return false; } - if (!getKpiListList() - .equals(other.getKpiListList())) return false; + if (java.lang.Float.floatToIntBits(getSamplingDurationS()) + != java.lang.Float.floatToIntBits( + other.getSamplingDurationS())) return false; + if (java.lang.Float.floatToIntBits(getSamplingIntervalS()) + != java.lang.Float.floatToIntBits( + other.getSamplingIntervalS())) return false; + if (!getStartDate() + .equals(other.getStartDate())) return false; + if (!getEndDate() + .equals(other.getEndDate())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -12461,82 +13040,88 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasSubsId()) { - hash = (37 * hash) + SUBS_ID_FIELD_NUMBER; - hash = (53 * hash) + getSubsId().hashCode(); - } - if (getKpiListCount() > 0) { - hash = (37 * hash) + KPI_LIST_FIELD_NUMBER; - hash = (53 * hash) + getKpiListList().hashCode(); + if (hasKpiId()) { + hash = (37 * hash) + KPI_ID_FIELD_NUMBER; + hash = (53 * hash) + getKpiId().hashCode(); } + hash = (37 * hash) + SAMPLING_DURATION_S_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getSamplingDurationS()); + hash = (37 * hash) + SAMPLING_INTERVAL_S_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getSamplingIntervalS()); + hash = (37 * hash) + START_DATE_FIELD_NUMBER; + hash = (53 * hash) + getStartDate().hashCode(); + hash = (37 * hash) + END_DATE_FIELD_NUMBER; + hash = (53 * hash) + getEndDate().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.SubsResponse parseFrom( + public static monitoring.Monitoring.SubsDescriptor parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubsResponse parseFrom( + public static monitoring.Monitoring.SubsDescriptor parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubsResponse parseFrom( + public static monitoring.Monitoring.SubsDescriptor parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubsResponse parseFrom( + public static monitoring.Monitoring.SubsDescriptor parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubsResponse parseFrom(byte[] data) + public static monitoring.Monitoring.SubsDescriptor parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubsResponse parseFrom( + public static monitoring.Monitoring.SubsDescriptor parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubsResponse parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.SubsDescriptor parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubsResponse parseFrom( + public static monitoring.Monitoring.SubsDescriptor parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.SubsResponse parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.SubsDescriptor parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubsResponse parseDelimitedFrom( + public static monitoring.Monitoring.SubsDescriptor parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.SubsResponse parseFrom( + public static monitoring.Monitoring.SubsDescriptor parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubsResponse parseFrom( + public static monitoring.Monitoring.SubsDescriptor parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -12549,7 +13134,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.SubsResponse prototype) { + public static Builder newBuilder(monitoring.Monitoring.SubsDescriptor prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -12565,26 +13150,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.SubsResponse} + * Protobuf type {@code monitoring.SubsDescriptor} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.SubsResponse) - monitoring.Monitoring.SubsResponseOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.SubsDescriptor) + monitoring.Monitoring.SubsDescriptorOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_SubsResponse_descriptor; + return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_SubsResponse_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.SubsResponse.class, monitoring.Monitoring.SubsResponse.Builder.class); + monitoring.Monitoring.SubsDescriptor.class, monitoring.Monitoring.SubsDescriptor.Builder.class); } - // Construct using monitoring.Monitoring.SubsResponse.newBuilder() + // Construct using monitoring.Monitoring.SubsDescriptor.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -12597,65 +13182,60 @@ public final class Monitoring { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getKpiListFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); - if (subsIdBuilder_ == null) { - subsId_ = null; - } else { - subsId_ = null; - subsIdBuilder_ = null; - } - if (kpiListBuilder_ == null) { - kpiList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + if (kpiIdBuilder_ == null) { + kpiId_ = null; } else { - kpiListBuilder_.clear(); + kpiId_ = null; + kpiIdBuilder_ = null; } + samplingDurationS_ = 0F; + + samplingIntervalS_ = 0F; + + startDate_ = ""; + + endDate_ = ""; + return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_SubsResponse_descriptor; - } - - @java.lang.Override - public monitoring.Monitoring.SubsResponse getDefaultInstanceForType() { - return monitoring.Monitoring.SubsResponse.getDefaultInstance(); + return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_descriptor; } @java.lang.Override - public monitoring.Monitoring.SubsResponse build() { - monitoring.Monitoring.SubsResponse result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; + public monitoring.Monitoring.SubsDescriptor getDefaultInstanceForType() { + return monitoring.Monitoring.SubsDescriptor.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.SubsResponse buildPartial() { - monitoring.Monitoring.SubsResponse result = new monitoring.Monitoring.SubsResponse(this); - int from_bitField0_ = bitField0_; - if (subsIdBuilder_ == null) { - result.subsId_ = subsId_; - } else { - result.subsId_ = subsIdBuilder_.build(); + public monitoring.Monitoring.SubsDescriptor build() { + monitoring.Monitoring.SubsDescriptor result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); } - if (kpiListBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { - kpiList_ = java.util.Collections.unmodifiableList(kpiList_); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.kpiList_ = kpiList_; + return result; + } + + @java.lang.Override + public monitoring.Monitoring.SubsDescriptor buildPartial() { + monitoring.Monitoring.SubsDescriptor result = new monitoring.Monitoring.SubsDescriptor(this); + if (kpiIdBuilder_ == null) { + result.kpiId_ = kpiId_; } else { - result.kpiList_ = kpiListBuilder_.build(); + result.kpiId_ = kpiIdBuilder_.build(); } + result.samplingDurationS_ = samplingDurationS_; + result.samplingIntervalS_ = samplingIntervalS_; + result.startDate_ = startDate_; + result.endDate_ = endDate_; onBuilt(); return result; } @@ -12694,44 +13274,32 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.SubsResponse) { - return mergeFrom((monitoring.Monitoring.SubsResponse)other); + if (other instanceof monitoring.Monitoring.SubsDescriptor) { + return mergeFrom((monitoring.Monitoring.SubsDescriptor)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.SubsResponse other) { - if (other == monitoring.Monitoring.SubsResponse.getDefaultInstance()) return this; - if (other.hasSubsId()) { - mergeSubsId(other.getSubsId()); + public Builder mergeFrom(monitoring.Monitoring.SubsDescriptor other) { + if (other == monitoring.Monitoring.SubsDescriptor.getDefaultInstance()) return this; + if (other.hasKpiId()) { + mergeKpiId(other.getKpiId()); } - if (kpiListBuilder_ == null) { - if (!other.kpiList_.isEmpty()) { - if (kpiList_.isEmpty()) { - kpiList_ = other.kpiList_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureKpiListIsMutable(); - kpiList_.addAll(other.kpiList_); - } - onChanged(); - } - } else { - if (!other.kpiList_.isEmpty()) { - if (kpiListBuilder_.isEmpty()) { - kpiListBuilder_.dispose(); - kpiListBuilder_ = null; - kpiList_ = other.kpiList_; - bitField0_ = (bitField0_ & ~0x00000001); - kpiListBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getKpiListFieldBuilder() : null; - } else { - kpiListBuilder_.addAllMessages(other.kpiList_); - } - } + if (other.getSamplingDurationS() != 0F) { + setSamplingDurationS(other.getSamplingDurationS()); + } + if (other.getSamplingIntervalS() != 0F) { + setSamplingIntervalS(other.getSamplingIntervalS()); + } + if (!other.getStartDate().isEmpty()) { + startDate_ = other.startDate_; + onChanged(); + } + if (!other.getEndDate().isEmpty()) { + endDate_ = other.endDate_; + onChanged(); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -12748,11 +13316,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.SubsResponse parsedMessage = null; + monitoring.Monitoring.SubsDescriptor parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.SubsResponse) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.SubsDescriptor) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -12761,365 +13329,378 @@ public final class Monitoring { } return this; } - private int bitField0_; - private monitoring.Monitoring.SubscriptionID subsId_; + private monitoring.Monitoring.KpiId kpiId_; private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> subsIdBuilder_; + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; /** - * .monitoring.SubscriptionID subs_id = 1; - * @return Whether the subsId field is set. + * .monitoring.KpiId kpi_id = 1; + * @return Whether the kpiId field is set. */ - public boolean hasSubsId() { - return subsIdBuilder_ != null || subsId_ != null; + public boolean hasKpiId() { + return kpiIdBuilder_ != null || kpiId_ != null; } /** - * .monitoring.SubscriptionID subs_id = 1; - * @return The subsId. + * .monitoring.KpiId kpi_id = 1; + * @return The kpiId. */ - public monitoring.Monitoring.SubscriptionID getSubsId() { - if (subsIdBuilder_ == null) { - return subsId_ == null ? monitoring.Monitoring.SubscriptionID.getDefaultInstance() : subsId_; + public monitoring.Monitoring.KpiId getKpiId() { + if (kpiIdBuilder_ == null) { + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } else { - return subsIdBuilder_.getMessage(); + return kpiIdBuilder_.getMessage(); } } /** - * .monitoring.SubscriptionID subs_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public Builder setSubsId(monitoring.Monitoring.SubscriptionID value) { - if (subsIdBuilder_ == null) { + public Builder setKpiId(monitoring.Monitoring.KpiId value) { + if (kpiIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - subsId_ = value; + kpiId_ = value; onChanged(); } else { - subsIdBuilder_.setMessage(value); + kpiIdBuilder_.setMessage(value); } return this; } /** - * .monitoring.SubscriptionID subs_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public Builder setSubsId( - monitoring.Monitoring.SubscriptionID.Builder builderForValue) { - if (subsIdBuilder_ == null) { - subsId_ = builderForValue.build(); + public Builder setKpiId( + monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdBuilder_ == null) { + kpiId_ = builderForValue.build(); onChanged(); } else { - subsIdBuilder_.setMessage(builderForValue.build()); + kpiIdBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .monitoring.SubscriptionID subs_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public Builder mergeSubsId(monitoring.Monitoring.SubscriptionID value) { - if (subsIdBuilder_ == null) { - if (subsId_ != null) { - subsId_ = - monitoring.Monitoring.SubscriptionID.newBuilder(subsId_).mergeFrom(value).buildPartial(); + public Builder mergeKpiId(monitoring.Monitoring.KpiId value) { + if (kpiIdBuilder_ == null) { + if (kpiId_ != null) { + kpiId_ = + monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial(); } else { - subsId_ = value; + kpiId_ = value; } onChanged(); } else { - subsIdBuilder_.mergeFrom(value); + kpiIdBuilder_.mergeFrom(value); } return this; } /** - * .monitoring.SubscriptionID subs_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public Builder clearSubsId() { - if (subsIdBuilder_ == null) { - subsId_ = null; + public Builder clearKpiId() { + if (kpiIdBuilder_ == null) { + kpiId_ = null; onChanged(); } else { - subsId_ = null; - subsIdBuilder_ = null; + kpiId_ = null; + kpiIdBuilder_ = null; } return this; } /** - * .monitoring.SubscriptionID subs_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public monitoring.Monitoring.SubscriptionID.Builder getSubsIdBuilder() { + public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() { onChanged(); - return getSubsIdFieldBuilder().getBuilder(); + return getKpiIdFieldBuilder().getBuilder(); } /** - * .monitoring.SubscriptionID subs_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsIdOrBuilder() { - if (subsIdBuilder_ != null) { - return subsIdBuilder_.getMessageOrBuilder(); + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { + if (kpiIdBuilder_ != null) { + return kpiIdBuilder_.getMessageOrBuilder(); } else { - return subsId_ == null ? - monitoring.Monitoring.SubscriptionID.getDefaultInstance() : subsId_; + return kpiId_ == null ? + monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } } /** - * .monitoring.SubscriptionID subs_id = 1; + * .monitoring.KpiId kpi_id = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> - getSubsIdFieldBuilder() { - if (subsIdBuilder_ == null) { - subsIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder>( - getSubsId(), + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> + getKpiIdFieldBuilder() { + if (kpiIdBuilder_ == null) { + kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( + getKpiId(), getParentForChildren(), isClean()); - subsId_ = null; + kpiId_ = null; } - return subsIdBuilder_; - } - - private java.util.List kpiList_ = - java.util.Collections.emptyList(); - private void ensureKpiListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - kpiList_ = new java.util.ArrayList(kpiList_); - bitField0_ |= 0x00000001; - } + return kpiIdBuilder_; } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiList, monitoring.Monitoring.KpiList.Builder, monitoring.Monitoring.KpiListOrBuilder> kpiListBuilder_; - - /** - * repeated .monitoring.KpiList kpi_list = 2; - */ - public java.util.List getKpiListList() { - if (kpiListBuilder_ == null) { - return java.util.Collections.unmodifiableList(kpiList_); - } else { - return kpiListBuilder_.getMessageList(); - } - } - /** - * repeated .monitoring.KpiList kpi_list = 2; - */ - public int getKpiListCount() { - if (kpiListBuilder_ == null) { - return kpiList_.size(); - } else { - return kpiListBuilder_.getCount(); - } - } - /** - * repeated .monitoring.KpiList kpi_list = 2; - */ - public monitoring.Monitoring.KpiList getKpiList(int index) { - if (kpiListBuilder_ == null) { - return kpiList_.get(index); - } else { - return kpiListBuilder_.getMessage(index); - } - } + private float samplingDurationS_ ; /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_duration_s = 2; + * @return The samplingDurationS. */ - public Builder setKpiList( - int index, monitoring.Monitoring.KpiList value) { - if (kpiListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiListIsMutable(); - kpiList_.set(index, value); - onChanged(); - } else { - kpiListBuilder_.setMessage(index, value); - } - return this; + @java.lang.Override + public float getSamplingDurationS() { + return samplingDurationS_; } /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_duration_s = 2; + * @param value The samplingDurationS to set. + * @return This builder for chaining. */ - public Builder setKpiList( - int index, monitoring.Monitoring.KpiList.Builder builderForValue) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - kpiList_.set(index, builderForValue.build()); - onChanged(); - } else { - kpiListBuilder_.setMessage(index, builderForValue.build()); - } + public Builder setSamplingDurationS(float value) { + + samplingDurationS_ = value; + onChanged(); return this; } /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_duration_s = 2; + * @return This builder for chaining. */ - public Builder addKpiList(monitoring.Monitoring.KpiList value) { - if (kpiListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiListIsMutable(); - kpiList_.add(value); - onChanged(); - } else { - kpiListBuilder_.addMessage(value); - } + public Builder clearSamplingDurationS() { + + samplingDurationS_ = 0F; + onChanged(); return this; } + + private float samplingIntervalS_ ; /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_interval_s = 3; + * @return The samplingIntervalS. */ - public Builder addKpiList( - int index, monitoring.Monitoring.KpiList value) { - if (kpiListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiListIsMutable(); - kpiList_.add(index, value); - onChanged(); - } else { - kpiListBuilder_.addMessage(index, value); - } - return this; + @java.lang.Override + public float getSamplingIntervalS() { + return samplingIntervalS_; } /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_interval_s = 3; + * @param value The samplingIntervalS to set. + * @return This builder for chaining. */ - public Builder addKpiList( - monitoring.Monitoring.KpiList.Builder builderForValue) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - kpiList_.add(builderForValue.build()); - onChanged(); - } else { - kpiListBuilder_.addMessage(builderForValue.build()); - } + public Builder setSamplingIntervalS(float value) { + + samplingIntervalS_ = value; + onChanged(); return this; } /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_interval_s = 3; + * @return This builder for chaining. */ - public Builder addKpiList( - int index, monitoring.Monitoring.KpiList.Builder builderForValue) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - kpiList_.add(index, builderForValue.build()); - onChanged(); - } else { - kpiListBuilder_.addMessage(index, builderForValue.build()); - } + public Builder clearSamplingIntervalS() { + + samplingIntervalS_ = 0F; + onChanged(); return this; } + + private java.lang.Object startDate_ = ""; /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 4; + * @return The startDate. */ - public Builder addAllKpiList( - java.lang.Iterable values) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, kpiList_); - onChanged(); + public java.lang.String getStartDate() { + java.lang.Object ref = startDate_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + startDate_ = s; + return s; } else { - kpiListBuilder_.addAllMessages(values); + return (java.lang.String) ref; } - return this; } /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 4; + * @return The bytes for startDate. */ - public Builder clearKpiList() { - if (kpiListBuilder_ == null) { - kpiList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); + public com.google.protobuf.ByteString + getStartDateBytes() { + java.lang.Object ref = startDate_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + startDate_ = b; + return b; } else { - kpiListBuilder_.clear(); + return (com.google.protobuf.ByteString) ref; } + } + /** + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 4; + * @param value The startDate to set. + * @return This builder for chaining. + */ + public Builder setStartDate( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + startDate_ = value; + onChanged(); return this; } /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 4; + * @return This builder for chaining. */ - public Builder removeKpiList(int index) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - kpiList_.remove(index); - onChanged(); - } else { - kpiListBuilder_.remove(index); - } + public Builder clearStartDate() { + + startDate_ = getDefaultInstance().getStartDate(); + onChanged(); return this; } /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 4; + * @param value The bytes for startDate to set. + * @return This builder for chaining. */ - public monitoring.Monitoring.KpiList.Builder getKpiListBuilder( - int index) { - return getKpiListFieldBuilder().getBuilder(index); + public Builder setStartDateBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + startDate_ = value; + onChanged(); + return this; } + + private java.lang.Object endDate_ = ""; /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 5; + * @return The endDate. */ - public monitoring.Monitoring.KpiListOrBuilder getKpiListOrBuilder( - int index) { - if (kpiListBuilder_ == null) { - return kpiList_.get(index); } else { - return kpiListBuilder_.getMessageOrBuilder(index); + public java.lang.String getEndDate() { + java.lang.Object ref = endDate_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + endDate_ = s; + return s; + } else { + return (java.lang.String) ref; } } /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 5; + * @return The bytes for endDate. */ - public java.util.List - getKpiListOrBuilderList() { - if (kpiListBuilder_ != null) { - return kpiListBuilder_.getMessageOrBuilderList(); + public com.google.protobuf.ByteString + getEndDateBytes() { + java.lang.Object ref = endDate_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + endDate_ = b; + return b; } else { - return java.util.Collections.unmodifiableList(kpiList_); + return (com.google.protobuf.ByteString) ref; } } /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 5; + * @param value The endDate to set. + * @return This builder for chaining. */ - public monitoring.Monitoring.KpiList.Builder addKpiListBuilder() { - return getKpiListFieldBuilder().addBuilder( - monitoring.Monitoring.KpiList.getDefaultInstance()); + public Builder setEndDate( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + endDate_ = value; + onChanged(); + return this; } /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 5; + * @return This builder for chaining. */ - public monitoring.Monitoring.KpiList.Builder addKpiListBuilder( - int index) { - return getKpiListFieldBuilder().addBuilder( - index, monitoring.Monitoring.KpiList.getDefaultInstance()); + public Builder clearEndDate() { + + endDate_ = getDefaultInstance().getEndDate(); + onChanged(); + return this; } /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 5; + * @param value The bytes for endDate to set. + * @return This builder for chaining. */ - public java.util.List - getKpiListBuilderList() { - return getKpiListFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiList, monitoring.Monitoring.KpiList.Builder, monitoring.Monitoring.KpiListOrBuilder> - getKpiListFieldBuilder() { - if (kpiListBuilder_ == null) { - kpiListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiList, monitoring.Monitoring.KpiList.Builder, monitoring.Monitoring.KpiListOrBuilder>( - kpiList_, - ((bitField0_ & 0x00000001) != 0), - getParentForChildren(), - isClean()); - kpiList_ = null; - } - return kpiListBuilder_; + public Builder setEndDateBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + endDate_ = value; + onChanged(); + return this; } @java.lang.Override public final Builder setUnknownFields( @@ -13134,95 +13715,85 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.SubsResponse) + // @@protoc_insertion_point(builder_scope:monitoring.SubsDescriptor) } - - // @@protoc_insertion_point(class_scope:monitoring.SubsResponse) - private static final monitoring.Monitoring.SubsResponse DEFAULT_INSTANCE; + + // @@protoc_insertion_point(class_scope:monitoring.SubsDescriptor) + private static final monitoring.Monitoring.SubsDescriptor DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.SubsResponse(); + DEFAULT_INSTANCE = new monitoring.Monitoring.SubsDescriptor(); } - public static monitoring.Monitoring.SubsResponse getDefaultInstance() { + public static monitoring.Monitoring.SubsDescriptor getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public SubsResponse parsePartialFrom( + public SubsDescriptor parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SubsResponse(input, extensionRegistry); + return new SubsDescriptor(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.SubsResponse getDefaultInstanceForType() { + public monitoring.Monitoring.SubsDescriptor getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface SubsIDListOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.SubsIDList) + public interface SubscriptionIDOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.SubscriptionID) com.google.protobuf.MessageOrBuilder { /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - java.util.List - getSubsListList(); - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - monitoring.Monitoring.SubscriptionID getSubsList(int index); - /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; + * @return Whether the subsId field is set. */ - int getSubsListCount(); + boolean hasSubsId(); /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; + * @return The subsId. */ - java.util.List - getSubsListOrBuilderList(); + context.ContextOuterClass.Uuid getSubsId(); /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; */ - monitoring.Monitoring.SubscriptionIDOrBuilder getSubsListOrBuilder( - int index); + context.ContextOuterClass.UuidOrBuilder getSubsIdOrBuilder(); } /** - * Protobuf type {@code monitoring.SubsIDList} + * Protobuf type {@code monitoring.SubscriptionID} */ - public static final class SubsIDList extends + public static final class SubscriptionID extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.SubsIDList) - SubsIDListOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.SubscriptionID) + SubscriptionIDOrBuilder { private static final long serialVersionUID = 0L; - // Use SubsIDList.newBuilder() to construct. - private SubsIDList(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use SubscriptionID.newBuilder() to construct. + private SubscriptionID(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private SubsIDList() { - subsList_ = java.util.Collections.emptyList(); + private SubscriptionID() { } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new SubsIDList(); + return new SubscriptionID(); } @java.lang.Override @@ -13230,7 +13801,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private SubsIDList( + private SubscriptionID( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -13238,7 +13809,6 @@ public final class Monitoring { if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -13250,12 +13820,16 @@ public final class Monitoring { done = true; break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - subsList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; + context.ContextOuterClass.Uuid.Builder subBuilder = null; + if (subsId_ != null) { + subBuilder = subsId_.toBuilder(); } - subsList_.add( - input.readMessage(monitoring.Monitoring.SubscriptionID.parser(), extensionRegistry)); + subsId_ = input.readMessage(context.ContextOuterClass.Uuid.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(subsId_); + subsId_ = subBuilder.buildPartial(); + } + break; } default: { @@ -13273,64 +13847,47 @@ public final class Monitoring { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - subsList_ = java.util.Collections.unmodifiableList(subsList_); - } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_SubsIDList_descriptor; + return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_SubsIDList_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.SubsIDList.class, monitoring.Monitoring.SubsIDList.Builder.class); + monitoring.Monitoring.SubscriptionID.class, monitoring.Monitoring.SubscriptionID.Builder.class); } - public static final int SUBS_LIST_FIELD_NUMBER = 1; - private java.util.List subsList_; - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - @java.lang.Override - public java.util.List getSubsListList() { - return subsList_; - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - @java.lang.Override - public java.util.List - getSubsListOrBuilderList() { - return subsList_; - } + public static final int SUBS_ID_FIELD_NUMBER = 1; + private context.ContextOuterClass.Uuid subsId_; /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; + * @return Whether the subsId field is set. */ @java.lang.Override - public int getSubsListCount() { - return subsList_.size(); + public boolean hasSubsId() { + return subsId_ != null; } /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; + * @return The subsId. */ @java.lang.Override - public monitoring.Monitoring.SubscriptionID getSubsList(int index) { - return subsList_.get(index); + public context.ContextOuterClass.Uuid getSubsId() { + return subsId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : subsId_; } /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; */ @java.lang.Override - public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsListOrBuilder( - int index) { - return subsList_.get(index); + public context.ContextOuterClass.UuidOrBuilder getSubsIdOrBuilder() { + return getSubsId(); } private byte memoizedIsInitialized = -1; @@ -13347,8 +13904,8 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - for (int i = 0; i < subsList_.size(); i++) { - output.writeMessage(1, subsList_.get(i)); + if (subsId_ != null) { + output.writeMessage(1, getSubsId()); } unknownFields.writeTo(output); } @@ -13359,9 +13916,9 @@ public final class Monitoring { if (size != -1) return size; size = 0; - for (int i = 0; i < subsList_.size(); i++) { + if (subsId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, subsList_.get(i)); + .computeMessageSize(1, getSubsId()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -13373,13 +13930,16 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.SubsIDList)) { + if (!(obj instanceof monitoring.Monitoring.SubscriptionID)) { return super.equals(obj); } - monitoring.Monitoring.SubsIDList other = (monitoring.Monitoring.SubsIDList) obj; + monitoring.Monitoring.SubscriptionID other = (monitoring.Monitoring.SubscriptionID) obj; - if (!getSubsListList() - .equals(other.getSubsListList())) return false; + if (hasSubsId() != other.hasSubsId()) return false; + if (hasSubsId()) { + if (!getSubsId() + .equals(other.getSubsId())) return false; + } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -13391,78 +13951,78 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getSubsListCount() > 0) { - hash = (37 * hash) + SUBS_LIST_FIELD_NUMBER; - hash = (53 * hash) + getSubsListList().hashCode(); + if (hasSubsId()) { + hash = (37 * hash) + SUBS_ID_FIELD_NUMBER; + hash = (53 * hash) + getSubsId().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.SubsIDList parseFrom( + public static monitoring.Monitoring.SubscriptionID parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubsIDList parseFrom( + public static monitoring.Monitoring.SubscriptionID parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubsIDList parseFrom( + public static monitoring.Monitoring.SubscriptionID parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubsIDList parseFrom( + public static monitoring.Monitoring.SubscriptionID parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubsIDList parseFrom(byte[] data) + public static monitoring.Monitoring.SubscriptionID parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubsIDList parseFrom( + public static monitoring.Monitoring.SubscriptionID parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubsIDList parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.SubscriptionID parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubsIDList parseFrom( + public static monitoring.Monitoring.SubscriptionID parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.SubsIDList parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.SubscriptionID parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubsIDList parseDelimitedFrom( + public static monitoring.Monitoring.SubscriptionID parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.SubsIDList parseFrom( + public static monitoring.Monitoring.SubscriptionID parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubsIDList parseFrom( + public static monitoring.Monitoring.SubscriptionID parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -13475,7 +14035,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.SubsIDList prototype) { + public static Builder newBuilder(monitoring.Monitoring.SubscriptionID prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -13491,26 +14051,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.SubsIDList} + * Protobuf type {@code monitoring.SubscriptionID} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.SubsIDList) - monitoring.Monitoring.SubsIDListOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.SubscriptionID) + monitoring.Monitoring.SubscriptionIDOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_SubsIDList_descriptor; + return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_SubsIDList_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.SubsIDList.class, monitoring.Monitoring.SubsIDList.Builder.class); + monitoring.Monitoring.SubscriptionID.class, monitoring.Monitoring.SubscriptionID.Builder.class); } - // Construct using monitoring.Monitoring.SubsIDList.newBuilder() + // Construct using monitoring.Monitoring.SubscriptionID.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -13523,17 +14083,16 @@ public final class Monitoring { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getSubsListFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); - if (subsListBuilder_ == null) { - subsList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + if (subsIdBuilder_ == null) { + subsId_ = null; } else { - subsListBuilder_.clear(); + subsId_ = null; + subsIdBuilder_ = null; } return this; } @@ -13541,17 +14100,17 @@ public final class Monitoring { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_SubsIDList_descriptor; + return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_descriptor; } @java.lang.Override - public monitoring.Monitoring.SubsIDList getDefaultInstanceForType() { - return monitoring.Monitoring.SubsIDList.getDefaultInstance(); + public monitoring.Monitoring.SubscriptionID getDefaultInstanceForType() { + return monitoring.Monitoring.SubscriptionID.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.SubsIDList build() { - monitoring.Monitoring.SubsIDList result = buildPartial(); + public monitoring.Monitoring.SubscriptionID build() { + monitoring.Monitoring.SubscriptionID result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -13559,17 +14118,12 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.SubsIDList buildPartial() { - monitoring.Monitoring.SubsIDList result = new monitoring.Monitoring.SubsIDList(this); - int from_bitField0_ = bitField0_; - if (subsListBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { - subsList_ = java.util.Collections.unmodifiableList(subsList_); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.subsList_ = subsList_; + public monitoring.Monitoring.SubscriptionID buildPartial() { + monitoring.Monitoring.SubscriptionID result = new monitoring.Monitoring.SubscriptionID(this); + if (subsIdBuilder_ == null) { + result.subsId_ = subsId_; } else { - result.subsList_ = subsListBuilder_.build(); + result.subsId_ = subsIdBuilder_.build(); } onBuilt(); return result; @@ -13606,44 +14160,21 @@ public final class Monitoring { com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return super.addRepeatedField(field, value); - } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.SubsIDList) { - return mergeFrom((monitoring.Monitoring.SubsIDList)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(monitoring.Monitoring.SubsIDList other) { - if (other == monitoring.Monitoring.SubsIDList.getDefaultInstance()) return this; - if (subsListBuilder_ == null) { - if (!other.subsList_.isEmpty()) { - if (subsList_.isEmpty()) { - subsList_ = other.subsList_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureSubsListIsMutable(); - subsList_.addAll(other.subsList_); - } - onChanged(); - } + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof monitoring.Monitoring.SubscriptionID) { + return mergeFrom((monitoring.Monitoring.SubscriptionID)other); } else { - if (!other.subsList_.isEmpty()) { - if (subsListBuilder_.isEmpty()) { - subsListBuilder_.dispose(); - subsListBuilder_ = null; - subsList_ = other.subsList_; - bitField0_ = (bitField0_ & ~0x00000001); - subsListBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getSubsListFieldBuilder() : null; - } else { - subsListBuilder_.addAllMessages(other.subsList_); - } - } + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(monitoring.Monitoring.SubscriptionID other) { + if (other == monitoring.Monitoring.SubscriptionID.getDefaultInstance()) return this; + if (other.hasSubsId()) { + mergeSubsId(other.getSubsId()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -13660,11 +14191,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.SubsIDList parsedMessage = null; + monitoring.Monitoring.SubscriptionID parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.SubsIDList) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.SubscriptionID) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -13673,246 +14204,124 @@ public final class Monitoring { } return this; } - private int bitField0_; - - private java.util.List subsList_ = - java.util.Collections.emptyList(); - private void ensureSubsListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - subsList_ = new java.util.ArrayList(subsList_); - bitField0_ |= 0x00000001; - } - } - - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> subsListBuilder_; + private context.ContextOuterClass.Uuid subsId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> subsIdBuilder_; /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - public java.util.List getSubsListList() { - if (subsListBuilder_ == null) { - return java.util.Collections.unmodifiableList(subsList_); - } else { - return subsListBuilder_.getMessageList(); - } - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; + * @return Whether the subsId field is set. */ - public int getSubsListCount() { - if (subsListBuilder_ == null) { - return subsList_.size(); - } else { - return subsListBuilder_.getCount(); - } + public boolean hasSubsId() { + return subsIdBuilder_ != null || subsId_ != null; } /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; + * @return The subsId. */ - public monitoring.Monitoring.SubscriptionID getSubsList(int index) { - if (subsListBuilder_ == null) { - return subsList_.get(index); + public context.ContextOuterClass.Uuid getSubsId() { + if (subsIdBuilder_ == null) { + return subsId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : subsId_; } else { - return subsListBuilder_.getMessage(index); + return subsIdBuilder_.getMessage(); } } /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; */ - public Builder setSubsList( - int index, monitoring.Monitoring.SubscriptionID value) { - if (subsListBuilder_ == null) { + public Builder setSubsId(context.ContextOuterClass.Uuid value) { + if (subsIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureSubsListIsMutable(); - subsList_.set(index, value); - onChanged(); - } else { - subsListBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - public Builder setSubsList( - int index, monitoring.Monitoring.SubscriptionID.Builder builderForValue) { - if (subsListBuilder_ == null) { - ensureSubsListIsMutable(); - subsList_.set(index, builderForValue.build()); + subsId_ = value; onChanged(); } else { - subsListBuilder_.setMessage(index, builderForValue.build()); + subsIdBuilder_.setMessage(value); } + return this; } /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; */ - public Builder addSubsList(monitoring.Monitoring.SubscriptionID value) { - if (subsListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureSubsListIsMutable(); - subsList_.add(value); + public Builder setSubsId( + context.ContextOuterClass.Uuid.Builder builderForValue) { + if (subsIdBuilder_ == null) { + subsId_ = builderForValue.build(); onChanged(); } else { - subsListBuilder_.addMessage(value); + subsIdBuilder_.setMessage(builderForValue.build()); } + return this; } /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; */ - public Builder addSubsList( - int index, monitoring.Monitoring.SubscriptionID value) { - if (subsListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); + public Builder mergeSubsId(context.ContextOuterClass.Uuid value) { + if (subsIdBuilder_ == null) { + if (subsId_ != null) { + subsId_ = + context.ContextOuterClass.Uuid.newBuilder(subsId_).mergeFrom(value).buildPartial(); + } else { + subsId_ = value; } - ensureSubsListIsMutable(); - subsList_.add(index, value); - onChanged(); - } else { - subsListBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - public Builder addSubsList( - monitoring.Monitoring.SubscriptionID.Builder builderForValue) { - if (subsListBuilder_ == null) { - ensureSubsListIsMutable(); - subsList_.add(builderForValue.build()); - onChanged(); - } else { - subsListBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - public Builder addSubsList( - int index, monitoring.Monitoring.SubscriptionID.Builder builderForValue) { - if (subsListBuilder_ == null) { - ensureSubsListIsMutable(); - subsList_.add(index, builderForValue.build()); - onChanged(); - } else { - subsListBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - public Builder addAllSubsList( - java.lang.Iterable values) { - if (subsListBuilder_ == null) { - ensureSubsListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, subsList_); - onChanged(); - } else { - subsListBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - public Builder clearSubsList() { - if (subsListBuilder_ == null) { - subsList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { - subsListBuilder_.clear(); + subsIdBuilder_.mergeFrom(value); } + return this; } /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; */ - public Builder removeSubsList(int index) { - if (subsListBuilder_ == null) { - ensureSubsListIsMutable(); - subsList_.remove(index); + public Builder clearSubsId() { + if (subsIdBuilder_ == null) { + subsId_ = null; onChanged(); } else { - subsListBuilder_.remove(index); + subsId_ = null; + subsIdBuilder_ = null; } + return this; } /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - public monitoring.Monitoring.SubscriptionID.Builder getSubsListBuilder( - int index) { - return getSubsListFieldBuilder().getBuilder(index); - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsListOrBuilder( - int index) { - if (subsListBuilder_ == null) { - return subsList_.get(index); } else { - return subsListBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - public java.util.List - getSubsListOrBuilderList() { - if (subsListBuilder_ != null) { - return subsListBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(subsList_); - } - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; */ - public monitoring.Monitoring.SubscriptionID.Builder addSubsListBuilder() { - return getSubsListFieldBuilder().addBuilder( - monitoring.Monitoring.SubscriptionID.getDefaultInstance()); + public context.ContextOuterClass.Uuid.Builder getSubsIdBuilder() { + + onChanged(); + return getSubsIdFieldBuilder().getBuilder(); } /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; */ - public monitoring.Monitoring.SubscriptionID.Builder addSubsListBuilder( - int index) { - return getSubsListFieldBuilder().addBuilder( - index, monitoring.Monitoring.SubscriptionID.getDefaultInstance()); + public context.ContextOuterClass.UuidOrBuilder getSubsIdOrBuilder() { + if (subsIdBuilder_ != null) { + return subsIdBuilder_.getMessageOrBuilder(); + } else { + return subsId_ == null ? + context.ContextOuterClass.Uuid.getDefaultInstance() : subsId_; + } } /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; */ - public java.util.List - getSubsListBuilderList() { - return getSubsListFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> - getSubsListFieldBuilder() { - if (subsListBuilder_ == null) { - subsListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder>( - subsList_, - ((bitField0_ & 0x00000001) != 0), + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> + getSubsIdFieldBuilder() { + if (subsIdBuilder_ == null) { + subsIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder>( + getSubsId(), getParentForChildren(), isClean()); - subsList_ = null; + subsId_ = null; } - return subsListBuilder_; + return subsIdBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -13927,176 +14336,110 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.SubsIDList) + // @@protoc_insertion_point(builder_scope:monitoring.SubscriptionID) } - // @@protoc_insertion_point(class_scope:monitoring.SubsIDList) - private static final monitoring.Monitoring.SubsIDList DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.SubscriptionID) + private static final monitoring.Monitoring.SubscriptionID DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.SubsIDList(); + DEFAULT_INSTANCE = new monitoring.Monitoring.SubscriptionID(); } - public static monitoring.Monitoring.SubsIDList getDefaultInstance() { + public static monitoring.Monitoring.SubscriptionID getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public SubsIDList parsePartialFrom( + public SubscriptionID parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SubsIDList(input, extensionRegistry); + return new SubscriptionID(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.SubsIDList getDefaultInstanceForType() { + public monitoring.Monitoring.SubscriptionID getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface AlarmDescriptorOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.AlarmDescriptor) + public interface SubsResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.SubsResponse) com.google.protobuf.MessageOrBuilder { /** - * .monitoring.AlarmID alarm_id = 1; - * @return Whether the alarmId field is set. - */ - boolean hasAlarmId(); - /** - * .monitoring.AlarmID alarm_id = 1; - * @return The alarmId. - */ - monitoring.Monitoring.AlarmID getAlarmId(); - /** - * .monitoring.AlarmID alarm_id = 1; - */ - monitoring.Monitoring.AlarmIDOrBuilder getAlarmIdOrBuilder(); - - /** - * string alarm_description = 2; - * @return The alarmDescription. - */ - java.lang.String getAlarmDescription(); - /** - * string alarm_description = 2; - * @return The bytes for alarmDescription. - */ - com.google.protobuf.ByteString - getAlarmDescriptionBytes(); - - /** - * string name = 3; - * @return The name. - */ - java.lang.String getName(); - /** - * string name = 3; - * @return The bytes for name. - */ - com.google.protobuf.ByteString - getNameBytes(); - - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - java.util.List - getKpiIdList(); - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - monitoring.Monitoring.KpiId getKpiId(int index); - /** - * repeated .monitoring.KpiId kpi_id = 4; + * .monitoring.SubscriptionID subs_id = 1; + * @return Whether the subsId field is set. */ - int getKpiIdCount(); + boolean hasSubsId(); /** - * repeated .monitoring.KpiId kpi_id = 4; + * .monitoring.SubscriptionID subs_id = 1; + * @return The subsId. */ - java.util.List - getKpiIdOrBuilderList(); + monitoring.Monitoring.SubscriptionID getSubsId(); /** - * repeated .monitoring.KpiId kpi_id = 4; + * .monitoring.SubscriptionID subs_id = 1; */ - monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder( - int index); + monitoring.Monitoring.SubscriptionIDOrBuilder getSubsIdOrBuilder(); /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ - java.util.List - getKpiValueRangeList(); + java.util.List + getKpiListList(); /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ - monitoring.Monitoring.KpiValueRange getKpiValueRange(int index); + monitoring.Monitoring.KpiList getKpiList(int index); /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ - int getKpiValueRangeCount(); + int getKpiListCount(); /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ - java.util.List - getKpiValueRangeOrBuilderList(); + java.util.List + getKpiListOrBuilderList(); /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ - monitoring.Monitoring.KpiValueRangeOrBuilder getKpiValueRangeOrBuilder( + monitoring.Monitoring.KpiListOrBuilder getKpiListOrBuilder( int index); - - /** - * .context.Timestamp timestamp = 6; - * @return Whether the timestamp field is set. - */ - boolean hasTimestamp(); - /** - * .context.Timestamp timestamp = 6; - * @return The timestamp. - */ - context.ContextOuterClass.Timestamp getTimestamp(); - /** - * .context.Timestamp timestamp = 6; - */ - context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder(); } /** - * Protobuf type {@code monitoring.AlarmDescriptor} + * Protobuf type {@code monitoring.SubsResponse} */ - public static final class AlarmDescriptor extends + public static final class SubsResponse extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.AlarmDescriptor) - AlarmDescriptorOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.SubsResponse) + SubsResponseOrBuilder { private static final long serialVersionUID = 0L; - // Use AlarmDescriptor.newBuilder() to construct. - private AlarmDescriptor(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use SubsResponse.newBuilder() to construct. + private SubsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private AlarmDescriptor() { - alarmDescription_ = ""; - name_ = ""; - kpiId_ = java.util.Collections.emptyList(); - kpiValueRange_ = java.util.Collections.emptyList(); + private SubsResponse() { + kpiList_ = java.util.Collections.emptyList(); } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new AlarmDescriptor(); + return new SubsResponse(); } @java.lang.Override @@ -14104,7 +14447,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private AlarmDescriptor( + private SubsResponse( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -14124,59 +14467,25 @@ public final class Monitoring { done = true; break; case 10: { - monitoring.Monitoring.AlarmID.Builder subBuilder = null; - if (alarmId_ != null) { - subBuilder = alarmId_.toBuilder(); + monitoring.Monitoring.SubscriptionID.Builder subBuilder = null; + if (subsId_ != null) { + subBuilder = subsId_.toBuilder(); } - alarmId_ = input.readMessage(monitoring.Monitoring.AlarmID.parser(), extensionRegistry); + subsId_ = input.readMessage(monitoring.Monitoring.SubscriptionID.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(alarmId_); - alarmId_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(subsId_); + subsId_ = subBuilder.buildPartial(); } break; } case 18: { - java.lang.String s = input.readStringRequireUtf8(); - - alarmDescription_ = s; - break; - } - case 26: { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - case 34: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - kpiId_ = new java.util.ArrayList(); + kpiList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - kpiId_.add( - input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry)); - break; - } - case 42: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - kpiValueRange_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - kpiValueRange_.add( - input.readMessage(monitoring.Monitoring.KpiValueRange.parser(), extensionRegistry)); - break; - } - case 50: { - context.ContextOuterClass.Timestamp.Builder subBuilder = null; - if (timestamp_ != null) { - subBuilder = timestamp_.toBuilder(); - } - timestamp_ = input.readMessage(context.ContextOuterClass.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(timestamp_); - timestamp_ = subBuilder.buildPartial(); - } - + kpiList_.add( + input.readMessage(monitoring.Monitoring.KpiList.parser(), extensionRegistry)); break; } default: { @@ -14195,234 +14504,89 @@ public final class Monitoring { e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { - kpiId_ = java.util.Collections.unmodifiableList(kpiId_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - kpiValueRange_ = java.util.Collections.unmodifiableList(kpiValueRange_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_fieldAccessorTable - .ensureFieldAccessorsInitialized( - monitoring.Monitoring.AlarmDescriptor.class, monitoring.Monitoring.AlarmDescriptor.Builder.class); - } - - public static final int ALARM_ID_FIELD_NUMBER = 1; - private monitoring.Monitoring.AlarmID alarmId_; - /** - * .monitoring.AlarmID alarm_id = 1; - * @return Whether the alarmId field is set. - */ - @java.lang.Override - public boolean hasAlarmId() { - return alarmId_ != null; - } - /** - * .monitoring.AlarmID alarm_id = 1; - * @return The alarmId. - */ - @java.lang.Override - public monitoring.Monitoring.AlarmID getAlarmId() { - return alarmId_ == null ? monitoring.Monitoring.AlarmID.getDefaultInstance() : alarmId_; - } - /** - * .monitoring.AlarmID alarm_id = 1; - */ - @java.lang.Override - public monitoring.Monitoring.AlarmIDOrBuilder getAlarmIdOrBuilder() { - return getAlarmId(); - } - - public static final int ALARM_DESCRIPTION_FIELD_NUMBER = 2; - private volatile java.lang.Object alarmDescription_; - /** - * string alarm_description = 2; - * @return The alarmDescription. - */ - @java.lang.Override - public java.lang.String getAlarmDescription() { - java.lang.Object ref = alarmDescription_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - alarmDescription_ = s; - return s; + kpiList_ = java.util.Collections.unmodifiableList(kpiList_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); } } - /** - * string alarm_description = 2; - * @return The bytes for alarmDescription. - */ - @java.lang.Override - public com.google.protobuf.ByteString - getAlarmDescriptionBytes() { - java.lang.Object ref = alarmDescription_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - alarmDescription_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return monitoring.Monitoring.internal_static_monitoring_SubsResponse_descriptor; } - public static final int NAME_FIELD_NUMBER = 3; - private volatile java.lang.Object name_; - /** - * string name = 3; - * @return The name. - */ - @java.lang.Override - public java.lang.String getName() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - name_ = s; - return s; - } - } - /** - * string name = 3; - * @return The bytes for name. - */ @java.lang.Override - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return monitoring.Monitoring.internal_static_monitoring_SubsResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + monitoring.Monitoring.SubsResponse.class, monitoring.Monitoring.SubsResponse.Builder.class); } - public static final int KPI_ID_FIELD_NUMBER = 4; - private java.util.List kpiId_; - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - @java.lang.Override - public java.util.List getKpiIdList() { - return kpiId_; - } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - @java.lang.Override - public java.util.List - getKpiIdOrBuilderList() { - return kpiId_; - } + public static final int SUBS_ID_FIELD_NUMBER = 1; + private monitoring.Monitoring.SubscriptionID subsId_; /** - * repeated .monitoring.KpiId kpi_id = 4; + * .monitoring.SubscriptionID subs_id = 1; + * @return Whether the subsId field is set. */ @java.lang.Override - public int getKpiIdCount() { - return kpiId_.size(); + public boolean hasSubsId() { + return subsId_ != null; } /** - * repeated .monitoring.KpiId kpi_id = 4; + * .monitoring.SubscriptionID subs_id = 1; + * @return The subsId. */ @java.lang.Override - public monitoring.Monitoring.KpiId getKpiId(int index) { - return kpiId_.get(index); + public monitoring.Monitoring.SubscriptionID getSubsId() { + return subsId_ == null ? monitoring.Monitoring.SubscriptionID.getDefaultInstance() : subsId_; } /** - * repeated .monitoring.KpiId kpi_id = 4; + * .monitoring.SubscriptionID subs_id = 1; */ @java.lang.Override - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder( - int index) { - return kpiId_.get(index); + public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsIdOrBuilder() { + return getSubsId(); } - public static final int KPI_VALUE_RANGE_FIELD_NUMBER = 5; - private java.util.List kpiValueRange_; + public static final int KPI_LIST_FIELD_NUMBER = 2; + private java.util.List kpiList_; /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ @java.lang.Override - public java.util.List getKpiValueRangeList() { - return kpiValueRange_; + public java.util.List getKpiListList() { + return kpiList_; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ @java.lang.Override - public java.util.List - getKpiValueRangeOrBuilderList() { - return kpiValueRange_; + public java.util.List + getKpiListOrBuilderList() { + return kpiList_; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ @java.lang.Override - public int getKpiValueRangeCount() { - return kpiValueRange_.size(); + public int getKpiListCount() { + return kpiList_.size(); } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ @java.lang.Override - public monitoring.Monitoring.KpiValueRange getKpiValueRange(int index) { - return kpiValueRange_.get(index); + public monitoring.Monitoring.KpiList getKpiList(int index) { + return kpiList_.get(index); } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ @java.lang.Override - public monitoring.Monitoring.KpiValueRangeOrBuilder getKpiValueRangeOrBuilder( + public monitoring.Monitoring.KpiListOrBuilder getKpiListOrBuilder( int index) { - return kpiValueRange_.get(index); - } - - public static final int TIMESTAMP_FIELD_NUMBER = 6; - private context.ContextOuterClass.Timestamp timestamp_; - /** - * .context.Timestamp timestamp = 6; - * @return Whether the timestamp field is set. - */ - @java.lang.Override - public boolean hasTimestamp() { - return timestamp_ != null; - } - /** - * .context.Timestamp timestamp = 6; - * @return The timestamp. - */ - @java.lang.Override - public context.ContextOuterClass.Timestamp getTimestamp() { - return timestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_; - } - /** - * .context.Timestamp timestamp = 6; - */ - @java.lang.Override - public context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder() { - return getTimestamp(); + return kpiList_.get(index); } private byte memoizedIsInitialized = -1; @@ -14439,23 +14603,11 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (alarmId_ != null) { - output.writeMessage(1, getAlarmId()); - } - if (!getAlarmDescriptionBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, alarmDescription_); - } - if (!getNameBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 3, name_); - } - for (int i = 0; i < kpiId_.size(); i++) { - output.writeMessage(4, kpiId_.get(i)); - } - for (int i = 0; i < kpiValueRange_.size(); i++) { - output.writeMessage(5, kpiValueRange_.get(i)); + if (subsId_ != null) { + output.writeMessage(1, getSubsId()); } - if (timestamp_ != null) { - output.writeMessage(6, getTimestamp()); + for (int i = 0; i < kpiList_.size(); i++) { + output.writeMessage(2, kpiList_.get(i)); } unknownFields.writeTo(output); } @@ -14466,27 +14618,13 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (alarmId_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getAlarmId()); - } - if (!getAlarmDescriptionBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, alarmDescription_); - } - if (!getNameBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, name_); - } - for (int i = 0; i < kpiId_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, kpiId_.get(i)); - } - for (int i = 0; i < kpiValueRange_.size(); i++) { + if (subsId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, kpiValueRange_.get(i)); + .computeMessageSize(1, getSubsId()); } - if (timestamp_ != null) { + for (int i = 0; i < kpiList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, getTimestamp()); + .computeMessageSize(2, kpiList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -14498,29 +14636,18 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.AlarmDescriptor)) { + if (!(obj instanceof monitoring.Monitoring.SubsResponse)) { return super.equals(obj); } - monitoring.Monitoring.AlarmDescriptor other = (monitoring.Monitoring.AlarmDescriptor) obj; + monitoring.Monitoring.SubsResponse other = (monitoring.Monitoring.SubsResponse) obj; - if (hasAlarmId() != other.hasAlarmId()) return false; - if (hasAlarmId()) { - if (!getAlarmId() - .equals(other.getAlarmId())) return false; - } - if (!getAlarmDescription() - .equals(other.getAlarmDescription())) return false; - if (!getName() - .equals(other.getName())) return false; - if (!getKpiIdList() - .equals(other.getKpiIdList())) return false; - if (!getKpiValueRangeList() - .equals(other.getKpiValueRangeList())) return false; - if (hasTimestamp() != other.hasTimestamp()) return false; - if (hasTimestamp()) { - if (!getTimestamp() - .equals(other.getTimestamp())) return false; + if (hasSubsId() != other.hasSubsId()) return false; + if (hasSubsId()) { + if (!getSubsId() + .equals(other.getSubsId())) return false; } + if (!getKpiListList() + .equals(other.getKpiListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -14532,94 +14659,82 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasAlarmId()) { - hash = (37 * hash) + ALARM_ID_FIELD_NUMBER; - hash = (53 * hash) + getAlarmId().hashCode(); - } - hash = (37 * hash) + ALARM_DESCRIPTION_FIELD_NUMBER; - hash = (53 * hash) + getAlarmDescription().hashCode(); - hash = (37 * hash) + NAME_FIELD_NUMBER; - hash = (53 * hash) + getName().hashCode(); - if (getKpiIdCount() > 0) { - hash = (37 * hash) + KPI_ID_FIELD_NUMBER; - hash = (53 * hash) + getKpiIdList().hashCode(); - } - if (getKpiValueRangeCount() > 0) { - hash = (37 * hash) + KPI_VALUE_RANGE_FIELD_NUMBER; - hash = (53 * hash) + getKpiValueRangeList().hashCode(); + if (hasSubsId()) { + hash = (37 * hash) + SUBS_ID_FIELD_NUMBER; + hash = (53 * hash) + getSubsId().hashCode(); } - if (hasTimestamp()) { - hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER; - hash = (53 * hash) + getTimestamp().hashCode(); + if (getKpiListCount() > 0) { + hash = (37 * hash) + KPI_LIST_FIELD_NUMBER; + hash = (53 * hash) + getKpiListList().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.AlarmDescriptor parseFrom( + public static monitoring.Monitoring.SubsResponse parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.AlarmDescriptor parseFrom( + public static monitoring.Monitoring.SubsResponse parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.AlarmDescriptor parseFrom( + public static monitoring.Monitoring.SubsResponse parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.AlarmDescriptor parseFrom( + public static monitoring.Monitoring.SubsResponse parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.AlarmDescriptor parseFrom(byte[] data) + public static monitoring.Monitoring.SubsResponse parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.AlarmDescriptor parseFrom( + public static monitoring.Monitoring.SubsResponse parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.AlarmDescriptor parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.SubsResponse parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.AlarmDescriptor parseFrom( + public static monitoring.Monitoring.SubsResponse parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.AlarmDescriptor parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.SubsResponse parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.AlarmDescriptor parseDelimitedFrom( + public static monitoring.Monitoring.SubsResponse parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.AlarmDescriptor parseFrom( + public static monitoring.Monitoring.SubsResponse parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.AlarmDescriptor parseFrom( + public static monitoring.Monitoring.SubsResponse parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -14632,7 +14747,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.AlarmDescriptor prototype) { + public static Builder newBuilder(monitoring.Monitoring.SubsResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -14648,26 +14763,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.AlarmDescriptor} + * Protobuf type {@code monitoring.SubsResponse} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.AlarmDescriptor) - monitoring.Monitoring.AlarmDescriptorOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.SubsResponse) + monitoring.Monitoring.SubsResponseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_descriptor; + return monitoring.Monitoring.internal_static_monitoring_SubsResponse_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_SubsResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.AlarmDescriptor.class, monitoring.Monitoring.AlarmDescriptor.Builder.class); + monitoring.Monitoring.SubsResponse.class, monitoring.Monitoring.SubsResponse.Builder.class); } - // Construct using monitoring.Monitoring.AlarmDescriptor.newBuilder() + // Construct using monitoring.Monitoring.SubsResponse.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -14680,40 +14795,23 @@ public final class Monitoring { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getKpiIdFieldBuilder(); - getKpiValueRangeFieldBuilder(); + getKpiListFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); - if (alarmIdBuilder_ == null) { - alarmId_ = null; - } else { - alarmId_ = null; - alarmIdBuilder_ = null; - } - alarmDescription_ = ""; - - name_ = ""; - - if (kpiIdBuilder_ == null) { - kpiId_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - } else { - kpiIdBuilder_.clear(); - } - if (kpiValueRangeBuilder_ == null) { - kpiValueRange_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + if (subsIdBuilder_ == null) { + subsId_ = null; } else { - kpiValueRangeBuilder_.clear(); + subsId_ = null; + subsIdBuilder_ = null; } - if (timestampBuilder_ == null) { - timestamp_ = null; + if (kpiListBuilder_ == null) { + kpiList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); } else { - timestamp_ = null; - timestampBuilder_ = null; + kpiListBuilder_.clear(); } return this; } @@ -14721,17 +14819,17 @@ public final class Monitoring { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_descriptor; + return monitoring.Monitoring.internal_static_monitoring_SubsResponse_descriptor; } @java.lang.Override - public monitoring.Monitoring.AlarmDescriptor getDefaultInstanceForType() { - return monitoring.Monitoring.AlarmDescriptor.getDefaultInstance(); + public monitoring.Monitoring.SubsResponse getDefaultInstanceForType() { + return monitoring.Monitoring.SubsResponse.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.AlarmDescriptor build() { - monitoring.Monitoring.AlarmDescriptor result = buildPartial(); + public monitoring.Monitoring.SubsResponse build() { + monitoring.Monitoring.SubsResponse result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -14739,38 +14837,22 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.AlarmDescriptor buildPartial() { - monitoring.Monitoring.AlarmDescriptor result = new monitoring.Monitoring.AlarmDescriptor(this); + public monitoring.Monitoring.SubsResponse buildPartial() { + monitoring.Monitoring.SubsResponse result = new monitoring.Monitoring.SubsResponse(this); int from_bitField0_ = bitField0_; - if (alarmIdBuilder_ == null) { - result.alarmId_ = alarmId_; + if (subsIdBuilder_ == null) { + result.subsId_ = subsId_; } else { - result.alarmId_ = alarmIdBuilder_.build(); + result.subsId_ = subsIdBuilder_.build(); } - result.alarmDescription_ = alarmDescription_; - result.name_ = name_; - if (kpiIdBuilder_ == null) { + if (kpiListBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { - kpiId_ = java.util.Collections.unmodifiableList(kpiId_); + kpiList_ = java.util.Collections.unmodifiableList(kpiList_); bitField0_ = (bitField0_ & ~0x00000001); } - result.kpiId_ = kpiId_; - } else { - result.kpiId_ = kpiIdBuilder_.build(); - } - if (kpiValueRangeBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { - kpiValueRange_ = java.util.Collections.unmodifiableList(kpiValueRange_); - bitField0_ = (bitField0_ & ~0x00000002); - } - result.kpiValueRange_ = kpiValueRange_; - } else { - result.kpiValueRange_ = kpiValueRangeBuilder_.build(); - } - if (timestampBuilder_ == null) { - result.timestamp_ = timestamp_; + result.kpiList_ = kpiList_; } else { - result.timestamp_ = timestampBuilder_.build(); + result.kpiList_ = kpiListBuilder_.build(); } onBuilt(); return result; @@ -14810,82 +14892,45 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.AlarmDescriptor) { - return mergeFrom((monitoring.Monitoring.AlarmDescriptor)other); + if (other instanceof monitoring.Monitoring.SubsResponse) { + return mergeFrom((monitoring.Monitoring.SubsResponse)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.AlarmDescriptor other) { - if (other == monitoring.Monitoring.AlarmDescriptor.getDefaultInstance()) return this; - if (other.hasAlarmId()) { - mergeAlarmId(other.getAlarmId()); - } - if (!other.getAlarmDescription().isEmpty()) { - alarmDescription_ = other.alarmDescription_; - onChanged(); - } - if (!other.getName().isEmpty()) { - name_ = other.name_; - onChanged(); + public Builder mergeFrom(monitoring.Monitoring.SubsResponse other) { + if (other == monitoring.Monitoring.SubsResponse.getDefaultInstance()) return this; + if (other.hasSubsId()) { + mergeSubsId(other.getSubsId()); } - if (kpiIdBuilder_ == null) { - if (!other.kpiId_.isEmpty()) { - if (kpiId_.isEmpty()) { - kpiId_ = other.kpiId_; + if (kpiListBuilder_ == null) { + if (!other.kpiList_.isEmpty()) { + if (kpiList_.isEmpty()) { + kpiList_ = other.kpiList_; bitField0_ = (bitField0_ & ~0x00000001); } else { - ensureKpiIdIsMutable(); - kpiId_.addAll(other.kpiId_); + ensureKpiListIsMutable(); + kpiList_.addAll(other.kpiList_); } onChanged(); } } else { - if (!other.kpiId_.isEmpty()) { - if (kpiIdBuilder_.isEmpty()) { - kpiIdBuilder_.dispose(); - kpiIdBuilder_ = null; - kpiId_ = other.kpiId_; + if (!other.kpiList_.isEmpty()) { + if (kpiListBuilder_.isEmpty()) { + kpiListBuilder_.dispose(); + kpiListBuilder_ = null; + kpiList_ = other.kpiList_; bitField0_ = (bitField0_ & ~0x00000001); - kpiIdBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getKpiIdFieldBuilder() : null; - } else { - kpiIdBuilder_.addAllMessages(other.kpiId_); - } - } - } - if (kpiValueRangeBuilder_ == null) { - if (!other.kpiValueRange_.isEmpty()) { - if (kpiValueRange_.isEmpty()) { - kpiValueRange_ = other.kpiValueRange_; - bitField0_ = (bitField0_ & ~0x00000002); - } else { - ensureKpiValueRangeIsMutable(); - kpiValueRange_.addAll(other.kpiValueRange_); - } - onChanged(); - } - } else { - if (!other.kpiValueRange_.isEmpty()) { - if (kpiValueRangeBuilder_.isEmpty()) { - kpiValueRangeBuilder_.dispose(); - kpiValueRangeBuilder_ = null; - kpiValueRange_ = other.kpiValueRange_; - bitField0_ = (bitField0_ & ~0x00000002); - kpiValueRangeBuilder_ = + kpiListBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getKpiValueRangeFieldBuilder() : null; + getKpiListFieldBuilder() : null; } else { - kpiValueRangeBuilder_.addAllMessages(other.kpiValueRange_); + kpiListBuilder_.addAllMessages(other.kpiList_); } } } - if (other.hasTimestamp()) { - mergeTimestamp(other.getTimestamp()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -14901,11 +14946,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.AlarmDescriptor parsedMessage = null; + monitoring.Monitoring.SubsResponse parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.AlarmDescriptor) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.SubsResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -14916,1495 +14961,2430 @@ public final class Monitoring { } private int bitField0_; - private monitoring.Monitoring.AlarmID alarmId_; + private monitoring.Monitoring.SubscriptionID subsId_; private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.AlarmID, monitoring.Monitoring.AlarmID.Builder, monitoring.Monitoring.AlarmIDOrBuilder> alarmIdBuilder_; + monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> subsIdBuilder_; /** - * .monitoring.AlarmID alarm_id = 1; - * @return Whether the alarmId field is set. + * .monitoring.SubscriptionID subs_id = 1; + * @return Whether the subsId field is set. */ - public boolean hasAlarmId() { - return alarmIdBuilder_ != null || alarmId_ != null; + public boolean hasSubsId() { + return subsIdBuilder_ != null || subsId_ != null; + } + /** + * .monitoring.SubscriptionID subs_id = 1; + * @return The subsId. + */ + public monitoring.Monitoring.SubscriptionID getSubsId() { + if (subsIdBuilder_ == null) { + return subsId_ == null ? monitoring.Monitoring.SubscriptionID.getDefaultInstance() : subsId_; + } else { + return subsIdBuilder_.getMessage(); + } + } + /** + * .monitoring.SubscriptionID subs_id = 1; + */ + public Builder setSubsId(monitoring.Monitoring.SubscriptionID value) { + if (subsIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + subsId_ = value; + onChanged(); + } else { + subsIdBuilder_.setMessage(value); + } + + return this; + } + /** + * .monitoring.SubscriptionID subs_id = 1; + */ + public Builder setSubsId( + monitoring.Monitoring.SubscriptionID.Builder builderForValue) { + if (subsIdBuilder_ == null) { + subsId_ = builderForValue.build(); + onChanged(); + } else { + subsIdBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .monitoring.SubscriptionID subs_id = 1; + */ + public Builder mergeSubsId(monitoring.Monitoring.SubscriptionID value) { + if (subsIdBuilder_ == null) { + if (subsId_ != null) { + subsId_ = + monitoring.Monitoring.SubscriptionID.newBuilder(subsId_).mergeFrom(value).buildPartial(); + } else { + subsId_ = value; + } + onChanged(); + } else { + subsIdBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .monitoring.SubscriptionID subs_id = 1; + */ + public Builder clearSubsId() { + if (subsIdBuilder_ == null) { + subsId_ = null; + onChanged(); + } else { + subsId_ = null; + subsIdBuilder_ = null; + } + + return this; + } + /** + * .monitoring.SubscriptionID subs_id = 1; + */ + public monitoring.Monitoring.SubscriptionID.Builder getSubsIdBuilder() { + + onChanged(); + return getSubsIdFieldBuilder().getBuilder(); + } + /** + * .monitoring.SubscriptionID subs_id = 1; + */ + public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsIdOrBuilder() { + if (subsIdBuilder_ != null) { + return subsIdBuilder_.getMessageOrBuilder(); + } else { + return subsId_ == null ? + monitoring.Monitoring.SubscriptionID.getDefaultInstance() : subsId_; + } + } + /** + * .monitoring.SubscriptionID subs_id = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> + getSubsIdFieldBuilder() { + if (subsIdBuilder_ == null) { + subsIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder>( + getSubsId(), + getParentForChildren(), + isClean()); + subsId_ = null; + } + return subsIdBuilder_; + } + + private java.util.List kpiList_ = + java.util.Collections.emptyList(); + private void ensureKpiListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + kpiList_ = new java.util.ArrayList(kpiList_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiList, monitoring.Monitoring.KpiList.Builder, monitoring.Monitoring.KpiListOrBuilder> kpiListBuilder_; + + /** + * repeated .monitoring.KpiList kpi_list = 2; + */ + public java.util.List getKpiListList() { + if (kpiListBuilder_ == null) { + return java.util.Collections.unmodifiableList(kpiList_); + } else { + return kpiListBuilder_.getMessageList(); + } + } + /** + * repeated .monitoring.KpiList kpi_list = 2; + */ + public int getKpiListCount() { + if (kpiListBuilder_ == null) { + return kpiList_.size(); + } else { + return kpiListBuilder_.getCount(); + } } /** - * .monitoring.AlarmID alarm_id = 1; - * @return The alarmId. + * repeated .monitoring.KpiList kpi_list = 2; */ - public monitoring.Monitoring.AlarmID getAlarmId() { - if (alarmIdBuilder_ == null) { - return alarmId_ == null ? monitoring.Monitoring.AlarmID.getDefaultInstance() : alarmId_; + public monitoring.Monitoring.KpiList getKpiList(int index) { + if (kpiListBuilder_ == null) { + return kpiList_.get(index); } else { - return alarmIdBuilder_.getMessage(); + return kpiListBuilder_.getMessage(index); } } /** - * .monitoring.AlarmID alarm_id = 1; + * repeated .monitoring.KpiList kpi_list = 2; */ - public Builder setAlarmId(monitoring.Monitoring.AlarmID value) { - if (alarmIdBuilder_ == null) { + public Builder setKpiList( + int index, monitoring.Monitoring.KpiList value) { + if (kpiListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - alarmId_ = value; + ensureKpiListIsMutable(); + kpiList_.set(index, value); onChanged(); } else { - alarmIdBuilder_.setMessage(value); + kpiListBuilder_.setMessage(index, value); } - return this; } /** - * .monitoring.AlarmID alarm_id = 1; + * repeated .monitoring.KpiList kpi_list = 2; */ - public Builder setAlarmId( - monitoring.Monitoring.AlarmID.Builder builderForValue) { - if (alarmIdBuilder_ == null) { - alarmId_ = builderForValue.build(); + public Builder setKpiList( + int index, monitoring.Monitoring.KpiList.Builder builderForValue) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + kpiList_.set(index, builderForValue.build()); onChanged(); } else { - alarmIdBuilder_.setMessage(builderForValue.build()); + kpiListBuilder_.setMessage(index, builderForValue.build()); } - return this; } /** - * .monitoring.AlarmID alarm_id = 1; + * repeated .monitoring.KpiList kpi_list = 2; */ - public Builder mergeAlarmId(monitoring.Monitoring.AlarmID value) { - if (alarmIdBuilder_ == null) { - if (alarmId_ != null) { - alarmId_ = - monitoring.Monitoring.AlarmID.newBuilder(alarmId_).mergeFrom(value).buildPartial(); - } else { - alarmId_ = value; + public Builder addKpiList(monitoring.Monitoring.KpiList value) { + if (kpiListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); } + ensureKpiListIsMutable(); + kpiList_.add(value); onChanged(); } else { - alarmIdBuilder_.mergeFrom(value); + kpiListBuilder_.addMessage(value); } - return this; } /** - * .monitoring.AlarmID alarm_id = 1; + * repeated .monitoring.KpiList kpi_list = 2; */ - public Builder clearAlarmId() { - if (alarmIdBuilder_ == null) { - alarmId_ = null; + public Builder addKpiList( + int index, monitoring.Monitoring.KpiList value) { + if (kpiListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiListIsMutable(); + kpiList_.add(index, value); onChanged(); } else { - alarmId_ = null; - alarmIdBuilder_ = null; + kpiListBuilder_.addMessage(index, value); } - return this; } /** - * .monitoring.AlarmID alarm_id = 1; - */ - public monitoring.Monitoring.AlarmID.Builder getAlarmIdBuilder() { - - onChanged(); - return getAlarmIdFieldBuilder().getBuilder(); - } - /** - * .monitoring.AlarmID alarm_id = 1; + * repeated .monitoring.KpiList kpi_list = 2; */ - public monitoring.Monitoring.AlarmIDOrBuilder getAlarmIdOrBuilder() { - if (alarmIdBuilder_ != null) { - return alarmIdBuilder_.getMessageOrBuilder(); + public Builder addKpiList( + monitoring.Monitoring.KpiList.Builder builderForValue) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + kpiList_.add(builderForValue.build()); + onChanged(); } else { - return alarmId_ == null ? - monitoring.Monitoring.AlarmID.getDefaultInstance() : alarmId_; + kpiListBuilder_.addMessage(builderForValue.build()); } + return this; } /** - * .monitoring.AlarmID alarm_id = 1; + * repeated .monitoring.KpiList kpi_list = 2; */ - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.AlarmID, monitoring.Monitoring.AlarmID.Builder, monitoring.Monitoring.AlarmIDOrBuilder> - getAlarmIdFieldBuilder() { - if (alarmIdBuilder_ == null) { - alarmIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.AlarmID, monitoring.Monitoring.AlarmID.Builder, monitoring.Monitoring.AlarmIDOrBuilder>( - getAlarmId(), - getParentForChildren(), - isClean()); - alarmId_ = null; + public Builder addKpiList( + int index, monitoring.Monitoring.KpiList.Builder builderForValue) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + kpiList_.add(index, builderForValue.build()); + onChanged(); + } else { + kpiListBuilder_.addMessage(index, builderForValue.build()); } - return alarmIdBuilder_; + return this; } - - private java.lang.Object alarmDescription_ = ""; /** - * string alarm_description = 2; - * @return The alarmDescription. + * repeated .monitoring.KpiList kpi_list = 2; */ - public java.lang.String getAlarmDescription() { - java.lang.Object ref = alarmDescription_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - alarmDescription_ = s; - return s; + public Builder addAllKpiList( + java.lang.Iterable values) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, kpiList_); + onChanged(); } else { - return (java.lang.String) ref; + kpiListBuilder_.addAllMessages(values); } + return this; } /** - * string alarm_description = 2; - * @return The bytes for alarmDescription. + * repeated .monitoring.KpiList kpi_list = 2; */ - public com.google.protobuf.ByteString - getAlarmDescriptionBytes() { - java.lang.Object ref = alarmDescription_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - alarmDescription_ = b; - return b; + public Builder clearKpiList() { + if (kpiListBuilder_ == null) { + kpiList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); } else { - return (com.google.protobuf.ByteString) ref; + kpiListBuilder_.clear(); } - } - /** - * string alarm_description = 2; - * @param value The alarmDescription to set. - * @return This builder for chaining. - */ - public Builder setAlarmDescription( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - alarmDescription_ = value; - onChanged(); return this; } /** - * string alarm_description = 2; - * @return This builder for chaining. + * repeated .monitoring.KpiList kpi_list = 2; */ - public Builder clearAlarmDescription() { - - alarmDescription_ = getDefaultInstance().getAlarmDescription(); - onChanged(); + public Builder removeKpiList(int index) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + kpiList_.remove(index); + onChanged(); + } else { + kpiListBuilder_.remove(index); + } return this; } /** - * string alarm_description = 2; - * @param value The bytes for alarmDescription to set. - * @return This builder for chaining. + * repeated .monitoring.KpiList kpi_list = 2; */ - public Builder setAlarmDescriptionBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - alarmDescription_ = value; - onChanged(); - return this; + public monitoring.Monitoring.KpiList.Builder getKpiListBuilder( + int index) { + return getKpiListFieldBuilder().getBuilder(index); } - - private java.lang.Object name_ = ""; /** - * string name = 3; - * @return The name. + * repeated .monitoring.KpiList kpi_list = 2; */ - public java.lang.String getName() { - java.lang.Object ref = name_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - name_ = s; - return s; - } else { - return (java.lang.String) ref; + public monitoring.Monitoring.KpiListOrBuilder getKpiListOrBuilder( + int index) { + if (kpiListBuilder_ == null) { + return kpiList_.get(index); } else { + return kpiListBuilder_.getMessageOrBuilder(index); } } /** - * string name = 3; - * @return The bytes for name. + * repeated .monitoring.KpiList kpi_list = 2; */ - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; + public java.util.List + getKpiListOrBuilderList() { + if (kpiListBuilder_ != null) { + return kpiListBuilder_.getMessageOrBuilderList(); } else { - return (com.google.protobuf.ByteString) ref; + return java.util.Collections.unmodifiableList(kpiList_); } } /** - * string name = 3; - * @param value The name to set. - * @return This builder for chaining. + * repeated .monitoring.KpiList kpi_list = 2; */ - public Builder setName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - name_ = value; - onChanged(); - return this; + public monitoring.Monitoring.KpiList.Builder addKpiListBuilder() { + return getKpiListFieldBuilder().addBuilder( + monitoring.Monitoring.KpiList.getDefaultInstance()); } /** - * string name = 3; - * @return This builder for chaining. + * repeated .monitoring.KpiList kpi_list = 2; */ - public Builder clearName() { - - name_ = getDefaultInstance().getName(); - onChanged(); - return this; + public monitoring.Monitoring.KpiList.Builder addKpiListBuilder( + int index) { + return getKpiListFieldBuilder().addBuilder( + index, monitoring.Monitoring.KpiList.getDefaultInstance()); } /** - * string name = 3; - * @param value The bytes for name to set. - * @return This builder for chaining. + * repeated .monitoring.KpiList kpi_list = 2; */ - public Builder setNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); + public java.util.List + getKpiListBuilderList() { + return getKpiListFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiList, monitoring.Monitoring.KpiList.Builder, monitoring.Monitoring.KpiListOrBuilder> + getKpiListFieldBuilder() { + if (kpiListBuilder_ == null) { + kpiListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiList, monitoring.Monitoring.KpiList.Builder, monitoring.Monitoring.KpiListOrBuilder>( + kpiList_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + kpiList_ = null; + } + return kpiListBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:monitoring.SubsResponse) + } + + // @@protoc_insertion_point(class_scope:monitoring.SubsResponse) + private static final monitoring.Monitoring.SubsResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new monitoring.Monitoring.SubsResponse(); + } + + public static monitoring.Monitoring.SubsResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public SubsResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new SubsResponse(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public monitoring.Monitoring.SubsResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + } - checkByteStringIsUtf8(value); - - name_ = value; - onChanged(); - return this; + + public interface SubsIDListOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.SubsIDList) + com.google.protobuf.MessageOrBuilder { + + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + java.util.List + getSubsListList(); + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + monitoring.Monitoring.SubscriptionID getSubsList(int index); + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + int getSubsListCount(); + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + java.util.List + getSubsListOrBuilderList(); + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + monitoring.Monitoring.SubscriptionIDOrBuilder getSubsListOrBuilder( + int index); + } + /** + * Protobuf type {@code monitoring.SubsIDList} + */ + public static final class SubsIDList extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:monitoring.SubsIDList) + SubsIDListOrBuilder { + private static final long serialVersionUID = 0L; + // Use SubsIDList.newBuilder() to construct. + private SubsIDList(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private SubsIDList() { + subsList_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new SubsIDList(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private SubsIDList( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + subsList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + subsList_.add( + input.readMessage(monitoring.Monitoring.SubscriptionID.parser(), extensionRegistry)); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + subsList_ = java.util.Collections.unmodifiableList(subsList_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return monitoring.Monitoring.internal_static_monitoring_SubsIDList_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return monitoring.Monitoring.internal_static_monitoring_SubsIDList_fieldAccessorTable + .ensureFieldAccessorsInitialized( + monitoring.Monitoring.SubsIDList.class, monitoring.Monitoring.SubsIDList.Builder.class); + } + + public static final int SUBS_LIST_FIELD_NUMBER = 1; + private java.util.List subsList_; + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + @java.lang.Override + public java.util.List getSubsListList() { + return subsList_; + } + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + @java.lang.Override + public java.util.List + getSubsListOrBuilderList() { + return subsList_; + } + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + @java.lang.Override + public int getSubsListCount() { + return subsList_.size(); + } + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + @java.lang.Override + public monitoring.Monitoring.SubscriptionID getSubsList(int index) { + return subsList_.get(index); + } + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + @java.lang.Override + public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsListOrBuilder( + int index) { + return subsList_.get(index); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; - private java.util.List kpiId_ = - java.util.Collections.emptyList(); - private void ensureKpiIdIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - kpiId_ = new java.util.ArrayList(kpiId_); - bitField0_ |= 0x00000001; - } + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + for (int i = 0; i < subsList_.size(); i++) { + output.writeMessage(1, subsList_.get(i)); } + unknownFields.writeTo(output); + } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public java.util.List getKpiIdList() { - if (kpiIdBuilder_ == null) { - return java.util.Collections.unmodifiableList(kpiId_); - } else { - return kpiIdBuilder_.getMessageList(); - } + size = 0; + for (int i = 0; i < subsList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, subsList_.get(i)); } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public int getKpiIdCount() { - if (kpiIdBuilder_ == null) { - return kpiId_.size(); - } else { - return kpiIdBuilder_.getCount(); - } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public monitoring.Monitoring.KpiId getKpiId(int index) { - if (kpiIdBuilder_ == null) { - return kpiId_.get(index); - } else { - return kpiIdBuilder_.getMessage(index); - } + if (!(obj instanceof monitoring.Monitoring.SubsIDList)) { + return super.equals(obj); } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public Builder setKpiId( - int index, monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiIdIsMutable(); - kpiId_.set(index, value); - onChanged(); - } else { - kpiIdBuilder_.setMessage(index, value); - } - return this; + monitoring.Monitoring.SubsIDList other = (monitoring.Monitoring.SubsIDList) obj; + + if (!getSubsListList() + .equals(other.getSubsListList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public Builder setKpiId( - int index, monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - kpiId_.set(index, builderForValue.build()); - onChanged(); - } else { - kpiIdBuilder_.setMessage(index, builderForValue.build()); - } - return this; + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getSubsListCount() > 0) { + hash = (37 * hash) + SUBS_LIST_FIELD_NUMBER; + hash = (53 * hash) + getSubsListList().hashCode(); } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public Builder addKpiId(monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiIdIsMutable(); - kpiId_.add(value); - onChanged(); - } else { - kpiIdBuilder_.addMessage(value); - } - return this; + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static monitoring.Monitoring.SubsIDList parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static monitoring.Monitoring.SubsIDList parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static monitoring.Monitoring.SubsIDList parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static monitoring.Monitoring.SubsIDList parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static monitoring.Monitoring.SubsIDList parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static monitoring.Monitoring.SubsIDList parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static monitoring.Monitoring.SubsIDList parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static monitoring.Monitoring.SubsIDList parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static monitoring.Monitoring.SubsIDList parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static monitoring.Monitoring.SubsIDList parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static monitoring.Monitoring.SubsIDList parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static monitoring.Monitoring.SubsIDList parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(monitoring.Monitoring.SubsIDList prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code monitoring.SubsIDList} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:monitoring.SubsIDList) + monitoring.Monitoring.SubsIDListOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return monitoring.Monitoring.internal_static_monitoring_SubsIDList_descriptor; } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public Builder addKpiId( - int index, monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiIdIsMutable(); - kpiId_.add(index, value); - onChanged(); - } else { - kpiIdBuilder_.addMessage(index, value); - } - return this; + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return monitoring.Monitoring.internal_static_monitoring_SubsIDList_fieldAccessorTable + .ensureFieldAccessorsInitialized( + monitoring.Monitoring.SubsIDList.class, monitoring.Monitoring.SubsIDList.Builder.class); + } + + // Construct using monitoring.Monitoring.SubsIDList.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public Builder addKpiId( - monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - kpiId_.add(builderForValue.build()); - onChanged(); - } else { - kpiIdBuilder_.addMessage(builderForValue.build()); + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getSubsListFieldBuilder(); } - return this; } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public Builder addKpiId( - int index, monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - kpiId_.add(index, builderForValue.build()); - onChanged(); + @java.lang.Override + public Builder clear() { + super.clear(); + if (subsListBuilder_ == null) { + subsList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); } else { - kpiIdBuilder_.addMessage(index, builderForValue.build()); + subsListBuilder_.clear(); } return this; } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public Builder addAllKpiId( - java.lang.Iterable values) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, kpiId_); - onChanged(); - } else { - kpiIdBuilder_.addAllMessages(values); - } - return this; + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return monitoring.Monitoring.internal_static_monitoring_SubsIDList_descriptor; } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public Builder clearKpiId() { - if (kpiIdBuilder_ == null) { - kpiId_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - } else { - kpiIdBuilder_.clear(); + + @java.lang.Override + public monitoring.Monitoring.SubsIDList getDefaultInstanceForType() { + return monitoring.Monitoring.SubsIDList.getDefaultInstance(); + } + + @java.lang.Override + public monitoring.Monitoring.SubsIDList build() { + monitoring.Monitoring.SubsIDList result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); } - return this; + return result; } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public Builder removeKpiId(int index) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - kpiId_.remove(index); - onChanged(); + + @java.lang.Override + public monitoring.Monitoring.SubsIDList buildPartial() { + monitoring.Monitoring.SubsIDList result = new monitoring.Monitoring.SubsIDList(this); + int from_bitField0_ = bitField0_; + if (subsListBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + subsList_ = java.util.Collections.unmodifiableList(subsList_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.subsList_ = subsList_; } else { - kpiIdBuilder_.remove(index); + result.subsList_ = subsListBuilder_.build(); } - return this; + onBuilt(); + return result; } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder( - int index) { - return getKpiIdFieldBuilder().getBuilder(index); + + @java.lang.Override + public Builder clone() { + return super.clone(); } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder( - int index) { - if (kpiIdBuilder_ == null) { - return kpiId_.get(index); } else { - return kpiIdBuilder_.getMessageOrBuilder(index); - } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public java.util.List - getKpiIdOrBuilderList() { - if (kpiIdBuilder_ != null) { - return kpiIdBuilder_.getMessageOrBuilderList(); + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof monitoring.Monitoring.SubsIDList) { + return mergeFrom((monitoring.Monitoring.SubsIDList)other); } else { - return java.util.Collections.unmodifiableList(kpiId_); + super.mergeFrom(other); + return this; } } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public monitoring.Monitoring.KpiId.Builder addKpiIdBuilder() { - return getKpiIdFieldBuilder().addBuilder( - monitoring.Monitoring.KpiId.getDefaultInstance()); - } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public monitoring.Monitoring.KpiId.Builder addKpiIdBuilder( - int index) { - return getKpiIdFieldBuilder().addBuilder( - index, monitoring.Monitoring.KpiId.getDefaultInstance()); + + public Builder mergeFrom(monitoring.Monitoring.SubsIDList other) { + if (other == monitoring.Monitoring.SubsIDList.getDefaultInstance()) return this; + if (subsListBuilder_ == null) { + if (!other.subsList_.isEmpty()) { + if (subsList_.isEmpty()) { + subsList_ = other.subsList_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureSubsListIsMutable(); + subsList_.addAll(other.subsList_); + } + onChanged(); + } + } else { + if (!other.subsList_.isEmpty()) { + if (subsListBuilder_.isEmpty()) { + subsListBuilder_.dispose(); + subsListBuilder_ = null; + subsList_ = other.subsList_; + bitField0_ = (bitField0_ & ~0x00000001); + subsListBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getSubsListFieldBuilder() : null; + } else { + subsListBuilder_.addAllMessages(other.subsList_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public java.util.List - getKpiIdBuilderList() { - return getKpiIdFieldBuilder().getBuilderList(); + + @java.lang.Override + public final boolean isInitialized() { + return true; } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> - getKpiIdFieldBuilder() { - if (kpiIdBuilder_ == null) { - kpiIdBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( - kpiId_, - ((bitField0_ & 0x00000001) != 0), - getParentForChildren(), - isClean()); - kpiId_ = null; + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + monitoring.Monitoring.SubsIDList parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (monitoring.Monitoring.SubsIDList) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } } - return kpiIdBuilder_; + return this; } + private int bitField0_; - private java.util.List kpiValueRange_ = + private java.util.List subsList_ = java.util.Collections.emptyList(); - private void ensureKpiValueRangeIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { - kpiValueRange_ = new java.util.ArrayList(kpiValueRange_); - bitField0_ |= 0x00000002; + private void ensureSubsListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + subsList_ = new java.util.ArrayList(subsList_); + bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiValueRange, monitoring.Monitoring.KpiValueRange.Builder, monitoring.Monitoring.KpiValueRangeOrBuilder> kpiValueRangeBuilder_; + monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> subsListBuilder_; /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public java.util.List getKpiValueRangeList() { - if (kpiValueRangeBuilder_ == null) { - return java.util.Collections.unmodifiableList(kpiValueRange_); + public java.util.List getSubsListList() { + if (subsListBuilder_ == null) { + return java.util.Collections.unmodifiableList(subsList_); } else { - return kpiValueRangeBuilder_.getMessageList(); + return subsListBuilder_.getMessageList(); } } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public int getKpiValueRangeCount() { - if (kpiValueRangeBuilder_ == null) { - return kpiValueRange_.size(); + public int getSubsListCount() { + if (subsListBuilder_ == null) { + return subsList_.size(); } else { - return kpiValueRangeBuilder_.getCount(); + return subsListBuilder_.getCount(); } } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public monitoring.Monitoring.KpiValueRange getKpiValueRange(int index) { - if (kpiValueRangeBuilder_ == null) { - return kpiValueRange_.get(index); + public monitoring.Monitoring.SubscriptionID getSubsList(int index) { + if (subsListBuilder_ == null) { + return subsList_.get(index); } else { - return kpiValueRangeBuilder_.getMessage(index); + return subsListBuilder_.getMessage(index); } } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public Builder setKpiValueRange( - int index, monitoring.Monitoring.KpiValueRange value) { - if (kpiValueRangeBuilder_ == null) { + public Builder setSubsList( + int index, monitoring.Monitoring.SubscriptionID value) { + if (subsListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureKpiValueRangeIsMutable(); - kpiValueRange_.set(index, value); + ensureSubsListIsMutable(); + subsList_.set(index, value); onChanged(); } else { - kpiValueRangeBuilder_.setMessage(index, value); + subsListBuilder_.setMessage(index, value); } return this; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public Builder setKpiValueRange( - int index, monitoring.Monitoring.KpiValueRange.Builder builderForValue) { - if (kpiValueRangeBuilder_ == null) { - ensureKpiValueRangeIsMutable(); - kpiValueRange_.set(index, builderForValue.build()); + public Builder setSubsList( + int index, monitoring.Monitoring.SubscriptionID.Builder builderForValue) { + if (subsListBuilder_ == null) { + ensureSubsListIsMutable(); + subsList_.set(index, builderForValue.build()); onChanged(); } else { - kpiValueRangeBuilder_.setMessage(index, builderForValue.build()); + subsListBuilder_.setMessage(index, builderForValue.build()); } return this; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public Builder addKpiValueRange(monitoring.Monitoring.KpiValueRange value) { - if (kpiValueRangeBuilder_ == null) { + public Builder addSubsList(monitoring.Monitoring.SubscriptionID value) { + if (subsListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureKpiValueRangeIsMutable(); - kpiValueRange_.add(value); + ensureSubsListIsMutable(); + subsList_.add(value); onChanged(); } else { - kpiValueRangeBuilder_.addMessage(value); + subsListBuilder_.addMessage(value); } return this; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public Builder addKpiValueRange( - int index, monitoring.Monitoring.KpiValueRange value) { - if (kpiValueRangeBuilder_ == null) { + public Builder addSubsList( + int index, monitoring.Monitoring.SubscriptionID value) { + if (subsListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureKpiValueRangeIsMutable(); - kpiValueRange_.add(index, value); + ensureSubsListIsMutable(); + subsList_.add(index, value); onChanged(); } else { - kpiValueRangeBuilder_.addMessage(index, value); + subsListBuilder_.addMessage(index, value); } return this; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public Builder addKpiValueRange( - monitoring.Monitoring.KpiValueRange.Builder builderForValue) { - if (kpiValueRangeBuilder_ == null) { - ensureKpiValueRangeIsMutable(); - kpiValueRange_.add(builderForValue.build()); + public Builder addSubsList( + monitoring.Monitoring.SubscriptionID.Builder builderForValue) { + if (subsListBuilder_ == null) { + ensureSubsListIsMutable(); + subsList_.add(builderForValue.build()); onChanged(); } else { - kpiValueRangeBuilder_.addMessage(builderForValue.build()); + subsListBuilder_.addMessage(builderForValue.build()); } return this; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public Builder addKpiValueRange( - int index, monitoring.Monitoring.KpiValueRange.Builder builderForValue) { - if (kpiValueRangeBuilder_ == null) { - ensureKpiValueRangeIsMutable(); - kpiValueRange_.add(index, builderForValue.build()); + public Builder addSubsList( + int index, monitoring.Monitoring.SubscriptionID.Builder builderForValue) { + if (subsListBuilder_ == null) { + ensureSubsListIsMutable(); + subsList_.add(index, builderForValue.build()); onChanged(); } else { - kpiValueRangeBuilder_.addMessage(index, builderForValue.build()); + subsListBuilder_.addMessage(index, builderForValue.build()); } return this; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public Builder addAllKpiValueRange( - java.lang.Iterable values) { - if (kpiValueRangeBuilder_ == null) { - ensureKpiValueRangeIsMutable(); + public Builder addAllSubsList( + java.lang.Iterable values) { + if (subsListBuilder_ == null) { + ensureSubsListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, kpiValueRange_); + values, subsList_); onChanged(); } else { - kpiValueRangeBuilder_.addAllMessages(values); + subsListBuilder_.addAllMessages(values); } return this; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public Builder clearKpiValueRange() { - if (kpiValueRangeBuilder_ == null) { - kpiValueRange_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + public Builder clearSubsList() { + if (subsListBuilder_ == null) { + subsList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { - kpiValueRangeBuilder_.clear(); + subsListBuilder_.clear(); } return this; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public Builder removeKpiValueRange(int index) { - if (kpiValueRangeBuilder_ == null) { - ensureKpiValueRangeIsMutable(); - kpiValueRange_.remove(index); + public Builder removeSubsList(int index) { + if (subsListBuilder_ == null) { + ensureSubsListIsMutable(); + subsList_.remove(index); onChanged(); } else { - kpiValueRangeBuilder_.remove(index); + subsListBuilder_.remove(index); } return this; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public monitoring.Monitoring.KpiValueRange.Builder getKpiValueRangeBuilder( + public monitoring.Monitoring.SubscriptionID.Builder getSubsListBuilder( int index) { - return getKpiValueRangeFieldBuilder().getBuilder(index); + return getSubsListFieldBuilder().getBuilder(index); } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public monitoring.Monitoring.KpiValueRangeOrBuilder getKpiValueRangeOrBuilder( + public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsListOrBuilder( int index) { - if (kpiValueRangeBuilder_ == null) { - return kpiValueRange_.get(index); } else { - return kpiValueRangeBuilder_.getMessageOrBuilder(index); + if (subsListBuilder_ == null) { + return subsList_.get(index); } else { + return subsListBuilder_.getMessageOrBuilder(index); } } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public java.util.List - getKpiValueRangeOrBuilderList() { - if (kpiValueRangeBuilder_ != null) { - return kpiValueRangeBuilder_.getMessageOrBuilderList(); + public java.util.List + getSubsListOrBuilderList() { + if (subsListBuilder_ != null) { + return subsListBuilder_.getMessageOrBuilderList(); } else { - return java.util.Collections.unmodifiableList(kpiValueRange_); + return java.util.Collections.unmodifiableList(subsList_); } } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public monitoring.Monitoring.KpiValueRange.Builder addKpiValueRangeBuilder() { - return getKpiValueRangeFieldBuilder().addBuilder( - monitoring.Monitoring.KpiValueRange.getDefaultInstance()); + public monitoring.Monitoring.SubscriptionID.Builder addSubsListBuilder() { + return getSubsListFieldBuilder().addBuilder( + monitoring.Monitoring.SubscriptionID.getDefaultInstance()); } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public monitoring.Monitoring.KpiValueRange.Builder addKpiValueRangeBuilder( + public monitoring.Monitoring.SubscriptionID.Builder addSubsListBuilder( int index) { - return getKpiValueRangeFieldBuilder().addBuilder( - index, monitoring.Monitoring.KpiValueRange.getDefaultInstance()); + return getSubsListFieldBuilder().addBuilder( + index, monitoring.Monitoring.SubscriptionID.getDefaultInstance()); } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public java.util.List - getKpiValueRangeBuilderList() { - return getKpiValueRangeFieldBuilder().getBuilderList(); + public java.util.List + getSubsListBuilderList() { + return getSubsListFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> + getSubsListFieldBuilder() { + if (subsListBuilder_ == null) { + subsListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder>( + subsList_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + subsList_ = null; + } + return subsListBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:monitoring.SubsIDList) + } + + // @@protoc_insertion_point(class_scope:monitoring.SubsIDList) + private static final monitoring.Monitoring.SubsIDList DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new monitoring.Monitoring.SubsIDList(); + } + + public static monitoring.Monitoring.SubsIDList getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public SubsIDList parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new SubsIDList(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public monitoring.Monitoring.SubsIDList getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface AlarmDescriptorOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.AlarmDescriptor) + com.google.protobuf.MessageOrBuilder { + + /** + * string alarm_description = 1; + * @return The alarmDescription. + */ + java.lang.String getAlarmDescription(); + /** + * string alarm_description = 1; + * @return The bytes for alarmDescription. + */ + com.google.protobuf.ByteString + getAlarmDescriptionBytes(); + + /** + * string name = 2; + * @return The name. + */ + java.lang.String getName(); + /** + * string name = 2; + * @return The bytes for name. + */ + com.google.protobuf.ByteString + getNameBytes(); + + /** + * .monitoring.KpiId kpi_id = 3; + * @return Whether the kpiId field is set. + */ + boolean hasKpiId(); + /** + * .monitoring.KpiId kpi_id = 3; + * @return The kpiId. + */ + monitoring.Monitoring.KpiId getKpiId(); + /** + * .monitoring.KpiId kpi_id = 3; + */ + monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder(); + + /** + * .monitoring.KpiValueRange kpi_value_range = 4; + * @return Whether the kpiValueRange field is set. + */ + boolean hasKpiValueRange(); + /** + * .monitoring.KpiValueRange kpi_value_range = 4; + * @return The kpiValueRange. + */ + monitoring.Monitoring.KpiValueRange getKpiValueRange(); + /** + * .monitoring.KpiValueRange kpi_value_range = 4; + */ + monitoring.Monitoring.KpiValueRangeOrBuilder getKpiValueRangeOrBuilder(); + + /** + * string timestamp = 5; + * @return The timestamp. + */ + java.lang.String getTimestamp(); + /** + * string timestamp = 5; + * @return The bytes for timestamp. + */ + com.google.protobuf.ByteString + getTimestampBytes(); + } + /** + * Protobuf type {@code monitoring.AlarmDescriptor} + */ + public static final class AlarmDescriptor extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:monitoring.AlarmDescriptor) + AlarmDescriptorOrBuilder { + private static final long serialVersionUID = 0L; + // Use AlarmDescriptor.newBuilder() to construct. + private AlarmDescriptor(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private AlarmDescriptor() { + alarmDescription_ = ""; + name_ = ""; + timestamp_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new AlarmDescriptor(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private AlarmDescriptor( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiValueRange, monitoring.Monitoring.KpiValueRange.Builder, monitoring.Monitoring.KpiValueRangeOrBuilder> - getKpiValueRangeFieldBuilder() { - if (kpiValueRangeBuilder_ == null) { - kpiValueRangeBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiValueRange, monitoring.Monitoring.KpiValueRange.Builder, monitoring.Monitoring.KpiValueRangeOrBuilder>( - kpiValueRange_, - ((bitField0_ & 0x00000002) != 0), - getParentForChildren(), - isClean()); - kpiValueRange_ = null; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + java.lang.String s = input.readStringRequireUtf8(); + + alarmDescription_ = s; + break; + } + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + + name_ = s; + break; + } + case 26: { + monitoring.Monitoring.KpiId.Builder subBuilder = null; + if (kpiId_ != null) { + subBuilder = kpiId_.toBuilder(); + } + kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(kpiId_); + kpiId_ = subBuilder.buildPartial(); + } + + break; + } + case 34: { + monitoring.Monitoring.KpiValueRange.Builder subBuilder = null; + if (kpiValueRange_ != null) { + subBuilder = kpiValueRange_.toBuilder(); + } + kpiValueRange_ = input.readMessage(monitoring.Monitoring.KpiValueRange.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(kpiValueRange_); + kpiValueRange_ = subBuilder.buildPartial(); + } + + break; + } + case 42: { + java.lang.String s = input.readStringRequireUtf8(); + + timestamp_ = s; + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } } - return kpiValueRangeBuilder_; + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_descriptor; + } - private context.ContextOuterClass.Timestamp timestamp_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> timestampBuilder_; - /** - * .context.Timestamp timestamp = 6; - * @return Whether the timestamp field is set. - */ - public boolean hasTimestamp() { - return timestampBuilder_ != null || timestamp_ != null; + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_fieldAccessorTable + .ensureFieldAccessorsInitialized( + monitoring.Monitoring.AlarmDescriptor.class, monitoring.Monitoring.AlarmDescriptor.Builder.class); + } + + public static final int ALARM_DESCRIPTION_FIELD_NUMBER = 1; + private volatile java.lang.Object alarmDescription_; + /** + * string alarm_description = 1; + * @return The alarmDescription. + */ + @java.lang.Override + public java.lang.String getAlarmDescription() { + java.lang.Object ref = alarmDescription_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + alarmDescription_ = s; + return s; } - /** - * .context.Timestamp timestamp = 6; - * @return The timestamp. - */ - public context.ContextOuterClass.Timestamp getTimestamp() { - if (timestampBuilder_ == null) { - return timestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_; - } else { - return timestampBuilder_.getMessage(); - } + } + /** + * string alarm_description = 1; + * @return The bytes for alarmDescription. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getAlarmDescriptionBytes() { + java.lang.Object ref = alarmDescription_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + alarmDescription_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; } - /** - * .context.Timestamp timestamp = 6; - */ - public Builder setTimestamp(context.ContextOuterClass.Timestamp value) { - if (timestampBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - timestamp_ = value; - onChanged(); - } else { - timestampBuilder_.setMessage(value); - } + } - return this; + public static final int NAME_FIELD_NUMBER = 2; + private volatile java.lang.Object name_; + /** + * string name = 2; + * @return The name. + */ + @java.lang.Override + public java.lang.String getName() { + java.lang.Object ref = name_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + name_ = s; + return s; } - /** - * .context.Timestamp timestamp = 6; - */ - public Builder setTimestamp( - context.ContextOuterClass.Timestamp.Builder builderForValue) { - if (timestampBuilder_ == null) { - timestamp_ = builderForValue.build(); - onChanged(); - } else { - timestampBuilder_.setMessage(builderForValue.build()); - } - - return this; + } + /** + * string name = 2; + * @return The bytes for name. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; } - /** - * .context.Timestamp timestamp = 6; - */ - public Builder mergeTimestamp(context.ContextOuterClass.Timestamp value) { - if (timestampBuilder_ == null) { - if (timestamp_ != null) { - timestamp_ = - context.ContextOuterClass.Timestamp.newBuilder(timestamp_).mergeFrom(value).buildPartial(); - } else { - timestamp_ = value; - } - onChanged(); - } else { - timestampBuilder_.mergeFrom(value); - } + } - return this; + public static final int KPI_ID_FIELD_NUMBER = 3; + private monitoring.Monitoring.KpiId kpiId_; + /** + * .monitoring.KpiId kpi_id = 3; + * @return Whether the kpiId field is set. + */ + @java.lang.Override + public boolean hasKpiId() { + return kpiId_ != null; + } + /** + * .monitoring.KpiId kpi_id = 3; + * @return The kpiId. + */ + @java.lang.Override + public monitoring.Monitoring.KpiId getKpiId() { + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + } + /** + * .monitoring.KpiId kpi_id = 3; + */ + @java.lang.Override + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { + return getKpiId(); + } + + public static final int KPI_VALUE_RANGE_FIELD_NUMBER = 4; + private monitoring.Monitoring.KpiValueRange kpiValueRange_; + /** + * .monitoring.KpiValueRange kpi_value_range = 4; + * @return Whether the kpiValueRange field is set. + */ + @java.lang.Override + public boolean hasKpiValueRange() { + return kpiValueRange_ != null; + } + /** + * .monitoring.KpiValueRange kpi_value_range = 4; + * @return The kpiValueRange. + */ + @java.lang.Override + public monitoring.Monitoring.KpiValueRange getKpiValueRange() { + return kpiValueRange_ == null ? monitoring.Monitoring.KpiValueRange.getDefaultInstance() : kpiValueRange_; + } + /** + * .monitoring.KpiValueRange kpi_value_range = 4; + */ + @java.lang.Override + public monitoring.Monitoring.KpiValueRangeOrBuilder getKpiValueRangeOrBuilder() { + return getKpiValueRange(); + } + + public static final int TIMESTAMP_FIELD_NUMBER = 5; + private volatile java.lang.Object timestamp_; + /** + * string timestamp = 5; + * @return The timestamp. + */ + @java.lang.Override + public java.lang.String getTimestamp() { + java.lang.Object ref = timestamp_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + timestamp_ = s; + return s; } - /** - * .context.Timestamp timestamp = 6; - */ - public Builder clearTimestamp() { - if (timestampBuilder_ == null) { - timestamp_ = null; - onChanged(); - } else { - timestamp_ = null; - timestampBuilder_ = null; - } + } + /** + * string timestamp = 5; + * @return The bytes for timestamp. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getTimestampBytes() { + java.lang.Object ref = timestamp_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + timestamp_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; - return this; - } - /** - * .context.Timestamp timestamp = 6; - */ - public context.ContextOuterClass.Timestamp.Builder getTimestampBuilder() { - - onChanged(); - return getTimestampFieldBuilder().getBuilder(); + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!getAlarmDescriptionBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, alarmDescription_); } - /** - * .context.Timestamp timestamp = 6; - */ - public context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder() { - if (timestampBuilder_ != null) { - return timestampBuilder_.getMessageOrBuilder(); - } else { - return timestamp_ == null ? - context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_; - } + if (!getNameBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_); } - /** - * .context.Timestamp timestamp = 6; - */ - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> - getTimestampFieldBuilder() { - if (timestampBuilder_ == null) { - timestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>( - getTimestamp(), - getParentForChildren(), - isClean()); - timestamp_ = null; - } - return timestampBuilder_; + if (kpiId_ != null) { + output.writeMessage(3, getKpiId()); } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); + if (kpiValueRange_ != null) { + output.writeMessage(4, getKpiValueRange()); } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); + if (!getTimestampBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, timestamp_); } - - - // @@protoc_insertion_point(builder_scope:monitoring.AlarmDescriptor) + unknownFields.writeTo(output); } - // @@protoc_insertion_point(class_scope:monitoring.AlarmDescriptor) - private static final monitoring.Monitoring.AlarmDescriptor DEFAULT_INSTANCE; - static { - DEFAULT_INSTANCE = new monitoring.Monitoring.AlarmDescriptor(); - } + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; - public static monitoring.Monitoring.AlarmDescriptor getDefaultInstance() { - return DEFAULT_INSTANCE; + size = 0; + if (!getAlarmDescriptionBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, alarmDescription_); + } + if (!getNameBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_); + } + if (kpiId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, getKpiId()); + } + if (kpiValueRange_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, getKpiValueRange()); + } + if (!getTimestampBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, timestamp_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public AlarmDescriptor parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new AlarmDescriptor(input, extensionRegistry); + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; } - }; + if (!(obj instanceof monitoring.Monitoring.AlarmDescriptor)) { + return super.equals(obj); + } + monitoring.Monitoring.AlarmDescriptor other = (monitoring.Monitoring.AlarmDescriptor) obj; - public static com.google.protobuf.Parser parser() { - return PARSER; + if (!getAlarmDescription() + .equals(other.getAlarmDescription())) return false; + if (!getName() + .equals(other.getName())) return false; + if (hasKpiId() != other.hasKpiId()) return false; + if (hasKpiId()) { + if (!getKpiId() + .equals(other.getKpiId())) return false; + } + if (hasKpiValueRange() != other.hasKpiValueRange()) return false; + if (hasKpiValueRange()) { + if (!getKpiValueRange() + .equals(other.getKpiValueRange())) return false; + } + if (!getTimestamp() + .equals(other.getTimestamp())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + ALARM_DESCRIPTION_FIELD_NUMBER; + hash = (53 * hash) + getAlarmDescription().hashCode(); + hash = (37 * hash) + NAME_FIELD_NUMBER; + hash = (53 * hash) + getName().hashCode(); + if (hasKpiId()) { + hash = (37 * hash) + KPI_ID_FIELD_NUMBER; + hash = (53 * hash) + getKpiId().hashCode(); + } + if (hasKpiValueRange()) { + hash = (37 * hash) + KPI_VALUE_RANGE_FIELD_NUMBER; + hash = (53 * hash) + getKpiValueRange().hashCode(); + } + hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER; + hash = (53 * hash) + getTimestamp().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; } - @java.lang.Override - public monitoring.Monitoring.AlarmDescriptor getDefaultInstanceForType() { - return DEFAULT_INSTANCE; + public static monitoring.Monitoring.AlarmDescriptor parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); } - - } - - public interface AlarmIDOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.AlarmID) - com.google.protobuf.MessageOrBuilder { - - /** - * .context.Uuid alarm_id = 1; - * @return Whether the alarmId field is set. - */ - boolean hasAlarmId(); - /** - * .context.Uuid alarm_id = 1; - * @return The alarmId. - */ - context.ContextOuterClass.Uuid getAlarmId(); - /** - * .context.Uuid alarm_id = 1; - */ - context.ContextOuterClass.UuidOrBuilder getAlarmIdOrBuilder(); - } - /** - * Protobuf type {@code monitoring.AlarmID} - */ - public static final class AlarmID extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.AlarmID) - AlarmIDOrBuilder { - private static final long serialVersionUID = 0L; - // Use AlarmID.newBuilder() to construct. - private AlarmID(com.google.protobuf.GeneratedMessageV3.Builder builder) { - super(builder); + public static monitoring.Monitoring.AlarmDescriptor parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); } - private AlarmID() { + public static monitoring.Monitoring.AlarmDescriptor parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); } - - @java.lang.Override - @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { - return new AlarmID(); + public static monitoring.Monitoring.AlarmDescriptor parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; + public static monitoring.Monitoring.AlarmDescriptor parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); } - private AlarmID( - com.google.protobuf.CodedInputStream input, + public static monitoring.Monitoring.AlarmDescriptor parseFrom( + byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - context.ContextOuterClass.Uuid.Builder subBuilder = null; - if (alarmId_ != null) { - subBuilder = alarmId_.toBuilder(); - } - alarmId_ = input.readMessage(context.ContextOuterClass.Uuid.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(alarmId_); - alarmId_ = subBuilder.buildPartial(); - } - - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } + return PARSER.parseFrom(data, extensionRegistry); + } + public static monitoring.Monitoring.AlarmDescriptor parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static monitoring.Monitoring.AlarmDescriptor parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static monitoring.Monitoring.AlarmDescriptor parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_AlarmID_descriptor; + public static monitoring.Monitoring.AlarmDescriptor parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static monitoring.Monitoring.AlarmDescriptor parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static monitoring.Monitoring.AlarmDescriptor parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_AlarmID_fieldAccessorTable - .ensureFieldAccessorsInitialized( - monitoring.Monitoring.AlarmID.class, monitoring.Monitoring.AlarmID.Builder.class); + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(monitoring.Monitoring.AlarmDescriptor prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - - public static final int ALARM_ID_FIELD_NUMBER = 1; - private context.ContextOuterClass.Uuid alarmId_; - /** - * .context.Uuid alarm_id = 1; - * @return Whether the alarmId field is set. - */ @java.lang.Override - public boolean hasAlarmId() { - return alarmId_ != null; + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } - /** - * .context.Uuid alarm_id = 1; - * @return The alarmId. - */ + @java.lang.Override - public context.ContextOuterClass.Uuid getAlarmId() { - return alarmId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : alarmId_; + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; } /** - * .context.Uuid alarm_id = 1; + * Protobuf type {@code monitoring.AlarmDescriptor} */ - @java.lang.Override - public context.ContextOuterClass.UuidOrBuilder getAlarmIdOrBuilder() { - return getAlarmId(); - } + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:monitoring.AlarmDescriptor) + monitoring.Monitoring.AlarmDescriptorOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_descriptor; + } - private byte memoizedIsInitialized = -1; - @java.lang.Override - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_fieldAccessorTable + .ensureFieldAccessorsInitialized( + monitoring.Monitoring.AlarmDescriptor.class, monitoring.Monitoring.AlarmDescriptor.Builder.class); + } - memoizedIsInitialized = 1; - return true; - } + // Construct using monitoring.Monitoring.AlarmDescriptor.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } - @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - if (alarmId_ != null) { - output.writeMessage(1, getAlarmId()); + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); } - unknownFields.writeTo(output); - } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + alarmDescription_ = ""; - @java.lang.Override - public int getSerializedSize() { - int size = memoizedSize; - if (size != -1) return size; + name_ = ""; - size = 0; - if (alarmId_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getAlarmId()); + if (kpiIdBuilder_ == null) { + kpiId_ = null; + } else { + kpiId_ = null; + kpiIdBuilder_ = null; + } + if (kpiValueRangeBuilder_ == null) { + kpiValueRange_ = null; + } else { + kpiValueRange_ = null; + kpiValueRangeBuilder_ = null; + } + timestamp_ = ""; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_descriptor; + } + + @java.lang.Override + public monitoring.Monitoring.AlarmDescriptor getDefaultInstanceForType() { + return monitoring.Monitoring.AlarmDescriptor.getDefaultInstance(); + } + + @java.lang.Override + public monitoring.Monitoring.AlarmDescriptor build() { + monitoring.Monitoring.AlarmDescriptor result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public monitoring.Monitoring.AlarmDescriptor buildPartial() { + monitoring.Monitoring.AlarmDescriptor result = new monitoring.Monitoring.AlarmDescriptor(this); + result.alarmDescription_ = alarmDescription_; + result.name_ = name_; + if (kpiIdBuilder_ == null) { + result.kpiId_ = kpiId_; + } else { + result.kpiId_ = kpiIdBuilder_.build(); + } + if (kpiValueRangeBuilder_ == null) { + result.kpiValueRange_ = kpiValueRange_; + } else { + result.kpiValueRange_ = kpiValueRangeBuilder_.build(); + } + result.timestamp_ = timestamp_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof monitoring.Monitoring.AlarmDescriptor) { + return mergeFrom((monitoring.Monitoring.AlarmDescriptor)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(monitoring.Monitoring.AlarmDescriptor other) { + if (other == monitoring.Monitoring.AlarmDescriptor.getDefaultInstance()) return this; + if (!other.getAlarmDescription().isEmpty()) { + alarmDescription_ = other.alarmDescription_; + onChanged(); + } + if (!other.getName().isEmpty()) { + name_ = other.name_; + onChanged(); + } + if (other.hasKpiId()) { + mergeKpiId(other.getKpiId()); + } + if (other.hasKpiValueRange()) { + mergeKpiValueRange(other.getKpiValueRange()); + } + if (!other.getTimestamp().isEmpty()) { + timestamp_ = other.timestamp_; + onChanged(); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + monitoring.Monitoring.AlarmDescriptor parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (monitoring.Monitoring.AlarmDescriptor) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; } - size += unknownFields.getSerializedSize(); - memoizedSize = size; - return size; - } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { - if (obj == this) { - return true; + private java.lang.Object alarmDescription_ = ""; + /** + * string alarm_description = 1; + * @return The alarmDescription. + */ + public java.lang.String getAlarmDescription() { + java.lang.Object ref = alarmDescription_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + alarmDescription_ = s; + return s; + } else { + return (java.lang.String) ref; + } } - if (!(obj instanceof monitoring.Monitoring.AlarmID)) { - return super.equals(obj); + /** + * string alarm_description = 1; + * @return The bytes for alarmDescription. + */ + public com.google.protobuf.ByteString + getAlarmDescriptionBytes() { + java.lang.Object ref = alarmDescription_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + alarmDescription_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } } - monitoring.Monitoring.AlarmID other = (monitoring.Monitoring.AlarmID) obj; - - if (hasAlarmId() != other.hasAlarmId()) return false; - if (hasAlarmId()) { - if (!getAlarmId() - .equals(other.getAlarmId())) return false; + /** + * string alarm_description = 1; + * @param value The alarmDescription to set. + * @return This builder for chaining. + */ + public Builder setAlarmDescription( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + alarmDescription_ = value; + onChanged(); + return this; } - if (!unknownFields.equals(other.unknownFields)) return false; - return true; - } - - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; + /** + * string alarm_description = 1; + * @return This builder for chaining. + */ + public Builder clearAlarmDescription() { + + alarmDescription_ = getDefaultInstance().getAlarmDescription(); + onChanged(); + return this; } - int hash = 41; - hash = (19 * hash) + getDescriptor().hashCode(); - if (hasAlarmId()) { - hash = (37 * hash) + ALARM_ID_FIELD_NUMBER; - hash = (53 * hash) + getAlarmId().hashCode(); + /** + * string alarm_description = 1; + * @param value The bytes for alarmDescription to set. + * @return This builder for chaining. + */ + public Builder setAlarmDescriptionBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + alarmDescription_ = value; + onChanged(); + return this; } - hash = (29 * hash) + unknownFields.hashCode(); - memoizedHashCode = hash; - return hash; - } - - public static monitoring.Monitoring.AlarmID parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static monitoring.Monitoring.AlarmID parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static monitoring.Monitoring.AlarmID parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static monitoring.Monitoring.AlarmID parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static monitoring.Monitoring.AlarmID parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static monitoring.Monitoring.AlarmID parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static monitoring.Monitoring.AlarmID parseFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static monitoring.Monitoring.AlarmID parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - public static monitoring.Monitoring.AlarmID parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); - } - public static monitoring.Monitoring.AlarmID parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); - } - public static monitoring.Monitoring.AlarmID parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static monitoring.Monitoring.AlarmID parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - - @java.lang.Override - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder() { - return DEFAULT_INSTANCE.toBuilder(); - } - public static Builder newBuilder(monitoring.Monitoring.AlarmID prototype) { - return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); - } - @java.lang.Override - public Builder toBuilder() { - return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); - } - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code monitoring.AlarmID} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.AlarmID) - monitoring.Monitoring.AlarmIDOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_AlarmID_descriptor; + private java.lang.Object name_ = ""; + /** + * string name = 2; + * @return The name. + */ + public java.lang.String getName() { + java.lang.Object ref = name_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + name_ = s; + return s; + } else { + return (java.lang.String) ref; + } } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_AlarmID_fieldAccessorTable - .ensureFieldAccessorsInitialized( - monitoring.Monitoring.AlarmID.class, monitoring.Monitoring.AlarmID.Builder.class); + /** + * string name = 2; + * @return The bytes for name. + */ + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string name = 2; + * @param value The name to set. + * @return This builder for chaining. + */ + public Builder setName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + name_ = value; + onChanged(); + return this; + } + /** + * string name = 2; + * @return This builder for chaining. + */ + public Builder clearName() { + + name_ = getDefaultInstance().getName(); + onChanged(); + return this; } - - // Construct using monitoring.Monitoring.AlarmID.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); + /** + * string name = 2; + * @param value The bytes for name to set. + * @return This builder for chaining. + */ + public Builder setNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + name_ = value; + onChanged(); + return this; } - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); + private monitoring.Monitoring.KpiId kpiId_; + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; + /** + * .monitoring.KpiId kpi_id = 3; + * @return Whether the kpiId field is set. + */ + public boolean hasKpiId() { + return kpiIdBuilder_ != null || kpiId_ != null; } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { + /** + * .monitoring.KpiId kpi_id = 3; + * @return The kpiId. + */ + public monitoring.Monitoring.KpiId getKpiId() { + if (kpiIdBuilder_ == null) { + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + } else { + return kpiIdBuilder_.getMessage(); } } - @java.lang.Override - public Builder clear() { - super.clear(); - if (alarmIdBuilder_ == null) { - alarmId_ = null; + /** + * .monitoring.KpiId kpi_id = 3; + */ + public Builder setKpiId(monitoring.Monitoring.KpiId value) { + if (kpiIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + kpiId_ = value; + onChanged(); } else { - alarmId_ = null; - alarmIdBuilder_ = null; + kpiIdBuilder_.setMessage(value); } - return this; - } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_AlarmID_descriptor; - } - @java.lang.Override - public monitoring.Monitoring.AlarmID getDefaultInstanceForType() { - return monitoring.Monitoring.AlarmID.getDefaultInstance(); + return this; } - - @java.lang.Override - public monitoring.Monitoring.AlarmID build() { - monitoring.Monitoring.AlarmID result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); + /** + * .monitoring.KpiId kpi_id = 3; + */ + public Builder setKpiId( + monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdBuilder_ == null) { + kpiId_ = builderForValue.build(); + onChanged(); + } else { + kpiIdBuilder_.setMessage(builderForValue.build()); } - return result; - } - @java.lang.Override - public monitoring.Monitoring.AlarmID buildPartial() { - monitoring.Monitoring.AlarmID result = new monitoring.Monitoring.AlarmID(this); - if (alarmIdBuilder_ == null) { - result.alarmId_ = alarmId_; + return this; + } + /** + * .monitoring.KpiId kpi_id = 3; + */ + public Builder mergeKpiId(monitoring.Monitoring.KpiId value) { + if (kpiIdBuilder_ == null) { + if (kpiId_ != null) { + kpiId_ = + monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial(); + } else { + kpiId_ = value; + } + onChanged(); } else { - result.alarmId_ = alarmIdBuilder_.build(); + kpiIdBuilder_.mergeFrom(value); } - onBuilt(); - return result; - } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); + return this; } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.AlarmID) { - return mergeFrom((monitoring.Monitoring.AlarmID)other); + /** + * .monitoring.KpiId kpi_id = 3; + */ + public Builder clearKpiId() { + if (kpiIdBuilder_ == null) { + kpiId_ = null; + onChanged(); } else { - super.mergeFrom(other); - return this; + kpiId_ = null; + kpiIdBuilder_ = null; } - } - public Builder mergeFrom(monitoring.Monitoring.AlarmID other) { - if (other == monitoring.Monitoring.AlarmID.getDefaultInstance()) return this; - if (other.hasAlarmId()) { - mergeAlarmId(other.getAlarmId()); - } - this.mergeUnknownFields(other.unknownFields); - onChanged(); return this; } - - @java.lang.Override - public final boolean isInitialized() { - return true; + /** + * .monitoring.KpiId kpi_id = 3; + */ + public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() { + + onChanged(); + return getKpiIdFieldBuilder().getBuilder(); } - - @java.lang.Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - monitoring.Monitoring.AlarmID parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.AlarmID) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } + /** + * .monitoring.KpiId kpi_id = 3; + */ + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { + if (kpiIdBuilder_ != null) { + return kpiIdBuilder_.getMessageOrBuilder(); + } else { + return kpiId_ == null ? + monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } - return this; + } + /** + * .monitoring.KpiId kpi_id = 3; + */ + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> + getKpiIdFieldBuilder() { + if (kpiIdBuilder_ == null) { + kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( + getKpiId(), + getParentForChildren(), + isClean()); + kpiId_ = null; + } + return kpiIdBuilder_; } - private context.ContextOuterClass.Uuid alarmId_; + private monitoring.Monitoring.KpiValueRange kpiValueRange_; private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> alarmIdBuilder_; + monitoring.Monitoring.KpiValueRange, monitoring.Monitoring.KpiValueRange.Builder, monitoring.Monitoring.KpiValueRangeOrBuilder> kpiValueRangeBuilder_; /** - * .context.Uuid alarm_id = 1; - * @return Whether the alarmId field is set. + * .monitoring.KpiValueRange kpi_value_range = 4; + * @return Whether the kpiValueRange field is set. */ - public boolean hasAlarmId() { - return alarmIdBuilder_ != null || alarmId_ != null; + public boolean hasKpiValueRange() { + return kpiValueRangeBuilder_ != null || kpiValueRange_ != null; } /** - * .context.Uuid alarm_id = 1; - * @return The alarmId. + * .monitoring.KpiValueRange kpi_value_range = 4; + * @return The kpiValueRange. */ - public context.ContextOuterClass.Uuid getAlarmId() { - if (alarmIdBuilder_ == null) { - return alarmId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : alarmId_; + public monitoring.Monitoring.KpiValueRange getKpiValueRange() { + if (kpiValueRangeBuilder_ == null) { + return kpiValueRange_ == null ? monitoring.Monitoring.KpiValueRange.getDefaultInstance() : kpiValueRange_; } else { - return alarmIdBuilder_.getMessage(); + return kpiValueRangeBuilder_.getMessage(); } } /** - * .context.Uuid alarm_id = 1; + * .monitoring.KpiValueRange kpi_value_range = 4; */ - public Builder setAlarmId(context.ContextOuterClass.Uuid value) { - if (alarmIdBuilder_ == null) { + public Builder setKpiValueRange(monitoring.Monitoring.KpiValueRange value) { + if (kpiValueRangeBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - alarmId_ = value; + kpiValueRange_ = value; onChanged(); } else { - alarmIdBuilder_.setMessage(value); + kpiValueRangeBuilder_.setMessage(value); } return this; } /** - * .context.Uuid alarm_id = 1; + * .monitoring.KpiValueRange kpi_value_range = 4; */ - public Builder setAlarmId( - context.ContextOuterClass.Uuid.Builder builderForValue) { - if (alarmIdBuilder_ == null) { - alarmId_ = builderForValue.build(); + public Builder setKpiValueRange( + monitoring.Monitoring.KpiValueRange.Builder builderForValue) { + if (kpiValueRangeBuilder_ == null) { + kpiValueRange_ = builderForValue.build(); onChanged(); } else { - alarmIdBuilder_.setMessage(builderForValue.build()); + kpiValueRangeBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .context.Uuid alarm_id = 1; + * .monitoring.KpiValueRange kpi_value_range = 4; */ - public Builder mergeAlarmId(context.ContextOuterClass.Uuid value) { - if (alarmIdBuilder_ == null) { - if (alarmId_ != null) { - alarmId_ = - context.ContextOuterClass.Uuid.newBuilder(alarmId_).mergeFrom(value).buildPartial(); + public Builder mergeKpiValueRange(monitoring.Monitoring.KpiValueRange value) { + if (kpiValueRangeBuilder_ == null) { + if (kpiValueRange_ != null) { + kpiValueRange_ = + monitoring.Monitoring.KpiValueRange.newBuilder(kpiValueRange_).mergeFrom(value).buildPartial(); } else { - alarmId_ = value; + kpiValueRange_ = value; } onChanged(); } else { - alarmIdBuilder_.mergeFrom(value); + kpiValueRangeBuilder_.mergeFrom(value); } return this; } /** - * .context.Uuid alarm_id = 1; + * .monitoring.KpiValueRange kpi_value_range = 4; */ - public Builder clearAlarmId() { - if (alarmIdBuilder_ == null) { - alarmId_ = null; + public Builder clearKpiValueRange() { + if (kpiValueRangeBuilder_ == null) { + kpiValueRange_ = null; onChanged(); } else { - alarmId_ = null; - alarmIdBuilder_ = null; + kpiValueRange_ = null; + kpiValueRangeBuilder_ = null; } return this; } /** - * .context.Uuid alarm_id = 1; + * .monitoring.KpiValueRange kpi_value_range = 4; */ - public context.ContextOuterClass.Uuid.Builder getAlarmIdBuilder() { + public monitoring.Monitoring.KpiValueRange.Builder getKpiValueRangeBuilder() { onChanged(); - return getAlarmIdFieldBuilder().getBuilder(); + return getKpiValueRangeFieldBuilder().getBuilder(); } /** - * .context.Uuid alarm_id = 1; + * .monitoring.KpiValueRange kpi_value_range = 4; */ - public context.ContextOuterClass.UuidOrBuilder getAlarmIdOrBuilder() { - if (alarmIdBuilder_ != null) { - return alarmIdBuilder_.getMessageOrBuilder(); + public monitoring.Monitoring.KpiValueRangeOrBuilder getKpiValueRangeOrBuilder() { + if (kpiValueRangeBuilder_ != null) { + return kpiValueRangeBuilder_.getMessageOrBuilder(); } else { - return alarmId_ == null ? - context.ContextOuterClass.Uuid.getDefaultInstance() : alarmId_; + return kpiValueRange_ == null ? + monitoring.Monitoring.KpiValueRange.getDefaultInstance() : kpiValueRange_; } } /** - * .context.Uuid alarm_id = 1; + * .monitoring.KpiValueRange kpi_value_range = 4; */ private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> - getAlarmIdFieldBuilder() { - if (alarmIdBuilder_ == null) { - alarmIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder>( - getAlarmId(), + monitoring.Monitoring.KpiValueRange, monitoring.Monitoring.KpiValueRange.Builder, monitoring.Monitoring.KpiValueRangeOrBuilder> + getKpiValueRangeFieldBuilder() { + if (kpiValueRangeBuilder_ == null) { + kpiValueRangeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValueRange, monitoring.Monitoring.KpiValueRange.Builder, monitoring.Monitoring.KpiValueRangeOrBuilder>( + getKpiValueRange(), getParentForChildren(), isClean()); - alarmId_ = null; + kpiValueRange_ = null; } - return alarmIdBuilder_; + return kpiValueRangeBuilder_; + } + + private java.lang.Object timestamp_ = ""; + /** + * string timestamp = 5; + * @return The timestamp. + */ + public java.lang.String getTimestamp() { + java.lang.Object ref = timestamp_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + timestamp_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string timestamp = 5; + * @return The bytes for timestamp. + */ + public com.google.protobuf.ByteString + getTimestampBytes() { + java.lang.Object ref = timestamp_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + timestamp_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string timestamp = 5; + * @param value The timestamp to set. + * @return This builder for chaining. + */ + public Builder setTimestamp( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + timestamp_ = value; + onChanged(); + return this; + } + /** + * string timestamp = 5; + * @return This builder for chaining. + */ + public Builder clearTimestamp() { + + timestamp_ = getDefaultInstance().getTimestamp(); + onChanged(); + return this; + } + /** + * string timestamp = 5; + * @param value The bytes for timestamp to set. + * @return This builder for chaining. + */ + public Builder setTimestampBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + timestamp_ = value; + onChanged(); + return this; } @java.lang.Override public final Builder setUnknownFields( @@ -16419,97 +17399,85 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.AlarmID) + // @@protoc_insertion_point(builder_scope:monitoring.AlarmDescriptor) } - // @@protoc_insertion_point(class_scope:monitoring.AlarmID) - private static final monitoring.Monitoring.AlarmID DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.AlarmDescriptor) + private static final monitoring.Monitoring.AlarmDescriptor DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.AlarmID(); + DEFAULT_INSTANCE = new monitoring.Monitoring.AlarmDescriptor(); } - public static monitoring.Monitoring.AlarmID getDefaultInstance() { + public static monitoring.Monitoring.AlarmDescriptor getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public AlarmID parsePartialFrom( + public AlarmDescriptor parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AlarmID(input, extensionRegistry); + return new AlarmDescriptor(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.AlarmID getDefaultInstanceForType() { + public monitoring.Monitoring.AlarmDescriptor getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface AlarmSubscriptionOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.AlarmSubscription) + public interface AlarmIDOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.AlarmID) com.google.protobuf.MessageOrBuilder { /** - * .monitoring.AlarmID alarmID = 1; - * @return Whether the alarmID field is set. - */ - boolean hasAlarmID(); - /** - * .monitoring.AlarmID alarmID = 1; - * @return The alarmID. - */ - monitoring.Monitoring.AlarmID getAlarmID(); - /** - * .monitoring.AlarmID alarmID = 1; + * .context.Uuid alarm_id = 1; + * @return Whether the alarmId field is set. */ - monitoring.Monitoring.AlarmIDOrBuilder getAlarmIDOrBuilder(); - + boolean hasAlarmId(); /** - * float subscription_timeout_s = 2; - * @return The subscriptionTimeoutS. + * .context.Uuid alarm_id = 1; + * @return The alarmId. */ - float getSubscriptionTimeoutS(); - + context.ContextOuterClass.Uuid getAlarmId(); /** - * float subscription_frequency_ms = 3; - * @return The subscriptionFrequencyMs. + * .context.Uuid alarm_id = 1; */ - float getSubscriptionFrequencyMs(); + context.ContextOuterClass.UuidOrBuilder getAlarmIdOrBuilder(); } /** - * Protobuf type {@code monitoring.AlarmSubscription} + * Protobuf type {@code monitoring.AlarmID} */ - public static final class AlarmSubscription extends + public static final class AlarmID extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.AlarmSubscription) - AlarmSubscriptionOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.AlarmID) + AlarmIDOrBuilder { private static final long serialVersionUID = 0L; - // Use AlarmSubscription.newBuilder() to construct. - private AlarmSubscription(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use AlarmID.newBuilder() to construct. + private AlarmID(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private AlarmSubscription() { + private AlarmID() { } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new AlarmSubscription(); + return new AlarmID(); } @java.lang.Override @@ -16517,7 +17485,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private AlarmSubscription( + private AlarmID( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -16536,28 +17504,18 @@ public final class Monitoring { done = true; break; case 10: { - monitoring.Monitoring.AlarmID.Builder subBuilder = null; - if (alarmID_ != null) { - subBuilder = alarmID_.toBuilder(); + context.ContextOuterClass.Uuid.Builder subBuilder = null; + if (alarmId_ != null) { + subBuilder = alarmId_.toBuilder(); } - alarmID_ = input.readMessage(monitoring.Monitoring.AlarmID.parser(), extensionRegistry); + alarmId_ = input.readMessage(context.ContextOuterClass.Uuid.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(alarmID_); - alarmID_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(alarmId_); + alarmId_ = subBuilder.buildPartial(); } break; } - case 21: { - - subscriptionTimeoutS_ = input.readFloat(); - break; - } - case 29: { - - subscriptionFrequencyMs_ = input.readFloat(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -16579,63 +17537,41 @@ public final class Monitoring { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_AlarmSubscription_descriptor; + return monitoring.Monitoring.internal_static_monitoring_AlarmID_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_AlarmSubscription_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_AlarmID_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.AlarmSubscription.class, monitoring.Monitoring.AlarmSubscription.Builder.class); + monitoring.Monitoring.AlarmID.class, monitoring.Monitoring.AlarmID.Builder.class); } - public static final int ALARMID_FIELD_NUMBER = 1; - private monitoring.Monitoring.AlarmID alarmID_; - /** - * .monitoring.AlarmID alarmID = 1; - * @return Whether the alarmID field is set. - */ - @java.lang.Override - public boolean hasAlarmID() { - return alarmID_ != null; - } - /** - * .monitoring.AlarmID alarmID = 1; - * @return The alarmID. - */ - @java.lang.Override - public monitoring.Monitoring.AlarmID getAlarmID() { - return alarmID_ == null ? monitoring.Monitoring.AlarmID.getDefaultInstance() : alarmID_; - } + public static final int ALARM_ID_FIELD_NUMBER = 1; + private context.ContextOuterClass.Uuid alarmId_; /** - * .monitoring.AlarmID alarmID = 1; + * .context.Uuid alarm_id = 1; + * @return Whether the alarmId field is set. */ @java.lang.Override - public monitoring.Monitoring.AlarmIDOrBuilder getAlarmIDOrBuilder() { - return getAlarmID(); + public boolean hasAlarmId() { + return alarmId_ != null; } - - public static final int SUBSCRIPTION_TIMEOUT_S_FIELD_NUMBER = 2; - private float subscriptionTimeoutS_; /** - * float subscription_timeout_s = 2; - * @return The subscriptionTimeoutS. + * .context.Uuid alarm_id = 1; + * @return The alarmId. */ @java.lang.Override - public float getSubscriptionTimeoutS() { - return subscriptionTimeoutS_; + public context.ContextOuterClass.Uuid getAlarmId() { + return alarmId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : alarmId_; } - - public static final int SUBSCRIPTION_FREQUENCY_MS_FIELD_NUMBER = 3; - private float subscriptionFrequencyMs_; /** - * float subscription_frequency_ms = 3; - * @return The subscriptionFrequencyMs. + * .context.Uuid alarm_id = 1; */ @java.lang.Override - public float getSubscriptionFrequencyMs() { - return subscriptionFrequencyMs_; + public context.ContextOuterClass.UuidOrBuilder getAlarmIdOrBuilder() { + return getAlarmId(); } private byte memoizedIsInitialized = -1; @@ -16652,14 +17588,8 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (alarmID_ != null) { - output.writeMessage(1, getAlarmID()); - } - if (subscriptionTimeoutS_ != 0F) { - output.writeFloat(2, subscriptionTimeoutS_); - } - if (subscriptionFrequencyMs_ != 0F) { - output.writeFloat(3, subscriptionFrequencyMs_); + if (alarmId_ != null) { + output.writeMessage(1, getAlarmId()); } unknownFields.writeTo(output); } @@ -16670,17 +17600,9 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (alarmID_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getAlarmID()); - } - if (subscriptionTimeoutS_ != 0F) { - size += com.google.protobuf.CodedOutputStream - .computeFloatSize(2, subscriptionTimeoutS_); - } - if (subscriptionFrequencyMs_ != 0F) { + if (alarmId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(3, subscriptionFrequencyMs_); + .computeMessageSize(1, getAlarmId()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -16692,22 +17614,16 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.AlarmSubscription)) { + if (!(obj instanceof monitoring.Monitoring.AlarmID)) { return super.equals(obj); } - monitoring.Monitoring.AlarmSubscription other = (monitoring.Monitoring.AlarmSubscription) obj; + monitoring.Monitoring.AlarmID other = (monitoring.Monitoring.AlarmID) obj; - if (hasAlarmID() != other.hasAlarmID()) return false; - if (hasAlarmID()) { - if (!getAlarmID() - .equals(other.getAlarmID())) return false; + if (hasAlarmId() != other.hasAlarmId()) return false; + if (hasAlarmId()) { + if (!getAlarmId() + .equals(other.getAlarmId())) return false; } - if (java.lang.Float.floatToIntBits(getSubscriptionTimeoutS()) - != java.lang.Float.floatToIntBits( - other.getSubscriptionTimeoutS())) return false; - if (java.lang.Float.floatToIntBits(getSubscriptionFrequencyMs()) - != java.lang.Float.floatToIntBits( - other.getSubscriptionFrequencyMs())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -16719,84 +17635,78 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasAlarmID()) { - hash = (37 * hash) + ALARMID_FIELD_NUMBER; - hash = (53 * hash) + getAlarmID().hashCode(); + if (hasAlarmId()) { + hash = (37 * hash) + ALARM_ID_FIELD_NUMBER; + hash = (53 * hash) + getAlarmId().hashCode(); } - hash = (37 * hash) + SUBSCRIPTION_TIMEOUT_S_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getSubscriptionTimeoutS()); - hash = (37 * hash) + SUBSCRIPTION_FREQUENCY_MS_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getSubscriptionFrequencyMs()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.AlarmSubscription parseFrom( + public static monitoring.Monitoring.AlarmID parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.AlarmSubscription parseFrom( + public static monitoring.Monitoring.AlarmID parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.AlarmSubscription parseFrom( + public static monitoring.Monitoring.AlarmID parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.AlarmSubscription parseFrom( + public static monitoring.Monitoring.AlarmID parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.AlarmSubscription parseFrom(byte[] data) + public static monitoring.Monitoring.AlarmID parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.AlarmSubscription parseFrom( + public static monitoring.Monitoring.AlarmID parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.AlarmSubscription parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.AlarmID parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.AlarmSubscription parseFrom( + public static monitoring.Monitoring.AlarmID parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.AlarmSubscription parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.AlarmID parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.AlarmSubscription parseDelimitedFrom( + public static monitoring.Monitoring.AlarmID parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.AlarmSubscription parseFrom( + public static monitoring.Monitoring.AlarmID parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.AlarmSubscription parseFrom( + public static monitoring.Monitoring.AlarmID parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -16809,7 +17719,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.AlarmSubscription prototype) { + public static Builder newBuilder(monitoring.Monitoring.AlarmID prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -16825,26 +17735,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.AlarmSubscription} + * Protobuf type {@code monitoring.AlarmID} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.AlarmSubscription) - monitoring.Monitoring.AlarmSubscriptionOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.AlarmID) + monitoring.Monitoring.AlarmIDOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_AlarmSubscription_descriptor; + return monitoring.Monitoring.internal_static_monitoring_AlarmID_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_AlarmSubscription_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_AlarmID_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.AlarmSubscription.class, monitoring.Monitoring.AlarmSubscription.Builder.class); + monitoring.Monitoring.AlarmID.class, monitoring.Monitoring.AlarmID.Builder.class); } - // Construct using monitoring.Monitoring.AlarmSubscription.newBuilder() + // Construct using monitoring.Monitoring.AlarmID.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -16862,33 +17772,29 @@ public final class Monitoring { @java.lang.Override public Builder clear() { super.clear(); - if (alarmIDBuilder_ == null) { - alarmID_ = null; + if (alarmIdBuilder_ == null) { + alarmId_ = null; } else { - alarmID_ = null; - alarmIDBuilder_ = null; + alarmId_ = null; + alarmIdBuilder_ = null; } - subscriptionTimeoutS_ = 0F; - - subscriptionFrequencyMs_ = 0F; - return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_AlarmSubscription_descriptor; + return monitoring.Monitoring.internal_static_monitoring_AlarmID_descriptor; } @java.lang.Override - public monitoring.Monitoring.AlarmSubscription getDefaultInstanceForType() { - return monitoring.Monitoring.AlarmSubscription.getDefaultInstance(); + public monitoring.Monitoring.AlarmID getDefaultInstanceForType() { + return monitoring.Monitoring.AlarmID.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.AlarmSubscription build() { - monitoring.Monitoring.AlarmSubscription result = buildPartial(); + public monitoring.Monitoring.AlarmID build() { + monitoring.Monitoring.AlarmID result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -16896,15 +17802,13 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.AlarmSubscription buildPartial() { - monitoring.Monitoring.AlarmSubscription result = new monitoring.Monitoring.AlarmSubscription(this); - if (alarmIDBuilder_ == null) { - result.alarmID_ = alarmID_; + public monitoring.Monitoring.AlarmID buildPartial() { + monitoring.Monitoring.AlarmID result = new monitoring.Monitoring.AlarmID(this); + if (alarmIdBuilder_ == null) { + result.alarmId_ = alarmId_; } else { - result.alarmID_ = alarmIDBuilder_.build(); + result.alarmId_ = alarmIdBuilder_.build(); } - result.subscriptionTimeoutS_ = subscriptionTimeoutS_; - result.subscriptionFrequencyMs_ = subscriptionFrequencyMs_; onBuilt(); return result; } @@ -16943,24 +17847,18 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.AlarmSubscription) { - return mergeFrom((monitoring.Monitoring.AlarmSubscription)other); + if (other instanceof monitoring.Monitoring.AlarmID) { + return mergeFrom((monitoring.Monitoring.AlarmID)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.AlarmSubscription other) { - if (other == monitoring.Monitoring.AlarmSubscription.getDefaultInstance()) return this; - if (other.hasAlarmID()) { - mergeAlarmID(other.getAlarmID()); - } - if (other.getSubscriptionTimeoutS() != 0F) { - setSubscriptionTimeoutS(other.getSubscriptionTimeoutS()); - } - if (other.getSubscriptionFrequencyMs() != 0F) { - setSubscriptionFrequencyMs(other.getSubscriptionFrequencyMs()); + public Builder mergeFrom(monitoring.Monitoring.AlarmID other) { + if (other == monitoring.Monitoring.AlarmID.getDefaultInstance()) return this; + if (other.hasAlarmId()) { + mergeAlarmId(other.getAlarmId()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -16977,11 +17875,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.AlarmSubscription parsedMessage = null; + monitoring.Monitoring.AlarmID parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.AlarmSubscription) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.AlarmID) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -16991,185 +17889,123 @@ public final class Monitoring { return this; } - private monitoring.Monitoring.AlarmID alarmID_; + private context.ContextOuterClass.Uuid alarmId_; private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.AlarmID, monitoring.Monitoring.AlarmID.Builder, monitoring.Monitoring.AlarmIDOrBuilder> alarmIDBuilder_; + context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> alarmIdBuilder_; /** - * .monitoring.AlarmID alarmID = 1; - * @return Whether the alarmID field is set. + * .context.Uuid alarm_id = 1; + * @return Whether the alarmId field is set. */ - public boolean hasAlarmID() { - return alarmIDBuilder_ != null || alarmID_ != null; + public boolean hasAlarmId() { + return alarmIdBuilder_ != null || alarmId_ != null; } /** - * .monitoring.AlarmID alarmID = 1; - * @return The alarmID. + * .context.Uuid alarm_id = 1; + * @return The alarmId. */ - public monitoring.Monitoring.AlarmID getAlarmID() { - if (alarmIDBuilder_ == null) { - return alarmID_ == null ? monitoring.Monitoring.AlarmID.getDefaultInstance() : alarmID_; + public context.ContextOuterClass.Uuid getAlarmId() { + if (alarmIdBuilder_ == null) { + return alarmId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : alarmId_; } else { - return alarmIDBuilder_.getMessage(); + return alarmIdBuilder_.getMessage(); } } /** - * .monitoring.AlarmID alarmID = 1; + * .context.Uuid alarm_id = 1; */ - public Builder setAlarmID(monitoring.Monitoring.AlarmID value) { - if (alarmIDBuilder_ == null) { + public Builder setAlarmId(context.ContextOuterClass.Uuid value) { + if (alarmIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - alarmID_ = value; + alarmId_ = value; onChanged(); } else { - alarmIDBuilder_.setMessage(value); + alarmIdBuilder_.setMessage(value); } return this; } /** - * .monitoring.AlarmID alarmID = 1; + * .context.Uuid alarm_id = 1; */ - public Builder setAlarmID( - monitoring.Monitoring.AlarmID.Builder builderForValue) { - if (alarmIDBuilder_ == null) { - alarmID_ = builderForValue.build(); + public Builder setAlarmId( + context.ContextOuterClass.Uuid.Builder builderForValue) { + if (alarmIdBuilder_ == null) { + alarmId_ = builderForValue.build(); onChanged(); } else { - alarmIDBuilder_.setMessage(builderForValue.build()); + alarmIdBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .monitoring.AlarmID alarmID = 1; + * .context.Uuid alarm_id = 1; */ - public Builder mergeAlarmID(monitoring.Monitoring.AlarmID value) { - if (alarmIDBuilder_ == null) { - if (alarmID_ != null) { - alarmID_ = - monitoring.Monitoring.AlarmID.newBuilder(alarmID_).mergeFrom(value).buildPartial(); + public Builder mergeAlarmId(context.ContextOuterClass.Uuid value) { + if (alarmIdBuilder_ == null) { + if (alarmId_ != null) { + alarmId_ = + context.ContextOuterClass.Uuid.newBuilder(alarmId_).mergeFrom(value).buildPartial(); } else { - alarmID_ = value; + alarmId_ = value; } onChanged(); } else { - alarmIDBuilder_.mergeFrom(value); + alarmIdBuilder_.mergeFrom(value); } return this; } /** - * .monitoring.AlarmID alarmID = 1; + * .context.Uuid alarm_id = 1; */ - public Builder clearAlarmID() { - if (alarmIDBuilder_ == null) { - alarmID_ = null; + public Builder clearAlarmId() { + if (alarmIdBuilder_ == null) { + alarmId_ = null; onChanged(); } else { - alarmID_ = null; - alarmIDBuilder_ = null; + alarmId_ = null; + alarmIdBuilder_ = null; } return this; } /** - * .monitoring.AlarmID alarmID = 1; + * .context.Uuid alarm_id = 1; */ - public monitoring.Monitoring.AlarmID.Builder getAlarmIDBuilder() { + public context.ContextOuterClass.Uuid.Builder getAlarmIdBuilder() { onChanged(); - return getAlarmIDFieldBuilder().getBuilder(); + return getAlarmIdFieldBuilder().getBuilder(); } /** - * .monitoring.AlarmID alarmID = 1; + * .context.Uuid alarm_id = 1; */ - public monitoring.Monitoring.AlarmIDOrBuilder getAlarmIDOrBuilder() { - if (alarmIDBuilder_ != null) { - return alarmIDBuilder_.getMessageOrBuilder(); + public context.ContextOuterClass.UuidOrBuilder getAlarmIdOrBuilder() { + if (alarmIdBuilder_ != null) { + return alarmIdBuilder_.getMessageOrBuilder(); } else { - return alarmID_ == null ? - monitoring.Monitoring.AlarmID.getDefaultInstance() : alarmID_; + return alarmId_ == null ? + context.ContextOuterClass.Uuid.getDefaultInstance() : alarmId_; } } /** - * .monitoring.AlarmID alarmID = 1; + * .context.Uuid alarm_id = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.AlarmID, monitoring.Monitoring.AlarmID.Builder, monitoring.Monitoring.AlarmIDOrBuilder> - getAlarmIDFieldBuilder() { - if (alarmIDBuilder_ == null) { - alarmIDBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.AlarmID, monitoring.Monitoring.AlarmID.Builder, monitoring.Monitoring.AlarmIDOrBuilder>( - getAlarmID(), + context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> + getAlarmIdFieldBuilder() { + if (alarmIdBuilder_ == null) { + alarmIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder>( + getAlarmId(), getParentForChildren(), isClean()); - alarmID_ = null; + alarmId_ = null; } - return alarmIDBuilder_; - } - - private float subscriptionTimeoutS_ ; - /** - * float subscription_timeout_s = 2; - * @return The subscriptionTimeoutS. - */ - @java.lang.Override - public float getSubscriptionTimeoutS() { - return subscriptionTimeoutS_; - } - /** - * float subscription_timeout_s = 2; - * @param value The subscriptionTimeoutS to set. - * @return This builder for chaining. - */ - public Builder setSubscriptionTimeoutS(float value) { - - subscriptionTimeoutS_ = value; - onChanged(); - return this; - } - /** - * float subscription_timeout_s = 2; - * @return This builder for chaining. - */ - public Builder clearSubscriptionTimeoutS() { - - subscriptionTimeoutS_ = 0F; - onChanged(); - return this; - } - - private float subscriptionFrequencyMs_ ; - /** - * float subscription_frequency_ms = 3; - * @return The subscriptionFrequencyMs. - */ - @java.lang.Override - public float getSubscriptionFrequencyMs() { - return subscriptionFrequencyMs_; - } - /** - * float subscription_frequency_ms = 3; - * @param value The subscriptionFrequencyMs to set. - * @return This builder for chaining. - */ - public Builder setSubscriptionFrequencyMs(float value) { - - subscriptionFrequencyMs_ = value; - onChanged(); - return this; - } - /** - * float subscription_frequency_ms = 3; - * @return This builder for chaining. - */ - public Builder clearSubscriptionFrequencyMs() { - - subscriptionFrequencyMs_ = 0F; - onChanged(); - return this; + return alarmIdBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -17184,41 +18020,41 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.AlarmSubscription) + // @@protoc_insertion_point(builder_scope:monitoring.AlarmID) } - // @@protoc_insertion_point(class_scope:monitoring.AlarmSubscription) - private static final monitoring.Monitoring.AlarmSubscription DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.AlarmID) + private static final monitoring.Monitoring.AlarmID DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.AlarmSubscription(); + DEFAULT_INSTANCE = new monitoring.Monitoring.AlarmID(); } - public static monitoring.Monitoring.AlarmSubscription getDefaultInstance() { + public static monitoring.Monitoring.AlarmID getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public AlarmSubscription parsePartialFrom( + public AlarmID parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AlarmSubscription(input, extensionRegistry); + return new AlarmID(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.AlarmSubscription getDefaultInstanceForType() { + public monitoring.Monitoring.AlarmID getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -17269,21 +18105,6 @@ public final class Monitoring { * .monitoring.KpiValue kpi_value = 3; */ monitoring.Monitoring.KpiValueOrBuilder getKpiValueOrBuilder(); - - /** - * .context.Timestamp timestamp = 4; - * @return Whether the timestamp field is set. - */ - boolean hasTimestamp(); - /** - * .context.Timestamp timestamp = 4; - * @return The timestamp. - */ - context.ContextOuterClass.Timestamp getTimestamp(); - /** - * .context.Timestamp timestamp = 4; - */ - context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder(); } /** * Protobuf type {@code monitoring.AlarmResponse} @@ -17363,19 +18184,6 @@ public final class Monitoring { break; } - case 34: { - context.ContextOuterClass.Timestamp.Builder subBuilder = null; - if (timestamp_ != null) { - subBuilder = timestamp_.toBuilder(); - } - timestamp_ = input.readMessage(context.ContextOuterClass.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(timestamp_); - timestamp_ = subBuilder.buildPartial(); - } - - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -17498,32 +18306,6 @@ public final class Monitoring { return getKpiValue(); } - public static final int TIMESTAMP_FIELD_NUMBER = 4; - private context.ContextOuterClass.Timestamp timestamp_; - /** - * .context.Timestamp timestamp = 4; - * @return Whether the timestamp field is set. - */ - @java.lang.Override - public boolean hasTimestamp() { - return timestamp_ != null; - } - /** - * .context.Timestamp timestamp = 4; - * @return The timestamp. - */ - @java.lang.Override - public context.ContextOuterClass.Timestamp getTimestamp() { - return timestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_; - } - /** - * .context.Timestamp timestamp = 4; - */ - @java.lang.Override - public context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder() { - return getTimestamp(); - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -17547,9 +18329,6 @@ public final class Monitoring { if (kpiValue_ != null) { output.writeMessage(3, getKpiValue()); } - if (timestamp_ != null) { - output.writeMessage(4, getTimestamp()); - } unknownFields.writeTo(output); } @@ -17570,10 +18349,6 @@ public final class Monitoring { size += com.google.protobuf.CodedOutputStream .computeMessageSize(3, getKpiValue()); } - if (timestamp_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, getTimestamp()); - } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -17601,11 +18376,6 @@ public final class Monitoring { if (!getKpiValue() .equals(other.getKpiValue())) return false; } - if (hasTimestamp() != other.hasTimestamp()) return false; - if (hasTimestamp()) { - if (!getTimestamp() - .equals(other.getTimestamp())) return false; - } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -17627,10 +18397,6 @@ public final class Monitoring { hash = (37 * hash) + KPI_VALUE_FIELD_NUMBER; hash = (53 * hash) + getKpiValue().hashCode(); } - if (hasTimestamp()) { - hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER; - hash = (53 * hash) + getTimestamp().hashCode(); - } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -17778,12 +18544,6 @@ public final class Monitoring { kpiValue_ = null; kpiValueBuilder_ = null; } - if (timestampBuilder_ == null) { - timestamp_ = null; - } else { - timestamp_ = null; - timestampBuilder_ = null; - } return this; } @@ -17821,11 +18581,6 @@ public final class Monitoring { } else { result.kpiValue_ = kpiValueBuilder_.build(); } - if (timestampBuilder_ == null) { - result.timestamp_ = timestamp_; - } else { - result.timestamp_ = timestampBuilder_.build(); - } onBuilt(); return result; } @@ -17884,9 +18639,6 @@ public final class Monitoring { if (other.hasKpiValue()) { mergeKpiValue(other.getKpiValue()); } - if (other.hasTimestamp()) { - mergeTimestamp(other.getTimestamp()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -18229,125 +18981,6 @@ public final class Monitoring { } return kpiValueBuilder_; } - - private context.ContextOuterClass.Timestamp timestamp_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> timestampBuilder_; - /** - * .context.Timestamp timestamp = 4; - * @return Whether the timestamp field is set. - */ - public boolean hasTimestamp() { - return timestampBuilder_ != null || timestamp_ != null; - } - /** - * .context.Timestamp timestamp = 4; - * @return The timestamp. - */ - public context.ContextOuterClass.Timestamp getTimestamp() { - if (timestampBuilder_ == null) { - return timestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_; - } else { - return timestampBuilder_.getMessage(); - } - } - /** - * .context.Timestamp timestamp = 4; - */ - public Builder setTimestamp(context.ContextOuterClass.Timestamp value) { - if (timestampBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - timestamp_ = value; - onChanged(); - } else { - timestampBuilder_.setMessage(value); - } - - return this; - } - /** - * .context.Timestamp timestamp = 4; - */ - public Builder setTimestamp( - context.ContextOuterClass.Timestamp.Builder builderForValue) { - if (timestampBuilder_ == null) { - timestamp_ = builderForValue.build(); - onChanged(); - } else { - timestampBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .context.Timestamp timestamp = 4; - */ - public Builder mergeTimestamp(context.ContextOuterClass.Timestamp value) { - if (timestampBuilder_ == null) { - if (timestamp_ != null) { - timestamp_ = - context.ContextOuterClass.Timestamp.newBuilder(timestamp_).mergeFrom(value).buildPartial(); - } else { - timestamp_ = value; - } - onChanged(); - } else { - timestampBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .context.Timestamp timestamp = 4; - */ - public Builder clearTimestamp() { - if (timestampBuilder_ == null) { - timestamp_ = null; - onChanged(); - } else { - timestamp_ = null; - timestampBuilder_ = null; - } - - return this; - } - /** - * .context.Timestamp timestamp = 4; - */ - public context.ContextOuterClass.Timestamp.Builder getTimestampBuilder() { - - onChanged(); - return getTimestampFieldBuilder().getBuilder(); - } - /** - * .context.Timestamp timestamp = 4; - */ - public context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder() { - if (timestampBuilder_ != null) { - return timestampBuilder_.getMessageOrBuilder(); - } else { - return timestamp_ == null ? - context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_; - } - } - /** - * .context.Timestamp timestamp = 4; - */ - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> - getTimestampFieldBuilder() { - if (timestampBuilder_ == null) { - timestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>( - getTimestamp(), - getParentForChildren(), - isClean()); - timestamp_ = null; - } - return timestampBuilder_; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -19199,6 +19832,16 @@ public final class Monitoring { private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_monitoring_KpiDescriptor_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_monitoring_BundleKpiDescriptor_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_monitoring_BundleKpiDescriptor_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_monitoring_EditedKpiDescriptor_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_monitoring_EditedKpiDescriptor_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_monitoring_MonitorKpiRequest_descriptor; private static final @@ -19269,11 +19912,6 @@ public final class Monitoring { private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_monitoring_AlarmID_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_monitoring_AlarmSubscription_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_monitoring_AlarmSubscription_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_monitoring_AlarmResponse_descriptor; private static final @@ -19294,95 +19932,97 @@ public final class Monitoring { static { java.lang.String[] descriptorData = { "\n\020monitoring.proto\022\nmonitoring\032\rcontext." + - "proto\032\026kpi_sample_types.proto\"\311\002\n\rKpiDes" + + "proto\032\026kpi_sample_types.proto\"\376\001\n\rKpiDes" + + "criptor\022\027\n\017kpi_description\030\001 \001(\t\0228\n\017kpi_" + + "sample_type\030\002 \001(\0162\037.kpi_sample_types.Kpi" + + "SampleType\022$\n\tdevice_id\030\003 \001(\0132\021.context." + + "DeviceId\022(\n\013endpoint_id\030\004 \001(\0132\023.context." + + "EndPointId\022&\n\nservice_id\030\005 \001(\0132\022.context" + + ".ServiceId\022\"\n\010slice_id\030\006 \001(\0132\020.context.S" + + "liceId\"\254\002\n\023BundleKpiDescriptor\022\027\n\017kpi_de" + + "scription\030\001 \001(\t\022&\n\013kpi_id_list\030\002 \003(\0132\021.m" + + "onitoring.KpiId\0228\n\017kpi_sample_type\030\003 \001(\016" + + "2\037.kpi_sample_types.KpiSampleType\022$\n\tdev" + + "ice_id\030\004 \001(\0132\021.context.DeviceId\022(\n\013endpo" + + "int_id\030\005 \001(\0132\023.context.EndPointId\022&\n\nser" + + "vice_id\030\006 \001(\0132\022.context.ServiceId\022\"\n\010sli" + + "ce_id\030\007 \001(\0132\020.context.SliceId\"\317\002\n\023Edited" + + "KpiDescriptor\022!\n\006kpi_id\030\001 \001(\0132\021.monitori" + + "ng.KpiId\022\027\n\017kpi_description\030\002 \001(\t\022&\n\013kpi" + + "_id_list\030\003 \003(\0132\021.monitoring.KpiId\0228\n\017kpi" + + "_sample_type\030\004 \001(\0162\037.kpi_sample_types.Kp" + + "iSampleType\022$\n\tdevice_id\030\005 \001(\0132\021.context" + + ".DeviceId\022(\n\013endpoint_id\030\006 \001(\0132\023.context" + + ".EndPointId\022&\n\nservice_id\030\007 \001(\0132\022.contex" + + "t.ServiceId\022\"\n\010slice_id\030\010 \001(\0132\020.context." + + "SliceId\"l\n\021MonitorKpiRequest\022!\n\006kpi_id\030\001" + + " \001(\0132\021.monitoring.KpiId\022\033\n\023monitoring_wi" + + "ndow_s\030\002 \001(\002\022\027\n\017sampling_rate_s\030\003 \001(\002\"\241\001" + + "\n\010KpiQuery\022!\n\006kpi_id\030\001 \003(\0132\021.monitoring." + + "KpiId\022\033\n\023monitoring_window_s\030\002 \001(\002\022\027\n\017sa" + + "mpling_rate_s\030\003 \001(\002\022\026\n\016last_n_samples\030\004 " + + "\001(\r\022\022\n\nstart_date\030\005 \001(\t\022\020\n\010end_date\030\006 \001(" + + "\t\"&\n\005KpiId\022\035\n\006kpi_id\030\001 \001(\0132\r.context.Uui" + + "d\"d\n\003Kpi\022!\n\006kpi_id\030\001 \001(\0132\021.monitoring.Kp" + + "iId\022\021\n\ttimestamp\030\002 \001(\t\022\'\n\tkpi_value\030\003 \001(" + + "\0132\024.monitoring.KpiValue\"e\n\rKpiValueRange" + + "\022)\n\013kpiMinValue\030\001 \001(\0132\024.monitoring.KpiVa" + + "lue\022)\n\013kpiMaxValue\030\002 \001(\0132\024.monitoring.Kp" + + "iValue\"a\n\010KpiValue\022\020\n\006intVal\030\001 \001(\rH\000\022\022\n\010" + + "floatVal\030\002 \001(\002H\000\022\023\n\tstringVal\030\003 \001(\tH\000\022\021\n" + + "\007boolVal\030\004 \001(\010H\000B\007\n\005value\",\n\007KpiList\022!\n\010" + + "kpi_list\030\001 \003(\0132\017.monitoring.Kpi\"K\n\021KpiDe" + + "scriptorList\0226\n\023kpi_descriptor_list\030\001 \003(" + + "\0132\031.monitoring.KpiDescriptor\"\223\001\n\016SubsDes" + "criptor\022!\n\006kpi_id\030\001 \001(\0132\021.monitoring.Kpi" + - "Id\022\027\n\017kpi_description\030\002 \001(\t\022&\n\013kpi_id_li" + - "st\030\003 \003(\0132\021.monitoring.KpiId\0228\n\017kpi_sampl" + - "e_type\030\004 \001(\0162\037.kpi_sample_types.KpiSampl" + - "eType\022$\n\tdevice_id\030\005 \001(\0132\021.context.Devic" + - "eId\022(\n\013endpoint_id\030\006 \001(\0132\023.context.EndPo" + - "intId\022&\n\nservice_id\030\007 \001(\0132\022.context.Serv" + - "iceId\022\"\n\010slice_id\030\010 \001(\0132\020.context.SliceI" + - "d\"l\n\021MonitorKpiRequest\022!\n\006kpi_id\030\001 \001(\0132\021" + - ".monitoring.KpiId\022\033\n\023monitoring_window_s" + - "\030\002 \001(\002\022\027\n\017sampling_rate_s\030\003 \001(\002\"\323\001\n\010KpiQ" + - "uery\022!\n\006kpi_id\030\001 \003(\0132\021.monitoring.KpiId\022" + - "\033\n\023monitoring_window_s\030\002 \001(\002\022\027\n\017sampling" + - "_rate_s\030\003 \001(\002\022\026\n\016last_n_samples\030\004 \001(\r\022+\n" + - "\017start_timestamp\030\005 \001(\0132\022.context.Timesta" + - "mp\022)\n\rend_timestamp\030\006 \001(\0132\022.context.Time" + - "stamp\"&\n\005KpiId\022\035\n\006kpi_id\030\001 \001(\0132\r.context" + - ".Uuid\"x\n\003Kpi\022!\n\006kpi_id\030\001 \001(\0132\021.monitorin" + - "g.KpiId\022%\n\ttimestamp\030\002 \001(\0132\022.context.Tim" + - "estamp\022\'\n\tkpi_value\030\003 \001(\0132\024.monitoring.K" + - "piValue\"\250\001\n\rKpiValueRange\022)\n\013kpiMinValue" + - "\030\001 \001(\0132\024.monitoring.KpiValue\022)\n\013kpiMaxVa" + - "lue\030\002 \001(\0132\024.monitoring.KpiValue\022\017\n\007inRan" + - "ge\030\003 \001(\010\022\027\n\017includeMinValue\030\004 \001(\010\022\027\n\017inc" + - "ludeMaxValue\030\005 \001(\010\"\241\001\n\010KpiValue\022\022\n\010int32" + - "Val\030\001 \001(\005H\000\022\023\n\tuint32Val\030\002 \001(\rH\000\022\022\n\010int6" + - "4Val\030\003 \001(\003H\000\022\023\n\tuint64Val\030\004 \001(\004H\000\022\022\n\010flo" + - "atVal\030\005 \001(\002H\000\022\023\n\tstringVal\030\006 \001(\tH\000\022\021\n\007bo" + - "olVal\030\007 \001(\010H\000B\007\n\005value\",\n\007KpiList\022!\n\010kpi" + - "_list\030\001 \003(\0132\017.monitoring.Kpi\"K\n\021KpiDescr" + - "iptorList\0226\n\023kpi_descriptor_list\030\001 \003(\0132\031" + - ".monitoring.KpiDescriptor\"\362\001\n\016SubsDescri" + - "ptor\022+\n\007subs_id\030\001 \001(\0132\032.monitoring.Subsc" + - "riptionID\022!\n\006kpi_id\030\002 \001(\0132\021.monitoring.K" + - "piId\022\033\n\023sampling_duration_s\030\003 \001(\002\022\033\n\023sam" + - "pling_interval_s\030\004 \001(\002\022+\n\017start_timestam" + - "p\030\005 \001(\0132\022.context.Timestamp\022)\n\rend_times" + - "tamp\030\006 \001(\0132\022.context.Timestamp\"0\n\016Subscr" + - "iptionID\022\036\n\007subs_id\030\001 \001(\0132\r.context.Uuid" + - "\"b\n\014SubsResponse\022+\n\007subs_id\030\001 \001(\0132\032.moni" + - "toring.SubscriptionID\022%\n\010kpi_list\030\002 \003(\0132" + - "\023.monitoring.KpiList\";\n\nSubsIDList\022-\n\tsu" + - "bs_list\030\001 \003(\0132\032.monitoring.SubscriptionI" + - "D\"\337\001\n\017AlarmDescriptor\022%\n\010alarm_id\030\001 \001(\0132" + - "\023.monitoring.AlarmID\022\031\n\021alarm_descriptio" + - "n\030\002 \001(\t\022\014\n\004name\030\003 \001(\t\022!\n\006kpi_id\030\004 \003(\0132\021." + - "monitoring.KpiId\0222\n\017kpi_value_range\030\005 \003(" + - "\0132\031.monitoring.KpiValueRange\022%\n\ttimestam" + - "p\030\006 \001(\0132\022.context.Timestamp\"*\n\007AlarmID\022\037" + - "\n\010alarm_id\030\001 \001(\0132\r.context.Uuid\"|\n\021Alarm" + - "Subscription\022$\n\007alarmID\030\001 \001(\0132\023.monitori" + - "ng.AlarmID\022\036\n\026subscription_timeout_s\030\002 \001" + - "(\002\022!\n\031subscription_frequency_ms\030\003 \001(\002\"\224\001" + - "\n\rAlarmResponse\022%\n\010alarm_id\030\001 \001(\0132\023.moni" + - "toring.AlarmID\022\014\n\004text\030\002 \001(\t\022\'\n\tkpi_valu" + - "e\030\003 \001(\0132\024.monitoring.KpiValue\022%\n\ttimesta" + - "mp\030\004 \001(\0132\022.context.Timestamp\"6\n\013AlarmIDL" + - "ist\022\'\n\nalarm_list\030\001 \003(\0132\023.monitoring.Ala" + - "rmID2\233\t\n\021MonitoringService\0228\n\006SetKpi\022\031.m" + - "onitoring.KpiDescriptor\032\021.monitoring.Kpi" + - "Id\"\000\0220\n\tDeleteKpi\022\021.monitoring.KpiId\032\016.c" + - "ontext.Empty\"\000\022B\n\020GetKpiDescriptor\022\021.mon" + - "itoring.KpiId\032\031.monitoring.KpiDescriptor" + - "\"\000\022G\n\024GetKpiDescriptorList\022\016.context.Emp" + - "ty\032\035.monitoring.KpiDescriptorList\"\000\022/\n\nI" + - "ncludeKpi\022\017.monitoring.Kpi\032\016.context.Emp" + - "ty\"\000\022=\n\nMonitorKpi\022\035.monitoring.MonitorK" + - "piRequest\032\016.context.Empty\"\000\022;\n\014QueryKpiD" + - "ata\022\024.monitoring.KpiQuery\032\023.monitoring.K" + - "piList\"\000\022I\n\022SetKpiSubscription\022\032.monitor" + - "ing.SubsDescriptor\032\023.monitoring.KpiList\"" + - "\0000\001\022M\n\021GetSubsDescriptor\022\032.monitoring.Su" + - "bscriptionID\032\032.monitoring.SubsDescriptor" + - "\"\000\022<\n\020GetSubscriptions\022\016.context.Empty\032\026" + - ".monitoring.SubsIDList\"\000\022B\n\022DeleteSubscr" + - "iption\022\032.monitoring.SubscriptionID\032\016.con" + - "text.Empty\"\000\022A\n\013SetKpiAlarm\022\033.monitoring" + - ".AlarmDescriptor\032\023.monitoring.AlarmID\"\000\022" + - "6\n\tGetAlarms\022\016.context.Empty\032\027.monitorin" + - "g.AlarmIDList\"\000\022H\n\022GetAlarmDescriptor\022\023." + - "monitoring.AlarmID\032\033.monitoring.AlarmDes" + - "criptor\"\000\022V\n\026GetAlarmResponseStream\022\035.mo" + - "nitoring.AlarmSubscription\032\031.monitoring." + - "AlarmResponse\"\0000\001\0224\n\013DeleteAlarm\022\023.monit" + - "oring.AlarmID\032\016.context.Empty\"\000\0226\n\014GetSt" + - "reamKpi\022\021.monitoring.KpiId\032\017.monitoring." + - "Kpi\"\0000\001\0229\n\rGetInstantKpi\022\021.monitoring.Kp" + - "iId\032\023.monitoring.KpiList\"\000b\006proto3" + "Id\022\033\n\023sampling_duration_s\030\002 \001(\002\022\033\n\023sampl" + + "ing_interval_s\030\003 \001(\002\022\022\n\nstart_date\030\004 \001(\t" + + "\022\020\n\010end_date\030\005 \001(\t\"0\n\016SubscriptionID\022\036\n\007" + + "subs_id\030\001 \001(\0132\r.context.Uuid\"b\n\014SubsResp" + + "onse\022+\n\007subs_id\030\001 \001(\0132\032.monitoring.Subsc" + + "riptionID\022%\n\010kpi_list\030\002 \003(\0132\023.monitoring" + + ".KpiList\";\n\nSubsIDList\022-\n\tsubs_list\030\001 \003(" + + "\0132\032.monitoring.SubscriptionID\"\244\001\n\017AlarmD" + + "escriptor\022\031\n\021alarm_description\030\001 \001(\t\022\014\n\004" + + "name\030\002 \001(\t\022!\n\006kpi_id\030\003 \001(\0132\021.monitoring." + + "KpiId\0222\n\017kpi_value_range\030\004 \001(\0132\031.monitor" + + "ing.KpiValueRange\022\021\n\ttimestamp\030\005 \001(\t\"*\n\007" + + "AlarmID\022\037\n\010alarm_id\030\001 \001(\0132\r.context.Uuid" + + "\"m\n\rAlarmResponse\022%\n\010alarm_id\030\001 \001(\0132\023.mo" + + "nitoring.AlarmID\022\014\n\004text\030\002 \001(\t\022\'\n\tkpi_va" + + "lue\030\003 \001(\0132\024.monitoring.KpiValue\"6\n\013Alarm" + + "IDList\022\'\n\nalarm_list\030\001 \003(\0132\023.monitoring." + + "AlarmID2\271\t\n\021MonitoringService\022;\n\tCreateK" + + "pi\022\031.monitoring.KpiDescriptor\032\021.monitori" + + "ng.KpiId\"\000\022F\n\021EditKpiDescriptor\022\037.monito" + + "ring.EditedKpiDescriptor\032\016.context.Empty" + + "\"\000\0220\n\tDeleteKpi\022\021.monitoring.KpiId\032\016.con" + + "text.Empty\"\000\022G\n\024GetKpiDescriptorList\022\016.c" + + "ontext.Empty\032\035.monitoring.KpiDescriptorL" + + "ist\"\000\022G\n\017CreateBundleKpi\022\037.monitoring.Bu" + + "ndleKpiDescriptor\032\021.monitoring.KpiId\"\000\022B" + + "\n\020GetKpiDescriptor\022\021.monitoring.KpiId\032\031." + + "monitoring.KpiDescriptor\"\000\022/\n\nIncludeKpi" + + "\022\017.monitoring.Kpi\032\016.context.Empty\"\000\022=\n\nM" + + "onitorKpi\022\035.monitoring.MonitorKpiRequest" + + "\032\016.context.Empty\"\000\022;\n\014QueryKpiData\022\024.mon" + + "itoring.KpiQuery\032\023.monitoring.KpiList\"\000\022" + + "C\n\014SubscribeKpi\022\032.monitoring.SubsDescrip" + + "tor\032\023.monitoring.KpiList\"\0000\001\022M\n\021GetSubsD" + + "escriptor\022\032.monitoring.SubscriptionID\032\032." + + "monitoring.SubsDescriptor\"\000\022<\n\020GetSubscr" + + "iptions\022\016.context.Empty\032\026.monitoring.Sub" + + "sIDList\"\000\022C\n\023EditKpiSubscription\022\032.monit" + + "oring.SubsDescriptor\032\016.context.Empty\"\000\022D" + + "\n\016CreateKpiAlarm\022\033.monitoring.AlarmDescr" + + "iptor\032\023.monitoring.AlarmID\"\000\022=\n\014EditKpiA" + + "larm\022\033.monitoring.AlarmDescriptor\032\016.cont" + + "ext.Empty\"\000\0226\n\tGetAlarms\022\016.context.Empty" + + "\032\027.monitoring.AlarmIDList\"\000\022H\n\022GetAlarmD" + + "escriptor\022\023.monitoring.AlarmID\032\033.monitor" + + "ing.AlarmDescriptor\"\000\022L\n\026GetAlarmRespons" + + "eStream\022\023.monitoring.AlarmID\032\031.monitorin" + + "g.AlarmResponse\"\0000\001b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -19395,105 +20035,111 @@ public final class Monitoring { internal_static_monitoring_KpiDescriptor_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_KpiDescriptor_descriptor, + new java.lang.String[] { "KpiDescription", "KpiSampleType", "DeviceId", "EndpointId", "ServiceId", "SliceId", }); + internal_static_monitoring_BundleKpiDescriptor_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_monitoring_BundleKpiDescriptor_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_monitoring_BundleKpiDescriptor_descriptor, + new java.lang.String[] { "KpiDescription", "KpiIdList", "KpiSampleType", "DeviceId", "EndpointId", "ServiceId", "SliceId", }); + internal_static_monitoring_EditedKpiDescriptor_descriptor = + getDescriptor().getMessageTypes().get(2); + internal_static_monitoring_EditedKpiDescriptor_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_monitoring_EditedKpiDescriptor_descriptor, new java.lang.String[] { "KpiId", "KpiDescription", "KpiIdList", "KpiSampleType", "DeviceId", "EndpointId", "ServiceId", "SliceId", }); internal_static_monitoring_MonitorKpiRequest_descriptor = - getDescriptor().getMessageTypes().get(1); + getDescriptor().getMessageTypes().get(3); internal_static_monitoring_MonitorKpiRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_MonitorKpiRequest_descriptor, new java.lang.String[] { "KpiId", "MonitoringWindowS", "SamplingRateS", }); internal_static_monitoring_KpiQuery_descriptor = - getDescriptor().getMessageTypes().get(2); + getDescriptor().getMessageTypes().get(4); internal_static_monitoring_KpiQuery_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_KpiQuery_descriptor, - new java.lang.String[] { "KpiId", "MonitoringWindowS", "SamplingRateS", "LastNSamples", "StartTimestamp", "EndTimestamp", }); + new java.lang.String[] { "KpiId", "MonitoringWindowS", "SamplingRateS", "LastNSamples", "StartDate", "EndDate", }); internal_static_monitoring_KpiId_descriptor = - getDescriptor().getMessageTypes().get(3); + getDescriptor().getMessageTypes().get(5); internal_static_monitoring_KpiId_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_KpiId_descriptor, new java.lang.String[] { "KpiId", }); internal_static_monitoring_Kpi_descriptor = - getDescriptor().getMessageTypes().get(4); + getDescriptor().getMessageTypes().get(6); internal_static_monitoring_Kpi_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_Kpi_descriptor, new java.lang.String[] { "KpiId", "Timestamp", "KpiValue", }); internal_static_monitoring_KpiValueRange_descriptor = - getDescriptor().getMessageTypes().get(5); + getDescriptor().getMessageTypes().get(7); internal_static_monitoring_KpiValueRange_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_KpiValueRange_descriptor, - new java.lang.String[] { "KpiMinValue", "KpiMaxValue", "InRange", "IncludeMinValue", "IncludeMaxValue", }); + new java.lang.String[] { "KpiMinValue", "KpiMaxValue", }); internal_static_monitoring_KpiValue_descriptor = - getDescriptor().getMessageTypes().get(6); + getDescriptor().getMessageTypes().get(8); internal_static_monitoring_KpiValue_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_KpiValue_descriptor, - new java.lang.String[] { "Int32Val", "Uint32Val", "Int64Val", "Uint64Val", "FloatVal", "StringVal", "BoolVal", "Value", }); + new java.lang.String[] { "IntVal", "FloatVal", "StringVal", "BoolVal", "Value", }); internal_static_monitoring_KpiList_descriptor = - getDescriptor().getMessageTypes().get(7); + getDescriptor().getMessageTypes().get(9); internal_static_monitoring_KpiList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_KpiList_descriptor, new java.lang.String[] { "KpiList", }); internal_static_monitoring_KpiDescriptorList_descriptor = - getDescriptor().getMessageTypes().get(8); + getDescriptor().getMessageTypes().get(10); internal_static_monitoring_KpiDescriptorList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_KpiDescriptorList_descriptor, new java.lang.String[] { "KpiDescriptorList", }); internal_static_monitoring_SubsDescriptor_descriptor = - getDescriptor().getMessageTypes().get(9); + getDescriptor().getMessageTypes().get(11); internal_static_monitoring_SubsDescriptor_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_SubsDescriptor_descriptor, - new java.lang.String[] { "SubsId", "KpiId", "SamplingDurationS", "SamplingIntervalS", "StartTimestamp", "EndTimestamp", }); + new java.lang.String[] { "KpiId", "SamplingDurationS", "SamplingIntervalS", "StartDate", "EndDate", }); internal_static_monitoring_SubscriptionID_descriptor = - getDescriptor().getMessageTypes().get(10); + getDescriptor().getMessageTypes().get(12); internal_static_monitoring_SubscriptionID_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_SubscriptionID_descriptor, new java.lang.String[] { "SubsId", }); internal_static_monitoring_SubsResponse_descriptor = - getDescriptor().getMessageTypes().get(11); + getDescriptor().getMessageTypes().get(13); internal_static_monitoring_SubsResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_SubsResponse_descriptor, new java.lang.String[] { "SubsId", "KpiList", }); internal_static_monitoring_SubsIDList_descriptor = - getDescriptor().getMessageTypes().get(12); + getDescriptor().getMessageTypes().get(14); internal_static_monitoring_SubsIDList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_SubsIDList_descriptor, new java.lang.String[] { "SubsList", }); internal_static_monitoring_AlarmDescriptor_descriptor = - getDescriptor().getMessageTypes().get(13); + getDescriptor().getMessageTypes().get(15); internal_static_monitoring_AlarmDescriptor_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_AlarmDescriptor_descriptor, - new java.lang.String[] { "AlarmId", "AlarmDescription", "Name", "KpiId", "KpiValueRange", "Timestamp", }); + new java.lang.String[] { "AlarmDescription", "Name", "KpiId", "KpiValueRange", "Timestamp", }); internal_static_monitoring_AlarmID_descriptor = - getDescriptor().getMessageTypes().get(14); + getDescriptor().getMessageTypes().get(16); internal_static_monitoring_AlarmID_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_AlarmID_descriptor, new java.lang.String[] { "AlarmId", }); - internal_static_monitoring_AlarmSubscription_descriptor = - getDescriptor().getMessageTypes().get(15); - internal_static_monitoring_AlarmSubscription_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_monitoring_AlarmSubscription_descriptor, - new java.lang.String[] { "AlarmID", "SubscriptionTimeoutS", "SubscriptionFrequencyMs", }); internal_static_monitoring_AlarmResponse_descriptor = - getDescriptor().getMessageTypes().get(16); + getDescriptor().getMessageTypes().get(17); internal_static_monitoring_AlarmResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_AlarmResponse_descriptor, - new java.lang.String[] { "AlarmId", "Text", "KpiValue", "Timestamp", }); + new java.lang.String[] { "AlarmId", "Text", "KpiValue", }); internal_static_monitoring_AlarmIDList_descriptor = - getDescriptor().getMessageTypes().get(17); + getDescriptor().getMessageTypes().get(18); internal_static_monitoring_AlarmIDList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_AlarmIDList_descriptor, diff --git a/src/automation/target/generated-sources/grpc/monitoring/MonitoringService.java b/src/automation/target/generated-sources/grpc/monitoring/MonitoringService.java index 637260068..f826e1167 100644 --- a/src/automation/target/generated-sources/grpc/monitoring/MonitoringService.java +++ b/src/automation/target/generated-sources/grpc/monitoring/MonitoringService.java @@ -8,14 +8,18 @@ comments = "Source: monitoring.proto") public interface MonitoringService extends MutinyService { - io.smallrye.mutiny.Uni setKpi(monitoring.Monitoring.KpiDescriptor request); + io.smallrye.mutiny.Uni createKpi(monitoring.Monitoring.KpiDescriptor request); - io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request); + io.smallrye.mutiny.Uni editKpiDescriptor(monitoring.Monitoring.EditedKpiDescriptor request); - io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request); + io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request); io.smallrye.mutiny.Uni getKpiDescriptorList(context.ContextOuterClass.Empty request); + io.smallrye.mutiny.Uni createBundleKpi(monitoring.Monitoring.BundleKpiDescriptor request); + + io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request); + io.smallrye.mutiny.Uni includeKpi(monitoring.Monitoring.Kpi request); io.smallrye.mutiny.Uni monitorKpi(monitoring.Monitoring.MonitorKpiRequest request); @@ -26,24 +30,20 @@ public interface MonitoringService extends MutinyService { io.smallrye.mutiny.Uni getSubscriptions(context.ContextOuterClass.Empty request); - io.smallrye.mutiny.Uni deleteSubscription(monitoring.Monitoring.SubscriptionID request); + io.smallrye.mutiny.Uni editKpiSubscription(monitoring.Monitoring.SubsDescriptor request); + + io.smallrye.mutiny.Uni createKpiAlarm(monitoring.Monitoring.AlarmDescriptor request); - io.smallrye.mutiny.Uni setKpiAlarm(monitoring.Monitoring.AlarmDescriptor request); + io.smallrye.mutiny.Uni editKpiAlarm(monitoring.Monitoring.AlarmDescriptor request); io.smallrye.mutiny.Uni getAlarms(context.ContextOuterClass.Empty request); io.smallrye.mutiny.Uni getAlarmDescriptor(monitoring.Monitoring.AlarmID request); - io.smallrye.mutiny.Uni deleteAlarm(monitoring.Monitoring.AlarmID request); - - io.smallrye.mutiny.Uni getInstantKpi(monitoring.Monitoring.KpiId request); - - - io.smallrye.mutiny.Multi setKpiSubscription(monitoring.Monitoring.SubsDescriptor request); - io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmSubscription request); + io.smallrye.mutiny.Multi subscribeKpi(monitoring.Monitoring.SubsDescriptor request); - io.smallrye.mutiny.Multi getStreamKpi(monitoring.Monitoring.KpiId request); + io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmID request); diff --git a/src/automation/target/generated-sources/grpc/monitoring/MonitoringServiceBean.java b/src/automation/target/generated-sources/grpc/monitoring/MonitoringServiceBean.java index 21f7f48ac..c7f776e7b 100644 --- a/src/automation/target/generated-sources/grpc/monitoring/MonitoringServiceBean.java +++ b/src/automation/target/generated-sources/grpc/monitoring/MonitoringServiceBean.java @@ -16,25 +16,25 @@ public class MonitoringServiceBean extends MutinyMonitoringServiceGrpc.Monitorin } @Override - public io.smallrye.mutiny.Uni setKpi(monitoring.Monitoring.KpiDescriptor request) { + public io.smallrye.mutiny.Uni createKpi(monitoring.Monitoring.KpiDescriptor request) { try { - return delegate.setKpi(request); + return delegate.createKpi(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request) { + public io.smallrye.mutiny.Uni editKpiDescriptor(monitoring.Monitoring.EditedKpiDescriptor request) { try { - return delegate.deleteKpi(request); + return delegate.editKpiDescriptor(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request) { + public io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request) { try { - return delegate.getKpiDescriptor(request); + return delegate.deleteKpi(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } @@ -48,116 +48,115 @@ public class MonitoringServiceBean extends MutinyMonitoringServiceGrpc.Monitorin } } @Override - public io.smallrye.mutiny.Uni includeKpi(monitoring.Monitoring.Kpi request) { + public io.smallrye.mutiny.Uni createBundleKpi(monitoring.Monitoring.BundleKpiDescriptor request) { try { - return delegate.includeKpi(request); + return delegate.createBundleKpi(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni monitorKpi(monitoring.Monitoring.MonitorKpiRequest request) { + public io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request) { try { - return delegate.monitorKpi(request); + return delegate.getKpiDescriptor(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni queryKpiData(monitoring.Monitoring.KpiQuery request) { + public io.smallrye.mutiny.Uni includeKpi(monitoring.Monitoring.Kpi request) { try { - return delegate.queryKpiData(request); + return delegate.includeKpi(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni getSubsDescriptor(monitoring.Monitoring.SubscriptionID request) { + public io.smallrye.mutiny.Uni monitorKpi(monitoring.Monitoring.MonitorKpiRequest request) { try { - return delegate.getSubsDescriptor(request); + return delegate.monitorKpi(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni getSubscriptions(context.ContextOuterClass.Empty request) { + public io.smallrye.mutiny.Uni queryKpiData(monitoring.Monitoring.KpiQuery request) { try { - return delegate.getSubscriptions(request); + return delegate.queryKpiData(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni deleteSubscription(monitoring.Monitoring.SubscriptionID request) { + public io.smallrye.mutiny.Uni getSubsDescriptor(monitoring.Monitoring.SubscriptionID request) { try { - return delegate.deleteSubscription(request); + return delegate.getSubsDescriptor(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni setKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { + public io.smallrye.mutiny.Uni getSubscriptions(context.ContextOuterClass.Empty request) { try { - return delegate.setKpiAlarm(request); + return delegate.getSubscriptions(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni getAlarms(context.ContextOuterClass.Empty request) { + public io.smallrye.mutiny.Uni editKpiSubscription(monitoring.Monitoring.SubsDescriptor request) { try { - return delegate.getAlarms(request); + return delegate.editKpiSubscription(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni getAlarmDescriptor(monitoring.Monitoring.AlarmID request) { + public io.smallrye.mutiny.Uni createKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { try { - return delegate.getAlarmDescriptor(request); + return delegate.createKpiAlarm(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni deleteAlarm(monitoring.Monitoring.AlarmID request) { + public io.smallrye.mutiny.Uni editKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { try { - return delegate.deleteAlarm(request); + return delegate.editKpiAlarm(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni getInstantKpi(monitoring.Monitoring.KpiId request) { + public io.smallrye.mutiny.Uni getAlarms(context.ContextOuterClass.Empty request) { try { - return delegate.getInstantKpi(request); + return delegate.getAlarms(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } - @Override - public io.smallrye.mutiny.Multi setKpiSubscription(monitoring.Monitoring.SubsDescriptor request) { + public io.smallrye.mutiny.Uni getAlarmDescriptor(monitoring.Monitoring.AlarmID request) { try { - return delegate.setKpiSubscription(request); + return delegate.getAlarmDescriptor(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmSubscription request) { + public io.smallrye.mutiny.Multi subscribeKpi(monitoring.Monitoring.SubsDescriptor request) { try { - return delegate.getAlarmResponseStream(request); + return delegate.subscribeKpi(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Multi getStreamKpi(monitoring.Monitoring.KpiId request) { + public io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmID request) { try { - return delegate.getStreamKpi(request); + return delegate.getAlarmResponseStream(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } diff --git a/src/automation/target/generated-sources/grpc/monitoring/MonitoringServiceClient.java b/src/automation/target/generated-sources/grpc/monitoring/MonitoringServiceClient.java index 6b6dc3864..35c98e8ff 100644 --- a/src/automation/target/generated-sources/grpc/monitoring/MonitoringServiceClient.java +++ b/src/automation/target/generated-sources/grpc/monitoring/MonitoringServiceClient.java @@ -21,22 +21,30 @@ public class MonitoringServiceClient implements MonitoringService, MutinyClient< } @Override - public io.smallrye.mutiny.Uni setKpi(monitoring.Monitoring.KpiDescriptor request) { - return stub.setKpi(request); + public io.smallrye.mutiny.Uni createKpi(monitoring.Monitoring.KpiDescriptor request) { + return stub.createKpi(request); } @Override - public io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request) { - return stub.deleteKpi(request); + public io.smallrye.mutiny.Uni editKpiDescriptor(monitoring.Monitoring.EditedKpiDescriptor request) { + return stub.editKpiDescriptor(request); } @Override - public io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request) { - return stub.getKpiDescriptor(request); + public io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request) { + return stub.deleteKpi(request); } @Override public io.smallrye.mutiny.Uni getKpiDescriptorList(context.ContextOuterClass.Empty request) { return stub.getKpiDescriptorList(request); } @Override + public io.smallrye.mutiny.Uni createBundleKpi(monitoring.Monitoring.BundleKpiDescriptor request) { + return stub.createBundleKpi(request); + } + @Override + public io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request) { + return stub.getKpiDescriptor(request); + } + @Override public io.smallrye.mutiny.Uni includeKpi(monitoring.Monitoring.Kpi request) { return stub.includeKpi(request); } @@ -57,12 +65,16 @@ public class MonitoringServiceClient implements MonitoringService, MutinyClient< return stub.getSubscriptions(request); } @Override - public io.smallrye.mutiny.Uni deleteSubscription(monitoring.Monitoring.SubscriptionID request) { - return stub.deleteSubscription(request); + public io.smallrye.mutiny.Uni editKpiSubscription(monitoring.Monitoring.SubsDescriptor request) { + return stub.editKpiSubscription(request); + } + @Override + public io.smallrye.mutiny.Uni createKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { + return stub.createKpiAlarm(request); } @Override - public io.smallrye.mutiny.Uni setKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { - return stub.setKpiAlarm(request); + public io.smallrye.mutiny.Uni editKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { + return stub.editKpiAlarm(request); } @Override public io.smallrye.mutiny.Uni getAlarms(context.ContextOuterClass.Empty request) { @@ -72,28 +84,15 @@ public class MonitoringServiceClient implements MonitoringService, MutinyClient< public io.smallrye.mutiny.Uni getAlarmDescriptor(monitoring.Monitoring.AlarmID request) { return stub.getAlarmDescriptor(request); } - @Override - public io.smallrye.mutiny.Uni deleteAlarm(monitoring.Monitoring.AlarmID request) { - return stub.deleteAlarm(request); - } - @Override - public io.smallrye.mutiny.Uni getInstantKpi(monitoring.Monitoring.KpiId request) { - return stub.getInstantKpi(request); - } @Override - public io.smallrye.mutiny.Multi setKpiSubscription(monitoring.Monitoring.SubsDescriptor request) { - return stub.setKpiSubscription(request); + public io.smallrye.mutiny.Multi subscribeKpi(monitoring.Monitoring.SubsDescriptor request) { + return stub.subscribeKpi(request); } @Override - public io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmSubscription request) { + public io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmID request) { return stub.getAlarmResponseStream(request); } - @Override - public io.smallrye.mutiny.Multi getStreamKpi(monitoring.Monitoring.KpiId request) { - return stub.getStreamKpi(request); - } - } \ No newline at end of file diff --git a/src/automation/target/generated-sources/grpc/monitoring/MonitoringServiceGrpc.java b/src/automation/target/generated-sources/grpc/monitoring/MonitoringServiceGrpc.java index fe92a7814..d4ae3510a 100644 --- a/src/automation/target/generated-sources/grpc/monitoring/MonitoringServiceGrpc.java +++ b/src/automation/target/generated-sources/grpc/monitoring/MonitoringServiceGrpc.java @@ -15,96 +15,96 @@ public final class MonitoringServiceGrpc { // Static method descriptors that strictly reflect the proto. private static volatile io.grpc.MethodDescriptor getSetKpiMethod; + monitoring.Monitoring.KpiId> getCreateKpiMethod; @io.grpc.stub.annotations.RpcMethod( - fullMethodName = SERVICE_NAME + '/' + "SetKpi", + fullMethodName = SERVICE_NAME + '/' + "CreateKpi", requestType = monitoring.Monitoring.KpiDescriptor.class, responseType = monitoring.Monitoring.KpiId.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor getSetKpiMethod() { - io.grpc.MethodDescriptor getSetKpiMethod; - if ((getSetKpiMethod = MonitoringServiceGrpc.getSetKpiMethod) == null) { + monitoring.Monitoring.KpiId> getCreateKpiMethod() { + io.grpc.MethodDescriptor getCreateKpiMethod; + if ((getCreateKpiMethod = MonitoringServiceGrpc.getCreateKpiMethod) == null) { synchronized (MonitoringServiceGrpc.class) { - if ((getSetKpiMethod = MonitoringServiceGrpc.getSetKpiMethod) == null) { - MonitoringServiceGrpc.getSetKpiMethod = getSetKpiMethod = + if ((getCreateKpiMethod = MonitoringServiceGrpc.getCreateKpiMethod) == null) { + MonitoringServiceGrpc.getCreateKpiMethod = getCreateKpiMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName(SERVICE_NAME, "SetKpi")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CreateKpi")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( monitoring.Monitoring.KpiDescriptor.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( monitoring.Monitoring.KpiId.getDefaultInstance())) - .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("SetKpi")) + .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("CreateKpi")) .build(); } } } - return getSetKpiMethod; + return getCreateKpiMethod; } - private static volatile io.grpc.MethodDescriptor getDeleteKpiMethod; + private static volatile io.grpc.MethodDescriptor getEditKpiDescriptorMethod; @io.grpc.stub.annotations.RpcMethod( - fullMethodName = SERVICE_NAME + '/' + "DeleteKpi", - requestType = monitoring.Monitoring.KpiId.class, + fullMethodName = SERVICE_NAME + '/' + "EditKpiDescriptor", + requestType = monitoring.Monitoring.EditedKpiDescriptor.class, responseType = context.ContextOuterClass.Empty.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getDeleteKpiMethod() { - io.grpc.MethodDescriptor getDeleteKpiMethod; - if ((getDeleteKpiMethod = MonitoringServiceGrpc.getDeleteKpiMethod) == null) { + public static io.grpc.MethodDescriptor getEditKpiDescriptorMethod() { + io.grpc.MethodDescriptor getEditKpiDescriptorMethod; + if ((getEditKpiDescriptorMethod = MonitoringServiceGrpc.getEditKpiDescriptorMethod) == null) { synchronized (MonitoringServiceGrpc.class) { - if ((getDeleteKpiMethod = MonitoringServiceGrpc.getDeleteKpiMethod) == null) { - MonitoringServiceGrpc.getDeleteKpiMethod = getDeleteKpiMethod = - io.grpc.MethodDescriptor.newBuilder() + if ((getEditKpiDescriptorMethod = MonitoringServiceGrpc.getEditKpiDescriptorMethod) == null) { + MonitoringServiceGrpc.getEditKpiDescriptorMethod = getEditKpiDescriptorMethod = + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName(SERVICE_NAME, "DeleteKpi")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "EditKpiDescriptor")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - monitoring.Monitoring.KpiId.getDefaultInstance())) + monitoring.Monitoring.EditedKpiDescriptor.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( context.ContextOuterClass.Empty.getDefaultInstance())) - .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("DeleteKpi")) + .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("EditKpiDescriptor")) .build(); } } } - return getDeleteKpiMethod; + return getEditKpiDescriptorMethod; } private static volatile io.grpc.MethodDescriptor getGetKpiDescriptorMethod; + context.ContextOuterClass.Empty> getDeleteKpiMethod; @io.grpc.stub.annotations.RpcMethod( - fullMethodName = SERVICE_NAME + '/' + "GetKpiDescriptor", + fullMethodName = SERVICE_NAME + '/' + "DeleteKpi", requestType = monitoring.Monitoring.KpiId.class, - responseType = monitoring.Monitoring.KpiDescriptor.class, + responseType = context.ContextOuterClass.Empty.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor getGetKpiDescriptorMethod() { - io.grpc.MethodDescriptor getGetKpiDescriptorMethod; - if ((getGetKpiDescriptorMethod = MonitoringServiceGrpc.getGetKpiDescriptorMethod) == null) { + context.ContextOuterClass.Empty> getDeleteKpiMethod() { + io.grpc.MethodDescriptor getDeleteKpiMethod; + if ((getDeleteKpiMethod = MonitoringServiceGrpc.getDeleteKpiMethod) == null) { synchronized (MonitoringServiceGrpc.class) { - if ((getGetKpiDescriptorMethod = MonitoringServiceGrpc.getGetKpiDescriptorMethod) == null) { - MonitoringServiceGrpc.getGetKpiDescriptorMethod = getGetKpiDescriptorMethod = - io.grpc.MethodDescriptor.newBuilder() + if ((getDeleteKpiMethod = MonitoringServiceGrpc.getDeleteKpiMethod) == null) { + MonitoringServiceGrpc.getDeleteKpiMethod = getDeleteKpiMethod = + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetKpiDescriptor")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "DeleteKpi")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( monitoring.Monitoring.KpiId.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - monitoring.Monitoring.KpiDescriptor.getDefaultInstance())) - .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("GetKpiDescriptor")) + context.ContextOuterClass.Empty.getDefaultInstance())) + .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("DeleteKpi")) .build(); } } } - return getGetKpiDescriptorMethod; + return getDeleteKpiMethod; } private static volatile io.grpc.MethodDescriptor getCreateBundleKpiMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "CreateBundleKpi", + requestType = monitoring.Monitoring.BundleKpiDescriptor.class, + responseType = monitoring.Monitoring.KpiId.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor getCreateBundleKpiMethod() { + io.grpc.MethodDescriptor getCreateBundleKpiMethod; + if ((getCreateBundleKpiMethod = MonitoringServiceGrpc.getCreateBundleKpiMethod) == null) { + synchronized (MonitoringServiceGrpc.class) { + if ((getCreateBundleKpiMethod = MonitoringServiceGrpc.getCreateBundleKpiMethod) == null) { + MonitoringServiceGrpc.getCreateBundleKpiMethod = getCreateBundleKpiMethod = + io.grpc.MethodDescriptor.newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CreateBundleKpi")) + .setSampledToLocalTracing(true) + .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + monitoring.Monitoring.BundleKpiDescriptor.getDefaultInstance())) + .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + monitoring.Monitoring.KpiId.getDefaultInstance())) + .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("CreateBundleKpi")) + .build(); + } + } + } + return getCreateBundleKpiMethod; + } + + private static volatile io.grpc.MethodDescriptor getGetKpiDescriptorMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "GetKpiDescriptor", + requestType = monitoring.Monitoring.KpiId.class, + responseType = monitoring.Monitoring.KpiDescriptor.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor getGetKpiDescriptorMethod() { + io.grpc.MethodDescriptor getGetKpiDescriptorMethod; + if ((getGetKpiDescriptorMethod = MonitoringServiceGrpc.getGetKpiDescriptorMethod) == null) { + synchronized (MonitoringServiceGrpc.class) { + if ((getGetKpiDescriptorMethod = MonitoringServiceGrpc.getGetKpiDescriptorMethod) == null) { + MonitoringServiceGrpc.getGetKpiDescriptorMethod = getGetKpiDescriptorMethod = + io.grpc.MethodDescriptor.newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetKpiDescriptor")) + .setSampledToLocalTracing(true) + .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + monitoring.Monitoring.KpiId.getDefaultInstance())) + .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + monitoring.Monitoring.KpiDescriptor.getDefaultInstance())) + .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("GetKpiDescriptor")) + .build(); + } + } + } + return getGetKpiDescriptorMethod; + } + private static volatile io.grpc.MethodDescriptor getIncludeKpiMethod; @@ -232,34 +294,34 @@ public final class MonitoringServiceGrpc { } private static volatile io.grpc.MethodDescriptor getSetKpiSubscriptionMethod; + monitoring.Monitoring.KpiList> getSubscribeKpiMethod; @io.grpc.stub.annotations.RpcMethod( - fullMethodName = SERVICE_NAME + '/' + "SetKpiSubscription", + fullMethodName = SERVICE_NAME + '/' + "SubscribeKpi", requestType = monitoring.Monitoring.SubsDescriptor.class, responseType = monitoring.Monitoring.KpiList.class, methodType = io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) public static io.grpc.MethodDescriptor getSetKpiSubscriptionMethod() { - io.grpc.MethodDescriptor getSetKpiSubscriptionMethod; - if ((getSetKpiSubscriptionMethod = MonitoringServiceGrpc.getSetKpiSubscriptionMethod) == null) { + monitoring.Monitoring.KpiList> getSubscribeKpiMethod() { + io.grpc.MethodDescriptor getSubscribeKpiMethod; + if ((getSubscribeKpiMethod = MonitoringServiceGrpc.getSubscribeKpiMethod) == null) { synchronized (MonitoringServiceGrpc.class) { - if ((getSetKpiSubscriptionMethod = MonitoringServiceGrpc.getSetKpiSubscriptionMethod) == null) { - MonitoringServiceGrpc.getSetKpiSubscriptionMethod = getSetKpiSubscriptionMethod = + if ((getSubscribeKpiMethod = MonitoringServiceGrpc.getSubscribeKpiMethod) == null) { + MonitoringServiceGrpc.getSubscribeKpiMethod = getSubscribeKpiMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) - .setFullMethodName(generateFullMethodName(SERVICE_NAME, "SetKpiSubscription")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "SubscribeKpi")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( monitoring.Monitoring.SubsDescriptor.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( monitoring.Monitoring.KpiList.getDefaultInstance())) - .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("SetKpiSubscription")) + .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("SubscribeKpi")) .build(); } } } - return getSetKpiSubscriptionMethod; + return getSubscribeKpiMethod; } private static volatile io.grpc.MethodDescriptor getDeleteSubscriptionMethod; + private static volatile io.grpc.MethodDescriptor getEditKpiSubscriptionMethod; @io.grpc.stub.annotations.RpcMethod( - fullMethodName = SERVICE_NAME + '/' + "DeleteSubscription", - requestType = monitoring.Monitoring.SubscriptionID.class, + fullMethodName = SERVICE_NAME + '/' + "EditKpiSubscription", + requestType = monitoring.Monitoring.SubsDescriptor.class, responseType = context.ContextOuterClass.Empty.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getDeleteSubscriptionMethod() { - io.grpc.MethodDescriptor getDeleteSubscriptionMethod; - if ((getDeleteSubscriptionMethod = MonitoringServiceGrpc.getDeleteSubscriptionMethod) == null) { + public static io.grpc.MethodDescriptor getEditKpiSubscriptionMethod() { + io.grpc.MethodDescriptor getEditKpiSubscriptionMethod; + if ((getEditKpiSubscriptionMethod = MonitoringServiceGrpc.getEditKpiSubscriptionMethod) == null) { synchronized (MonitoringServiceGrpc.class) { - if ((getDeleteSubscriptionMethod = MonitoringServiceGrpc.getDeleteSubscriptionMethod) == null) { - MonitoringServiceGrpc.getDeleteSubscriptionMethod = getDeleteSubscriptionMethod = - io.grpc.MethodDescriptor.newBuilder() + if ((getEditKpiSubscriptionMethod = MonitoringServiceGrpc.getEditKpiSubscriptionMethod) == null) { + MonitoringServiceGrpc.getEditKpiSubscriptionMethod = getEditKpiSubscriptionMethod = + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName(SERVICE_NAME, "DeleteSubscription")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "EditKpiSubscription")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - monitoring.Monitoring.SubscriptionID.getDefaultInstance())) + monitoring.Monitoring.SubsDescriptor.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( context.ContextOuterClass.Empty.getDefaultInstance())) - .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("DeleteSubscription")) + .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("EditKpiSubscription")) .build(); } } } - return getDeleteSubscriptionMethod; + return getEditKpiSubscriptionMethod; } private static volatile io.grpc.MethodDescriptor getSetKpiAlarmMethod; + monitoring.Monitoring.AlarmID> getCreateKpiAlarmMethod; @io.grpc.stub.annotations.RpcMethod( - fullMethodName = SERVICE_NAME + '/' + "SetKpiAlarm", + fullMethodName = SERVICE_NAME + '/' + "CreateKpiAlarm", requestType = monitoring.Monitoring.AlarmDescriptor.class, responseType = monitoring.Monitoring.AlarmID.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor getSetKpiAlarmMethod() { - io.grpc.MethodDescriptor getSetKpiAlarmMethod; - if ((getSetKpiAlarmMethod = MonitoringServiceGrpc.getSetKpiAlarmMethod) == null) { + monitoring.Monitoring.AlarmID> getCreateKpiAlarmMethod() { + io.grpc.MethodDescriptor getCreateKpiAlarmMethod; + if ((getCreateKpiAlarmMethod = MonitoringServiceGrpc.getCreateKpiAlarmMethod) == null) { synchronized (MonitoringServiceGrpc.class) { - if ((getSetKpiAlarmMethod = MonitoringServiceGrpc.getSetKpiAlarmMethod) == null) { - MonitoringServiceGrpc.getSetKpiAlarmMethod = getSetKpiAlarmMethod = + if ((getCreateKpiAlarmMethod = MonitoringServiceGrpc.getCreateKpiAlarmMethod) == null) { + MonitoringServiceGrpc.getCreateKpiAlarmMethod = getCreateKpiAlarmMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName(SERVICE_NAME, "SetKpiAlarm")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CreateKpiAlarm")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( monitoring.Monitoring.AlarmDescriptor.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( monitoring.Monitoring.AlarmID.getDefaultInstance())) - .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("SetKpiAlarm")) + .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("CreateKpiAlarm")) .build(); } } } - return getSetKpiAlarmMethod; + return getCreateKpiAlarmMethod; + } + + private static volatile io.grpc.MethodDescriptor getEditKpiAlarmMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "EditKpiAlarm", + requestType = monitoring.Monitoring.AlarmDescriptor.class, + responseType = context.ContextOuterClass.Empty.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor getEditKpiAlarmMethod() { + io.grpc.MethodDescriptor getEditKpiAlarmMethod; + if ((getEditKpiAlarmMethod = MonitoringServiceGrpc.getEditKpiAlarmMethod) == null) { + synchronized (MonitoringServiceGrpc.class) { + if ((getEditKpiAlarmMethod = MonitoringServiceGrpc.getEditKpiAlarmMethod) == null) { + MonitoringServiceGrpc.getEditKpiAlarmMethod = getEditKpiAlarmMethod = + io.grpc.MethodDescriptor.newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "EditKpiAlarm")) + .setSampledToLocalTracing(true) + .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + monitoring.Monitoring.AlarmDescriptor.getDefaultInstance())) + .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + context.ContextOuterClass.Empty.getDefaultInstance())) + .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("EditKpiAlarm")) + .build(); + } + } + } + return getEditKpiAlarmMethod; } private static volatile io.grpc.MethodDescriptor getGetAlarmResponseStreamMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "GetAlarmResponseStream", - requestType = monitoring.Monitoring.AlarmSubscription.class, + requestType = monitoring.Monitoring.AlarmID.class, responseType = monitoring.Monitoring.AlarmResponse.class, methodType = io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) - public static io.grpc.MethodDescriptor getGetAlarmResponseStreamMethod() { - io.grpc.MethodDescriptor getGetAlarmResponseStreamMethod; + io.grpc.MethodDescriptor getGetAlarmResponseStreamMethod; if ((getGetAlarmResponseStreamMethod = MonitoringServiceGrpc.getGetAlarmResponseStreamMethod) == null) { synchronized (MonitoringServiceGrpc.class) { if ((getGetAlarmResponseStreamMethod = MonitoringServiceGrpc.getGetAlarmResponseStreamMethod) == null) { MonitoringServiceGrpc.getGetAlarmResponseStreamMethod = getGetAlarmResponseStreamMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetAlarmResponseStream")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - monitoring.Monitoring.AlarmSubscription.getDefaultInstance())) + monitoring.Monitoring.AlarmID.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( monitoring.Monitoring.AlarmResponse.getDefaultInstance())) .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("GetAlarmResponseStream")) @@ -479,99 +572,6 @@ public final class MonitoringServiceGrpc { return getGetAlarmResponseStreamMethod; } - private static volatile io.grpc.MethodDescriptor getDeleteAlarmMethod; - - @io.grpc.stub.annotations.RpcMethod( - fullMethodName = SERVICE_NAME + '/' + "DeleteAlarm", - requestType = monitoring.Monitoring.AlarmID.class, - responseType = context.ContextOuterClass.Empty.class, - methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getDeleteAlarmMethod() { - io.grpc.MethodDescriptor getDeleteAlarmMethod; - if ((getDeleteAlarmMethod = MonitoringServiceGrpc.getDeleteAlarmMethod) == null) { - synchronized (MonitoringServiceGrpc.class) { - if ((getDeleteAlarmMethod = MonitoringServiceGrpc.getDeleteAlarmMethod) == null) { - MonitoringServiceGrpc.getDeleteAlarmMethod = getDeleteAlarmMethod = - io.grpc.MethodDescriptor.newBuilder() - .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName(SERVICE_NAME, "DeleteAlarm")) - .setSampledToLocalTracing(true) - .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - monitoring.Monitoring.AlarmID.getDefaultInstance())) - .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - context.ContextOuterClass.Empty.getDefaultInstance())) - .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("DeleteAlarm")) - .build(); - } - } - } - return getDeleteAlarmMethod; - } - - private static volatile io.grpc.MethodDescriptor getGetStreamKpiMethod; - - @io.grpc.stub.annotations.RpcMethod( - fullMethodName = SERVICE_NAME + '/' + "GetStreamKpi", - requestType = monitoring.Monitoring.KpiId.class, - responseType = monitoring.Monitoring.Kpi.class, - methodType = io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) - public static io.grpc.MethodDescriptor getGetStreamKpiMethod() { - io.grpc.MethodDescriptor getGetStreamKpiMethod; - if ((getGetStreamKpiMethod = MonitoringServiceGrpc.getGetStreamKpiMethod) == null) { - synchronized (MonitoringServiceGrpc.class) { - if ((getGetStreamKpiMethod = MonitoringServiceGrpc.getGetStreamKpiMethod) == null) { - MonitoringServiceGrpc.getGetStreamKpiMethod = getGetStreamKpiMethod = - io.grpc.MethodDescriptor.newBuilder() - .setType(io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) - .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetStreamKpi")) - .setSampledToLocalTracing(true) - .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - monitoring.Monitoring.KpiId.getDefaultInstance())) - .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - monitoring.Monitoring.Kpi.getDefaultInstance())) - .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("GetStreamKpi")) - .build(); - } - } - } - return getGetStreamKpiMethod; - } - - private static volatile io.grpc.MethodDescriptor getGetInstantKpiMethod; - - @io.grpc.stub.annotations.RpcMethod( - fullMethodName = SERVICE_NAME + '/' + "GetInstantKpi", - requestType = monitoring.Monitoring.KpiId.class, - responseType = monitoring.Monitoring.KpiList.class, - methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getGetInstantKpiMethod() { - io.grpc.MethodDescriptor getGetInstantKpiMethod; - if ((getGetInstantKpiMethod = MonitoringServiceGrpc.getGetInstantKpiMethod) == null) { - synchronized (MonitoringServiceGrpc.class) { - if ((getGetInstantKpiMethod = MonitoringServiceGrpc.getGetInstantKpiMethod) == null) { - MonitoringServiceGrpc.getGetInstantKpiMethod = getGetInstantKpiMethod = - io.grpc.MethodDescriptor.newBuilder() - .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetInstantKpi")) - .setSampledToLocalTracing(true) - .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - monitoring.Monitoring.KpiId.getDefaultInstance())) - .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - monitoring.Monitoring.KpiList.getDefaultInstance())) - .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("GetInstantKpi")) - .build(); - } - } - } - return getGetInstantKpiMethod; - } - /** * Creates a new async stub that supports all call types for the service */ @@ -622,23 +622,23 @@ public final class MonitoringServiceGrpc { /** */ - public void setKpi(monitoring.Monitoring.KpiDescriptor request, + public void createKpi(monitoring.Monitoring.KpiDescriptor request, io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSetKpiMethod(), responseObserver); + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCreateKpiMethod(), responseObserver); } /** */ - public void deleteKpi(monitoring.Monitoring.KpiId request, + public void editKpiDescriptor(monitoring.Monitoring.EditedKpiDescriptor request, io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getDeleteKpiMethod(), responseObserver); + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getEditKpiDescriptorMethod(), responseObserver); } /** */ - public void getKpiDescriptor(monitoring.Monitoring.KpiId request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetKpiDescriptorMethod(), responseObserver); + public void deleteKpi(monitoring.Monitoring.KpiId request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getDeleteKpiMethod(), responseObserver); } /** @@ -648,6 +648,20 @@ public final class MonitoringServiceGrpc { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetKpiDescriptorListMethod(), responseObserver); } + /** + */ + public void createBundleKpi(monitoring.Monitoring.BundleKpiDescriptor request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCreateBundleKpiMethod(), responseObserver); + } + + /** + */ + public void getKpiDescriptor(monitoring.Monitoring.KpiId request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetKpiDescriptorMethod(), responseObserver); + } + /** */ public void includeKpi(monitoring.Monitoring.Kpi request, @@ -671,9 +685,9 @@ public final class MonitoringServiceGrpc { /** */ - public void setKpiSubscription(monitoring.Monitoring.SubsDescriptor request, + public void subscribeKpi(monitoring.Monitoring.SubsDescriptor request, io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSetKpiSubscriptionMethod(), responseObserver); + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSubscribeKpiMethod(), responseObserver); } /** @@ -692,16 +706,23 @@ public final class MonitoringServiceGrpc { /** */ - public void deleteSubscription(monitoring.Monitoring.SubscriptionID request, + public void editKpiSubscription(monitoring.Monitoring.SubsDescriptor request, io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getDeleteSubscriptionMethod(), responseObserver); + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getEditKpiSubscriptionMethod(), responseObserver); } /** */ - public void setKpiAlarm(monitoring.Monitoring.AlarmDescriptor request, + public void createKpiAlarm(monitoring.Monitoring.AlarmDescriptor request, io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSetKpiAlarmMethod(), responseObserver); + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCreateKpiAlarmMethod(), responseObserver); + } + + /** + */ + public void editKpiAlarm(monitoring.Monitoring.AlarmDescriptor request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getEditKpiAlarmMethod(), responseObserver); } /** @@ -720,55 +741,34 @@ public final class MonitoringServiceGrpc { /** */ - public void getAlarmResponseStream(monitoring.Monitoring.AlarmSubscription request, + public void getAlarmResponseStream(monitoring.Monitoring.AlarmID request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetAlarmResponseStreamMethod(), responseObserver); } - /** - */ - public void deleteAlarm(monitoring.Monitoring.AlarmID request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getDeleteAlarmMethod(), responseObserver); - } - - /** - */ - public void getStreamKpi(monitoring.Monitoring.KpiId request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetStreamKpiMethod(), responseObserver); - } - - /** - */ - public void getInstantKpi(monitoring.Monitoring.KpiId request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetInstantKpiMethod(), responseObserver); - } - @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( - getSetKpiMethod(), + getCreateKpiMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< monitoring.Monitoring.KpiDescriptor, monitoring.Monitoring.KpiId>( - this, METHODID_SET_KPI))) + this, METHODID_CREATE_KPI))) .addMethod( - getDeleteKpiMethod(), + getEditKpiDescriptorMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - monitoring.Monitoring.KpiId, + monitoring.Monitoring.EditedKpiDescriptor, context.ContextOuterClass.Empty>( - this, METHODID_DELETE_KPI))) + this, METHODID_EDIT_KPI_DESCRIPTOR))) .addMethod( - getGetKpiDescriptorMethod(), + getDeleteKpiMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< monitoring.Monitoring.KpiId, - monitoring.Monitoring.KpiDescriptor>( - this, METHODID_GET_KPI_DESCRIPTOR))) + context.ContextOuterClass.Empty>( + this, METHODID_DELETE_KPI))) .addMethod( getGetKpiDescriptorListMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( @@ -776,6 +776,20 @@ public final class MonitoringServiceGrpc { context.ContextOuterClass.Empty, monitoring.Monitoring.KpiDescriptorList>( this, METHODID_GET_KPI_DESCRIPTOR_LIST))) + .addMethod( + getCreateBundleKpiMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + monitoring.Monitoring.BundleKpiDescriptor, + monitoring.Monitoring.KpiId>( + this, METHODID_CREATE_BUNDLE_KPI))) + .addMethod( + getGetKpiDescriptorMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + monitoring.Monitoring.KpiId, + monitoring.Monitoring.KpiDescriptor>( + this, METHODID_GET_KPI_DESCRIPTOR))) .addMethod( getIncludeKpiMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( @@ -798,12 +812,12 @@ public final class MonitoringServiceGrpc { monitoring.Monitoring.KpiList>( this, METHODID_QUERY_KPI_DATA))) .addMethod( - getSetKpiSubscriptionMethod(), + getSubscribeKpiMethod(), io.grpc.stub.ServerCalls.asyncServerStreamingCall( new MethodHandlers< monitoring.Monitoring.SubsDescriptor, monitoring.Monitoring.KpiList>( - this, METHODID_SET_KPI_SUBSCRIPTION))) + this, METHODID_SUBSCRIBE_KPI))) .addMethod( getGetSubsDescriptorMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( @@ -819,19 +833,26 @@ public final class MonitoringServiceGrpc { monitoring.Monitoring.SubsIDList>( this, METHODID_GET_SUBSCRIPTIONS))) .addMethod( - getDeleteSubscriptionMethod(), + getEditKpiSubscriptionMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - monitoring.Monitoring.SubscriptionID, + monitoring.Monitoring.SubsDescriptor, context.ContextOuterClass.Empty>( - this, METHODID_DELETE_SUBSCRIPTION))) + this, METHODID_EDIT_KPI_SUBSCRIPTION))) .addMethod( - getSetKpiAlarmMethod(), + getCreateKpiAlarmMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< monitoring.Monitoring.AlarmDescriptor, monitoring.Monitoring.AlarmID>( - this, METHODID_SET_KPI_ALARM))) + this, METHODID_CREATE_KPI_ALARM))) + .addMethod( + getEditKpiAlarmMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + monitoring.Monitoring.AlarmDescriptor, + context.ContextOuterClass.Empty>( + this, METHODID_EDIT_KPI_ALARM))) .addMethod( getGetAlarmsMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( @@ -850,30 +871,9 @@ public final class MonitoringServiceGrpc { getGetAlarmResponseStreamMethod(), io.grpc.stub.ServerCalls.asyncServerStreamingCall( new MethodHandlers< - monitoring.Monitoring.AlarmSubscription, + monitoring.Monitoring.AlarmID, monitoring.Monitoring.AlarmResponse>( this, METHODID_GET_ALARM_RESPONSE_STREAM))) - .addMethod( - getDeleteAlarmMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - monitoring.Monitoring.AlarmID, - context.ContextOuterClass.Empty>( - this, METHODID_DELETE_ALARM))) - .addMethod( - getGetStreamKpiMethod(), - io.grpc.stub.ServerCalls.asyncServerStreamingCall( - new MethodHandlers< - monitoring.Monitoring.KpiId, - monitoring.Monitoring.Kpi>( - this, METHODID_GET_STREAM_KPI))) - .addMethod( - getGetInstantKpiMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - monitoring.Monitoring.KpiId, - monitoring.Monitoring.KpiList>( - this, METHODID_GET_INSTANT_KPI))) .build(); } } @@ -894,26 +894,26 @@ public final class MonitoringServiceGrpc { /** */ - public void setKpi(monitoring.Monitoring.KpiDescriptor request, + public void createKpi(monitoring.Monitoring.KpiDescriptor request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( - getChannel().newCall(getSetKpiMethod(), getCallOptions()), request, responseObserver); + getChannel().newCall(getCreateKpiMethod(), getCallOptions()), request, responseObserver); } /** */ - public void deleteKpi(monitoring.Monitoring.KpiId request, + public void editKpiDescriptor(monitoring.Monitoring.EditedKpiDescriptor request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( - getChannel().newCall(getDeleteKpiMethod(), getCallOptions()), request, responseObserver); + getChannel().newCall(getEditKpiDescriptorMethod(), getCallOptions()), request, responseObserver); } /** */ - public void getKpiDescriptor(monitoring.Monitoring.KpiId request, - io.grpc.stub.StreamObserver responseObserver) { + public void deleteKpi(monitoring.Monitoring.KpiId request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( - getChannel().newCall(getGetKpiDescriptorMethod(), getCallOptions()), request, responseObserver); + getChannel().newCall(getDeleteKpiMethod(), getCallOptions()), request, responseObserver); } /** @@ -924,6 +924,22 @@ public final class MonitoringServiceGrpc { getChannel().newCall(getGetKpiDescriptorListMethod(), getCallOptions()), request, responseObserver); } + /** + */ + public void createBundleKpi(monitoring.Monitoring.BundleKpiDescriptor request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getCreateBundleKpiMethod(), getCallOptions()), request, responseObserver); + } + + /** + */ + public void getKpiDescriptor(monitoring.Monitoring.KpiId request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getGetKpiDescriptorMethod(), getCallOptions()), request, responseObserver); + } + /** */ public void includeKpi(monitoring.Monitoring.Kpi request, @@ -950,10 +966,10 @@ public final class MonitoringServiceGrpc { /** */ - public void setKpiSubscription(monitoring.Monitoring.SubsDescriptor request, + public void subscribeKpi(monitoring.Monitoring.SubsDescriptor request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( - getChannel().newCall(getSetKpiSubscriptionMethod(), getCallOptions()), request, responseObserver); + getChannel().newCall(getSubscribeKpiMethod(), getCallOptions()), request, responseObserver); } /** @@ -974,18 +990,26 @@ public final class MonitoringServiceGrpc { /** */ - public void deleteSubscription(monitoring.Monitoring.SubscriptionID request, + public void editKpiSubscription(monitoring.Monitoring.SubsDescriptor request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( - getChannel().newCall(getDeleteSubscriptionMethod(), getCallOptions()), request, responseObserver); + getChannel().newCall(getEditKpiSubscriptionMethod(), getCallOptions()), request, responseObserver); } /** */ - public void setKpiAlarm(monitoring.Monitoring.AlarmDescriptor request, + public void createKpiAlarm(monitoring.Monitoring.AlarmDescriptor request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( - getChannel().newCall(getSetKpiAlarmMethod(), getCallOptions()), request, responseObserver); + getChannel().newCall(getCreateKpiAlarmMethod(), getCallOptions()), request, responseObserver); + } + + /** + */ + public void editKpiAlarm(monitoring.Monitoring.AlarmDescriptor request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getEditKpiAlarmMethod(), getCallOptions()), request, responseObserver); } /** @@ -1006,35 +1030,11 @@ public final class MonitoringServiceGrpc { /** */ - public void getAlarmResponseStream(monitoring.Monitoring.AlarmSubscription request, + public void getAlarmResponseStream(monitoring.Monitoring.AlarmID request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( getChannel().newCall(getGetAlarmResponseStreamMethod(), getCallOptions()), request, responseObserver); } - - /** - */ - public void deleteAlarm(monitoring.Monitoring.AlarmID request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ClientCalls.asyncUnaryCall( - getChannel().newCall(getDeleteAlarmMethod(), getCallOptions()), request, responseObserver); - } - - /** - */ - public void getStreamKpi(monitoring.Monitoring.KpiId request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ClientCalls.asyncServerStreamingCall( - getChannel().newCall(getGetStreamKpiMethod(), getCallOptions()), request, responseObserver); - } - - /** - */ - public void getInstantKpi(monitoring.Monitoring.KpiId request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ClientCalls.asyncUnaryCall( - getChannel().newCall(getGetInstantKpiMethod(), getCallOptions()), request, responseObserver); - } } /** @@ -1053,23 +1053,23 @@ public final class MonitoringServiceGrpc { /** */ - public monitoring.Monitoring.KpiId setKpi(monitoring.Monitoring.KpiDescriptor request) { + public monitoring.Monitoring.KpiId createKpi(monitoring.Monitoring.KpiDescriptor request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( - getChannel(), getSetKpiMethod(), getCallOptions(), request); + getChannel(), getCreateKpiMethod(), getCallOptions(), request); } /** */ - public context.ContextOuterClass.Empty deleteKpi(monitoring.Monitoring.KpiId request) { + public context.ContextOuterClass.Empty editKpiDescriptor(monitoring.Monitoring.EditedKpiDescriptor request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( - getChannel(), getDeleteKpiMethod(), getCallOptions(), request); + getChannel(), getEditKpiDescriptorMethod(), getCallOptions(), request); } /** */ - public monitoring.Monitoring.KpiDescriptor getKpiDescriptor(monitoring.Monitoring.KpiId request) { + public context.ContextOuterClass.Empty deleteKpi(monitoring.Monitoring.KpiId request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( - getChannel(), getGetKpiDescriptorMethod(), getCallOptions(), request); + getChannel(), getDeleteKpiMethod(), getCallOptions(), request); } /** @@ -1079,6 +1079,20 @@ public final class MonitoringServiceGrpc { getChannel(), getGetKpiDescriptorListMethod(), getCallOptions(), request); } + /** + */ + public monitoring.Monitoring.KpiId createBundleKpi(monitoring.Monitoring.BundleKpiDescriptor request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getCreateBundleKpiMethod(), getCallOptions(), request); + } + + /** + */ + public monitoring.Monitoring.KpiDescriptor getKpiDescriptor(monitoring.Monitoring.KpiId request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getGetKpiDescriptorMethod(), getCallOptions(), request); + } + /** */ public context.ContextOuterClass.Empty includeKpi(monitoring.Monitoring.Kpi request) { @@ -1102,10 +1116,10 @@ public final class MonitoringServiceGrpc { /** */ - public java.util.Iterator setKpiSubscription( + public java.util.Iterator subscribeKpi( monitoring.Monitoring.SubsDescriptor request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( - getChannel(), getSetKpiSubscriptionMethod(), getCallOptions(), request); + getChannel(), getSubscribeKpiMethod(), getCallOptions(), request); } /** @@ -1124,16 +1138,23 @@ public final class MonitoringServiceGrpc { /** */ - public context.ContextOuterClass.Empty deleteSubscription(monitoring.Monitoring.SubscriptionID request) { + public context.ContextOuterClass.Empty editKpiSubscription(monitoring.Monitoring.SubsDescriptor request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( - getChannel(), getDeleteSubscriptionMethod(), getCallOptions(), request); + getChannel(), getEditKpiSubscriptionMethod(), getCallOptions(), request); } /** */ - public monitoring.Monitoring.AlarmID setKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { + public monitoring.Monitoring.AlarmID createKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( - getChannel(), getSetKpiAlarmMethod(), getCallOptions(), request); + getChannel(), getCreateKpiAlarmMethod(), getCallOptions(), request); + } + + /** + */ + public context.ContextOuterClass.Empty editKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getEditKpiAlarmMethod(), getCallOptions(), request); } /** @@ -1153,32 +1174,10 @@ public final class MonitoringServiceGrpc { /** */ public java.util.Iterator getAlarmResponseStream( - monitoring.Monitoring.AlarmSubscription request) { + monitoring.Monitoring.AlarmID request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( getChannel(), getGetAlarmResponseStreamMethod(), getCallOptions(), request); } - - /** - */ - public context.ContextOuterClass.Empty deleteAlarm(monitoring.Monitoring.AlarmID request) { - return io.grpc.stub.ClientCalls.blockingUnaryCall( - getChannel(), getDeleteAlarmMethod(), getCallOptions(), request); - } - - /** - */ - public java.util.Iterator getStreamKpi( - monitoring.Monitoring.KpiId request) { - return io.grpc.stub.ClientCalls.blockingServerStreamingCall( - getChannel(), getGetStreamKpiMethod(), getCallOptions(), request); - } - - /** - */ - public monitoring.Monitoring.KpiList getInstantKpi(monitoring.Monitoring.KpiId request) { - return io.grpc.stub.ClientCalls.blockingUnaryCall( - getChannel(), getGetInstantKpiMethod(), getCallOptions(), request); - } } /** @@ -1197,26 +1196,26 @@ public final class MonitoringServiceGrpc { /** */ - public com.google.common.util.concurrent.ListenableFuture setKpi( + public com.google.common.util.concurrent.ListenableFuture createKpi( monitoring.Monitoring.KpiDescriptor request) { return io.grpc.stub.ClientCalls.futureUnaryCall( - getChannel().newCall(getSetKpiMethod(), getCallOptions()), request); + getChannel().newCall(getCreateKpiMethod(), getCallOptions()), request); } /** */ - public com.google.common.util.concurrent.ListenableFuture deleteKpi( - monitoring.Monitoring.KpiId request) { + public com.google.common.util.concurrent.ListenableFuture editKpiDescriptor( + monitoring.Monitoring.EditedKpiDescriptor request) { return io.grpc.stub.ClientCalls.futureUnaryCall( - getChannel().newCall(getDeleteKpiMethod(), getCallOptions()), request); + getChannel().newCall(getEditKpiDescriptorMethod(), getCallOptions()), request); } /** */ - public com.google.common.util.concurrent.ListenableFuture getKpiDescriptor( + public com.google.common.util.concurrent.ListenableFuture deleteKpi( monitoring.Monitoring.KpiId request) { return io.grpc.stub.ClientCalls.futureUnaryCall( - getChannel().newCall(getGetKpiDescriptorMethod(), getCallOptions()), request); + getChannel().newCall(getDeleteKpiMethod(), getCallOptions()), request); } /** @@ -1227,6 +1226,22 @@ public final class MonitoringServiceGrpc { getChannel().newCall(getGetKpiDescriptorListMethod(), getCallOptions()), request); } + /** + */ + public com.google.common.util.concurrent.ListenableFuture createBundleKpi( + monitoring.Monitoring.BundleKpiDescriptor request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getCreateBundleKpiMethod(), getCallOptions()), request); + } + + /** + */ + public com.google.common.util.concurrent.ListenableFuture getKpiDescriptor( + monitoring.Monitoring.KpiId request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getGetKpiDescriptorMethod(), getCallOptions()), request); + } + /** */ public com.google.common.util.concurrent.ListenableFuture includeKpi( @@ -1269,71 +1284,63 @@ public final class MonitoringServiceGrpc { /** */ - public com.google.common.util.concurrent.ListenableFuture deleteSubscription( - monitoring.Monitoring.SubscriptionID request) { + public com.google.common.util.concurrent.ListenableFuture editKpiSubscription( + monitoring.Monitoring.SubsDescriptor request) { return io.grpc.stub.ClientCalls.futureUnaryCall( - getChannel().newCall(getDeleteSubscriptionMethod(), getCallOptions()), request); + getChannel().newCall(getEditKpiSubscriptionMethod(), getCallOptions()), request); } /** */ - public com.google.common.util.concurrent.ListenableFuture setKpiAlarm( + public com.google.common.util.concurrent.ListenableFuture createKpiAlarm( monitoring.Monitoring.AlarmDescriptor request) { return io.grpc.stub.ClientCalls.futureUnaryCall( - getChannel().newCall(getSetKpiAlarmMethod(), getCallOptions()), request); + getChannel().newCall(getCreateKpiAlarmMethod(), getCallOptions()), request); } /** */ - public com.google.common.util.concurrent.ListenableFuture getAlarms( - context.ContextOuterClass.Empty request) { + public com.google.common.util.concurrent.ListenableFuture editKpiAlarm( + monitoring.Monitoring.AlarmDescriptor request) { return io.grpc.stub.ClientCalls.futureUnaryCall( - getChannel().newCall(getGetAlarmsMethod(), getCallOptions()), request); + getChannel().newCall(getEditKpiAlarmMethod(), getCallOptions()), request); } /** */ - public com.google.common.util.concurrent.ListenableFuture getAlarmDescriptor( - monitoring.Monitoring.AlarmID request) { + public com.google.common.util.concurrent.ListenableFuture getAlarms( + context.ContextOuterClass.Empty request) { return io.grpc.stub.ClientCalls.futureUnaryCall( - getChannel().newCall(getGetAlarmDescriptorMethod(), getCallOptions()), request); + getChannel().newCall(getGetAlarmsMethod(), getCallOptions()), request); } /** */ - public com.google.common.util.concurrent.ListenableFuture deleteAlarm( + public com.google.common.util.concurrent.ListenableFuture getAlarmDescriptor( monitoring.Monitoring.AlarmID request) { return io.grpc.stub.ClientCalls.futureUnaryCall( - getChannel().newCall(getDeleteAlarmMethod(), getCallOptions()), request); - } - - /** - */ - public com.google.common.util.concurrent.ListenableFuture getInstantKpi( - monitoring.Monitoring.KpiId request) { - return io.grpc.stub.ClientCalls.futureUnaryCall( - getChannel().newCall(getGetInstantKpiMethod(), getCallOptions()), request); + getChannel().newCall(getGetAlarmDescriptorMethod(), getCallOptions()), request); } } - private static final int METHODID_SET_KPI = 0; - private static final int METHODID_DELETE_KPI = 1; - private static final int METHODID_GET_KPI_DESCRIPTOR = 2; + private static final int METHODID_CREATE_KPI = 0; + private static final int METHODID_EDIT_KPI_DESCRIPTOR = 1; + private static final int METHODID_DELETE_KPI = 2; private static final int METHODID_GET_KPI_DESCRIPTOR_LIST = 3; - private static final int METHODID_INCLUDE_KPI = 4; - private static final int METHODID_MONITOR_KPI = 5; - private static final int METHODID_QUERY_KPI_DATA = 6; - private static final int METHODID_SET_KPI_SUBSCRIPTION = 7; - private static final int METHODID_GET_SUBS_DESCRIPTOR = 8; - private static final int METHODID_GET_SUBSCRIPTIONS = 9; - private static final int METHODID_DELETE_SUBSCRIPTION = 10; - private static final int METHODID_SET_KPI_ALARM = 11; - private static final int METHODID_GET_ALARMS = 12; - private static final int METHODID_GET_ALARM_DESCRIPTOR = 13; - private static final int METHODID_GET_ALARM_RESPONSE_STREAM = 14; - private static final int METHODID_DELETE_ALARM = 15; - private static final int METHODID_GET_STREAM_KPI = 16; - private static final int METHODID_GET_INSTANT_KPI = 17; + private static final int METHODID_CREATE_BUNDLE_KPI = 4; + private static final int METHODID_GET_KPI_DESCRIPTOR = 5; + private static final int METHODID_INCLUDE_KPI = 6; + private static final int METHODID_MONITOR_KPI = 7; + private static final int METHODID_QUERY_KPI_DATA = 8; + private static final int METHODID_SUBSCRIBE_KPI = 9; + private static final int METHODID_GET_SUBS_DESCRIPTOR = 10; + private static final int METHODID_GET_SUBSCRIPTIONS = 11; + private static final int METHODID_EDIT_KPI_SUBSCRIPTION = 12; + private static final int METHODID_CREATE_KPI_ALARM = 13; + private static final int METHODID_EDIT_KPI_ALARM = 14; + private static final int METHODID_GET_ALARMS = 15; + private static final int METHODID_GET_ALARM_DESCRIPTOR = 16; + private static final int METHODID_GET_ALARM_RESPONSE_STREAM = 17; private static final class MethodHandlers implements io.grpc.stub.ServerCalls.UnaryMethod, @@ -1352,22 +1359,30 @@ public final class MonitoringServiceGrpc { @java.lang.SuppressWarnings("unchecked") public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) { switch (methodId) { - case METHODID_SET_KPI: - serviceImpl.setKpi((monitoring.Monitoring.KpiDescriptor) request, + case METHODID_CREATE_KPI: + serviceImpl.createKpi((monitoring.Monitoring.KpiDescriptor) request, (io.grpc.stub.StreamObserver) responseObserver); break; + case METHODID_EDIT_KPI_DESCRIPTOR: + serviceImpl.editKpiDescriptor((monitoring.Monitoring.EditedKpiDescriptor) request, + (io.grpc.stub.StreamObserver) responseObserver); + break; case METHODID_DELETE_KPI: serviceImpl.deleteKpi((monitoring.Monitoring.KpiId) request, (io.grpc.stub.StreamObserver) responseObserver); break; - case METHODID_GET_KPI_DESCRIPTOR: - serviceImpl.getKpiDescriptor((monitoring.Monitoring.KpiId) request, - (io.grpc.stub.StreamObserver) responseObserver); - break; case METHODID_GET_KPI_DESCRIPTOR_LIST: serviceImpl.getKpiDescriptorList((context.ContextOuterClass.Empty) request, (io.grpc.stub.StreamObserver) responseObserver); break; + case METHODID_CREATE_BUNDLE_KPI: + serviceImpl.createBundleKpi((monitoring.Monitoring.BundleKpiDescriptor) request, + (io.grpc.stub.StreamObserver) responseObserver); + break; + case METHODID_GET_KPI_DESCRIPTOR: + serviceImpl.getKpiDescriptor((monitoring.Monitoring.KpiId) request, + (io.grpc.stub.StreamObserver) responseObserver); + break; case METHODID_INCLUDE_KPI: serviceImpl.includeKpi((monitoring.Monitoring.Kpi) request, (io.grpc.stub.StreamObserver) responseObserver); @@ -1380,8 +1395,8 @@ public final class MonitoringServiceGrpc { serviceImpl.queryKpiData((monitoring.Monitoring.KpiQuery) request, (io.grpc.stub.StreamObserver) responseObserver); break; - case METHODID_SET_KPI_SUBSCRIPTION: - serviceImpl.setKpiSubscription((monitoring.Monitoring.SubsDescriptor) request, + case METHODID_SUBSCRIBE_KPI: + serviceImpl.subscribeKpi((monitoring.Monitoring.SubsDescriptor) request, (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_GET_SUBS_DESCRIPTOR: @@ -1392,14 +1407,18 @@ public final class MonitoringServiceGrpc { serviceImpl.getSubscriptions((context.ContextOuterClass.Empty) request, (io.grpc.stub.StreamObserver) responseObserver); break; - case METHODID_DELETE_SUBSCRIPTION: - serviceImpl.deleteSubscription((monitoring.Monitoring.SubscriptionID) request, + case METHODID_EDIT_KPI_SUBSCRIPTION: + serviceImpl.editKpiSubscription((monitoring.Monitoring.SubsDescriptor) request, (io.grpc.stub.StreamObserver) responseObserver); break; - case METHODID_SET_KPI_ALARM: - serviceImpl.setKpiAlarm((monitoring.Monitoring.AlarmDescriptor) request, + case METHODID_CREATE_KPI_ALARM: + serviceImpl.createKpiAlarm((monitoring.Monitoring.AlarmDescriptor) request, (io.grpc.stub.StreamObserver) responseObserver); break; + case METHODID_EDIT_KPI_ALARM: + serviceImpl.editKpiAlarm((monitoring.Monitoring.AlarmDescriptor) request, + (io.grpc.stub.StreamObserver) responseObserver); + break; case METHODID_GET_ALARMS: serviceImpl.getAlarms((context.ContextOuterClass.Empty) request, (io.grpc.stub.StreamObserver) responseObserver); @@ -1409,21 +1428,9 @@ public final class MonitoringServiceGrpc { (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_GET_ALARM_RESPONSE_STREAM: - serviceImpl.getAlarmResponseStream((monitoring.Monitoring.AlarmSubscription) request, + serviceImpl.getAlarmResponseStream((monitoring.Monitoring.AlarmID) request, (io.grpc.stub.StreamObserver) responseObserver); break; - case METHODID_DELETE_ALARM: - serviceImpl.deleteAlarm((monitoring.Monitoring.AlarmID) request, - (io.grpc.stub.StreamObserver) responseObserver); - break; - case METHODID_GET_STREAM_KPI: - serviceImpl.getStreamKpi((monitoring.Monitoring.KpiId) request, - (io.grpc.stub.StreamObserver) responseObserver); - break; - case METHODID_GET_INSTANT_KPI: - serviceImpl.getInstantKpi((monitoring.Monitoring.KpiId) request, - (io.grpc.stub.StreamObserver) responseObserver); - break; default: throw new AssertionError(); } @@ -1485,24 +1492,24 @@ public final class MonitoringServiceGrpc { if (result == null) { serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME) .setSchemaDescriptor(new MonitoringServiceFileDescriptorSupplier()) - .addMethod(getSetKpiMethod()) + .addMethod(getCreateKpiMethod()) + .addMethod(getEditKpiDescriptorMethod()) .addMethod(getDeleteKpiMethod()) - .addMethod(getGetKpiDescriptorMethod()) .addMethod(getGetKpiDescriptorListMethod()) + .addMethod(getCreateBundleKpiMethod()) + .addMethod(getGetKpiDescriptorMethod()) .addMethod(getIncludeKpiMethod()) .addMethod(getMonitorKpiMethod()) .addMethod(getQueryKpiDataMethod()) - .addMethod(getSetKpiSubscriptionMethod()) + .addMethod(getSubscribeKpiMethod()) .addMethod(getGetSubsDescriptorMethod()) .addMethod(getGetSubscriptionsMethod()) - .addMethod(getDeleteSubscriptionMethod()) - .addMethod(getSetKpiAlarmMethod()) + .addMethod(getEditKpiSubscriptionMethod()) + .addMethod(getCreateKpiAlarmMethod()) + .addMethod(getEditKpiAlarmMethod()) .addMethod(getGetAlarmsMethod()) .addMethod(getGetAlarmDescriptorMethod()) .addMethod(getGetAlarmResponseStreamMethod()) - .addMethod(getDeleteAlarmMethod()) - .addMethod(getGetStreamKpiMethod()) - .addMethod(getGetInstantKpiMethod()) .build(); } } diff --git a/src/automation/target/generated-sources/grpc/monitoring/MutinyMonitoringServiceGrpc.java b/src/automation/target/generated-sources/grpc/monitoring/MutinyMonitoringServiceGrpc.java index d663b38c9..46f442b74 100644 --- a/src/automation/target/generated-sources/grpc/monitoring/MutinyMonitoringServiceGrpc.java +++ b/src/automation/target/generated-sources/grpc/monitoring/MutinyMonitoringServiceGrpc.java @@ -36,18 +36,18 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim } - public io.smallrye.mutiny.Uni setKpi(monitoring.Monitoring.KpiDescriptor request) { - return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::setKpi); + public io.smallrye.mutiny.Uni createKpi(monitoring.Monitoring.KpiDescriptor request) { + return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::createKpi); } - public io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request) { - return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::deleteKpi); + public io.smallrye.mutiny.Uni editKpiDescriptor(monitoring.Monitoring.EditedKpiDescriptor request) { + return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::editKpiDescriptor); } - public io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request) { - return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::getKpiDescriptor); + public io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request) { + return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::deleteKpi); } @@ -56,6 +56,16 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim } + public io.smallrye.mutiny.Uni createBundleKpi(monitoring.Monitoring.BundleKpiDescriptor request) { + return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::createBundleKpi); + } + + + public io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request) { + return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::getKpiDescriptor); + } + + public io.smallrye.mutiny.Uni includeKpi(monitoring.Monitoring.Kpi request) { return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::includeKpi); } @@ -81,13 +91,18 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim } - public io.smallrye.mutiny.Uni deleteSubscription(monitoring.Monitoring.SubscriptionID request) { - return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::deleteSubscription); + public io.smallrye.mutiny.Uni editKpiSubscription(monitoring.Monitoring.SubsDescriptor request) { + return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::editKpiSubscription); + } + + + public io.smallrye.mutiny.Uni createKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { + return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::createKpiAlarm); } - public io.smallrye.mutiny.Uni setKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { - return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::setKpiAlarm); + public io.smallrye.mutiny.Uni editKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { + return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::editKpiAlarm); } @@ -101,30 +116,15 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim } - public io.smallrye.mutiny.Uni deleteAlarm(monitoring.Monitoring.AlarmID request) { - return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::deleteAlarm); - } - - - public io.smallrye.mutiny.Uni getInstantKpi(monitoring.Monitoring.KpiId request) { - return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::getInstantKpi); - } - - - public io.smallrye.mutiny.Multi setKpiSubscription(monitoring.Monitoring.SubsDescriptor request) { - return io.quarkus.grpc.runtime.ClientCalls.oneToMany(request, delegateStub::setKpiSubscription); + public io.smallrye.mutiny.Multi subscribeKpi(monitoring.Monitoring.SubsDescriptor request) { + return io.quarkus.grpc.runtime.ClientCalls.oneToMany(request, delegateStub::subscribeKpi); } - public io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmSubscription request) { + public io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmID request) { return io.quarkus.grpc.runtime.ClientCalls.oneToMany(request, delegateStub::getAlarmResponseStream); } - - public io.smallrye.mutiny.Multi getStreamKpi(monitoring.Monitoring.KpiId request) { - return io.quarkus.grpc.runtime.ClientCalls.oneToMany(request, delegateStub::getStreamKpi); - } - } @@ -143,17 +143,17 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim - public io.smallrye.mutiny.Uni setKpi(monitoring.Monitoring.KpiDescriptor request) { + public io.smallrye.mutiny.Uni createKpi(monitoring.Monitoring.KpiDescriptor request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request) { + public io.smallrye.mutiny.Uni editKpiDescriptor(monitoring.Monitoring.EditedKpiDescriptor request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request) { + public io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } @@ -163,98 +163,98 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim } - public io.smallrye.mutiny.Uni includeKpi(monitoring.Monitoring.Kpi request) { + public io.smallrye.mutiny.Uni createBundleKpi(monitoring.Monitoring.BundleKpiDescriptor request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni monitorKpi(monitoring.Monitoring.MonitorKpiRequest request) { + public io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni queryKpiData(monitoring.Monitoring.KpiQuery request) { + public io.smallrye.mutiny.Uni includeKpi(monitoring.Monitoring.Kpi request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni getSubsDescriptor(monitoring.Monitoring.SubscriptionID request) { + public io.smallrye.mutiny.Uni monitorKpi(monitoring.Monitoring.MonitorKpiRequest request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni getSubscriptions(context.ContextOuterClass.Empty request) { + public io.smallrye.mutiny.Uni queryKpiData(monitoring.Monitoring.KpiQuery request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni deleteSubscription(monitoring.Monitoring.SubscriptionID request) { + public io.smallrye.mutiny.Uni getSubsDescriptor(monitoring.Monitoring.SubscriptionID request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni setKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { + public io.smallrye.mutiny.Uni getSubscriptions(context.ContextOuterClass.Empty request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni getAlarms(context.ContextOuterClass.Empty request) { + public io.smallrye.mutiny.Uni editKpiSubscription(monitoring.Monitoring.SubsDescriptor request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni getAlarmDescriptor(monitoring.Monitoring.AlarmID request) { + public io.smallrye.mutiny.Uni createKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni deleteAlarm(monitoring.Monitoring.AlarmID request) { + public io.smallrye.mutiny.Uni editKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni getInstantKpi(monitoring.Monitoring.KpiId request) { + public io.smallrye.mutiny.Uni getAlarms(context.ContextOuterClass.Empty request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Multi setKpiSubscription(monitoring.Monitoring.SubsDescriptor request) { + public io.smallrye.mutiny.Uni getAlarmDescriptor(monitoring.Monitoring.AlarmID request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmSubscription request) { + public io.smallrye.mutiny.Multi subscribeKpi(monitoring.Monitoring.SubsDescriptor request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Multi getStreamKpi(monitoring.Monitoring.KpiId request) { + public io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmID request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( - monitoring.MonitoringServiceGrpc.getSetKpiMethod(), + monitoring.MonitoringServiceGrpc.getCreateKpiMethod(), asyncUnaryCall( new MethodHandlers< monitoring.Monitoring.KpiDescriptor, monitoring.Monitoring.KpiId>( - this, METHODID_SET_KPI, compression))) + this, METHODID_CREATE_KPI, compression))) .addMethod( - monitoring.MonitoringServiceGrpc.getDeleteKpiMethod(), + monitoring.MonitoringServiceGrpc.getEditKpiDescriptorMethod(), asyncUnaryCall( new MethodHandlers< - monitoring.Monitoring.KpiId, + monitoring.Monitoring.EditedKpiDescriptor, context.ContextOuterClass.Empty>( - this, METHODID_DELETE_KPI, compression))) + this, METHODID_EDIT_KPI_DESCRIPTOR, compression))) .addMethod( - monitoring.MonitoringServiceGrpc.getGetKpiDescriptorMethod(), + monitoring.MonitoringServiceGrpc.getDeleteKpiMethod(), asyncUnaryCall( new MethodHandlers< monitoring.Monitoring.KpiId, - monitoring.Monitoring.KpiDescriptor>( - this, METHODID_GET_KPI_DESCRIPTOR, compression))) + context.ContextOuterClass.Empty>( + this, METHODID_DELETE_KPI, compression))) .addMethod( monitoring.MonitoringServiceGrpc.getGetKpiDescriptorListMethod(), asyncUnaryCall( @@ -262,6 +262,20 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim context.ContextOuterClass.Empty, monitoring.Monitoring.KpiDescriptorList>( this, METHODID_GET_KPI_DESCRIPTOR_LIST, compression))) + .addMethod( + monitoring.MonitoringServiceGrpc.getCreateBundleKpiMethod(), + asyncUnaryCall( + new MethodHandlers< + monitoring.Monitoring.BundleKpiDescriptor, + monitoring.Monitoring.KpiId>( + this, METHODID_CREATE_BUNDLE_KPI, compression))) + .addMethod( + monitoring.MonitoringServiceGrpc.getGetKpiDescriptorMethod(), + asyncUnaryCall( + new MethodHandlers< + monitoring.Monitoring.KpiId, + monitoring.Monitoring.KpiDescriptor>( + this, METHODID_GET_KPI_DESCRIPTOR, compression))) .addMethod( monitoring.MonitoringServiceGrpc.getIncludeKpiMethod(), asyncUnaryCall( @@ -284,12 +298,12 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim monitoring.Monitoring.KpiList>( this, METHODID_QUERY_KPI_DATA, compression))) .addMethod( - monitoring.MonitoringServiceGrpc.getSetKpiSubscriptionMethod(), + monitoring.MonitoringServiceGrpc.getSubscribeKpiMethod(), asyncServerStreamingCall( new MethodHandlers< monitoring.Monitoring.SubsDescriptor, monitoring.Monitoring.KpiList>( - this, METHODID_SET_KPI_SUBSCRIPTION, compression))) + this, METHODID_SUBSCRIBE_KPI, compression))) .addMethod( monitoring.MonitoringServiceGrpc.getGetSubsDescriptorMethod(), asyncUnaryCall( @@ -305,19 +319,26 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim monitoring.Monitoring.SubsIDList>( this, METHODID_GET_SUBSCRIPTIONS, compression))) .addMethod( - monitoring.MonitoringServiceGrpc.getDeleteSubscriptionMethod(), + monitoring.MonitoringServiceGrpc.getEditKpiSubscriptionMethod(), asyncUnaryCall( new MethodHandlers< - monitoring.Monitoring.SubscriptionID, + monitoring.Monitoring.SubsDescriptor, context.ContextOuterClass.Empty>( - this, METHODID_DELETE_SUBSCRIPTION, compression))) + this, METHODID_EDIT_KPI_SUBSCRIPTION, compression))) .addMethod( - monitoring.MonitoringServiceGrpc.getSetKpiAlarmMethod(), + monitoring.MonitoringServiceGrpc.getCreateKpiAlarmMethod(), asyncUnaryCall( new MethodHandlers< monitoring.Monitoring.AlarmDescriptor, monitoring.Monitoring.AlarmID>( - this, METHODID_SET_KPI_ALARM, compression))) + this, METHODID_CREATE_KPI_ALARM, compression))) + .addMethod( + monitoring.MonitoringServiceGrpc.getEditKpiAlarmMethod(), + asyncUnaryCall( + new MethodHandlers< + monitoring.Monitoring.AlarmDescriptor, + context.ContextOuterClass.Empty>( + this, METHODID_EDIT_KPI_ALARM, compression))) .addMethod( monitoring.MonitoringServiceGrpc.getGetAlarmsMethod(), asyncUnaryCall( @@ -336,52 +357,31 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim monitoring.MonitoringServiceGrpc.getGetAlarmResponseStreamMethod(), asyncServerStreamingCall( new MethodHandlers< - monitoring.Monitoring.AlarmSubscription, + monitoring.Monitoring.AlarmID, monitoring.Monitoring.AlarmResponse>( this, METHODID_GET_ALARM_RESPONSE_STREAM, compression))) - .addMethod( - monitoring.MonitoringServiceGrpc.getDeleteAlarmMethod(), - asyncUnaryCall( - new MethodHandlers< - monitoring.Monitoring.AlarmID, - context.ContextOuterClass.Empty>( - this, METHODID_DELETE_ALARM, compression))) - .addMethod( - monitoring.MonitoringServiceGrpc.getGetStreamKpiMethod(), - asyncServerStreamingCall( - new MethodHandlers< - monitoring.Monitoring.KpiId, - monitoring.Monitoring.Kpi>( - this, METHODID_GET_STREAM_KPI, compression))) - .addMethod( - monitoring.MonitoringServiceGrpc.getGetInstantKpiMethod(), - asyncUnaryCall( - new MethodHandlers< - monitoring.Monitoring.KpiId, - monitoring.Monitoring.KpiList>( - this, METHODID_GET_INSTANT_KPI, compression))) .build(); } } - private static final int METHODID_SET_KPI = 0; - private static final int METHODID_DELETE_KPI = 1; - private static final int METHODID_GET_KPI_DESCRIPTOR = 2; + private static final int METHODID_CREATE_KPI = 0; + private static final int METHODID_EDIT_KPI_DESCRIPTOR = 1; + private static final int METHODID_DELETE_KPI = 2; private static final int METHODID_GET_KPI_DESCRIPTOR_LIST = 3; - private static final int METHODID_INCLUDE_KPI = 4; - private static final int METHODID_MONITOR_KPI = 5; - private static final int METHODID_QUERY_KPI_DATA = 6; - private static final int METHODID_SET_KPI_SUBSCRIPTION = 7; - private static final int METHODID_GET_SUBS_DESCRIPTOR = 8; - private static final int METHODID_GET_SUBSCRIPTIONS = 9; - private static final int METHODID_DELETE_SUBSCRIPTION = 10; - private static final int METHODID_SET_KPI_ALARM = 11; - private static final int METHODID_GET_ALARMS = 12; - private static final int METHODID_GET_ALARM_DESCRIPTOR = 13; - private static final int METHODID_GET_ALARM_RESPONSE_STREAM = 14; - private static final int METHODID_DELETE_ALARM = 15; - private static final int METHODID_GET_STREAM_KPI = 16; - private static final int METHODID_GET_INSTANT_KPI = 17; + private static final int METHODID_CREATE_BUNDLE_KPI = 4; + private static final int METHODID_GET_KPI_DESCRIPTOR = 5; + private static final int METHODID_INCLUDE_KPI = 6; + private static final int METHODID_MONITOR_KPI = 7; + private static final int METHODID_QUERY_KPI_DATA = 8; + private static final int METHODID_SUBSCRIBE_KPI = 9; + private static final int METHODID_GET_SUBS_DESCRIPTOR = 10; + private static final int METHODID_GET_SUBSCRIPTIONS = 11; + private static final int METHODID_EDIT_KPI_SUBSCRIPTION = 12; + private static final int METHODID_CREATE_KPI_ALARM = 13; + private static final int METHODID_EDIT_KPI_ALARM = 14; + private static final int METHODID_GET_ALARMS = 15; + private static final int METHODID_GET_ALARM_DESCRIPTOR = 16; + private static final int METHODID_GET_ALARM_RESPONSE_STREAM = 17; private static final class MethodHandlers implements io.grpc.stub.ServerCalls.UnaryMethod, @@ -402,23 +402,23 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim @java.lang.SuppressWarnings("unchecked") public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) { switch (methodId) { - case METHODID_SET_KPI: + case METHODID_CREATE_KPI: io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.KpiDescriptor) request, (io.grpc.stub.StreamObserver) responseObserver, compression, - serviceImpl::setKpi); + serviceImpl::createKpi); break; - case METHODID_DELETE_KPI: - io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.KpiId) request, + case METHODID_EDIT_KPI_DESCRIPTOR: + io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.EditedKpiDescriptor) request, (io.grpc.stub.StreamObserver) responseObserver, compression, - serviceImpl::deleteKpi); + serviceImpl::editKpiDescriptor); break; - case METHODID_GET_KPI_DESCRIPTOR: + case METHODID_DELETE_KPI: io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.KpiId) request, - (io.grpc.stub.StreamObserver) responseObserver, + (io.grpc.stub.StreamObserver) responseObserver, compression, - serviceImpl::getKpiDescriptor); + serviceImpl::deleteKpi); break; case METHODID_GET_KPI_DESCRIPTOR_LIST: io.quarkus.grpc.runtime.ServerCalls.oneToOne((context.ContextOuterClass.Empty) request, @@ -426,6 +426,18 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim compression, serviceImpl::getKpiDescriptorList); break; + case METHODID_CREATE_BUNDLE_KPI: + io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.BundleKpiDescriptor) request, + (io.grpc.stub.StreamObserver) responseObserver, + compression, + serviceImpl::createBundleKpi); + break; + case METHODID_GET_KPI_DESCRIPTOR: + io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.KpiId) request, + (io.grpc.stub.StreamObserver) responseObserver, + compression, + serviceImpl::getKpiDescriptor); + break; case METHODID_INCLUDE_KPI: io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.Kpi) request, (io.grpc.stub.StreamObserver) responseObserver, @@ -444,11 +456,11 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim compression, serviceImpl::queryKpiData); break; - case METHODID_SET_KPI_SUBSCRIPTION: + case METHODID_SUBSCRIBE_KPI: io.quarkus.grpc.runtime.ServerCalls.oneToMany((monitoring.Monitoring.SubsDescriptor) request, (io.grpc.stub.StreamObserver) responseObserver, compression, - serviceImpl::setKpiSubscription); + serviceImpl::subscribeKpi); break; case METHODID_GET_SUBS_DESCRIPTOR: io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.SubscriptionID) request, @@ -462,17 +474,23 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim compression, serviceImpl::getSubscriptions); break; - case METHODID_DELETE_SUBSCRIPTION: - io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.SubscriptionID) request, + case METHODID_EDIT_KPI_SUBSCRIPTION: + io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.SubsDescriptor) request, (io.grpc.stub.StreamObserver) responseObserver, compression, - serviceImpl::deleteSubscription); + serviceImpl::editKpiSubscription); break; - case METHODID_SET_KPI_ALARM: + case METHODID_CREATE_KPI_ALARM: io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.AlarmDescriptor) request, (io.grpc.stub.StreamObserver) responseObserver, compression, - serviceImpl::setKpiAlarm); + serviceImpl::createKpiAlarm); + break; + case METHODID_EDIT_KPI_ALARM: + io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.AlarmDescriptor) request, + (io.grpc.stub.StreamObserver) responseObserver, + compression, + serviceImpl::editKpiAlarm); break; case METHODID_GET_ALARMS: io.quarkus.grpc.runtime.ServerCalls.oneToOne((context.ContextOuterClass.Empty) request, @@ -487,29 +505,11 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim serviceImpl::getAlarmDescriptor); break; case METHODID_GET_ALARM_RESPONSE_STREAM: - io.quarkus.grpc.runtime.ServerCalls.oneToMany((monitoring.Monitoring.AlarmSubscription) request, + io.quarkus.grpc.runtime.ServerCalls.oneToMany((monitoring.Monitoring.AlarmID) request, (io.grpc.stub.StreamObserver) responseObserver, compression, serviceImpl::getAlarmResponseStream); break; - case METHODID_DELETE_ALARM: - io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.AlarmID) request, - (io.grpc.stub.StreamObserver) responseObserver, - compression, - serviceImpl::deleteAlarm); - break; - case METHODID_GET_STREAM_KPI: - io.quarkus.grpc.runtime.ServerCalls.oneToMany((monitoring.Monitoring.KpiId) request, - (io.grpc.stub.StreamObserver) responseObserver, - compression, - serviceImpl::getStreamKpi); - break; - case METHODID_GET_INSTANT_KPI: - io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.KpiId) request, - (io.grpc.stub.StreamObserver) responseObserver, - compression, - serviceImpl::getInstantKpi); - break; default: throw new java.lang.AssertionError(); } diff --git a/src/automation/target/kubernetes/kubernetes.yml b/src/automation/target/kubernetes/kubernetes.yml index 1fc788787..f5cea3757 100644 --- a/src/automation/target/kubernetes/kubernetes.yml +++ b/src/automation/target/kubernetes/kubernetes.yml @@ -3,8 +3,8 @@ apiVersion: v1 kind: Service metadata: annotations: - app.quarkus.io/commit-id: 80cfc0874138153f72a2a673fc4d040be707e899 - app.quarkus.io/build-timestamp: 2022-08-31 - 09:25:37 +0000 + app.quarkus.io/commit-id: ac09ca6e8827edf1379450dc3e68dcdc35957479 + app.quarkus.io/build-timestamp: 2022-08-02 - 07:36:43 +0000 labels: app.kubernetes.io/name: automationservice app: automationservice @@ -25,8 +25,8 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - app.quarkus.io/commit-id: 80cfc0874138153f72a2a673fc4d040be707e899 - app.quarkus.io/build-timestamp: 2022-08-31 - 09:25:37 +0000 + app.quarkus.io/commit-id: ac09ca6e8827edf1379450dc3e68dcdc35957479 + app.quarkus.io/build-timestamp: 2022-08-02 - 07:36:43 +0000 labels: app: automationservice app.kubernetes.io/name: automationservice @@ -39,8 +39,8 @@ spec: template: metadata: annotations: - app.quarkus.io/commit-id: 80cfc0874138153f72a2a673fc4d040be707e899 - app.quarkus.io/build-timestamp: 2022-08-31 - 09:25:37 +0000 + app.quarkus.io/commit-id: ac09ca6e8827edf1379450dc3e68dcdc35957479 + app.quarkus.io/build-timestamp: 2022-08-02 - 07:36:43 +0000 labels: app: automationservice app.kubernetes.io/name: automationservice diff --git a/src/common/DeviceTypes.py b/src/common/DeviceTypes.py index 4d67ff661..bf871a2d5 100644 --- a/src/common/DeviceTypes.py +++ b/src/common/DeviceTypes.py @@ -15,14 +15,12 @@ from enum import Enum class DeviceTypeEnum(Enum): - EMULATED_DATACENTER = 'emu-datacenter' - EMULATED_OPEN_LINE_SYSTEM = 'emu-open-line-system' - EMULATED_PACKET_ROUTER = 'emu-packet-router' - DATACENTER = 'datacenter' - MICROVAWE_RADIO_SYSTEM = 'microwave-radio-system' - OPTICAL_ROADM = 'optical-roadm' - OPTICAL_TRANDPONDER = 'optical-trandponder' - OPEN_LINE_SYSTEM = 'open-line-system' - PACKET_ROUTER = 'packet-router' - PACKET_SWITCH = 'packet-switch' - P4_SWITCH = 'p4-switch' + EMULATED_OPTICAL_LINE_SYSTEM = 'emu-optical-line-system' + EMULATED_PACKET_ROUTER = 'emu-packet-router' + MICROVAWE_RADIO_SYSTEM = 'microwave-radio-system' + OPTICAL_ROADM = 'optical-roadm' + OPTICAL_TRANDPONDER = 'optical-trandponder' + OPTICAL_LINE_SYSTEM = 'optical-line-system' + PACKET_ROUTER = 'packet-router' + PACKET_SWITCH = 'packet-switch' + P4_SWITCH = 'p4-switch' diff --git a/src/common/tools/object_factory/Constraint.py b/src/common/tools/object_factory/Constraint.py index 757531daf..df290d428 100644 --- a/src/common/tools/object_factory/Constraint.py +++ b/src/common/tools/object_factory/Constraint.py @@ -15,19 +15,6 @@ import json from typing import Any, Dict, Union -def json_constraint_custom(constraint_type : str, constraint_value : Union[str, Dict[str, Any]]) -> Dict: +def json_constraint(constraint_type : str, constraint_value : Union[str, Dict[str, Any]]): if not isinstance(constraint_value, str): constraint_value = json.dumps(constraint_value, sort_keys=True) return {'custom': {'constraint_type': constraint_type, 'constraint_value': constraint_value}} - -def json_constraint_endpoint_location_region(endpoint_id : Dict, region : str) -> Dict: - return {'endpoint_location': {'endpoint_id': endpoint_id, 'location': {'region': region}}} - -def json_constraint_endpoint_location_gps(endpoint_id : Dict, latitude : float, longitude : float) -> Dict: - gps_position = {'latitude': latitude, 'longitude': longitude} - return {'endpoint_location': {'endpoint_id': endpoint_id, 'location': {'gps_position': gps_position}}} - -def json_constraint_endpoint_priority(endpoint_id : Dict, priority : int) -> Dict: - return {'endpoint_priority': {'endpoint_id': endpoint_id, 'priority': priority}} - -def json_constraint_sla_availability(num_disjoint_paths : int, all_active : bool) -> Dict: - return {'sla_availability': {'num_disjoint_paths': num_disjoint_paths, 'all_active': all_active}} diff --git a/src/common/tools/object_factory/Device.py b/src/common/tools/object_factory/Device.py index 4a590134d..32baff9ae 100644 --- a/src/common/tools/object_factory/Device.py +++ b/src/common/tools/object_factory/Device.py @@ -20,8 +20,7 @@ from common.tools.object_factory.ConfigRule import json_config_rule_set DEVICE_DISABLED = DeviceOperationalStatusEnum.DEVICEOPERATIONALSTATUS_DISABLED -DEVICE_EMUDC_TYPE = DeviceTypeEnum.EMULATED_DATACENTER.value -DEVICE_EMUOLS_TYPE = DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM.value +DEVICE_EMUOLS_TYPE = DeviceTypeEnum.EMULATED_OPTICAL_LINE_SYSTEM.value DEVICE_EMUPR_TYPE = DeviceTypeEnum.EMULATED_PACKET_ROUTER.value DEVICE_EMU_DRIVERS = [DeviceDriverEnum.DEVICEDRIVER_UNDEFINED] DEVICE_EMU_ADDRESS = '127.0.0.1' @@ -30,7 +29,7 @@ DEVICE_EMU_PORT = '0' DEVICE_PR_TYPE = DeviceTypeEnum.PACKET_ROUTER.value DEVICE_PR_DRIVERS = [DeviceDriverEnum.DEVICEDRIVER_OPENCONFIG] -DEVICE_TAPI_TYPE = DeviceTypeEnum.OPEN_LINE_SYSTEM.value +DEVICE_TAPI_TYPE = DeviceTypeEnum.OPTICAL_LINE_SYSTEM.value DEVICE_TAPI_DRIVERS = [DeviceDriverEnum.DEVICEDRIVER_TRANSPORT_API] # check which enum type and value assign to microwave device @@ -72,14 +71,6 @@ def json_device_emulated_tapi_disabled( device_uuid, DEVICE_EMUOLS_TYPE, DEVICE_DISABLED, endpoints=endpoints, config_rules=config_rules, drivers=drivers) -def json_device_emulated_datacenter_disabled( - device_uuid : str, endpoints : List[Dict] = [], config_rules : List[Dict] = [], - drivers : List[Dict] = DEVICE_EMU_DRIVERS - ): - return json_device( - device_uuid, DEVICE_EMUDC_TYPE, DEVICE_DISABLED, endpoints=endpoints, config_rules=config_rules, - drivers=drivers) - def json_device_packetrouter_disabled( device_uuid : str, endpoints : List[Dict] = [], config_rules : List[Dict] = [], drivers : List[Dict] = DEVICE_PR_DRIVERS diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/Constants.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/Constants.py index b6177cb9c..d432e5605 100644 --- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/Constants.py +++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/Constants.py @@ -51,4 +51,4 @@ BEARER_MAPPINGS = { 'R4@D2:3/1': ('R4@D2', '3/1', '10.0.2.4', '65002:104', 100, '2.4.3.1', 24), 'R4@D2:3/2': ('R4@D2', '3/2', '10.0.2.4', '65002:104', 100, '2.4.3.2', 24), 'R4@D2:3/3': ('R4@D2', '3/3', '10.0.2.4', '65002:104', 100, '2.4.3.3', 24), -} \ No newline at end of file +} diff --git a/src/compute/tests/Constants.py b/src/compute/tests/Constants.py index cb1331c74..640124b07 100644 --- a/src/compute/tests/Constants.py +++ b/src/compute/tests/Constants.py @@ -82,4 +82,4 @@ SERVICE_CONNECTION_POINTS_2 = [ {'service_endpoint_id': 'ep-3', 'service_endpoint_encapsulation_type': 'dot1q', 'service_endpoint_encapsulation_info': {'vlan': 1234}}, -] \ No newline at end of file +] diff --git a/src/context/client/ContextClient.py b/src/context/client/ContextClient.py index da907341f..6e8cbac6a 100644 --- a/src/context/client/ContextClient.py +++ b/src/context/client/ContextClient.py @@ -250,13 +250,6 @@ class ContextClient: LOGGER.debug('SetService result: {:s}'.format(grpc_message_to_json_string(response))) return response - @RETRY_DECORATOR - def UnsetService(self, request: Service) -> ServiceId: - LOGGER.debug('UnsetService request: {:s}'.format(grpc_message_to_json_string(request))) - response = self.stub.UnsetService(request) - LOGGER.debug('UnsetService result: {:s}'.format(grpc_message_to_json_string(response))) - return response - @RETRY_DECORATOR def RemoveService(self, request: ServiceId) -> Empty: LOGGER.debug('RemoveService request: {:s}'.format(grpc_message_to_json_string(request))) @@ -299,13 +292,6 @@ class ContextClient: LOGGER.debug('SetSlice result: {:s}'.format(grpc_message_to_json_string(response))) return response - @RETRY_DECORATOR - def UnsetSlice(self, request: Slice) -> SliceId: - LOGGER.debug('UnsetSlice request: {:s}'.format(grpc_message_to_json_string(request))) - response = self.stub.UnsetSlice(request) - LOGGER.debug('UnsetSlice result: {:s}'.format(grpc_message_to_json_string(response))) - return response - @RETRY_DECORATOR def RemoveSlice(self, request: SliceId) -> Empty: LOGGER.debug('RemoveSlice request: {:s}'.format(grpc_message_to_json_string(request))) diff --git a/src/context/service/__main__.py b/src/context/service/__main__.py index dfd0c8773..53754caf4 100644 --- a/src/context/service/__main__.py +++ b/src/context/service/__main__.py @@ -36,7 +36,7 @@ def main(): global LOGGER # pylint: disable=global-statement log_level = get_log_level() - logging.basicConfig(level=log_level, format="[%(asctime)s] %(levelname)s:%(name)s:%(message)s") + logging.basicConfig(level=log_level) LOGGER = logging.getLogger(__name__) signal.signal(signal.SIGINT, signal_handler) diff --git a/src/context/service/database/ConfigModel.py b/src/context/service/database/ConfigModel.py index a5f90788e..bb2a37467 100644 --- a/src/context/service/database/ConfigModel.py +++ b/src/context/service/database/ConfigModel.py @@ -116,7 +116,7 @@ def update_config( raw_config_rules : List[Tuple[ORM_ConfigActionEnum, str, str]] ) -> List[Tuple[Union[ConfigModel, ConfigRuleModel], bool]]: - str_config_key = key_to_str([config_name, db_parent_pk], separator=':') + str_config_key = key_to_str([db_parent_pk, config_name], separator=':') result : Tuple[ConfigModel, bool] = get_or_create_object(database, ConfigModel, str_config_key) db_config, created = result diff --git a/src/context/service/database/ConstraintModel.py b/src/context/service/database/ConstraintModel.py index 449dcedee..a35ec250d 100644 --- a/src/context/service/database/ConstraintModel.py +++ b/src/context/service/database/ConstraintModel.py @@ -54,13 +54,24 @@ class ConstraintCustomModel(Model): # pylint: disable=abstract-method def dump(self) -> Dict: # pylint: disable=arguments-differ return {'custom': {'constraint_type': self.constraint_type, 'constraint_value': self.constraint_value}} +Union_ConstraintEndpoint = Union[ + 'ConstraintEndpointLocationGpsPositionModel', 'ConstraintEndpointLocationRegionModel', + 'ConstraintEndpointPriorityModel' +] +def dump_endpoint_id(endpoint_constraint : Union_ConstraintEndpoint): + db_endpoints_pks = list(endpoint_constraint.references(EndPointModel)) + num_endpoints = len(db_endpoints_pks) + if num_endpoints != 1: + raise Exception('Wrong number({:d}) of associated Endpoints with constraint'.format(num_endpoints)) + db_endpoint = EndPointModel(endpoint_constraint.database, db_endpoints_pks[0]) + return db_endpoint.dump_id() + class ConstraintEndpointLocationRegionModel(Model): # pylint: disable=abstract-method endpoint_fk = ForeignKeyField(EndPointModel) region = StringField(required=True, allow_empty=False) def dump(self) -> Dict: # pylint: disable=arguments-differ - json_endpoint_id = EndPointModel(self.database, self.endpoint_fk).dump_id() - return {'endpoint_location': {'endpoint_id': json_endpoint_id, 'location': {'region': self.region}}} + return {'endpoint_location': {'endpoint_id': dump_endpoint_id(self), 'region': self.region}} class ConstraintEndpointLocationGpsPositionModel(Model): # pylint: disable=abstract-method endpoint_fk = ForeignKeyField(EndPointModel) @@ -69,16 +80,14 @@ class ConstraintEndpointLocationGpsPositionModel(Model): # pylint: disable=abstr def dump(self) -> Dict: # pylint: disable=arguments-differ gps_position = {'latitude': self.latitude, 'longitude': self.longitude} - json_endpoint_id = EndPointModel(self.database, self.endpoint_fk).dump_id() - return {'endpoint_location': {'endpoint_id': json_endpoint_id, 'location': {'gps_position': gps_position}}} + return {'endpoint_location': {'endpoint_id': dump_endpoint_id(self), 'gps_position': gps_position}} class ConstraintEndpointPriorityModel(Model): # pylint: disable=abstract-method endpoint_fk = ForeignKeyField(EndPointModel) - priority = IntegerField(required=True, min_value=0) + priority = FloatField(required=True) def dump(self) -> Dict: # pylint: disable=arguments-differ - json_endpoint_id = EndPointModel(self.database, self.endpoint_fk).dump_id() - return {'endpoint_priority': {'endpoint_id': json_endpoint_id, 'priority': self.priority}} + return {'endpoint_priority': {'endpoint_id': dump_endpoint_id(self), 'priority': self.priority}} class ConstraintSlaAvailabilityModel(Model): # pylint: disable=abstract-method num_disjoint_paths = IntegerField(required=True, min_value=1) @@ -231,7 +240,7 @@ def set_constraints( database : Database, db_parent_pk : str, constraints_name : str, grpc_constraints ) -> List[Tuple[Union[ConstraintsModel, ConstraintModel], bool]]: - str_constraints_key = key_to_str([constraints_name, db_parent_pk], separator=':') + str_constraints_key = key_to_str([db_parent_pk, constraints_name], separator=':') result : Tuple[ConstraintsModel, bool] = get_or_create_object(database, ConstraintsModel, str_constraints_key) db_constraints, created = result diff --git a/src/context/service/grpc_server/ContextServiceServicerImpl.py b/src/context/service/grpc_server/ContextServiceServicerImpl.py index 71c97bf9f..4c8f957ec 100644 --- a/src/context/service/grpc_server/ContextServiceServicerImpl.py +++ b/src/context/service/grpc_server/ContextServiceServicerImpl.py @@ -61,7 +61,6 @@ METHOD_NAMES = [ 'ListLinkIds', 'ListLinks', 'GetLink', 'SetLink', 'RemoveLink', 'GetLinkEvents', 'ListServiceIds', 'ListServices', 'GetService', 'SetService', 'RemoveService', 'GetServiceEvents', 'ListSliceIds', 'ListSlices', 'GetSlice', 'SetSlice', 'RemoveSlice', 'GetSliceEvents', - 'UnsetService', 'UnsetSlice', ] METRICS = create_metrics(SERVICE_NAME, METHOD_NAMES) @@ -278,8 +277,8 @@ class ContextServiceServicerImpl(ContextServiceServicer): ['should be == {:s}({:s})'.format('request.device_id.device_uuid.uuid', device_uuid)]) config_rules = grpc_config_rules_to_raw(request.device_config.config_rules) - running_config_rules = update_config(self.database, device_uuid, 'device', config_rules) - db_running_config = running_config_rules[0][0] + running_config_result = update_config(self.database, device_uuid, 'running', config_rules) + db_running_config = running_config_result[0][0] result : Tuple[DeviceModel, bool] = update_or_create_object(self.database, DeviceModel, device_uuid, { 'device_uuid' : device_uuid, @@ -320,7 +319,7 @@ class ContextServiceServicerImpl(ContextServiceServicer): result : Tuple[EndPointModel, bool] = update_or_create_object( self.database, EndPointModel, str_endpoint_key, endpoint_attributes) - db_endpoint, endpoint_updated = result # pylint: disable=unused-variable + db_endpoint, endpoint_updated = result set_kpi_sample_types(self.database, db_endpoint, endpoint.kpi_sample_types) @@ -484,12 +483,12 @@ class ContextServiceServicerImpl(ContextServiceServicer): str_service_key = key_to_str([context_uuid, service_uuid]) constraints_result = set_constraints( - self.database, str_service_key, 'service', request.service_constraints) + self.database, str_service_key, 'constraints', request.service_constraints) db_constraints = constraints_result[0][0] config_rules = grpc_config_rules_to_raw(request.service_config.config_rules) - running_config_rules = update_config(self.database, str_service_key, 'service', config_rules) - db_running_config = running_config_rules[0][0] + running_config_result = update_config(self.database, str_service_key, 'running', config_rules) + db_running_config = running_config_result[0][0] result : Tuple[ServiceModel, bool] = update_or_create_object(self.database, ServiceModel, str_service_key, { 'context_fk' : db_context, @@ -593,12 +592,12 @@ class ContextServiceServicerImpl(ContextServiceServicer): str_slice_key = key_to_str([context_uuid, slice_uuid]) constraints_result = set_constraints( - self.database, str_slice_key, 'slice', request.slice_constraints) + self.database, str_slice_key, 'constraints', request.slice_constraints) db_constraints = constraints_result[0][0] config_rules = grpc_config_rules_to_raw(request.slice_config.config_rules) - running_config_rules = update_config(self.database, str_slice_key, 'slice', config_rules) - db_running_config = running_config_rules[0][0] + running_config_result = update_config(self.database, str_slice_key, 'running', config_rules) + db_running_config = running_config_result[0][0] result : Tuple[SliceModel, bool] = update_or_create_object(self.database, SliceModel, str_slice_key, { 'context_fk' : db_context, @@ -657,55 +656,6 @@ class ContextServiceServicerImpl(ContextServiceServicer): notify_event(self.messagebroker, TOPIC_SLICE, event_type, {'slice_id': dict_slice_id}) return SliceId(**dict_slice_id) - @safe_and_metered_rpc_method(METRICS, LOGGER) - def UnsetSlice(self, request: Slice, context : grpc.ServicerContext) -> SliceId: - with self.lock: - context_uuid = request.slice_id.context_id.context_uuid.uuid - db_context : ContextModel = get_object(self.database, ContextModel, context_uuid) - - for i,endpoint_id in enumerate(request.slice_endpoint_ids): - endpoint_topology_context_uuid = endpoint_id.topology_id.context_id.context_uuid.uuid - if len(endpoint_topology_context_uuid) > 0 and context_uuid != endpoint_topology_context_uuid: - raise InvalidArgumentException( - 'request.slice_endpoint_ids[{:d}].topology_id.context_id.context_uuid.uuid'.format(i), - endpoint_topology_context_uuid, - ['should be == {:s}({:s})'.format( - 'request.slice_id.context_id.context_uuid.uuid', context_uuid)]) - - slice_uuid = request.slice_id.slice_uuid.uuid - str_slice_key = key_to_str([context_uuid, slice_uuid]) - - if len(request.slice_constraints) > 0: - raise NotImplementedError('UnsetSlice: removal of constraints') - if len(request.slice_config.config_rules) > 0: - raise NotImplementedError('UnsetSlice: removal of config rules') - if len(request.slice_endpoint_ids) > 0: - raise NotImplementedError('UnsetSlice: removal of endpoints') - - updated = False - - for service_id in request.slice_service_ids: - service_uuid = service_id.service_uuid.uuid - service_context_uuid = service_id.context_id.context_uuid.uuid - str_service_key = key_to_str([service_context_uuid, service_uuid]) - str_slice_service_key = key_to_str([str_slice_key, str_service_key], separator='--') - SliceServiceModel(self.database, str_slice_service_key).delete() - updated = True - - for subslice_id in request.slice_subslice_ids: - subslice_uuid = subslice_id.slice_uuid.uuid - subslice_context_uuid = subslice_id.context_id.context_uuid.uuid - str_subslice_key = key_to_str([subslice_context_uuid, subslice_uuid]) - str_slice_subslice_key = key_to_str([str_slice_key, str_subslice_key], separator='--') - SliceSubSliceModel(self.database, str_slice_subslice_key).delete() - updated = True - - event_type = EventTypeEnum.EVENTTYPE_UPDATE if updated else EventTypeEnum.EVENTTYPE_CREATE - db_slice : SliceModel = get_object(self.database, SliceModel, str_slice_key) - dict_slice_id = db_slice.dump_id() - notify_event(self.messagebroker, TOPIC_SLICE, event_type, {'slice_id': dict_slice_id}) - return SliceId(**dict_slice_id) - @safe_and_metered_rpc_method(METRICS, LOGGER) def RemoveSlice(self, request: SliceId, context : grpc.ServicerContext) -> Empty: with self.lock: diff --git a/src/context/tests/Objects.py b/src/context/tests/Objects.py index 140cbff68..519a0093a 100644 --- a/src/context/tests/Objects.py +++ b/src/context/tests/Objects.py @@ -16,7 +16,7 @@ from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID from common.proto.kpi_sample_types_pb2 import KpiSampleType from common.tools.object_factory.ConfigRule import json_config_rule_set from common.tools.object_factory.Connection import json_connection, json_connection_id -from common.tools.object_factory.Constraint import json_constraint_custom +from common.tools.object_factory.Constraint import json_constraint from common.tools.object_factory.Context import json_context, json_context_id from common.tools.object_factory.Device import json_device_id, json_device_packetrouter_disabled from common.tools.object_factory.EndPoint import json_endpoint, json_endpoint_id @@ -129,8 +129,8 @@ SERVICE_R1_R2_EPIDS = [ json_endpoint_id(DEVICE_R2_ID, 'EP100', topology_id=TOPOLOGY_ID), ] SERVICE_R1_R2_CONST = [ - json_constraint_custom('latency[ms]', '15.2'), - json_constraint_custom('jitter[us]', '1.2'), + json_constraint('latency_ms', '15.2'), + json_constraint('jitter_us', '1.2'), ] SERVICE_R1_R2_RULES = [ json_config_rule_set('svc/rsrc1/value', 'value7'), @@ -149,8 +149,8 @@ SERVICE_R1_R3_EPIDS = [ json_endpoint_id(DEVICE_R3_ID, 'EP100', topology_id=TOPOLOGY_ID), ] SERVICE_R1_R3_CONST = [ - json_constraint_custom('latency[ms]', '5.8'), - json_constraint_custom('jitter[us]', '0.1'), + json_constraint('latency_ms', '5.8'), + json_constraint('jitter_us', '0.1'), ] SERVICE_R1_R3_RULES = [ json_config_rule_set('svc/rsrc1/value', 'value7'), @@ -169,8 +169,8 @@ SERVICE_R2_R3_EPIDS = [ json_endpoint_id(DEVICE_R3_ID, 'EP100', topology_id=TOPOLOGY_ID), ] SERVICE_R2_R3_CONST = [ - json_constraint_custom('latency[ms]', '23.1'), - json_constraint_custom('jitter[us]', '3.4'), + json_constraint('latency_ms', '23.1'), + json_constraint('jitter_us', '3.4'), ] SERVICE_R2_R3_RULES = [ json_config_rule_set('svc/rsrc1/value', 'value7'), diff --git a/src/device/service/MonitoringLoops.py b/src/device/service/MonitoringLoops.py index 18faed0d5..4d6d3f591 100644 --- a/src/device/service/MonitoringLoops.py +++ b/src/device/service/MonitoringLoops.py @@ -129,8 +129,8 @@ class MonitoringLoops: # FIXME: uint32 used for intVal results in out of range issues. Temporarily changed to float # extend the 'kpi_value' to support long integers (uint64 / int64 / ...) if isinstance(value, int): - kpi_value_field_name = 'int64Val' - kpi_value_field_cast = int + kpi_value_field_name = 'floatVal' # 'intVal' + kpi_value_field_cast = float # int elif isinstance(value, float): kpi_value_field_name = 'floatVal' kpi_value_field_cast = float @@ -144,7 +144,7 @@ class MonitoringLoops: try: self._monitoring_client.IncludeKpi(Kpi(**{ 'kpi_id' : {'kpi_id': {'uuid': db_kpi.kpi_uuid}}, - 'timestamp': {'timestamp': timestamp}, + 'timestamp': datetime.utcfromtimestamp(timestamp).isoformat() + 'Z', 'kpi_value': {kpi_value_field_name: kpi_value_field_cast(value)} })) except: # pylint: disable=bare-except diff --git a/src/device/service/database/ContextModel.py b/src/device/service/database/ContextModel.py index a609e1ba9..0ca13269c 100644 --- a/src/device/service/database/ContextModel.py +++ b/src/device/service/database/ContextModel.py @@ -24,15 +24,15 @@ class ContextModel(Model): pk = PrimaryKeyField() context_uuid = StringField(required=True, allow_empty=False) - def dump_id(self) -> Dict: - return {'context_uuid': {'uuid': self.context_uuid}} +# def dump_id(self) -> Dict: +# return {'context_uuid': {'uuid': self.context_uuid}} - def dump_topology_ids(self) -> List[Dict]: - from .TopologyModel import TopologyModel # pylint: disable=import-outside-toplevel - db_topology_pks = self.references(TopologyModel) - return [TopologyModel(self.database, pk).dump_id() for pk,_ in db_topology_pks] +# def dump_topology_ids(self) -> List[Dict]: +# from .TopologyModel import TopologyModel # pylint: disable=import-outside-toplevel +# db_topology_pks = self.references(TopologyModel) +# return [TopologyModel(self.database, pk).dump_id() for pk,_ in db_topology_pks] - def dump(self, include_topologies=False) -> Dict: # pylint: disable=arguments-differ - result = {'context_id': self.dump_id()} - if include_topologies: result['topology_ids'] = self.dump_topology_ids() - return result +# def dump(self, include_topologies=True) -> Dict: # pylint: disable=arguments-differ +# result = {'context_id': self.dump_id()} +# if include_topologies: result['topology_ids'] = self.dump_topology_ids() +# return result diff --git a/src/device/service/database/TopologyModel.py b/src/device/service/database/TopologyModel.py index f9e9c0b1a..a099c8adf 100644 --- a/src/device/service/database/TopologyModel.py +++ b/src/device/service/database/TopologyModel.py @@ -27,13 +27,13 @@ class TopologyModel(Model): context_fk = ForeignKeyField(ContextModel) topology_uuid = StringField(required=True, allow_empty=False) - def dump_id(self) -> Dict: - context_id = ContextModel(self.database, self.context_fk).dump_id() - return { - 'context_id': context_id, - 'topology_uuid': {'uuid': self.topology_uuid}, - } +# def dump_id(self) -> Dict: +# context_id = ContextModel(self.database, self.context_fk).dump_id() +# return { +# 'context_id': context_id, +# 'topology_uuid': {'uuid': self.topology_uuid}, +# } - def dump(self) -> Dict: - result = {'topology_id': self.dump_id()} - return result +# def dump(self) -> Dict: +# result = {'topology_id': self.dump_id()} +# return result diff --git a/src/device/service/drivers/__init__.py b/src/device/service/drivers/__init__.py index 6188a385d..40912f50b 100644 --- a/src/device/service/drivers/__init__.py +++ b/src/device/service/drivers/__init__.py @@ -29,7 +29,7 @@ DRIVERS = [ { # Emulated OLS/Packet Router, specifying Undefined/OpenConfig/TAPI Driver => use EmulatedDriver FilterFieldEnum.DEVICE_TYPE: [ - DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM, + DeviceTypeEnum.EMULATED_OPTICAL_LINE_SYSTEM, DeviceTypeEnum.EMULATED_PACKET_ROUTER, ], FilterFieldEnum.DRIVER : [ @@ -49,7 +49,7 @@ DRIVERS = [ (TransportApiDriver, [ { # Real OLS, specifying TAPI Driver => use TransportApiDriver - FilterFieldEnum.DEVICE_TYPE: DeviceTypeEnum.OPEN_LINE_SYSTEM, + FilterFieldEnum.DEVICE_TYPE: DeviceTypeEnum.OPTICAL_LINE_SYSTEM, FilterFieldEnum.DRIVER : ORM_DeviceDriverEnum.TRANSPORT_API, } ]), diff --git a/src/device/tests/test_unitary_emulated.py b/src/device/tests/test_unitary_emulated.py index 745c25c1e..87c067a08 100644 --- a/src/device/tests/test_unitary_emulated.py +++ b/src/device/tests/test_unitary_emulated.py @@ -299,7 +299,12 @@ def test_device_emulated_monitor( for received_sample in received_samples: kpi_uuid = received_sample.kpi_id.kpi_id.uuid assert kpi_uuid in KPI_UUIDS__TO__NUM_SAMPLES_RECEIVED - timestamp = float(received_sample.timestamp.timestamp) + assert isinstance(received_sample.timestamp, str) + try: + timestamp = float(received_sample.timestamp) + except ValueError: + dt_time = dateutil.parser.isoparse(received_sample.timestamp).replace(tzinfo=timezone.utc) + timestamp = float(calendar.timegm(dt_time.timetuple())) + (dt_time.microsecond / 1.e6) assert timestamp > t_start_monitoring assert timestamp < t_end_monitoring assert received_sample.kpi_value.HasField('floatVal') or received_sample.kpi_value.HasField('intVal') diff --git a/src/monitoring/service/__main__.py b/src/monitoring/service/__main__.py index 3334a860c..e37412fa0 100644 --- a/src/monitoring/service/__main__.py +++ b/src/monitoring/service/__main__.py @@ -45,8 +45,8 @@ def start_monitoring(): # Create Monitor Kpi Requests monitor_kpi_request = monitoring_pb2.MonitorKpiRequest() monitor_kpi_request.kpi_id.CopyFrom(kpi_id) - monitor_kpi_request.monitoring_window_s = 86400 - monitor_kpi_request.sampling_rate_s = 30 + monitor_kpi_request.sampling_duration_s = 86400 + monitor_kpi_request.sampling_interval_s = 30 events_collector._monitoring_client.MonitorKpi(monitor_kpi_request) else: # Terminate is set, looping terminates diff --git a/src/pathcomp/.gitlab-ci.yml b/src/pathcomp/.gitlab-ci.yml index a45e735e4..fd52da6fb 100644 --- a/src/pathcomp/.gitlab-ci.yml +++ b/src/pathcomp/.gitlab-ci.yml @@ -21,14 +21,9 @@ build pathcomp: before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - # This first build tags the builder resulting image to prevent being removed by dangling image removal command - - docker build -t "${IMAGE_NAME}-backend:${IMAGE_TAG}-builder" --target builder -f ./src/$IMAGE_NAME/backend/Dockerfile . - - docker build -t "${IMAGE_NAME}-backend:$IMAGE_TAG" -f ./src/$IMAGE_NAME/backend/Dockerfile . - - docker build -t "${IMAGE_NAME}-frontend:$IMAGE_TAG" -f ./src/$IMAGE_NAME/frontend/Dockerfile . - - docker tag "${IMAGE_NAME}-backend:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-backend:$IMAGE_TAG" - - docker tag "${IMAGE_NAME}-frontend:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-frontend:$IMAGE_TAG" - - docker push "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-backend:$IMAGE_TAG" - - docker push "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-frontend:$IMAGE_TAG" + - docker build -t "$IMAGE_NAME:$IMAGE_TAG" -f ./src/$IMAGE_NAME/Dockerfile . + - docker tag "$IMAGE_NAME:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG" + - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG" after_script: - docker images --filter="dangling=true" --quiet | xargs -r docker rmi rules: @@ -37,18 +32,14 @@ build pathcomp: - changes: - src/common/**/*.py - proto/*.proto - - src/$IMAGE_NAME/.gitlab-ci.yml - - src/$IMAGE_NAME/backend/**/*.{c,h,conf} - - src/$IMAGE_NAME/backend/Makefile - - src/$IMAGE_NAME/backend/Dockerfile - - src/$IMAGE_NAME/frontend/**/*.{py,in,yml} - - src/$IMAGE_NAME/frontend/Dockerfile - - src/$IMAGE_NAME/frontend/tests/*.py + - src/$IMAGE_NAME/**/*.{py,in,yml} + - src/$IMAGE_NAME/Dockerfile + - src/$IMAGE_NAME/tests/*.py - manifests/${IMAGE_NAME}service.yaml - .gitlab-ci.yml # Apply unit test to the component -unit test pathcomp-backend: +unit test pathcomp: variables: IMAGE_NAME: 'pathcomp' # name of the microservice IMAGE_TAG: 'latest' # tag of the container image (production, development, etc) @@ -58,22 +49,18 @@ unit test pathcomp-backend: 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}-frontend; then docker rm -f ${IMAGE_NAME}-frontend; else echo "${IMAGE_NAME}-frontend image is not in the system"; fi - - if docker container ls | grep ${IMAGE_NAME}-backend; then docker rm -f ${IMAGE_NAME}-backend; else echo "${IMAGE_NAME}-backend image is not in the system"; 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 script: - - docker pull "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-backend:$IMAGE_TAG" - #- docker run --name ${IMAGE_NAME}-backend -d -p 8081:8081 -v "$PWD/src/${IMAGE_NAME}/backend/tests:/opt/results" --network=teraflowbridge ${IMAGE_NAME}-backend:${IMAGE_TAG}-builder - - docker run --name ${IMAGE_NAME}-backend -d -p 8081:8081 --network=teraflowbridge ${IMAGE_NAME}-backend:${IMAGE_TAG}-builder + - docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG" + - docker run --name $IMAGE_NAME -d -p 10020:10020 -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" --network=teraflowbridge $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG - sleep 5 - docker ps -a - - docker logs ${IMAGE_NAME}-backend - - docker exec -i ${IMAGE_NAME}-backend bash -c "curl -0 -v -X POST -H 'Expect:' -H 'Content-Type:\ application/json' http://127.0.0.1:8081/pathComp/api/v1/compRoute -d @/var/teraflow/tests/pc-req.json" - - docker kill --signal=SIGUSR1 pathcomp-backend - - docker exec -i ${IMAGE_NAME}-backend bash -c "gcovr" + - docker logs $IMAGE_NAME + - docker exec -i $IMAGE_NAME bash -c "coverage run -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}_report.xml" + - 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 ${IMAGE_NAME}-backend - - docker rm -f ${IMAGE_NAME}-backend + - docker rm -f $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)' @@ -81,71 +68,16 @@ unit test pathcomp-backend: - changes: - src/common/**/*.py - proto/*.proto - - src/$IMAGE_NAME/.gitlab-ci.yml - - src/$IMAGE_NAME/backend/**/*.{c,h,conf} - - src/$IMAGE_NAME/backend/Makefile - - src/$IMAGE_NAME/backend/Dockerfile - - manifests/${IMAGE_NAME}service.yaml - - .gitlab-ci.yml - #artifacts: - # when: always - # reports: - # junit: src/$IMAGE_NAME/backend/tests/${IMAGE_NAME}-backend_report.xml - -# Apply unit test to the component -unit test pathcomp-frontend: - variables: - IMAGE_NAME: 'pathcomp' # name of the microservice - IMAGE_TAG: 'latest' # tag of the container image (production, development, etc) - stage: unit_test - needs: - - build pathcomp - 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 --driver=bridge --subnet=172.28.0.0/24 --gateway=172.28.0.254 teraflowbridge; fi - - if docker container ls | grep ${IMAGE_NAME}-frontend; then docker rm -f ${IMAGE_NAME}-frontend; else echo "${IMAGE_NAME}-frontend image is not in the system"; fi - - if docker container ls | grep ${IMAGE_NAME}-backend; then docker rm -f ${IMAGE_NAME}-backend; else echo "${IMAGE_NAME}-backend image is not in the system"; fi - script: - - docker pull "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-frontend:$IMAGE_TAG" - - docker pull "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-backend:$IMAGE_TAG" - - docker run --name ${IMAGE_NAME}-backend -d -p 8081:8081 -v "$PWD/src/${IMAGE_NAME}/backend/tests:/opt/results" --network=teraflowbridge --ip 172.28.0.1 $CI_REGISTRY_IMAGE/${IMAGE_NAME}-backend:$IMAGE_TAG - - sleep 1 - - docker run --name ${IMAGE_NAME}-frontend -d -p 10020:10020 --env "PATHCOMP_BACKEND_HOST=172.28.0.1" --env "PATHCOMP_BACKEND_PORT=8081" -v "$PWD/src/${IMAGE_NAME}/frontend/tests:/opt/results" --network=teraflowbridge --ip 172.28.0.2 $CI_REGISTRY_IMAGE/${IMAGE_NAME}-frontend:$IMAGE_TAG - - docker exec -i ${IMAGE_NAME}-frontend bash -c "env" - - docker exec -i ${IMAGE_NAME}-backend bash -c "env" - - sleep 5 - - docker ps -a - - docker logs ${IMAGE_NAME}-frontend - - docker logs ${IMAGE_NAME}-backend - - docker exec -i ${IMAGE_NAME}-frontend bash -c "coverage run -m pytest --log-level=INFO --verbose $IMAGE_NAME/frontend/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}-frontend_report.xml" - - docker exec -i ${IMAGE_NAME}-frontend bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing" - coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/' - after_script: - - docker ps -a - - docker logs ${IMAGE_NAME}-frontend - - docker logs ${IMAGE_NAME}-backend - - docker rm -f ${IMAGE_NAME}-frontend - - docker rm -f ${IMAGE_NAME}-backend - - 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)' - - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"' - - changes: - - src/common/**/*.py - - proto/*.proto - - src/$IMAGE_NAME/.gitlab-ci.yml - - src/$IMAGE_NAME/frontend/**/*.{py,in,yml} - - src/$IMAGE_NAME/frontend/Dockerfile - - src/$IMAGE_NAME/frontend/tests/*.py - - src/$IMAGE_NAME/backend/**/*.{c,h,conf} - - src/$IMAGE_NAME/backend/Makefile - - src/$IMAGE_NAME/backend/Dockerfile + - 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 artifacts: when: always reports: - junit: src/$IMAGE_NAME/frontend/tests/${IMAGE_NAME}-frontend_report.xml + junit: src/$IMAGE_NAME/tests/${IMAGE_NAME}_report.xml # Deployment of the service in Kubernetes Cluster deploy pathcomp: @@ -154,8 +86,7 @@ deploy pathcomp: IMAGE_TAG: 'latest' # tag of the container image (production, development, etc) stage: deploy needs: - - unit test pathcomp-backend - - unit test pathcomp-frontend + - unit test pathcomp # - integ_test execute script: - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/${IMAGE_NAME}service.yaml' diff --git a/src/pathcomp/Config.py b/src/pathcomp/Config.py new file mode 100644 index 000000000..9953c8205 --- /dev/null +++ b/src/pathcomp/Config.py @@ -0,0 +1,13 @@ +# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/src/pathcomp/Dockerfile b/src/pathcomp/Dockerfile new file mode 100644 index 000000000..ec1ebbf06 --- /dev/null +++ b/src/pathcomp/Dockerfile @@ -0,0 +1,69 @@ +# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM python:3.9-slim + +# Install dependencies +RUN apt-get --yes --quiet --quiet update && \ + apt-get --yes --quiet --quiet install wget g++ && \ + rm -rf /var/lib/apt/lists/* + +# Set Python to show logs as they occur +ENV PYTHONUNBUFFERED=0 + +# Download the gRPC health probe +RUN GRPC_HEALTH_PROBE_VERSION=v0.2.0 && \ + wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \ + chmod +x /bin/grpc_health_probe + +# Get generic Python packages +RUN python3 -m pip install --upgrade pip +RUN python3 -m pip install --upgrade setuptools wheel +RUN python3 -m pip install --upgrade pip-tools + +# Get common Python packages +# Note: this step enables sharing the previous Docker build steps among all the Python components +WORKDIR /var/teraflow +COPY common_requirements.in common_requirements.in +RUN pip-compile --quiet --output-file=common_requirements.txt common_requirements.in +RUN python3 -m pip install -r common_requirements.txt + +# Add common files into working directory +WORKDIR /var/teraflow/common +COPY src/common/. ./ +RUN rm -rf proto + +# Create proto sub-folder, copy .proto files, and generate Python code +RUN mkdir -p /var/teraflow/common/proto +WORKDIR /var/teraflow/common/proto +RUN touch __init__.py +COPY proto/*.proto ./ +RUN python3 -m grpc_tools.protoc -I=. --python_out=. --grpc_python_out=. *.proto +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/pathcomp +WORKDIR /var/teraflow/pathcomp +COPY src/pathcomp/requirements.in requirements.in +RUN pip-compile --quiet --output-file=requirements.txt requirements.in +RUN python3 -m pip install -r requirements.txt + +# Add component files into working directory +WORKDIR /var/teraflow +COPY src/context/. context/ +COPY src/pathcomp/. pathcomp/ + +# Start the service +ENTRYPOINT ["python", "-m", "pathcomp.service"] diff --git a/src/pathcomp/client/PathCompClient.py b/src/pathcomp/client/PathCompClient.py new file mode 100644 index 000000000..b5a85b533 --- /dev/null +++ b/src/pathcomp/client/PathCompClient.py @@ -0,0 +1,53 @@ +# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import grpc, logging +from common.Constants import ServiceNameEnum +from common.Settings import get_service_host, get_service_port_grpc +from common.proto.pathcomp_pb2 import PathCompReply, PathCompRequest +from common.proto.pathcomp_pb2_grpc import PathCompServiceStub +from common.tools.client.RetryDecorator import retry, delay_exponential +from common.tools.grpc.Tools import grpc_message_to_json_string + +LOGGER = logging.getLogger(__name__) +MAX_RETRIES = 15 +DELAY_FUNCTION = delay_exponential(initial=0.01, increment=2.0, maximum=5.0) +RETRY_DECORATOR = retry(max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION, prepare_method_name='connect') + +class PathCompClient: + def __init__(self, host=None, port=None): + if not host: host = get_service_host(ServiceNameEnum.PATHCOMP) + if not port: port = get_service_port_grpc(ServiceNameEnum.PATHCOMP) + self.endpoint = '{:s}:{:s}'.format(str(host), str(port)) + LOGGER.debug('Creating channel to {:s}...'.format(str(self.endpoint))) + self.channel = None + self.stub = None + self.connect() + LOGGER.debug('Channel created') + + def connect(self): + self.channel = grpc.insecure_channel(self.endpoint) + self.stub = PathCompServiceStub(self.channel) + + def close(self): + if self.channel is not None: self.channel.close() + self.channel = None + self.stub = None + + @RETRY_DECORATOR + def Compute(self, request : PathCompRequest) -> PathCompReply: + LOGGER.debug('Compute request: {:s}'.format(grpc_message_to_json_string(request))) + response = self.stub.Compute(request) + LOGGER.debug('Compute result: {:s}'.format(grpc_message_to_json_string(response))) + return response diff --git a/src/pathcomp/client/__init__.py b/src/pathcomp/client/__init__.py new file mode 100644 index 000000000..70a332512 --- /dev/null +++ b/src/pathcomp/client/__init__.py @@ -0,0 +1,14 @@ +# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + diff --git a/src/pathcomp/requirements.in b/src/pathcomp/requirements.in new file mode 100644 index 000000000..a743bbe34 --- /dev/null +++ b/src/pathcomp/requirements.in @@ -0,0 +1 @@ +requests==2.27.1 diff --git a/src/pathcomp/service/PathCompService.py b/src/pathcomp/service/PathCompService.py new file mode 100644 index 000000000..7fd9eab3b --- /dev/null +++ b/src/pathcomp/service/PathCompService.py @@ -0,0 +1,28 @@ +# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from common.Constants import ServiceNameEnum +from common.Settings import get_service_port_grpc +from common.tools.service.GenericGrpcService import GenericGrpcService +from pathcomp.proto.pathcomp_pb2_grpc import add_PathCompServiceServicer_to_server +from .PathCompServiceServicerImpl import PathCompServiceServicerImpl + +class PathCompService(GenericGrpcService): + def __init__(self, cls_name: str = __name__) -> None: + port = get_service_port_grpc(ServiceNameEnum.PATHCOMP) + super().__init__(port, cls_name=cls_name) + self.pathcomp_servicer = PathCompServiceServicerImpl() + + def install_servicers(self): + add_PathCompServiceServicer_to_server(self.pathcomp_servicer, self.server) diff --git a/src/pathcomp/service/PathCompServiceServicerImpl.py b/src/pathcomp/service/PathCompServiceServicerImpl.py new file mode 100644 index 000000000..239ab6ab5 --- /dev/null +++ b/src/pathcomp/service/PathCompServiceServicerImpl.py @@ -0,0 +1,85 @@ +# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from typing import List +import grpc, logging, uuid +from common.proto.context_pb2 import Connection, Empty, EndPointId +from common.proto.pathcomp_pb2 import PathCompReply, PathCompRequest +from common.proto.pathcomp_pb2_grpc import PathCompServiceServicer +from common.rpc_method_wrapper.Decorator import create_metrics, safe_and_metered_rpc_method +from common.tools.grpc.Tools import grpc_message_to_json, grpc_message_to_json_string +from context.client.ContextClient import ContextClient + +LOGGER = logging.getLogger(__name__) + +SERVICE_NAME = 'PathComp' +METHOD_NAMES = ['Compute'] +METRICS = create_metrics(SERVICE_NAME, METHOD_NAMES) + +class PathCompServiceServicerImpl(PathCompServiceServicer): + def __init__(self) -> None: + LOGGER.debug('Creating Servicer...') + LOGGER.debug('Servicer Created') + + @safe_and_metered_rpc_method(METRICS, LOGGER) + def Compute(self, request : PathCompRequest, context : grpc.ServicerContext) -> PathCompReply: + LOGGER.info('[Compute] begin ; request = {:s}'.format(grpc_message_to_json_string(request))) + + context_client = ContextClient() + + # TODO: consider filtering resources + + grpc_contexts = context_client.ListContexts(Empty()) + grpc_devices = context_client.ListDevices(Empty()) + grpc_links = context_client.ListLinks(Empty()) + for grpc_context in grpc_contexts.contexts: + # TODO: add context to request + grpc_topologies = context_client.ListTopologies(grpc_context.context_id) + for grpc_topology in grpc_topologies.topologies: #pylint: disable=unused-variable + # TODO: add topology to request + pass + for grpc_device in grpc_devices.devices: #pylint: disable=unused-variable + # TODO: add device to request + pass + for grpc_link in grpc_links.links: #pylint: disable=unused-variable + # TODO: add link to request + pass + + reply = PathCompReply() + # TODO: issue path computation request + # TODO: compose reply populating reply.services and reply.connections + + for service in request.services: + # TODO: implement support for multi-point services + service_endpoint_ids = service.service_endpoint_ids + if len(service_endpoint_ids) != 2: raise NotImplementedError('Service must have 2 endpoints') + a_endpoint_id, z_endpoint_id = service_endpoint_ids[0], service_endpoint_ids[-1] + + connection_uuid = str(uuid.uuid4()) + connection_path_hops : List[EndPointId] = [] + connection_path_hops.extend([ + grpc_message_to_json(a_endpoint_id), + grpc_message_to_json(z_endpoint_id), + ]) + connection = Connection(**{ + 'connection_id': {'connection_uuid': {'uuid': connection_uuid}}, + 'service_id': grpc_message_to_json(service.service_id), + 'path_hops_endpoint_ids': connection_path_hops, + 'sub_service_ids': [], + }) + reply.connections.append(connection) #pylint: disable=no-member + reply.services.append(service) #pylint: disable=no-member + + LOGGER.info('[Compute] end ; reply = {:s}'.format(grpc_message_to_json_string(reply))) + return reply diff --git a/src/pathcomp/service/__init__.py b/src/pathcomp/service/__init__.py new file mode 100644 index 000000000..70a332512 --- /dev/null +++ b/src/pathcomp/service/__init__.py @@ -0,0 +1,14 @@ +# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + diff --git a/src/pathcomp/service/__main__.py b/src/pathcomp/service/__main__.py new file mode 100644 index 000000000..a41b9e994 --- /dev/null +++ b/src/pathcomp/service/__main__.py @@ -0,0 +1,65 @@ +# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import logging, signal, sys, threading +from prometheus_client import start_http_server +from common.Constants import ServiceNameEnum +from common.Settings import ( + ENVVAR_SUFIX_SERVICE_HOST, ENVVAR_SUFIX_SERVICE_PORT_GRPC, get_env_var_name, get_log_level, get_metrics_port, + wait_for_environment_variables) +from .PathCompService import PathCompService + +terminate = threading.Event() +LOGGER : logging.Logger = None + +def signal_handler(signal, frame): # pylint: disable=redefined-outer-name + LOGGER.warning('Terminate signal received') + terminate.set() + +def main(): + global LOGGER # pylint: disable=global-statement + + log_level = get_log_level() + logging.basicConfig(level=log_level) + LOGGER = logging.getLogger(__name__) + + wait_for_environment_variables([ + get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_HOST ), + get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_PORT_GRPC), + ]) + + signal.signal(signal.SIGINT, signal_handler) + signal.signal(signal.SIGTERM, signal_handler) + + LOGGER.info('Starting...') + + # Start metrics server + metrics_port = get_metrics_port() + start_http_server(metrics_port) + + # Starting service service + grpc_service = PathCompService() + grpc_service.start() + + # Wait for Ctrl+C or termination signal + while not terminate.wait(timeout=0.1): pass + + LOGGER.info('Terminating...') + grpc_service.stop() + + LOGGER.info('Bye') + return 0 + +if __name__ == '__main__': + sys.exit(main()) diff --git a/src/pathcomp/tests/.gitignore b/src/pathcomp/tests/.gitignore new file mode 100644 index 000000000..6b97d6fe3 --- /dev/null +++ b/src/pathcomp/tests/.gitignore @@ -0,0 +1 @@ +# Add here your files containing confidential testbed details such as IP addresses, ports, usernames, passwords, etc. diff --git a/src/pathcomp/tests/MockService_Dependencies.py b/src/pathcomp/tests/MockService_Dependencies.py new file mode 100644 index 000000000..b5fe85aa9 --- /dev/null +++ b/src/pathcomp/tests/MockService_Dependencies.py @@ -0,0 +1,58 @@ +# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +from typing import Union +from common.Constants import ServiceNameEnum +from common.Settings import ENVVAR_SUFIX_SERVICE_HOST, ENVVAR_SUFIX_SERVICE_PORT_GRPC, get_env_var_name +from common.proto.context_pb2_grpc import add_ContextServiceServicer_to_server +from common.proto.device_pb2_grpc import add_DeviceServiceServicer_to_server +from common.proto.service_pb2_grpc import add_ServiceServiceServicer_to_server +from common.tests.MockServicerImpl_Context import MockServicerImpl_Context +from common.tests.MockServicerImpl_Device import MockServicerImpl_Device +from common.tests.MockServicerImpl_Service import MockServicerImpl_Service +from common.tools.service.GenericGrpcService import GenericGrpcService + +LOCAL_HOST = '127.0.0.1' + +SERVICE_CONTEXT = ServiceNameEnum.CONTEXT +SERVICE_DEVICE = ServiceNameEnum.DEVICE +SERVICE_SERVICE = ServiceNameEnum.SERVICE + +class MockService_Dependencies(GenericGrpcService): + # Mock Service implementing Context, Device, and Service to simplify unitary tests of PathComp + + def __init__(self, bind_port: Union[str, int]) -> None: + super().__init__(bind_port, LOCAL_HOST, enable_health_servicer=False, cls_name='MockService') + + # pylint: disable=attribute-defined-outside-init + def install_servicers(self): + self.context_servicer = MockServicerImpl_Context() + add_ContextServiceServicer_to_server(self.context_servicer, self.server) + + self.device_servicer = MockServicerImpl_Device() + add_DeviceServiceServicer_to_server(self.device_servicer, self.server) + + self.service_servicer = MockServicerImpl_Service() + add_ServiceServiceServicer_to_server(self.service_servicer, self.server) + + def configure_env_vars(self): + os.environ[get_env_var_name(SERVICE_CONTEXT, ENVVAR_SUFIX_SERVICE_HOST )] = str(self.bind_address) + os.environ[get_env_var_name(SERVICE_CONTEXT, ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(self.bind_port) + + os.environ[get_env_var_name(SERVICE_DEVICE, ENVVAR_SUFIX_SERVICE_HOST )] = str(self.bind_address) + os.environ[get_env_var_name(SERVICE_DEVICE, ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(self.bind_port) + + os.environ[get_env_var_name(SERVICE_SERVICE, ENVVAR_SUFIX_SERVICE_HOST )] = str(self.bind_address) + os.environ[get_env_var_name(SERVICE_SERVICE, ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(self.bind_port) diff --git a/src/pathcomp/tests/Objects.py b/src/pathcomp/tests/Objects.py new file mode 100644 index 000000000..f4785d7ae --- /dev/null +++ b/src/pathcomp/tests/Objects.py @@ -0,0 +1,110 @@ +# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID +from common.tools.object_factory.Constraint import json_constraint +from common.tools.object_factory.Context import json_context, json_context_id +from common.tools.object_factory.Device import json_device_emulated_packet_router_disabled, json_device_id +from common.tools.object_factory.EndPoint import json_endpoints +from common.tools.object_factory.Link import get_link_uuid, json_link, json_link_id +from common.tools.object_factory.Service import get_service_uuid, json_service_l3nm_planned +from common.tools.object_factory.Topology import json_topology, json_topology_id + +def compose_device(device_uuid, endpoint_uuids): + device_id = json_device_id(device_uuid) + endpoints = [(endpoint_uuid, 'copper', []) for endpoint_uuid in endpoint_uuids] + endpoints = json_endpoints(device_id, endpoints, topology_id=TOPOLOGY_A_ID) + device = json_device_emulated_packet_router_disabled(device_uuid, endpoints=endpoints) + return device_id, endpoints, device + +def compose_link(endpoint_a, endpoint_z): + link_uuid = get_link_uuid(endpoint_a['endpoint_id'], endpoint_z['endpoint_id']) + link_id = json_link_id(link_uuid) + link = json_link(link_uuid, [endpoint_a['endpoint_id'], endpoint_z['endpoint_id']]) + return link_id, link + +def compose_service(endpoint_a, endpoint_z, constraints=[]): + service_uuid = get_service_uuid(endpoint_a['endpoint_id'], endpoint_z['endpoint_id']) + endpoint_ids = [endpoint_a['endpoint_id'], endpoint_z['endpoint_id']] + service = json_service_l3nm_planned(service_uuid, endpoint_ids=endpoint_ids, constraints=constraints) + return service + +# ----- Context -------------------------------------------------------------------------------------------------------- +CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_UUID) +CONTEXT = json_context(DEFAULT_CONTEXT_UUID) + +# ----- Domains -------------------------------------------------------------------------------------------------------- +TOPOLOGY_ADMIN_ID = json_topology_id(DEFAULT_TOPOLOGY_UUID, context_id=CONTEXT_ID) +TOPOLOGY_ADMIN = json_topology(DEFAULT_TOPOLOGY_UUID, context_id=CONTEXT_ID) + +TOPOLOGY_A_ID = json_topology_id('A', context_id=CONTEXT_ID) +TOPOLOGY_A = json_topology('A', context_id=CONTEXT_ID) + +TOPOLOGY_B_ID = json_topology_id('B', context_id=CONTEXT_ID) +TOPOLOGY_B = json_topology('B', context_id=CONTEXT_ID) + +TOPOLOGY_C_ID = json_topology_id('C', context_id=CONTEXT_ID) +TOPOLOGY_C = json_topology('C', context_id=CONTEXT_ID) + +# ----- Devices Domain A ----------------------------------------------------------------------------------------------- +DEVICE_A1_ID, DEVICE_A1_ENDPOINTS, DEVICE_A1 = compose_device('A1', ['1', '2', '2000']) +DEVICE_A2_ID, DEVICE_A2_ENDPOINTS, DEVICE_A2 = compose_device('A2', ['1', '2', '1001']) +DEVICE_A3_ID, DEVICE_A3_ENDPOINTS, DEVICE_A3 = compose_device('A3', ['1', '2']) + +# ----- Devices Domain B ----------------------------------------------------------------------------------------------- +DEVICE_B1_ID, DEVICE_B1_ENDPOINTS, DEVICE_B1 = compose_device('B1', ['1', '2', '2000']) +DEVICE_B2_ID, DEVICE_B2_ENDPOINTS, DEVICE_B2 = compose_device('B2', ['1', '2', '1002']) +DEVICE_B3_ID, DEVICE_B3_ENDPOINTS, DEVICE_B3 = compose_device('B3', ['1', '2']) + +# ----- Devices Domain C ----------------------------------------------------------------------------------------------- +DEVICE_C1_ID, DEVICE_C1_ENDPOINTS, DEVICE_C1 = compose_device('C1', ['1', '2', '1001']) +DEVICE_C2_ID, DEVICE_C2_ENDPOINTS, DEVICE_C2 = compose_device('C2', ['1', '2']) +DEVICE_C3_ID, DEVICE_C3_ENDPOINTS, DEVICE_C3 = compose_device('C3', ['1', '2', '1002']) + +# ----- InterDomain Links ---------------------------------------------------------------------------------------------- +LINK_A2_C3_ID, LINK_A2_C3 = compose_link(DEVICE_A2_ENDPOINTS[2], DEVICE_C3_ENDPOINTS[2]) +LINK_C1_B2_ID, LINK_C1_B2 = compose_link(DEVICE_C1_ENDPOINTS[2], DEVICE_B2_ENDPOINTS[2]) + +# ----- IntraDomain A Links -------------------------------------------------------------------------------------------- +LINK_A1_A2_ID, LINK_A1_A2 = compose_link(DEVICE_A1_ENDPOINTS[0], DEVICE_A2_ENDPOINTS[0]) +LINK_A1_A3_ID, LINK_A1_A3 = compose_link(DEVICE_A1_ENDPOINTS[1], DEVICE_A3_ENDPOINTS[0]) +LINK_A2_A3_ID, LINK_A2_A3 = compose_link(DEVICE_A2_ENDPOINTS[1], DEVICE_A3_ENDPOINTS[1]) + +# ----- IntraDomain B Links -------------------------------------------------------------------------------------------- +LINK_B1_B2_ID, LINK_B1_B2 = compose_link(DEVICE_B1_ENDPOINTS[0], DEVICE_B2_ENDPOINTS[0]) +LINK_B1_B3_ID, LINK_B1_B3 = compose_link(DEVICE_B1_ENDPOINTS[1], DEVICE_B3_ENDPOINTS[0]) +LINK_B2_B3_ID, LINK_B2_B3 = compose_link(DEVICE_B2_ENDPOINTS[1], DEVICE_B3_ENDPOINTS[1]) + +# ----- IntraDomain C Links -------------------------------------------------------------------------------------------- +LINK_C1_C2_ID, LINK_C1_C2 = compose_link(DEVICE_C1_ENDPOINTS[0], DEVICE_C2_ENDPOINTS[0]) +LINK_C1_C3_ID, LINK_C1_C3 = compose_link(DEVICE_C1_ENDPOINTS[1], DEVICE_C3_ENDPOINTS[0]) +LINK_C2_C3_ID, LINK_C2_C3 = compose_link(DEVICE_C2_ENDPOINTS[1], DEVICE_C3_ENDPOINTS[1]) + +# ----- Service -------------------------------------------------------------------------------------------------------- +SERVICE_A1_B1 = compose_service(DEVICE_A1_ENDPOINTS[2], DEVICE_B1_ENDPOINTS[2], constraints=[ + json_constraint('bandwidth[gbps]', 10.0), + json_constraint('latency[ms]', 5.0), +]) + +# ----- Containers ----------------------------------------------------------------------------------------------------- +CONTEXTS = [CONTEXT] +TOPOLOGIES = [TOPOLOGY_ADMIN, TOPOLOGY_A, TOPOLOGY_B, TOPOLOGY_C] +DEVICES = [ DEVICE_A1, DEVICE_A2, DEVICE_A3, + DEVICE_B1, DEVICE_B2, DEVICE_B3, + DEVICE_C1, DEVICE_C2, DEVICE_C3, ] +LINKS = [ LINK_A2_C3, LINK_C1_B2, + LINK_A1_A2, LINK_A1_A3, LINK_A2_A3, + LINK_B1_B2, LINK_B1_B3, LINK_B2_B3, + LINK_C1_C2, LINK_C1_C3, LINK_C2_C3, ] +SERVICES = [SERVICE_A1_B1] diff --git a/src/pathcomp/tests/PrepareTestScenario.py b/src/pathcomp/tests/PrepareTestScenario.py new file mode 100644 index 000000000..a4efcbdbf --- /dev/null +++ b/src/pathcomp/tests/PrepareTestScenario.py @@ -0,0 +1,65 @@ +# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import pytest, os +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 context.client.ContextClient import ContextClient +from device.client.DeviceClient import DeviceClient +from pathcomp.client.PathCompClient import PathCompClient +from pathcomp.service.PathCompService import PathCompService +from pathcomp.tests.MockService_Dependencies import MockService_Dependencies + +LOCAL_HOST = '127.0.0.1' +MOCKSERVICE_PORT = 10000 +PATHCOMP_SERVICE_PORT = MOCKSERVICE_PORT + get_service_port_grpc(ServiceNameEnum.PATHCOMP) # avoid privileged ports +os.environ[get_env_var_name(ServiceNameEnum.PATHCOMP, ENVVAR_SUFIX_SERVICE_HOST )] = str(LOCAL_HOST) +os.environ[get_env_var_name(ServiceNameEnum.PATHCOMP, ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(PATHCOMP_SERVICE_PORT) + +@pytest.fixture(scope='session') +def mock_service(): + _service = MockService_Dependencies(MOCKSERVICE_PORT) + _service.configure_env_vars() + _service.start() + yield _service + _service.stop() + +@pytest.fixture(scope='session') +def context_client(mock_service : MockService_Dependencies): # pylint: disable=redefined-outer-name + _client = ContextClient() + yield _client + _client.close() + +@pytest.fixture(scope='session') +def device_client(mock_service : MockService_Dependencies): # pylint: disable=redefined-outer-name + _client = DeviceClient() + yield _client + _client.close() + +@pytest.fixture(scope='session') +def pathcomp_service( + context_client : ContextClient, # pylint: disable=redefined-outer-name + device_client : DeviceClient): # pylint: disable=redefined-outer-name + + _service = PathCompService() + _service.start() + yield _service + _service.stop() + +@pytest.fixture(scope='session') +def pathcomp_client(pathcomp_service : PathCompService): # pylint: disable=redefined-outer-name + _client = PathCompClient() + yield _client + _client.close() diff --git a/src/pathcomp/tests/__init__.py b/src/pathcomp/tests/__init__.py new file mode 100644 index 000000000..70a332512 --- /dev/null +++ b/src/pathcomp/tests/__init__.py @@ -0,0 +1,14 @@ +# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + diff --git a/src/pathcomp/tests/test_unitary.py b/src/pathcomp/tests/test_unitary.py new file mode 100644 index 000000000..23e574e0e --- /dev/null +++ b/src/pathcomp/tests/test_unitary.py @@ -0,0 +1,95 @@ +# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import logging +from common.proto.context_pb2 import Context, ContextId, DeviceId, Link, LinkId, Topology, Device, TopologyId +from common.proto.pathcomp_pb2 import PathCompRequest +from common.tools.grpc.Tools import grpc_message_to_json +from context.client.ContextClient import ContextClient +from device.client.DeviceClient import DeviceClient +from pathcomp.client.PathCompClient import PathCompClient +from .Objects import CONTEXTS, DEVICES, LINKS, SERVICES, TOPOLOGIES +from .PrepareTestScenario import ( # pylint: disable=unused-import + # be careful, order of symbols is important here! + mock_service, pathcomp_service, context_client, device_client, pathcomp_client) + +LOGGER = logging.getLogger(__name__) +LOGGER.setLevel(logging.DEBUG) + + +def test_prepare_environment( + context_client : ContextClient, # pylint: disable=redefined-outer-name + device_client : DeviceClient): # pylint: disable=redefined-outer-name + + for context in CONTEXTS : context_client.SetContext (Context (**context )) + for topology in TOPOLOGIES: context_client.SetTopology(Topology(**topology)) + for device in DEVICES : device_client .AddDevice (Device (**device )) + for link in LINKS : context_client.SetLink (Link (**link )) + + +def test_request_service( + pathcomp_client : PathCompClient): # pylint: disable=redefined-outer-name + + request_services = SERVICES + pathcomp_request = PathCompRequest(services=request_services) + pathcomp_reply = pathcomp_client.Compute(pathcomp_request) + pathcomp_reply = grpc_message_to_json(pathcomp_reply) + reply_services = pathcomp_reply['services'] + reply_connections = pathcomp_reply['connections'] + assert len(request_services) <= len(reply_services) + request_service_ids = { + '{:s}/{:s}'.format( + svc['service_id']['context_id']['context_uuid']['uuid'], + svc['service_id']['service_uuid']['uuid'] + ) + for svc in request_services + } + reply_service_ids = { + '{:s}/{:s}'.format( + svc['service_id']['context_id']['context_uuid']['uuid'], + svc['service_id']['service_uuid']['uuid'] + ) + for svc in reply_services + } + # Assert all requested services have a reply + # It permits having other services not requested (i.e., sub-services) + assert len(request_service_ids.difference(reply_service_ids)) == 0 + + reply_connection_service_ids = { + '{:s}/{:s}'.format( + conn['service_id']['context_id']['context_uuid']['uuid'], + conn['service_id']['service_uuid']['uuid'] + ) + for conn in reply_connections + } + # Assert all requested services have a connection associated + # It permits having other connections not requested (i.e., connections for sub-services) + assert len(request_service_ids.difference(reply_connection_service_ids)) == 0 + + # TODO: implement other checks. examples: + # - request service and reply service endpoints match + # - request service and reply connection endpoints match + # - reply sub-service and reply sub-connection endpoints match + # - others? + #for json_service,json_connection in zip(json_services, json_connections): + + +def test_cleanup_environment( + context_client : ContextClient, # pylint: disable=redefined-outer-name + device_client : DeviceClient): # pylint: disable=redefined-outer-name + + for link in LINKS : context_client.RemoveLink (LinkId (**link ['link_id' ])) + for device in DEVICES : device_client .DeleteDevice (DeviceId (**device ['device_id' ])) + for topology in TOPOLOGIES: context_client.RemoveTopology(TopologyId(**topology['topology_id'])) + for context in CONTEXTS : context_client.RemoveContext (ContextId (**context ['context_id' ])) diff --git a/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java b/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java index 7cb393500..66994625d 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java +++ b/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java @@ -17,7 +17,6 @@ package eu.teraflow.policy; import eu.teraflow.policy.context.ContextService; -import eu.teraflow.policy.model.PolicyRuleBasic; import eu.teraflow.policy.model.PolicyRuleDevice; import eu.teraflow.policy.model.PolicyRuleService; import eu.teraflow.policy.model.PolicyRuleState; @@ -25,8 +24,6 @@ import eu.teraflow.policy.model.RuleState; import eu.teraflow.policy.monitoring.MonitoringService; import eu.teraflow.policy.service.ServiceService; import io.smallrye.mutiny.Uni; -import java.util.ArrayList; -import java.util.List; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; import org.jboss.logging.Logger; @@ -35,88 +32,23 @@ import org.jboss.logging.Logger; public class PolicyServiceImpl implements PolicyService { private static final Logger LOGGER = Logger.getLogger(PolicyServiceImpl.class); - private static final String INVALID_MESSAGE = "%s is invalid."; - private static final String VALID_MESSAGE = "%s is valid."; - private static final PolicyRuleState INSERTED_POLICYRULE_STATE = - new PolicyRuleState(RuleState.POLICY_INSERTED); - private static final PolicyRuleState VALIDATED_POLICYRULE_STATE = - new PolicyRuleState(RuleState.POLICY_VALIDATED); - private static final PolicyRuleState FAILED_POLICYRULE_STATE = - new PolicyRuleState(RuleState.POLICY_FAILED); private final ContextService contextService; private final MonitoringService monitoringService; private final ServiceService serviceService; - private final PolicyRuleConditionValidator policyRuleConditionValidator; - private final PolicyRuleConditionFieldsGetter policyRuleConditionFieldsGetter; @Inject public PolicyServiceImpl( ContextService contextService, MonitoringService monitoringService, - ServiceService serviceService, - PolicyRuleConditionValidator policyRuleConditionValidator, - PolicyRuleConditionFieldsGetter policyRuleConditionFieldsGetter) { + ServiceService serviceService) { this.contextService = contextService; this.monitoringService = monitoringService; this.serviceService = serviceService; - this.policyRuleConditionValidator = policyRuleConditionValidator; - this.policyRuleConditionFieldsGetter = policyRuleConditionFieldsGetter; } @Override public Uni addPolicyService(PolicyRuleService policyRuleService) { - LOGGER.infof("Received %s", policyRuleService); - - final var serviceId = policyRuleService.getServiceId(); - final var deviceIds = policyRuleService.getDeviceIds(); - final var policyRuleBasic = policyRuleService.getPolicyRuleBasic(); - - final var policyRuleConditions = policyRuleBasic.getPolicyRuleConditions(); - final var kpiIds = policyRuleConditionFieldsGetter.getKpiIds(policyRuleConditions); - final var kpiValues = policyRuleConditionFieldsGetter.getKpiValues(policyRuleConditions); - final var numericalOperators = - policyRuleConditionFieldsGetter.getNumericalOperators(policyRuleConditions); - - final var isServiceIdValid = policyRuleConditionValidator.validateServiceId(serviceId); - - logAndSetPolicyRuleState(INSERTED_POLICYRULE_STATE, policyRuleBasic); - contextService.setPolicyRule(policyRuleBasic); - - // VALIDATION PHASE - isServiceIdValid - .subscribe() - .with( - serviceIdBooleanValue -> { - if (Boolean.FALSE.equals(serviceIdBooleanValue)) { - LOGGER.errorf(INVALID_MESSAGE, serviceId); - final var invalidDeviceIds = returnInvalidDeviceIds(deviceIds); - - if (invalidDeviceIds.isEmpty()) { - LOGGER.info("All Device Ids are valid."); - } - - logAndSetPolicyRuleState(FAILED_POLICYRULE_STATE, policyRuleBasic); - } else { - LOGGER.infof(VALID_MESSAGE, serviceId); - - final var invalidDeviceIds = returnInvalidDeviceIds(deviceIds); - - if (!invalidDeviceIds.isEmpty()) { - logAndSetPolicyRuleState(FAILED_POLICYRULE_STATE, policyRuleBasic); - contextService.setPolicyRule(policyRuleBasic); - } else { - LOGGER.infof("All deviceIds are valid"); - } - - logAndSetPolicyRuleState(VALIDATED_POLICYRULE_STATE, policyRuleBasic); - } - - contextService.setPolicyRule(policyRuleBasic); - }); - - // PROVISION PHASE - final var policyRuleState = new PolicyRuleState(RuleState.POLICY_VALIDATED); return Uni.createFrom().item(policyRuleState); @@ -124,80 +56,8 @@ public class PolicyServiceImpl implements PolicyService { @Override public Uni addPolicyDevice(PolicyRuleDevice policyRuleDevice) { - LOGGER.infof("Received %s", policyRuleDevice); - - final var policyRuleBasic = policyRuleDevice.getPolicyRuleBasic(); - final var deviceIds = policyRuleDevice.getDeviceIds(); - - final var policyRuleConditions = policyRuleBasic.getPolicyRuleConditions(); - final var kpiIds = policyRuleConditionFieldsGetter.getKpiIds(policyRuleConditions); - final var kpiValues = policyRuleConditionFieldsGetter.getKpiValues(policyRuleConditions); - final var numericalOperators = - policyRuleConditionFieldsGetter.getNumericalOperators(policyRuleConditions); - - logAndSetPolicyRuleState(INSERTED_POLICYRULE_STATE, policyRuleBasic); - contextService.setPolicyRule(policyRuleBasic); - - // VALIDATION PHASE - final var invalidDeviceIds = returnInvalidDeviceIds(deviceIds); - - if (!invalidDeviceIds.isEmpty()) { - logAndSetPolicyRuleState(FAILED_POLICYRULE_STATE, policyRuleBasic); - } else { - LOGGER.infof("All deviceIds are valid"); - logAndSetPolicyRuleState(VALIDATED_POLICYRULE_STATE, policyRuleBasic); - } - contextService.setPolicyRule(policyRuleBasic); - - // PROVISION PHASE - final var policyRuleState = new PolicyRuleState(RuleState.POLICY_VALIDATED); return Uni.createFrom().item(policyRuleState); } - - private List returnInvalidDeviceIds(List deviceIds) { - var invalidDeviceIds = new ArrayList(); - - if (!deviceIds.isEmpty()) { - - for (String deviceId : deviceIds) { - final var validatedDeviceId = policyRuleConditionValidator.validateDeviceId(deviceId); - - validatedDeviceId - .subscribe() - .with( - deviceIdBoolean -> { - if (Boolean.FALSE.equals(deviceIdBoolean)) { - invalidDeviceIds.add(deviceId); - } - }); - } - - } else { - LOGGER.warnf("No deviceIds found"); - } - - return invalidDeviceIds; - } - - private void logAndSetPolicyRuleState( - PolicyRuleState policyRuleState, PolicyRuleBasic policyRuleBasic) { - final var POLICY_RULE_STATE_MESSAGE = "Setting Policy Rule state to [%s]"; - - if (policyRuleState.getRuleState() == RuleState.POLICY_INSERTED) { - LOGGER.infof(POLICY_RULE_STATE_MESSAGE, RuleState.POLICY_INSERTED.toString()); - policyRuleBasic.setPolicyRuleState(policyRuleState); - } - - if (policyRuleState.getRuleState() == RuleState.POLICY_VALIDATED) { - LOGGER.infof(POLICY_RULE_STATE_MESSAGE, RuleState.POLICY_VALIDATED.toString()); - policyRuleBasic.setPolicyRuleState(policyRuleState); - } - - if (policyRuleState.getRuleState() == RuleState.POLICY_FAILED) { - LOGGER.errorf(POLICY_RULE_STATE_MESSAGE, RuleState.POLICY_FAILED.toString()); - policyRuleBasic.setPolicyRuleState(policyRuleState); - } - } } diff --git a/src/policy/src/main/java/eu/teraflow/policy/Serializer.java b/src/policy/src/main/java/eu/teraflow/policy/Serializer.java index 49882be71..35b6e2fd8 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/Serializer.java +++ b/src/policy/src/main/java/eu/teraflow/policy/Serializer.java @@ -88,7 +88,6 @@ import eu.teraflow.policy.model.PolicyRuleState; import eu.teraflow.policy.model.RuleState; import eu.teraflow.policy.monitoring.model.AlarmDescriptor; import eu.teraflow.policy.monitoring.model.AlarmResponse; -import eu.teraflow.policy.monitoring.model.AlarmSubscription; import eu.teraflow.policy.monitoring.model.BooleanKpiValue; import eu.teraflow.policy.monitoring.model.FloatKpiValue; import eu.teraflow.policy.monitoring.model.IntegerKpiValue; @@ -1473,12 +1472,12 @@ public class Serializer { public Monitoring.KpiValue serializeIntegerKpiValue(KpiValue kpiValue) { final var builder = Monitoring.KpiValue.newBuilder(); - return builder.setInt32Val(kpiValue.getValue()).build(); + return builder.setIntVal(kpiValue.getValue()).build(); } public int deserializeIntegerKpiValue(Monitoring.KpiValue serializedKpiValue) { - return serializedKpiValue.getInt32Val(); + return serializedKpiValue.getIntVal(); } public Monitoring.KpiValue serialize(KpiValue kpiValue) { @@ -1486,7 +1485,7 @@ public class Serializer { if (kpiValue.getValue() instanceof Integer) { final var serializedIntegerKpiValue = serializeIntegerKpiValue((KpiValue) kpiValue); - builder.setInt32Val(serializedIntegerKpiValue.getInt32Val()); + builder.setIntVal(serializedIntegerKpiValue.getIntVal()); } if (kpiValue.getValue() instanceof Float) { final var serializedFloatKpiValue = serializeFloatKpiValue((KpiValue) kpiValue); @@ -1509,7 +1508,7 @@ public class Serializer { final var typeOfKpiValue = serializedKpiValue.getValueCase(); switch (typeOfKpiValue) { - case INT32VAL: + case INTVAL: final var intValue = deserializeIntegerKpiValue(serializedKpiValue); return new IntegerKpiValue(intValue); case BOOLVAL: @@ -1570,47 +1569,37 @@ public class Serializer { public Monitoring.AlarmDescriptor serialize(AlarmDescriptor alarmDescriptor) { final var builder = Monitoring.AlarmDescriptor.newBuilder(); - final var alarmId = alarmDescriptor.getAlarmId(); final var alarmDescription = alarmDescriptor.getAlarmDescription(); final var name = alarmDescriptor.getName(); - final var kpiIds = alarmDescriptor.getKpiIds(); - final var kpiValueRanges = alarmDescriptor.getKpiValueRanges(); + final var kpiId = alarmDescriptor.getKpiId(); + final var kpiValueRange = alarmDescriptor.getKpiValueRange(); final var timestamp = alarmDescriptor.getTimestamp(); - final var serializedAlarmId = serializeAlarmId(alarmId); - final var serializedKpiIds = - kpiIds.stream().map(this::serializeKpiId).collect(Collectors.toList()); - final var serializedKpiValueRanges = - kpiValueRanges.stream().map(this::serialize).collect(Collectors.toList()); - final var serializedTimestamp = serialize(timestamp); + final var serializedKpiIdUuid = serializeUuid(kpiId); + final var serializedKpiId = KpiId.newBuilder().setKpiId(serializedKpiIdUuid).build(); + final var serializedKpiValueRange = serialize(kpiValueRange); - builder.setAlarmId(serializedAlarmId); builder.setAlarmDescription(alarmDescription); builder.setName(name); - builder.addAllKpiId(serializedKpiIds); - builder.addAllKpiValueRange(serializedKpiValueRanges); - builder.setTimestamp(serializedTimestamp); + builder.setKpiId(serializedKpiId); + builder.setKpiValueRange(serializedKpiValueRange); + builder.setTimestamp(timestamp); return builder.build(); } public AlarmDescriptor deserialize(Monitoring.AlarmDescriptor serializedAlarmDescriptor) { - final var serializedAlarmId = serializedAlarmDescriptor.getAlarmId(); final var alarmDescription = serializedAlarmDescriptor.getAlarmDescription(); final var name = serializedAlarmDescriptor.getName(); - final var serializedKpiIds = serializedAlarmDescriptor.getKpiIdList(); - final var serializedKpiValueRanges = serializedAlarmDescriptor.getKpiValueRangeList(); - final var serializeTimestamp = serializedAlarmDescriptor.getTimestamp(); + final var serializedKpiId = serializedAlarmDescriptor.getKpiId(); + final var serializedKpiValueRange = serializedAlarmDescriptor.getKpiValueRange(); + final var timestamp = serializedAlarmDescriptor.getTimestamp(); - final var alarmId = deserialize(serializedAlarmId); - final var kpiIds = - serializedKpiIds.stream().map(this::deserialize).collect(Collectors.toList()); - final var kpiValueRanges = - serializedKpiValueRanges.stream().map(this::deserialize).collect(Collectors.toList()); - final var timestamp = deserialize(serializeTimestamp); + final var kpiId = deserialize(serializedKpiId); + final var kpiValueRange = deserialize(serializedKpiValueRange); - return new AlarmDescriptor(alarmId, alarmDescription, name, kpiIds, kpiValueRanges, timestamp); + return new AlarmDescriptor(alarmDescription, name, kpiId, kpiValueRange, timestamp); } public Monitoring.AlarmResponse serialize(AlarmResponse alarmResponse) { @@ -1646,44 +1635,34 @@ public class Serializer { public Monitoring.SubsDescriptor serialize(SubsDescriptor subDescriptor) { final var builder = Monitoring.SubsDescriptor.newBuilder(); - final var subscriptionId = subDescriptor.getSubscriptionId(); final var kpiId = subDescriptor.getKpiId(); final var samplingDurationS = subDescriptor.getSamplingDurationS(); final var samplingIntervalS = subDescriptor.getSamplingIntervalS(); - final var startTimestamp = subDescriptor.getStartTimestamp(); - final var endTimestamp = subDescriptor.getEndTimestamp(); + final var startDate = subDescriptor.getStartDate(); + final var endDate = subDescriptor.getEndDate(); - final var serializedSubscriptionIdUuid = serializeSubscriptionIdId(subscriptionId); final var serializedKpiIdUuid = serializeUuid(kpiId); final var serializedKpiId = Monitoring.KpiId.newBuilder().setKpiId(serializedKpiIdUuid).build(); - final var serializedStartTimestamp = serialize(startTimestamp); - final var serializedEndTimestamp = serialize(endTimestamp); - builder.setSubsId(serializedSubscriptionIdUuid); builder.setKpiId(serializedKpiId); builder.setSamplingDurationS(samplingDurationS); builder.setSamplingIntervalS(samplingIntervalS); - builder.setStartTimestamp(serializedStartTimestamp); - builder.setEndTimestamp(serializedEndTimestamp); + builder.setStartDate(startDate); + builder.setEndDate(endDate); return builder.build(); } public SubsDescriptor deserialize(Monitoring.SubsDescriptor serializedSubDescriptor) { - final var serializedSubscriptionId = serializedSubDescriptor.getSubsId(); final var serializedKpiId = serializedSubDescriptor.getKpiId(); final var samplingDurationS = serializedSubDescriptor.getSamplingDurationS(); final var samplingIntervalS = serializedSubDescriptor.getSamplingIntervalS(); - final var serializedStartTimestamp = serializedSubDescriptor.getStartTimestamp(); - final var serializedEndTimestamp = serializedSubDescriptor.getEndTimestamp(); + final var startDate = serializedSubDescriptor.getStartDate(); + final var endDate = serializedSubDescriptor.getEndDate(); - final var subscriptionId = deserialize(serializedSubscriptionId); final var kpiId = deserialize(serializedKpiId); - final var startTimestamp = deserialize(serializedStartTimestamp); - final var endTimestamp = deserialize(serializedEndTimestamp); - return new SubsDescriptor( - subscriptionId, kpiId, samplingDurationS, samplingIntervalS, startTimestamp, endTimestamp); + return new SubsDescriptor(kpiId, samplingDurationS, samplingIntervalS, startDate, endDate); } public SubscriptionID serializeSubscriptionIdId(String subscriptionId) { @@ -1951,11 +1930,10 @@ public class Serializer { final var kpiValue = kpi.getKpiValue(); final var serializedKpiId = serializeKpiId(kpiId); - final var serializedTimestamp = serialize(timestamp); final var serializedKpiValue = serialize(kpiValue); builder.setKpiId(serializedKpiId); - builder.setTimestamp(serializedTimestamp); + builder.setTimestamp(timestamp); builder.setKpiValue(serializedKpiValue); return builder.build(); @@ -1964,11 +1942,10 @@ public class Serializer { public Kpi deserialize(Monitoring.Kpi serializedKpi) { final var serializedKpiId = serializedKpi.getKpiId(); - final var serializedTimestamp = serializedKpi.getTimestamp(); + final var timestamp = serializedKpi.getTimestamp(); final var serializedKpiValue = serializedKpi.getKpiValue(); final var kpiId = deserialize(serializedKpiId); - final var timestamp = deserialize(serializedTimestamp); final var kpiValue = deserialize(serializedKpiValue); return new Kpi(kpiId, timestamp, kpiValue); @@ -2172,33 +2149,6 @@ public class Serializer { return new EndPoint.EndPointBuilder(endPointId, endPointType, kpiSampleTypes).build(); } - public Monitoring.AlarmSubscription serialize(AlarmSubscription alarmSubscription) { - final var builder = Monitoring.AlarmSubscription.newBuilder(); - - final var alarmId = alarmSubscription.getAlarmId(); - final var subscriptionTimeoutS = alarmSubscription.getSubscriptionTimeoutS(); - final var subscriptionFrequencyMs = alarmSubscription.getSubscriptionFrequencyMs(); - - final var serializedAlarmId = serializeAlarmId(alarmId); - - builder.setAlarmID(serializedAlarmId); - builder.setSubscriptionTimeoutS(subscriptionTimeoutS); - builder.setSubscriptionFrequencyMs(subscriptionFrequencyMs); - - return builder.build(); - } - - public AlarmSubscription deserialize(Monitoring.AlarmSubscription serializedAlarmSubscription) { - - final var serializedAlarmId = serializedAlarmSubscription.getAlarmID(); - final var subscriptionTimeoutS = serializedAlarmSubscription.getSubscriptionTimeoutS(); - final var subscriptionFrequencyMs = serializedAlarmSubscription.getSubscriptionFrequencyMs(); - - final var alarmId = deserialize(serializedAlarmId); - - return new AlarmSubscription(alarmId, subscriptionTimeoutS, subscriptionFrequencyMs); - } - public ContextOuterClass.Device serialize(Device device) { final var builder = ContextOuterClass.Device.newBuilder(); diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleBasic.java b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleBasic.java index 6f50dfca8..b32d3cf30 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleBasic.java +++ b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleBasic.java @@ -25,7 +25,7 @@ import java.util.List; public class PolicyRuleBasic { private final String policyRuleId; - private PolicyRuleState policyRuleState; + private final PolicyRuleState policyRuleState; private final int priority; private final List policyRuleConditions; private final BooleanOperator booleanOperator; @@ -64,10 +64,6 @@ public class PolicyRuleBasic { return policyRuleState; } - public void setPolicyRuleState(PolicyRuleState state) { - this.policyRuleState = state; - } - public int getPriority() { return priority; } diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGateway.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGateway.java index 925c22aa6..4b9849a76 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGateway.java +++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGateway.java @@ -16,9 +16,9 @@ package eu.teraflow.policy.monitoring; +import eu.teraflow.policy.context.model.Empty; import eu.teraflow.policy.monitoring.model.AlarmDescriptor; import eu.teraflow.policy.monitoring.model.AlarmResponse; -import eu.teraflow.policy.monitoring.model.AlarmSubscription; import eu.teraflow.policy.monitoring.model.Kpi; import eu.teraflow.policy.monitoring.model.KpiDescriptor; import eu.teraflow.policy.monitoring.model.SubsDescriptor; @@ -28,17 +28,21 @@ import java.util.List; public interface MonitoringGateway { - Uni setKpi(KpiDescriptor kpiDescriptor); + Uni createKpi(KpiDescriptor kpiDescriptor); Uni getKpiDescriptor(String kpiId); - Multi> setKpiSubscription(SubsDescriptor subsDescriptor); + Multi> subscribeKpi(SubsDescriptor subsDescriptor); Uni getSubsDescriptor(String subscriptionId); - Uni setKpiAlarm(AlarmDescriptor alarmDescriptor); + Uni editKpiSubscription(SubsDescriptor subsDescriptor); + + Uni createKpiAlarm(AlarmDescriptor alarmDescriptor); + + Uni editKpiAlarm(AlarmDescriptor alarmDescriptor); Uni getAlarmDescriptor(String alarmId); - Multi getAlarmResponseStream(AlarmSubscription alarmSubscription); + Multi getAlarmResponseStream(String alarmId); } diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGatewayImpl.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGatewayImpl.java index e500b78c5..e0b4e088a 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGatewayImpl.java +++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGatewayImpl.java @@ -17,9 +17,9 @@ package eu.teraflow.policy.monitoring; import eu.teraflow.policy.Serializer; +import eu.teraflow.policy.context.model.Empty; import eu.teraflow.policy.monitoring.model.AlarmDescriptor; import eu.teraflow.policy.monitoring.model.AlarmResponse; -import eu.teraflow.policy.monitoring.model.AlarmSubscription; import eu.teraflow.policy.monitoring.model.Kpi; import eu.teraflow.policy.monitoring.model.KpiDescriptor; import eu.teraflow.policy.monitoring.model.SubsDescriptor; @@ -45,11 +45,11 @@ public class MonitoringGatewayImpl implements MonitoringGateway { } @Override - public Uni setKpi(KpiDescriptor kpiDescriptor) { + public Uni createKpi(KpiDescriptor kpiDescriptor) { final var serializedKpiDescriptor = serializer.serialize(kpiDescriptor); return streamingDelegateMonitoring - .setKpi(serializedKpiDescriptor) + .createKpi(serializedKpiDescriptor) .onItem() .transform(serializer::deserialize); } @@ -65,11 +65,11 @@ public class MonitoringGatewayImpl implements MonitoringGateway { } @Override - public Multi> setKpiSubscription(SubsDescriptor subsDescriptor) { + public Multi> subscribeKpi(SubsDescriptor subsDescriptor) { final var serializedSubsDescriptor = serializer.serialize(subsDescriptor); return streamingDelegateMonitoring - .setKpiSubscription(serializedSubsDescriptor) + .subscribeKpi(serializedSubsDescriptor) .onItem() .transform(kpiList -> serializer.deserialize(kpiList.getKpiListList())); } @@ -85,15 +85,35 @@ public class MonitoringGatewayImpl implements MonitoringGateway { } @Override - public Uni setKpiAlarm(AlarmDescriptor alarmDescriptor) { + public Uni editKpiSubscription(SubsDescriptor subsDescriptor) { + final var serializedSubsDescriptor = serializer.serialize(subsDescriptor); + + return streamingDelegateMonitoring + .editKpiSubscription(serializedSubsDescriptor) + .onItem() + .transform(serializer::deserializeEmpty); + } + + @Override + public Uni createKpiAlarm(AlarmDescriptor alarmDescriptor) { final var serializedAlarmDescriptor = serializer.serialize(alarmDescriptor); return streamingDelegateMonitoring - .setKpiAlarm(serializedAlarmDescriptor) + .createKpiAlarm(serializedAlarmDescriptor) .onItem() .transform(serializer::deserialize); } + @Override + public Uni editKpiAlarm(AlarmDescriptor alarmDescriptor) { + final var serializedAlarmDescriptor = serializer.serialize(alarmDescriptor); + + return streamingDelegateMonitoring + .editKpiAlarm(serializedAlarmDescriptor) + .onItem() + .transform(serializer::deserializeEmpty); + } + @Override public Uni getAlarmDescriptor(String alarmId) { final var serializedAlarmId = serializer.serializeAlarmId(alarmId); @@ -105,11 +125,11 @@ public class MonitoringGatewayImpl implements MonitoringGateway { } @Override - public Multi getAlarmResponseStream(AlarmSubscription alarmSubscription) { - final var serializedAlarmSubscription = serializer.serialize(alarmSubscription); + public Multi getAlarmResponseStream(String alarmId) { + final var serializedAlarmId = serializer.serializeAlarmId(alarmId); return streamingDelegateMonitoring - .getAlarmResponseStream(serializedAlarmSubscription) + .getAlarmResponseStream(serializedAlarmId) .onItem() .transform(serializer::deserialize); } diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringService.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringService.java index 5022833ce..276a9d363 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringService.java +++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringService.java @@ -16,9 +16,9 @@ package eu.teraflow.policy.monitoring; +import eu.teraflow.policy.context.model.Empty; import eu.teraflow.policy.monitoring.model.AlarmDescriptor; import eu.teraflow.policy.monitoring.model.AlarmResponse; -import eu.teraflow.policy.monitoring.model.AlarmSubscription; import eu.teraflow.policy.monitoring.model.Kpi; import eu.teraflow.policy.monitoring.model.KpiDescriptor; import eu.teraflow.policy.monitoring.model.SubsDescriptor; @@ -28,17 +28,21 @@ import java.util.List; public interface MonitoringService { - Uni setKpi(KpiDescriptor kpiDescriptor); + Uni createKpi(KpiDescriptor kpiDescriptor); Uni getKpiDescriptor(String kpiId); - Multi> setKpiSubscription(SubsDescriptor subsDescriptor); + Multi> subscribeKpi(SubsDescriptor subsDescriptor); Uni getSubsDescriptor(String subscriptionId); - Uni setKpiAlarm(AlarmDescriptor alarmDescriptor); + Uni editKpiSubscription(SubsDescriptor subsDescriptor); + + Uni createKpiAlarm(AlarmDescriptor alarmDescriptor); + + Uni editKpiAlarm(AlarmDescriptor alarmDescriptor); Uni getAlarmDescriptor(String alarmId); - Multi getAlarmResponseStream(AlarmSubscription alarmSubscription); + Multi getAlarmResponseStream(String alarmId); } diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringServiceImpl.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringServiceImpl.java index 5cec6e989..e1e79af75 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringServiceImpl.java +++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringServiceImpl.java @@ -16,9 +16,9 @@ package eu.teraflow.policy.monitoring; +import eu.teraflow.policy.context.model.Empty; import eu.teraflow.policy.monitoring.model.AlarmDescriptor; import eu.teraflow.policy.monitoring.model.AlarmResponse; -import eu.teraflow.policy.monitoring.model.AlarmSubscription; import eu.teraflow.policy.monitoring.model.Kpi; import eu.teraflow.policy.monitoring.model.KpiDescriptor; import eu.teraflow.policy.monitoring.model.SubsDescriptor; @@ -39,8 +39,8 @@ public class MonitoringServiceImpl implements MonitoringService { } @Override - public Uni setKpi(KpiDescriptor kpiDescriptor) { - return monitoringGateway.setKpi(kpiDescriptor); + public Uni createKpi(KpiDescriptor kpiDescriptor) { + return monitoringGateway.createKpi(kpiDescriptor); } @Override @@ -49,8 +49,8 @@ public class MonitoringServiceImpl implements MonitoringService { } @Override - public Multi> setKpiSubscription(SubsDescriptor subsDescriptor) { - return monitoringGateway.setKpiSubscription(subsDescriptor); + public Multi> subscribeKpi(SubsDescriptor subsDescriptor) { + return monitoringGateway.subscribeKpi(subsDescriptor); } @Override @@ -59,8 +59,18 @@ public class MonitoringServiceImpl implements MonitoringService { } @Override - public Uni setKpiAlarm(AlarmDescriptor alarmDescriptor) { - return monitoringGateway.setKpiAlarm(alarmDescriptor); + public Uni editKpiSubscription(SubsDescriptor subsDescriptor) { + return monitoringGateway.editKpiSubscription(subsDescriptor); + } + + @Override + public Uni createKpiAlarm(AlarmDescriptor alarmDescriptor) { + return monitoringGateway.createKpiAlarm(alarmDescriptor); + } + + @Override + public Uni editKpiAlarm(AlarmDescriptor alarmDescriptor) { + return monitoringGateway.editKpiAlarm(alarmDescriptor); } @Override @@ -69,7 +79,7 @@ public class MonitoringServiceImpl implements MonitoringService { } @Override - public Multi getAlarmResponseStream(AlarmSubscription alarmSubscription) { - return monitoringGateway.getAlarmResponseStream(alarmSubscription); + public Multi getAlarmResponseStream(String alarmId) { + return monitoringGateway.getAlarmResponseStream(alarmId); } } diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmDescriptor.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmDescriptor.java index 85f0ce9e7..ac216ee7c 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmDescriptor.java +++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmDescriptor.java @@ -16,36 +16,26 @@ package eu.teraflow.policy.monitoring.model; -import eu.teraflow.policy.common.Util; -import java.util.List; - public class AlarmDescriptor { - private final String alarmId; private final String alarmDescription; private final String name; - private final List kpiIds; - private final List kpiValueRanges; - private final double timestamp; + private final String kpiId; + private final KpiValueRange kpiValueRange; + private final String timestamp; public AlarmDescriptor( - String alarmId, String alarmDescription, String name, - List kpiIds, - List kpiValueRanges, - double timestamp) { - this.alarmId = alarmId; + String kpiId, + KpiValueRange kpiValueRange, + String timestamp) { this.alarmDescription = alarmDescription; this.name = name; - this.kpiIds = kpiIds; - this.kpiValueRanges = kpiValueRanges; + this.kpiId = kpiId; + this.kpiValueRange = kpiValueRange; this.timestamp = timestamp; } - public String getAlarmId() { - return alarmId; - } - public String getAlarmDescription() { return alarmDescription; } @@ -54,28 +44,22 @@ public class AlarmDescriptor { return name; } - public List getKpiIds() { - return kpiIds; + public String getKpiId() { + return kpiId; } - public List getKpiValueRanges() { - return kpiValueRanges; + public KpiValueRange getKpiValueRange() { + return kpiValueRange; } - public double getTimestamp() { + public String getTimestamp() { return timestamp; } @Override public String toString() { return String.format( - "%s:{alarmId:\"%s\", alarmDescription:\"%s\", name:\"%s\", [%s], [%s], timestamp:\"%f\"}", - getClass().getSimpleName(), - alarmId, - alarmDescription, - name, - Util.toString(kpiIds), - Util.toString(kpiValueRanges), - timestamp); + "%s:{alarmDescription:\"%s\", name:\"%s\", kpiId:\"%s\", %s, timestamp:\"%s\"}", + getClass().getSimpleName(), alarmDescription, name, kpiId, kpiValueRange, timestamp); } } diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/Kpi.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/Kpi.java index 98b8c510d..c04224029 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/Kpi.java +++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/Kpi.java @@ -19,10 +19,10 @@ package eu.teraflow.policy.monitoring.model; public class Kpi { private final String kpiId; - private final double timestamp; + private final String timestamp; private final KpiValue kpiValue; - public Kpi(String kpiId, double timestamp, KpiValue kpiValue) { + public Kpi(String kpiId, String timestamp, KpiValue kpiValue) { this.kpiId = kpiId; this.timestamp = timestamp; this.kpiValue = kpiValue; @@ -32,7 +32,7 @@ public class Kpi { return kpiId; } - public double getTimestamp() { + public String getTimestamp() { return timestamp; } @@ -43,7 +43,7 @@ public class Kpi { @Override public String toString() { return String.format( - "%s:{kpiId:\"%s\", timeStamp:\"%f\", %s}", + "%s:{kpiId:\"%s\", timeStamp:\"%s\", %s}", getClass().getSimpleName(), kpiId, timestamp, kpiValue); } } diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsDescriptor.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsDescriptor.java index 101d784c3..ced38b3f9 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsDescriptor.java +++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsDescriptor.java @@ -17,30 +17,23 @@ package eu.teraflow.policy.monitoring.model; public class SubsDescriptor { - private final String subscriptionId; private final String kpiId; private final float samplingDurationS; private final float samplingIntervalS; - private final double startTimestamp; - private final double endTimestamp; + private final String startDate; + private final String endDate; public SubsDescriptor( - String subscriptionId, String kpiId, float samplingDurationS, float samplingIntervalS, - double startTimestamp, - double endTimestamp) { - this.subscriptionId = subscriptionId; + String startDate, + String endDate) { this.kpiId = kpiId; this.samplingDurationS = samplingDurationS; this.samplingIntervalS = samplingIntervalS; - this.startTimestamp = startTimestamp; - this.endTimestamp = endTimestamp; - } - - public String getSubscriptionId() { - return subscriptionId; + this.startDate = startDate; + this.endDate = endDate; } public String getKpiId() { @@ -55,24 +48,23 @@ public class SubsDescriptor { return samplingIntervalS; } - public double getStartTimestamp() { - return startTimestamp; + public String getStartDate() { + return startDate; } - public double getEndTimestamp() { - return endTimestamp; + public String getEndDate() { + return endDate; } @Override public String toString() { return String.format( - "%s:{subscriptionId:\"%s\", kpiId:\"%s\", samplingDurationS:\"%f\", samplingIntervalS:\"%f\", startTimestamp:\"%f\", endTimestamp:\"%f\"}", + "%s:{kpiId:\"%s\", samplingDurationS:\"%f\", samplingIntervalS:\"%f\", startDate:\"%s\", endDate:\"%s\"}", getClass().getSimpleName(), - subscriptionId, kpiId, samplingDurationS, samplingIntervalS, - startTimestamp, - endTimestamp); + startDate, + endDate); } } diff --git a/src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java b/src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java index fa0495217..05f835d58 100644 --- a/src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java +++ b/src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java @@ -2432,7 +2432,7 @@ class SerializerTest { Arguments.of( new BooleanKpiValue(true), Monitoring.KpiValue.newBuilder().setBoolVal(true).build()), Arguments.of( - new IntegerKpiValue(44), Monitoring.KpiValue.newBuilder().setInt32Val(44).build()), + new IntegerKpiValue(44), Monitoring.KpiValue.newBuilder().setIntVal(44).build()), Arguments.of( new FloatKpiValue(12.3f), Monitoring.KpiValue.newBuilder().setFloatVal(12.3f).build())); } @@ -2507,32 +2507,32 @@ class SerializerTest { Arguments.of( new KpiValueRange(new IntegerKpiValue(32), new IntegerKpiValue(42)), Monitoring.KpiValueRange.newBuilder() - .setKpiMinValue(Monitoring.KpiValue.newBuilder().setInt32Val(32).build()) - .setKpiMaxValue(Monitoring.KpiValue.newBuilder().setInt32Val(42).build()) + .setKpiMinValue(Monitoring.KpiValue.newBuilder().setIntVal(32).build()) + .setKpiMaxValue(Monitoring.KpiValue.newBuilder().setIntVal(42).build()) .build()), Arguments.of( new KpiValueRange(new IntegerKpiValue(32), new FloatKpiValue(42.2f)), Monitoring.KpiValueRange.newBuilder() - .setKpiMinValue(Monitoring.KpiValue.newBuilder().setInt32Val(32).build()) + .setKpiMinValue(Monitoring.KpiValue.newBuilder().setIntVal(32).build()) .setKpiMaxValue(Monitoring.KpiValue.newBuilder().setFloatVal(42.2f).build()) .build()), Arguments.of( new KpiValueRange(new IntegerKpiValue(32), new BooleanKpiValue(true)), Monitoring.KpiValueRange.newBuilder() - .setKpiMinValue(Monitoring.KpiValue.newBuilder().setInt32Val(32).build()) + .setKpiMinValue(Monitoring.KpiValue.newBuilder().setIntVal(32).build()) .setKpiMaxValue(Monitoring.KpiValue.newBuilder().setBoolVal(true).build()) .build()), Arguments.of( new KpiValueRange(new IntegerKpiValue(32), new StringKpiValue("string")), Monitoring.KpiValueRange.newBuilder() - .setKpiMinValue(Monitoring.KpiValue.newBuilder().setInt32Val(32).build()) + .setKpiMinValue(Monitoring.KpiValue.newBuilder().setIntVal(32).build()) .setKpiMaxValue(Monitoring.KpiValue.newBuilder().setStringVal("string").build()) .build()), Arguments.of( new KpiValueRange(new FloatKpiValue(56.2f), new IntegerKpiValue(42)), Monitoring.KpiValueRange.newBuilder() .setKpiMinValue(Monitoring.KpiValue.newBuilder().setFloatVal(56.2f).build()) - .setKpiMaxValue(Monitoring.KpiValue.newBuilder().setInt32Val(42).build()) + .setKpiMaxValue(Monitoring.KpiValue.newBuilder().setIntVal(42).build()) .build()), Arguments.of( new KpiValueRange(new FloatKpiValue(56.2f), new FloatKpiValue(42.2f)), @@ -2556,7 +2556,7 @@ class SerializerTest { new KpiValueRange(new BooleanKpiValue(true), new IntegerKpiValue(42)), Monitoring.KpiValueRange.newBuilder() .setKpiMinValue(Monitoring.KpiValue.newBuilder().setBoolVal(true).build()) - .setKpiMaxValue(Monitoring.KpiValue.newBuilder().setInt32Val(42).build()) + .setKpiMaxValue(Monitoring.KpiValue.newBuilder().setIntVal(42).build()) .build()), Arguments.of( new KpiValueRange(new BooleanKpiValue(false), new FloatKpiValue(42.2f)), @@ -2580,7 +2580,7 @@ class SerializerTest { new KpiValueRange(new StringKpiValue("string"), new IntegerKpiValue(42)), Monitoring.KpiValueRange.newBuilder() .setKpiMinValue(Monitoring.KpiValue.newBuilder().setStringVal("string").build()) - .setKpiMaxValue(Monitoring.KpiValue.newBuilder().setInt32Val(42).build()) + .setKpiMaxValue(Monitoring.KpiValue.newBuilder().setIntVal(42).build()) .build()), Arguments.of( new KpiValueRange(new StringKpiValue("string"), new FloatKpiValue(42.2f)), @@ -2656,38 +2656,26 @@ class SerializerTest { @Test void shouldSerializeAlarmDescriptor() { - final var alarmId = "alarmId"; final var alarmDescription = "alarmDescription"; final var name = "name"; final var kpiId = "kpiId"; - final double timestamp = 100.0; - final var kpiIds = List.of("kpiId1", "kpiId2"); + final var timestamp = "timestamp"; final var kpiValueRange = new KpiValueRange(new IntegerKpiValue(23), new IntegerKpiValue(1800)); - final var kpiValueRanges = List.of(kpiValueRange); - final var alarmDescriptor = - new AlarmDescriptor(alarmId, alarmDescription, name, kpiIds, kpiValueRanges, timestamp); - - final var serializedalarmIdUuid = serializer.serializeUuid(alarmId); - final var serializedalarmId = AlarmID.newBuilder().setAlarmId(serializedalarmIdUuid).build(); + new AlarmDescriptor(alarmDescription, name, kpiId, kpiValueRange, timestamp); - final var serializedKpiIdUuid = serializer.serializeUuid("kpiId1"); - final var serializedKpiId1 = KpiId.newBuilder().setKpiId(serializedKpiIdUuid).build(); - final var serializedKpiId2 = KpiId.newBuilder().setKpiId(serializer.serializeUuid("kpiId2")); + final var serializedKpiIdUuid = serializer.serializeUuid(kpiId); + final var serializedKpiId = KpiId.newBuilder().setKpiId(serializedKpiIdUuid).build(); final var serializedKpiValueRange = serializer.serialize(kpiValueRange); - final var serializedTimeStamp = - context.ContextOuterClass.Timestamp.newBuilder().setTimestamp(timestamp); final var expectedAlarmDescriptor = Monitoring.AlarmDescriptor.newBuilder() - .setAlarmId(serializedalarmId) .setAlarmDescription(alarmDescription) .setName(name) - .addKpiId(serializedKpiId1) - .addKpiId(serializedKpiId2) - .addKpiValueRange(serializedKpiValueRange) - .setTimestamp(serializedTimeStamp) + .setKpiId(serializedKpiId) + .setKpiValueRange(serializedKpiValueRange) + .setTimestamp(timestamp) .build(); final var serializedAlarmDescriptor = serializer.serialize(alarmDescriptor); @@ -2697,39 +2685,26 @@ class SerializerTest { @Test void shouldDeserializeAlarmDescriptor() { - final var alarmId = "alarmId"; final var alarmDescription = "alarmDescription"; final var name = "name"; final var kpiId = "kpiId"; - final double timestamp = 100.0; - final var kpiIds = List.of("kpiId1", "kpiId2"); + final var timestamp = "timestamp"; final var kpiValueRange = new KpiValueRange(new IntegerKpiValue(23), new IntegerKpiValue(1800)); - final var kpiValueRanges = List.of(kpiValueRange); - final var expectedAlarmDescriptor = - new AlarmDescriptor(alarmId, alarmDescription, name, kpiIds, kpiValueRanges, timestamp); - - final var serializedalarmIdUuid = serializer.serializeUuid(alarmId); - final var serializedalarmId = AlarmID.newBuilder().setAlarmId(serializedalarmIdUuid).build(); - - final var serializedKpiIdUuid = serializer.serializeUuid("kpiId1"); - final var serializedKpiId1 = KpiId.newBuilder().setKpiId(serializedKpiIdUuid).build(); - final var serializedKpiId2 = KpiId.newBuilder().setKpiId(serializer.serializeUuid("kpiId2")); + new AlarmDescriptor(alarmDescription, name, kpiId, kpiValueRange, timestamp); + final var serializedKpiIdUuid = serializer.serializeUuid(kpiId); + final var serializedKpiId = KpiId.newBuilder().setKpiId(serializedKpiIdUuid).build(); final var serializedKpiValueRange = serializer.serialize(kpiValueRange); - final var serializedTimeStamp = - context.ContextOuterClass.Timestamp.newBuilder().setTimestamp(timestamp); final var serializedAlarmDescriptor = Monitoring.AlarmDescriptor.newBuilder() - .setAlarmId(serializedalarmId) .setAlarmDescription(alarmDescription) .setName(name) - .addKpiId(serializedKpiId1) - .addKpiId(serializedKpiId2) - .addKpiValueRange(serializedKpiValueRange) - .setTimestamp(serializedTimeStamp) + .setKpiId(serializedKpiId) + .setKpiValueRange(serializedKpiValueRange) + .setTimestamp(timestamp) .build(); final var alarmDescriptor = serializer.deserialize(serializedAlarmDescriptor); @@ -2787,42 +2762,25 @@ class SerializerTest { @Test void shouldSerializeSubDescriptor() { - final var subscriptionId = "subscriptionId"; final var kpiId = "kpiId"; final var samplingDurationS = 10f; final var samplingIntervalS = 45f; - final var startTimestamp = 1.0; - final var endTimestamp = 100.0; + final var startDate = "01/07/2022"; + final var endDate = "02/07/2022"; final var subDescriptor = - new SubsDescriptor( - subscriptionId, - kpiId, - samplingDurationS, - samplingIntervalS, - startTimestamp, - endTimestamp); - - final var serializedSubscriptionIdUuid = serializer.serializeUuid(subscriptionId); - final var serializedSubscriptionId = - monitoring.Monitoring.SubscriptionID.newBuilder() - .setSubsId(serializedSubscriptionIdUuid) - .build(); + new SubsDescriptor(kpiId, samplingDurationS, samplingIntervalS, startDate, endDate); + final var serializedKpiIdUuid = serializer.serializeUuid(kpiId); final var serializedKpiId = KpiId.newBuilder().setKpiId(serializedKpiIdUuid).build(); - final var serializedStartTimestamp = - ContextOuterClass.Timestamp.newBuilder().setTimestamp(startTimestamp); - final var serializedEndTimestamp = - ContextOuterClass.Timestamp.newBuilder().setTimestamp(endTimestamp); final var expectedSubDescriptor = Monitoring.SubsDescriptor.newBuilder() - .setSubsId(serializedSubscriptionId) .setKpiId(serializedKpiId) .setSamplingDurationS(samplingDurationS) .setSamplingIntervalS(samplingIntervalS) - .setStartTimestamp(serializedStartTimestamp) - .setEndTimestamp(serializedEndTimestamp) + .setStartDate(startDate) + .setEndDate(endDate) .build(); final var serializedSubDescriptor = serializer.serialize(subDescriptor); @@ -2832,42 +2790,25 @@ class SerializerTest { @Test void shouldDeserializeSubDescriptor() { - final var subscriptionId = "subscriptionId"; final var kpiId = "kpiId"; final var samplingDurationS = 10f; final var samplingIntervalS = 45f; - final var startTimestamp = 1.0; - final var endTimestamp = 100.0; + final var startDate = "01/07/2022"; + final var endDate = "02/07/2022"; final var expectedSubDescriptor = - new SubsDescriptor( - subscriptionId, - kpiId, - samplingDurationS, - samplingIntervalS, - startTimestamp, - endTimestamp); - - final var serializedSubscriptionIdUuid = serializer.serializeUuid(subscriptionId); - final var serializedSubscriptionId = - monitoring.Monitoring.SubscriptionID.newBuilder() - .setSubsId(serializedSubscriptionIdUuid) - .build(); + new SubsDescriptor(kpiId, samplingDurationS, samplingIntervalS, startDate, endDate); + final var serializedKpiIdUuid = serializer.serializeUuid(kpiId); final var serializedKpiId = KpiId.newBuilder().setKpiId(serializedKpiIdUuid).build(); - final var serializedStartTimestamp = - ContextOuterClass.Timestamp.newBuilder().setTimestamp(startTimestamp); - final var serializedEndTimestamp = - ContextOuterClass.Timestamp.newBuilder().setTimestamp(endTimestamp); final var serializedSubDescriptor = Monitoring.SubsDescriptor.newBuilder() - .setSubsId(serializedSubscriptionId) .setKpiId(serializedKpiId) .setSamplingDurationS(samplingDurationS) .setSamplingIntervalS(samplingIntervalS) - .setStartTimestamp(serializedStartTimestamp) - .setEndTimestamp(serializedEndTimestamp) + .setStartDate(startDate) + .setEndDate(endDate) .build(); final var subDescriptor = serializer.deserialize(serializedSubDescriptor); @@ -3214,20 +3155,18 @@ class SerializerTest { @Test void shouldSerializeKpi() { final var expectedKpiId = "expectedKpiId"; - final var expectedTimestamp = 100.0; + final var expectedTimestamp = "expectedTimestamp"; final var expectedKpiValue = new FloatKpiValue(643.45f); final var kpi = new Kpi(expectedKpiId, expectedTimestamp, expectedKpiValue); final var serializedKpiId = serializer.serializeKpiId(expectedKpiId); final var serializedKpiValue = serializer.serialize(expectedKpiValue); - final var serializedexpectedTimestamp = - context.ContextOuterClass.Timestamp.newBuilder().setTimestamp(expectedTimestamp); final var expectedKpi = Monitoring.Kpi.newBuilder() .setKpiId(serializedKpiId) - .setTimestamp(serializedexpectedTimestamp) + .setTimestamp(expectedTimestamp) .setKpiValue(serializedKpiValue) .build(); @@ -3239,7 +3178,7 @@ class SerializerTest { @Test void shouldDeserializeKpi() { final var expectedKpiId = "expectedKpiId"; - final var expectedTimestamp = 100.0; + final var expectedTimestamp = "expectedTimestamp"; final var expectedKpiValue = new BooleanKpiValue(true); final var expectedKpi = new Kpi(expectedKpiId, expectedTimestamp, expectedKpiValue); @@ -3253,20 +3192,16 @@ class SerializerTest { @Test void shouldSerializeKpisList() { final var expectedKpiIdA = "expectedKpiIdA"; - final var expectedTimestampA = 100.0; + final var expectedTimestampA = "expectedTimestampA"; final var expectedKpiValueA = new FloatKpiValue(643.45f); final var serializedKpiIdA = serializer.serializeKpiId(expectedKpiIdA); - final var serializedexpectedTimestampA = - context.ContextOuterClass.Timestamp.newBuilder().setTimestamp(expectedTimestampA); final var serializedKpiValueA = serializer.serialize(expectedKpiValueA); final var kpiA = new Kpi(expectedKpiIdA, expectedTimestampA, expectedKpiValueA); final var expectedKpiIdB = "expectedKpiIdB"; - final var expectedTimestampB = 100.0; + final var expectedTimestampB = "expectedTimestampB"; final var expectedKpiValueB = new IntegerKpiValue(32); final var serializedKpiIdB = serializer.serializeKpiId(expectedKpiIdB); - final var serializedexpectedTimestampB = - context.ContextOuterClass.Timestamp.newBuilder().setTimestamp(expectedTimestampB); final var serializedKpiValueB = serializer.serialize(expectedKpiValueB); final var kpiB = new Kpi(expectedKpiIdB, expectedTimestampB, expectedKpiValueB); @@ -3275,14 +3210,14 @@ class SerializerTest { final var expectedKpiA = Monitoring.Kpi.newBuilder() .setKpiId(serializedKpiIdA) - .setTimestamp(serializedexpectedTimestampA) + .setTimestamp(expectedTimestampA) .setKpiValue(serializedKpiValueA) .build(); final var expectedKpiB = Monitoring.Kpi.newBuilder() .setKpiId(serializedKpiIdB) - .setTimestamp(serializedexpectedTimestampB) + .setTimestamp(expectedTimestampB) .setKpiValue(serializedKpiValueB) .build(); @@ -3296,20 +3231,16 @@ class SerializerTest { @Test void shouldDeserializeKpisList() { final var expectedKpiIdA = "expectedKpiIdA"; - final var expectedTimestampA = 100.0; + final var expectedTimestampA = "expectedTimestampA"; final var expectedKpiValueA = new FloatKpiValue(643.45f); final var serializedKpiIdA = serializer.serializeKpiId(expectedKpiIdA); - final var serializedexpectedTimestampA = - context.ContextOuterClass.Timestamp.newBuilder().setTimestamp(expectedTimestampA); final var serializedKpiValueA = serializer.serialize(expectedKpiValueA); final var expectedKpiA = new Kpi(expectedKpiIdA, expectedTimestampA, expectedKpiValueA); final var expectedKpiIdB = "expectedKpiIdB"; - final var expectedTimestampB = 200.0; + final var expectedTimestampB = "expectedTimestampB"; final var expectedKpiValueB = new IntegerKpiValue(32); final var serializedKpiIdB = serializer.serializeKpiId(expectedKpiIdB); - final var serializedexpectedTimestampB = - context.ContextOuterClass.Timestamp.newBuilder().setTimestamp(expectedTimestampB); final var serializedKpiValueB = serializer.serialize(expectedKpiValueB); final var expectedKpiB = new Kpi(expectedKpiIdB, expectedTimestampB, expectedKpiValueB); @@ -3318,14 +3249,14 @@ class SerializerTest { final var serializedKpiA = Monitoring.Kpi.newBuilder() .setKpiId(serializedKpiIdA) - .setTimestamp(serializedexpectedTimestampA) + .setTimestamp(expectedTimestampA) .setKpiValue(serializedKpiValueA) .build(); final var serializedKpiB = Monitoring.Kpi.newBuilder() .setKpiId(serializedKpiIdB) - .setTimestamp(serializedexpectedTimestampB) + .setTimestamp(expectedTimestampB) .setKpiValue(serializedKpiValueB) .build(); diff --git a/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java b/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java index 9d05f3da8..5d63d4aa4 100644 --- a/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java +++ b/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java @@ -19,124 +19,85 @@ public final class Monitoring { com.google.protobuf.MessageOrBuilder { /** - * .monitoring.KpiId kpi_id = 1; - * @return Whether the kpiId field is set. - */ - boolean hasKpiId(); - /** - * .monitoring.KpiId kpi_id = 1; - * @return The kpiId. - */ - monitoring.Monitoring.KpiId getKpiId(); - /** - * .monitoring.KpiId kpi_id = 1; - */ - monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder(); - - /** - * string kpi_description = 2; + * string kpi_description = 1; * @return The kpiDescription. */ java.lang.String getKpiDescription(); /** - * string kpi_description = 2; + * string kpi_description = 1; * @return The bytes for kpiDescription. */ com.google.protobuf.ByteString getKpiDescriptionBytes(); /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - java.util.List - getKpiIdListList(); - /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - monitoring.Monitoring.KpiId getKpiIdList(int index); - /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - int getKpiIdListCount(); - /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - java.util.List - getKpiIdListOrBuilderList(); - /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - monitoring.Monitoring.KpiIdOrBuilder getKpiIdListOrBuilder( - int index); - - /** - * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 2; * @return The enum numeric value on the wire for kpiSampleType. */ int getKpiSampleTypeValue(); /** - * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 2; * @return The kpiSampleType. */ kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType(); /** - * .context.DeviceId device_id = 5; + * .context.DeviceId device_id = 3; * @return Whether the deviceId field is set. */ boolean hasDeviceId(); /** - * .context.DeviceId device_id = 5; + * .context.DeviceId device_id = 3; * @return The deviceId. */ context.ContextOuterClass.DeviceId getDeviceId(); /** - * .context.DeviceId device_id = 5; + * .context.DeviceId device_id = 3; */ context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder(); /** - * .context.EndPointId endpoint_id = 6; + * .context.EndPointId endpoint_id = 4; * @return Whether the endpointId field is set. */ boolean hasEndpointId(); /** - * .context.EndPointId endpoint_id = 6; + * .context.EndPointId endpoint_id = 4; * @return The endpointId. */ context.ContextOuterClass.EndPointId getEndpointId(); /** - * .context.EndPointId endpoint_id = 6; + * .context.EndPointId endpoint_id = 4; */ context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder(); /** - * .context.ServiceId service_id = 7; + * .context.ServiceId service_id = 5; * @return Whether the serviceId field is set. */ boolean hasServiceId(); /** - * .context.ServiceId service_id = 7; + * .context.ServiceId service_id = 5; * @return The serviceId. */ context.ContextOuterClass.ServiceId getServiceId(); /** - * .context.ServiceId service_id = 7; + * .context.ServiceId service_id = 5; */ context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder(); /** - * .context.SliceId slice_id = 8; + * .context.SliceId slice_id = 6; * @return Whether the sliceId field is set. */ boolean hasSliceId(); /** - * .context.SliceId slice_id = 8; + * .context.SliceId slice_id = 6; * @return The sliceId. */ context.ContextOuterClass.SliceId getSliceId(); /** - * .context.SliceId slice_id = 8; + * .context.SliceId slice_id = 6; */ context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder(); } @@ -154,7 +115,6 @@ public final class Monitoring { } private KpiDescriptor() { kpiDescription_ = ""; - kpiIdList_ = java.util.Collections.emptyList(); kpiSampleType_ = 0; } @@ -178,7 +138,6 @@ public final class Monitoring { if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -190,40 +149,18 @@ public final class Monitoring { done = true; break; case 10: { - monitoring.Monitoring.KpiId.Builder subBuilder = null; - if (kpiId_ != null) { - subBuilder = kpiId_.toBuilder(); - } - kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(kpiId_); - kpiId_ = subBuilder.buildPartial(); - } - - break; - } - case 18: { java.lang.String s = input.readStringRequireUtf8(); kpiDescription_ = s; break; } - case 26: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - kpiIdList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - kpiIdList_.add( - input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry)); - break; - } - case 32: { + case 16: { int rawValue = input.readEnum(); kpiSampleType_ = rawValue; break; } - case 42: { + case 26: { context.ContextOuterClass.DeviceId.Builder subBuilder = null; if (deviceId_ != null) { subBuilder = deviceId_.toBuilder(); @@ -236,7 +173,7 @@ public final class Monitoring { break; } - case 50: { + case 34: { context.ContextOuterClass.EndPointId.Builder subBuilder = null; if (endpointId_ != null) { subBuilder = endpointId_.toBuilder(); @@ -249,7 +186,7 @@ public final class Monitoring { break; } - case 58: { + case 42: { context.ContextOuterClass.ServiceId.Builder subBuilder = null; if (serviceId_ != null) { subBuilder = serviceId_.toBuilder(); @@ -262,7 +199,7 @@ public final class Monitoring { break; } - case 66: { + case 50: { context.ContextOuterClass.SliceId.Builder subBuilder = null; if (sliceId_ != null) { subBuilder = sliceId_.toBuilder(); @@ -290,9 +227,6 @@ public final class Monitoring { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - kpiIdList_ = java.util.Collections.unmodifiableList(kpiIdList_); - } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -310,36 +244,10 @@ public final class Monitoring { monitoring.Monitoring.KpiDescriptor.class, monitoring.Monitoring.KpiDescriptor.Builder.class); } - public static final int KPI_ID_FIELD_NUMBER = 1; - private monitoring.Monitoring.KpiId kpiId_; - /** - * .monitoring.KpiId kpi_id = 1; - * @return Whether the kpiId field is set. - */ - @java.lang.Override - public boolean hasKpiId() { - return kpiId_ != null; - } - /** - * .monitoring.KpiId kpi_id = 1; - * @return The kpiId. - */ - @java.lang.Override - public monitoring.Monitoring.KpiId getKpiId() { - return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; - } - /** - * .monitoring.KpiId kpi_id = 1; - */ - @java.lang.Override - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { - return getKpiId(); - } - - public static final int KPI_DESCRIPTION_FIELD_NUMBER = 2; + public static final int KPI_DESCRIPTION_FIELD_NUMBER = 1; private volatile java.lang.Object kpiDescription_; /** - * string kpi_description = 2; + * string kpi_description = 1; * @return The kpiDescription. */ @java.lang.Override @@ -356,7 +264,7 @@ public final class Monitoring { } } /** - * string kpi_description = 2; + * string kpi_description = 1; * @return The bytes for kpiDescription. */ @java.lang.Override @@ -374,57 +282,17 @@ public final class Monitoring { } } - public static final int KPI_ID_LIST_FIELD_NUMBER = 3; - private java.util.List kpiIdList_; - /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - @java.lang.Override - public java.util.List getKpiIdListList() { - return kpiIdList_; - } - /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - @java.lang.Override - public java.util.List - getKpiIdListOrBuilderList() { - return kpiIdList_; - } - /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - @java.lang.Override - public int getKpiIdListCount() { - return kpiIdList_.size(); - } - /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - @java.lang.Override - public monitoring.Monitoring.KpiId getKpiIdList(int index) { - return kpiIdList_.get(index); - } - /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - @java.lang.Override - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdListOrBuilder( - int index) { - return kpiIdList_.get(index); - } - - public static final int KPI_SAMPLE_TYPE_FIELD_NUMBER = 4; + public static final int KPI_SAMPLE_TYPE_FIELD_NUMBER = 2; private int kpiSampleType_; /** - * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 2; * @return The enum numeric value on the wire for kpiSampleType. */ @java.lang.Override public int getKpiSampleTypeValue() { return kpiSampleType_; } /** - * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 2; * @return The kpiSampleType. */ @java.lang.Override public kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType() { @@ -433,10 +301,10 @@ public final class Monitoring { return result == null ? kpi_sample_types.KpiSampleTypes.KpiSampleType.UNRECOGNIZED : result; } - public static final int DEVICE_ID_FIELD_NUMBER = 5; + public static final int DEVICE_ID_FIELD_NUMBER = 3; private context.ContextOuterClass.DeviceId deviceId_; /** - * .context.DeviceId device_id = 5; + * .context.DeviceId device_id = 3; * @return Whether the deviceId field is set. */ @java.lang.Override @@ -444,7 +312,7 @@ public final class Monitoring { return deviceId_ != null; } /** - * .context.DeviceId device_id = 5; + * .context.DeviceId device_id = 3; * @return The deviceId. */ @java.lang.Override @@ -452,17 +320,17 @@ public final class Monitoring { return deviceId_ == null ? context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; } /** - * .context.DeviceId device_id = 5; + * .context.DeviceId device_id = 3; */ @java.lang.Override public context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder() { return getDeviceId(); } - public static final int ENDPOINT_ID_FIELD_NUMBER = 6; + public static final int ENDPOINT_ID_FIELD_NUMBER = 4; private context.ContextOuterClass.EndPointId endpointId_; /** - * .context.EndPointId endpoint_id = 6; + * .context.EndPointId endpoint_id = 4; * @return Whether the endpointId field is set. */ @java.lang.Override @@ -470,7 +338,7 @@ public final class Monitoring { return endpointId_ != null; } /** - * .context.EndPointId endpoint_id = 6; + * .context.EndPointId endpoint_id = 4; * @return The endpointId. */ @java.lang.Override @@ -478,17 +346,17 @@ public final class Monitoring { return endpointId_ == null ? context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; } /** - * .context.EndPointId endpoint_id = 6; + * .context.EndPointId endpoint_id = 4; */ @java.lang.Override public context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder() { return getEndpointId(); } - public static final int SERVICE_ID_FIELD_NUMBER = 7; + public static final int SERVICE_ID_FIELD_NUMBER = 5; private context.ContextOuterClass.ServiceId serviceId_; /** - * .context.ServiceId service_id = 7; + * .context.ServiceId service_id = 5; * @return Whether the serviceId field is set. */ @java.lang.Override @@ -496,7 +364,7 @@ public final class Monitoring { return serviceId_ != null; } /** - * .context.ServiceId service_id = 7; + * .context.ServiceId service_id = 5; * @return The serviceId. */ @java.lang.Override @@ -504,17 +372,17 @@ public final class Monitoring { return serviceId_ == null ? context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; } /** - * .context.ServiceId service_id = 7; + * .context.ServiceId service_id = 5; */ @java.lang.Override public context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder() { return getServiceId(); } - public static final int SLICE_ID_FIELD_NUMBER = 8; + public static final int SLICE_ID_FIELD_NUMBER = 6; private context.ContextOuterClass.SliceId sliceId_; /** - * .context.SliceId slice_id = 8; + * .context.SliceId slice_id = 6; * @return Whether the sliceId field is set. */ @java.lang.Override @@ -522,7 +390,7 @@ public final class Monitoring { return sliceId_ != null; } /** - * .context.SliceId slice_id = 8; + * .context.SliceId slice_id = 6; * @return The sliceId. */ @java.lang.Override @@ -530,7 +398,7 @@ public final class Monitoring { return sliceId_ == null ? context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; } /** - * .context.SliceId slice_id = 8; + * .context.SliceId slice_id = 6; */ @java.lang.Override public context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder() { @@ -551,29 +419,23 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (kpiId_ != null) { - output.writeMessage(1, getKpiId()); - } if (!getKpiDescriptionBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, kpiDescription_); - } - for (int i = 0; i < kpiIdList_.size(); i++) { - output.writeMessage(3, kpiIdList_.get(i)); + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, kpiDescription_); } if (kpiSampleType_ != kpi_sample_types.KpiSampleTypes.KpiSampleType.KPISAMPLETYPE_UNKNOWN.getNumber()) { - output.writeEnum(4, kpiSampleType_); + output.writeEnum(2, kpiSampleType_); } if (deviceId_ != null) { - output.writeMessage(5, getDeviceId()); + output.writeMessage(3, getDeviceId()); } if (endpointId_ != null) { - output.writeMessage(6, getEndpointId()); + output.writeMessage(4, getEndpointId()); } if (serviceId_ != null) { - output.writeMessage(7, getServiceId()); + output.writeMessage(5, getServiceId()); } if (sliceId_ != null) { - output.writeMessage(8, getSliceId()); + output.writeMessage(6, getSliceId()); } unknownFields.writeTo(output); } @@ -584,36 +446,28 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (kpiId_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getKpiId()); - } if (!getKpiDescriptionBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, kpiDescription_); - } - for (int i = 0; i < kpiIdList_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, kpiIdList_.get(i)); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, kpiDescription_); } if (kpiSampleType_ != kpi_sample_types.KpiSampleTypes.KpiSampleType.KPISAMPLETYPE_UNKNOWN.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(4, kpiSampleType_); + .computeEnumSize(2, kpiSampleType_); } if (deviceId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, getDeviceId()); + .computeMessageSize(3, getDeviceId()); } if (endpointId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, getEndpointId()); + .computeMessageSize(4, getEndpointId()); } if (serviceId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(7, getServiceId()); + .computeMessageSize(5, getServiceId()); } if (sliceId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, getSliceId()); + .computeMessageSize(6, getSliceId()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -630,15 +484,8 @@ public final class Monitoring { } monitoring.Monitoring.KpiDescriptor other = (monitoring.Monitoring.KpiDescriptor) obj; - if (hasKpiId() != other.hasKpiId()) return false; - if (hasKpiId()) { - if (!getKpiId() - .equals(other.getKpiId())) return false; - } if (!getKpiDescription() .equals(other.getKpiDescription())) return false; - if (!getKpiIdListList() - .equals(other.getKpiIdListList())) return false; if (kpiSampleType_ != other.kpiSampleType_) return false; if (hasDeviceId() != other.hasDeviceId()) return false; if (hasDeviceId()) { @@ -671,16 +518,8 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasKpiId()) { - hash = (37 * hash) + KPI_ID_FIELD_NUMBER; - hash = (53 * hash) + getKpiId().hashCode(); - } hash = (37 * hash) + KPI_DESCRIPTION_FIELD_NUMBER; hash = (53 * hash) + getKpiDescription().hashCode(); - if (getKpiIdListCount() > 0) { - hash = (37 * hash) + KPI_ID_LIST_FIELD_NUMBER; - hash = (53 * hash) + getKpiIdListList().hashCode(); - } hash = (37 * hash) + KPI_SAMPLE_TYPE_FIELD_NUMBER; hash = (53 * hash) + kpiSampleType_; if (hasDeviceId()) { @@ -827,26 +666,13 @@ public final class Monitoring { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getKpiIdListFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); - if (kpiIdBuilder_ == null) { - kpiId_ = null; - } else { - kpiId_ = null; - kpiIdBuilder_ = null; - } kpiDescription_ = ""; - if (kpiIdListBuilder_ == null) { - kpiIdList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - } else { - kpiIdListBuilder_.clear(); - } kpiSampleType_ = 0; if (deviceIdBuilder_ == null) { @@ -899,22 +725,7 @@ public final class Monitoring { @java.lang.Override public monitoring.Monitoring.KpiDescriptor buildPartial() { monitoring.Monitoring.KpiDescriptor result = new monitoring.Monitoring.KpiDescriptor(this); - int from_bitField0_ = bitField0_; - if (kpiIdBuilder_ == null) { - result.kpiId_ = kpiId_; - } else { - result.kpiId_ = kpiIdBuilder_.build(); - } result.kpiDescription_ = kpiDescription_; - if (kpiIdListBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { - kpiIdList_ = java.util.Collections.unmodifiableList(kpiIdList_); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.kpiIdList_ = kpiIdList_; - } else { - result.kpiIdList_ = kpiIdListBuilder_.build(); - } result.kpiSampleType_ = kpiSampleType_; if (deviceIdBuilder_ == null) { result.deviceId_ = deviceId_; @@ -984,39 +795,10 @@ public final class Monitoring { public Builder mergeFrom(monitoring.Monitoring.KpiDescriptor other) { if (other == monitoring.Monitoring.KpiDescriptor.getDefaultInstance()) return this; - if (other.hasKpiId()) { - mergeKpiId(other.getKpiId()); - } if (!other.getKpiDescription().isEmpty()) { kpiDescription_ = other.kpiDescription_; onChanged(); } - if (kpiIdListBuilder_ == null) { - if (!other.kpiIdList_.isEmpty()) { - if (kpiIdList_.isEmpty()) { - kpiIdList_ = other.kpiIdList_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureKpiIdListIsMutable(); - kpiIdList_.addAll(other.kpiIdList_); - } - onChanged(); - } - } else { - if (!other.kpiIdList_.isEmpty()) { - if (kpiIdListBuilder_.isEmpty()) { - kpiIdListBuilder_.dispose(); - kpiIdListBuilder_ = null; - kpiIdList_ = other.kpiIdList_; - bitField0_ = (bitField0_ & ~0x00000001); - kpiIdListBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getKpiIdListFieldBuilder() : null; - } else { - kpiIdListBuilder_.addAllMessages(other.kpiIdList_); - } - } - } if (other.kpiSampleType_ != 0) { setKpiSampleTypeValue(other.getKpiSampleTypeValue()); } @@ -1060,130 +842,10 @@ public final class Monitoring { } return this; } - private int bitField0_; - - private monitoring.Monitoring.KpiId kpiId_; - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; - /** - * .monitoring.KpiId kpi_id = 1; - * @return Whether the kpiId field is set. - */ - public boolean hasKpiId() { - return kpiIdBuilder_ != null || kpiId_ != null; - } - /** - * .monitoring.KpiId kpi_id = 1; - * @return The kpiId. - */ - public monitoring.Monitoring.KpiId getKpiId() { - if (kpiIdBuilder_ == null) { - return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; - } else { - return kpiIdBuilder_.getMessage(); - } - } - /** - * .monitoring.KpiId kpi_id = 1; - */ - public Builder setKpiId(monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - kpiId_ = value; - onChanged(); - } else { - kpiIdBuilder_.setMessage(value); - } - - return this; - } - /** - * .monitoring.KpiId kpi_id = 1; - */ - public Builder setKpiId( - monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdBuilder_ == null) { - kpiId_ = builderForValue.build(); - onChanged(); - } else { - kpiIdBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .monitoring.KpiId kpi_id = 1; - */ - public Builder mergeKpiId(monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (kpiId_ != null) { - kpiId_ = - monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial(); - } else { - kpiId_ = value; - } - onChanged(); - } else { - kpiIdBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .monitoring.KpiId kpi_id = 1; - */ - public Builder clearKpiId() { - if (kpiIdBuilder_ == null) { - kpiId_ = null; - onChanged(); - } else { - kpiId_ = null; - kpiIdBuilder_ = null; - } - - return this; - } - /** - * .monitoring.KpiId kpi_id = 1; - */ - public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() { - - onChanged(); - return getKpiIdFieldBuilder().getBuilder(); - } - /** - * .monitoring.KpiId kpi_id = 1; - */ - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { - if (kpiIdBuilder_ != null) { - return kpiIdBuilder_.getMessageOrBuilder(); - } else { - return kpiId_ == null ? - monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; - } - } - /** - * .monitoring.KpiId kpi_id = 1; - */ - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> - getKpiIdFieldBuilder() { - if (kpiIdBuilder_ == null) { - kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( - getKpiId(), - getParentForChildren(), - isClean()); - kpiId_ = null; - } - return kpiIdBuilder_; - } private java.lang.Object kpiDescription_ = ""; /** - * string kpi_description = 2; + * string kpi_description = 1; * @return The kpiDescription. */ public java.lang.String getKpiDescription() { @@ -1199,7 +861,7 @@ public final class Monitoring { } } /** - * string kpi_description = 2; + * string kpi_description = 1; * @return The bytes for kpiDescription. */ public com.google.protobuf.ByteString @@ -1216,7 +878,7 @@ public final class Monitoring { } } /** - * string kpi_description = 2; + * string kpi_description = 1; * @param value The kpiDescription to set. * @return This builder for chaining. */ @@ -1231,7 +893,7 @@ public final class Monitoring { return this; } /** - * string kpi_description = 2; + * string kpi_description = 1; * @return This builder for chaining. */ public Builder clearKpiDescription() { @@ -1241,7 +903,7 @@ public final class Monitoring { return this; } /** - * string kpi_description = 2; + * string kpi_description = 1; * @param value The bytes for kpiDescription to set. * @return This builder for chaining. */ @@ -1257,785 +919,545 @@ public final class Monitoring { return this; } - private java.util.List kpiIdList_ = - java.util.Collections.emptyList(); - private void ensureKpiIdListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - kpiIdList_ = new java.util.ArrayList(kpiIdList_); - bitField0_ |= 0x00000001; - } + private int kpiSampleType_ = 0; + /** + * .kpi_sample_types.KpiSampleType kpi_sample_type = 2; + * @return The enum numeric value on the wire for kpiSampleType. + */ + @java.lang.Override public int getKpiSampleTypeValue() { + return kpiSampleType_; } - - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdListBuilder_; - /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 2; + * @param value The enum numeric value on the wire for kpiSampleType to set. + * @return This builder for chaining. */ - public java.util.List getKpiIdListList() { - if (kpiIdListBuilder_ == null) { - return java.util.Collections.unmodifiableList(kpiIdList_); - } else { - return kpiIdListBuilder_.getMessageList(); - } + public Builder setKpiSampleTypeValue(int value) { + + kpiSampleType_ = value; + onChanged(); + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 2; + * @return The kpiSampleType. */ - public int getKpiIdListCount() { - if (kpiIdListBuilder_ == null) { - return kpiIdList_.size(); - } else { - return kpiIdListBuilder_.getCount(); + @java.lang.Override + public kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType() { + @SuppressWarnings("deprecation") + kpi_sample_types.KpiSampleTypes.KpiSampleType result = kpi_sample_types.KpiSampleTypes.KpiSampleType.valueOf(kpiSampleType_); + return result == null ? kpi_sample_types.KpiSampleTypes.KpiSampleType.UNRECOGNIZED : result; + } + /** + * .kpi_sample_types.KpiSampleType kpi_sample_type = 2; + * @param value The kpiSampleType to set. + * @return This builder for chaining. + */ + public Builder setKpiSampleType(kpi_sample_types.KpiSampleTypes.KpiSampleType value) { + if (value == null) { + throw new NullPointerException(); } + + kpiSampleType_ = value.getNumber(); + onChanged(); + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 2; + * @return This builder for chaining. */ - public monitoring.Monitoring.KpiId getKpiIdList(int index) { - if (kpiIdListBuilder_ == null) { - return kpiIdList_.get(index); + public Builder clearKpiSampleType() { + + kpiSampleType_ = 0; + onChanged(); + return this; + } + + private context.ContextOuterClass.DeviceId deviceId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder> deviceIdBuilder_; + /** + * .context.DeviceId device_id = 3; + * @return Whether the deviceId field is set. + */ + public boolean hasDeviceId() { + return deviceIdBuilder_ != null || deviceId_ != null; + } + /** + * .context.DeviceId device_id = 3; + * @return The deviceId. + */ + public context.ContextOuterClass.DeviceId getDeviceId() { + if (deviceIdBuilder_ == null) { + return deviceId_ == null ? context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; } else { - return kpiIdListBuilder_.getMessage(index); + return deviceIdBuilder_.getMessage(); } } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.DeviceId device_id = 3; */ - public Builder setKpiIdList( - int index, monitoring.Monitoring.KpiId value) { - if (kpiIdListBuilder_ == null) { + public Builder setDeviceId(context.ContextOuterClass.DeviceId value) { + if (deviceIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureKpiIdListIsMutable(); - kpiIdList_.set(index, value); + deviceId_ = value; onChanged(); } else { - kpiIdListBuilder_.setMessage(index, value); + deviceIdBuilder_.setMessage(value); } + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.DeviceId device_id = 3; */ - public Builder setKpiIdList( - int index, monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdListBuilder_ == null) { - ensureKpiIdListIsMutable(); - kpiIdList_.set(index, builderForValue.build()); + public Builder setDeviceId( + context.ContextOuterClass.DeviceId.Builder builderForValue) { + if (deviceIdBuilder_ == null) { + deviceId_ = builderForValue.build(); onChanged(); } else { - kpiIdListBuilder_.setMessage(index, builderForValue.build()); + deviceIdBuilder_.setMessage(builderForValue.build()); } + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.DeviceId device_id = 3; */ - public Builder addKpiIdList(monitoring.Monitoring.KpiId value) { - if (kpiIdListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); + public Builder mergeDeviceId(context.ContextOuterClass.DeviceId value) { + if (deviceIdBuilder_ == null) { + if (deviceId_ != null) { + deviceId_ = + context.ContextOuterClass.DeviceId.newBuilder(deviceId_).mergeFrom(value).buildPartial(); + } else { + deviceId_ = value; } - ensureKpiIdListIsMutable(); - kpiIdList_.add(value); onChanged(); } else { - kpiIdListBuilder_.addMessage(value); + deviceIdBuilder_.mergeFrom(value); } + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.DeviceId device_id = 3; */ - public Builder addKpiIdList( - int index, monitoring.Monitoring.KpiId value) { - if (kpiIdListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiIdListIsMutable(); - kpiIdList_.add(index, value); + public Builder clearDeviceId() { + if (deviceIdBuilder_ == null) { + deviceId_ = null; onChanged(); } else { - kpiIdListBuilder_.addMessage(index, value); + deviceId_ = null; + deviceIdBuilder_ = null; } + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.DeviceId device_id = 3; */ - public Builder addKpiIdList( - monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdListBuilder_ == null) { - ensureKpiIdListIsMutable(); - kpiIdList_.add(builderForValue.build()); - onChanged(); + public context.ContextOuterClass.DeviceId.Builder getDeviceIdBuilder() { + + onChanged(); + return getDeviceIdFieldBuilder().getBuilder(); + } + /** + * .context.DeviceId device_id = 3; + */ + public context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder() { + if (deviceIdBuilder_ != null) { + return deviceIdBuilder_.getMessageOrBuilder(); } else { - kpiIdListBuilder_.addMessage(builderForValue.build()); + return deviceId_ == null ? + context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; } - return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.DeviceId device_id = 3; */ - public Builder addKpiIdList( - int index, monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdListBuilder_ == null) { - ensureKpiIdListIsMutable(); - kpiIdList_.add(index, builderForValue.build()); - onChanged(); - } else { - kpiIdListBuilder_.addMessage(index, builderForValue.build()); + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder> + getDeviceIdFieldBuilder() { + if (deviceIdBuilder_ == null) { + deviceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder>( + getDeviceId(), + getParentForChildren(), + isClean()); + deviceId_ = null; } - return this; + return deviceIdBuilder_; } + + private context.ContextOuterClass.EndPointId endpointId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder> endpointIdBuilder_; /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.EndPointId endpoint_id = 4; + * @return Whether the endpointId field is set. */ - public Builder addAllKpiIdList( - java.lang.Iterable values) { - if (kpiIdListBuilder_ == null) { - ensureKpiIdListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, kpiIdList_); - onChanged(); + public boolean hasEndpointId() { + return endpointIdBuilder_ != null || endpointId_ != null; + } + /** + * .context.EndPointId endpoint_id = 4; + * @return The endpointId. + */ + public context.ContextOuterClass.EndPointId getEndpointId() { + if (endpointIdBuilder_ == null) { + return endpointId_ == null ? context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; } else { - kpiIdListBuilder_.addAllMessages(values); + return endpointIdBuilder_.getMessage(); } - return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.EndPointId endpoint_id = 4; */ - public Builder clearKpiIdList() { - if (kpiIdListBuilder_ == null) { - kpiIdList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + public Builder setEndpointId(context.ContextOuterClass.EndPointId value) { + if (endpointIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + endpointId_ = value; onChanged(); } else { - kpiIdListBuilder_.clear(); + endpointIdBuilder_.setMessage(value); } + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.EndPointId endpoint_id = 4; */ - public Builder removeKpiIdList(int index) { - if (kpiIdListBuilder_ == null) { - ensureKpiIdListIsMutable(); - kpiIdList_.remove(index); + public Builder setEndpointId( + context.ContextOuterClass.EndPointId.Builder builderForValue) { + if (endpointIdBuilder_ == null) { + endpointId_ = builderForValue.build(); onChanged(); } else { - kpiIdListBuilder_.remove(index); + endpointIdBuilder_.setMessage(builderForValue.build()); } + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; - */ - public monitoring.Monitoring.KpiId.Builder getKpiIdListBuilder( - int index) { - return getKpiIdListFieldBuilder().getBuilder(index); - } - /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.EndPointId endpoint_id = 4; */ - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdListOrBuilder( - int index) { - if (kpiIdListBuilder_ == null) { - return kpiIdList_.get(index); } else { - return kpiIdListBuilder_.getMessageOrBuilder(index); + public Builder mergeEndpointId(context.ContextOuterClass.EndPointId value) { + if (endpointIdBuilder_ == null) { + if (endpointId_ != null) { + endpointId_ = + context.ContextOuterClass.EndPointId.newBuilder(endpointId_).mergeFrom(value).buildPartial(); + } else { + endpointId_ = value; + } + onChanged(); + } else { + endpointIdBuilder_.mergeFrom(value); } + + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.EndPointId endpoint_id = 4; */ - public java.util.List - getKpiIdListOrBuilderList() { - if (kpiIdListBuilder_ != null) { - return kpiIdListBuilder_.getMessageOrBuilderList(); + public Builder clearEndpointId() { + if (endpointIdBuilder_ == null) { + endpointId_ = null; + onChanged(); } else { - return java.util.Collections.unmodifiableList(kpiIdList_); + endpointId_ = null; + endpointIdBuilder_ = null; } + + return this; } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.EndPointId endpoint_id = 4; */ - public monitoring.Monitoring.KpiId.Builder addKpiIdListBuilder() { - return getKpiIdListFieldBuilder().addBuilder( - monitoring.Monitoring.KpiId.getDefaultInstance()); + public context.ContextOuterClass.EndPointId.Builder getEndpointIdBuilder() { + + onChanged(); + return getEndpointIdFieldBuilder().getBuilder(); } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.EndPointId endpoint_id = 4; */ - public monitoring.Monitoring.KpiId.Builder addKpiIdListBuilder( - int index) { - return getKpiIdListFieldBuilder().addBuilder( - index, monitoring.Monitoring.KpiId.getDefaultInstance()); + public context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder() { + if (endpointIdBuilder_ != null) { + return endpointIdBuilder_.getMessageOrBuilder(); + } else { + return endpointId_ == null ? + context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; + } } /** - * repeated .monitoring.KpiId kpi_id_list = 3; + * .context.EndPointId endpoint_id = 4; */ - public java.util.List - getKpiIdListBuilderList() { - return getKpiIdListFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> - getKpiIdListFieldBuilder() { - if (kpiIdListBuilder_ == null) { - kpiIdListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( - kpiIdList_, - ((bitField0_ & 0x00000001) != 0), + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder> + getEndpointIdFieldBuilder() { + if (endpointIdBuilder_ == null) { + endpointIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder>( + getEndpointId(), getParentForChildren(), isClean()); - kpiIdList_ = null; + endpointId_ = null; } - return kpiIdListBuilder_; + return endpointIdBuilder_; } - private int kpiSampleType_ = 0; + private context.ContextOuterClass.ServiceId serviceId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder> serviceIdBuilder_; /** - * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; - * @return The enum numeric value on the wire for kpiSampleType. + * .context.ServiceId service_id = 5; + * @return Whether the serviceId field is set. */ - @java.lang.Override public int getKpiSampleTypeValue() { - return kpiSampleType_; + public boolean hasServiceId() { + return serviceIdBuilder_ != null || serviceId_ != null; } /** - * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; - * @param value The enum numeric value on the wire for kpiSampleType to set. - * @return This builder for chaining. + * .context.ServiceId service_id = 5; + * @return The serviceId. */ - public Builder setKpiSampleTypeValue(int value) { - - kpiSampleType_ = value; - onChanged(); - return this; + public context.ContextOuterClass.ServiceId getServiceId() { + if (serviceIdBuilder_ == null) { + return serviceId_ == null ? context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; + } else { + return serviceIdBuilder_.getMessage(); + } } /** - * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; - * @return The kpiSampleType. + * .context.ServiceId service_id = 5; */ - @java.lang.Override - public kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType() { - @SuppressWarnings("deprecation") - kpi_sample_types.KpiSampleTypes.KpiSampleType result = kpi_sample_types.KpiSampleTypes.KpiSampleType.valueOf(kpiSampleType_); - return result == null ? kpi_sample_types.KpiSampleTypes.KpiSampleType.UNRECOGNIZED : result; + public Builder setServiceId(context.ContextOuterClass.ServiceId value) { + if (serviceIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + serviceId_ = value; + onChanged(); + } else { + serviceIdBuilder_.setMessage(value); + } + + return this; } /** - * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; - * @param value The kpiSampleType to set. - * @return This builder for chaining. - */ - public Builder setKpiSampleType(kpi_sample_types.KpiSampleTypes.KpiSampleType value) { - if (value == null) { - throw new NullPointerException(); - } - - kpiSampleType_ = value.getNumber(); - onChanged(); - return this; - } - /** - * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; - * @return This builder for chaining. - */ - public Builder clearKpiSampleType() { - - kpiSampleType_ = 0; - onChanged(); - return this; - } - - private context.ContextOuterClass.DeviceId deviceId_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder> deviceIdBuilder_; - /** - * .context.DeviceId device_id = 5; - * @return Whether the deviceId field is set. - */ - public boolean hasDeviceId() { - return deviceIdBuilder_ != null || deviceId_ != null; - } - /** - * .context.DeviceId device_id = 5; - * @return The deviceId. - */ - public context.ContextOuterClass.DeviceId getDeviceId() { - if (deviceIdBuilder_ == null) { - return deviceId_ == null ? context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; - } else { - return deviceIdBuilder_.getMessage(); - } - } - /** - * .context.DeviceId device_id = 5; - */ - public Builder setDeviceId(context.ContextOuterClass.DeviceId value) { - if (deviceIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - deviceId_ = value; - onChanged(); - } else { - deviceIdBuilder_.setMessage(value); - } - - return this; - } - /** - * .context.DeviceId device_id = 5; + * .context.ServiceId service_id = 5; */ - public Builder setDeviceId( - context.ContextOuterClass.DeviceId.Builder builderForValue) { - if (deviceIdBuilder_ == null) { - deviceId_ = builderForValue.build(); + public Builder setServiceId( + context.ContextOuterClass.ServiceId.Builder builderForValue) { + if (serviceIdBuilder_ == null) { + serviceId_ = builderForValue.build(); onChanged(); } else { - deviceIdBuilder_.setMessage(builderForValue.build()); + serviceIdBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .context.DeviceId device_id = 5; + * .context.ServiceId service_id = 5; */ - public Builder mergeDeviceId(context.ContextOuterClass.DeviceId value) { - if (deviceIdBuilder_ == null) { - if (deviceId_ != null) { - deviceId_ = - context.ContextOuterClass.DeviceId.newBuilder(deviceId_).mergeFrom(value).buildPartial(); + public Builder mergeServiceId(context.ContextOuterClass.ServiceId value) { + if (serviceIdBuilder_ == null) { + if (serviceId_ != null) { + serviceId_ = + context.ContextOuterClass.ServiceId.newBuilder(serviceId_).mergeFrom(value).buildPartial(); } else { - deviceId_ = value; + serviceId_ = value; } onChanged(); } else { - deviceIdBuilder_.mergeFrom(value); + serviceIdBuilder_.mergeFrom(value); } return this; } /** - * .context.DeviceId device_id = 5; + * .context.ServiceId service_id = 5; */ - public Builder clearDeviceId() { - if (deviceIdBuilder_ == null) { - deviceId_ = null; + public Builder clearServiceId() { + if (serviceIdBuilder_ == null) { + serviceId_ = null; onChanged(); } else { - deviceId_ = null; - deviceIdBuilder_ = null; + serviceId_ = null; + serviceIdBuilder_ = null; } return this; } /** - * .context.DeviceId device_id = 5; + * .context.ServiceId service_id = 5; */ - public context.ContextOuterClass.DeviceId.Builder getDeviceIdBuilder() { + public context.ContextOuterClass.ServiceId.Builder getServiceIdBuilder() { onChanged(); - return getDeviceIdFieldBuilder().getBuilder(); + return getServiceIdFieldBuilder().getBuilder(); } /** - * .context.DeviceId device_id = 5; + * .context.ServiceId service_id = 5; */ - public context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder() { - if (deviceIdBuilder_ != null) { - return deviceIdBuilder_.getMessageOrBuilder(); + public context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder() { + if (serviceIdBuilder_ != null) { + return serviceIdBuilder_.getMessageOrBuilder(); } else { - return deviceId_ == null ? - context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; + return serviceId_ == null ? + context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; } } /** - * .context.DeviceId device_id = 5; + * .context.ServiceId service_id = 5; */ private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder> - getDeviceIdFieldBuilder() { - if (deviceIdBuilder_ == null) { - deviceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder>( - getDeviceId(), + context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder> + getServiceIdFieldBuilder() { + if (serviceIdBuilder_ == null) { + serviceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder>( + getServiceId(), getParentForChildren(), isClean()); - deviceId_ = null; + serviceId_ = null; } - return deviceIdBuilder_; + return serviceIdBuilder_; } - private context.ContextOuterClass.EndPointId endpointId_; + private context.ContextOuterClass.SliceId sliceId_; private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder> endpointIdBuilder_; + context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder> sliceIdBuilder_; /** - * .context.EndPointId endpoint_id = 6; - * @return Whether the endpointId field is set. + * .context.SliceId slice_id = 6; + * @return Whether the sliceId field is set. */ - public boolean hasEndpointId() { - return endpointIdBuilder_ != null || endpointId_ != null; + public boolean hasSliceId() { + return sliceIdBuilder_ != null || sliceId_ != null; } /** - * .context.EndPointId endpoint_id = 6; - * @return The endpointId. + * .context.SliceId slice_id = 6; + * @return The sliceId. */ - public context.ContextOuterClass.EndPointId getEndpointId() { - if (endpointIdBuilder_ == null) { - return endpointId_ == null ? context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; + public context.ContextOuterClass.SliceId getSliceId() { + if (sliceIdBuilder_ == null) { + return sliceId_ == null ? context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; } else { - return endpointIdBuilder_.getMessage(); + return sliceIdBuilder_.getMessage(); } } /** - * .context.EndPointId endpoint_id = 6; + * .context.SliceId slice_id = 6; */ - public Builder setEndpointId(context.ContextOuterClass.EndPointId value) { - if (endpointIdBuilder_ == null) { + public Builder setSliceId(context.ContextOuterClass.SliceId value) { + if (sliceIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - endpointId_ = value; + sliceId_ = value; onChanged(); } else { - endpointIdBuilder_.setMessage(value); + sliceIdBuilder_.setMessage(value); } return this; } /** - * .context.EndPointId endpoint_id = 6; + * .context.SliceId slice_id = 6; */ - public Builder setEndpointId( - context.ContextOuterClass.EndPointId.Builder builderForValue) { - if (endpointIdBuilder_ == null) { - endpointId_ = builderForValue.build(); + public Builder setSliceId( + context.ContextOuterClass.SliceId.Builder builderForValue) { + if (sliceIdBuilder_ == null) { + sliceId_ = builderForValue.build(); onChanged(); } else { - endpointIdBuilder_.setMessage(builderForValue.build()); + sliceIdBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .context.EndPointId endpoint_id = 6; + * .context.SliceId slice_id = 6; */ - public Builder mergeEndpointId(context.ContextOuterClass.EndPointId value) { - if (endpointIdBuilder_ == null) { - if (endpointId_ != null) { - endpointId_ = - context.ContextOuterClass.EndPointId.newBuilder(endpointId_).mergeFrom(value).buildPartial(); + public Builder mergeSliceId(context.ContextOuterClass.SliceId value) { + if (sliceIdBuilder_ == null) { + if (sliceId_ != null) { + sliceId_ = + context.ContextOuterClass.SliceId.newBuilder(sliceId_).mergeFrom(value).buildPartial(); } else { - endpointId_ = value; + sliceId_ = value; } onChanged(); } else { - endpointIdBuilder_.mergeFrom(value); + sliceIdBuilder_.mergeFrom(value); } return this; } /** - * .context.EndPointId endpoint_id = 6; + * .context.SliceId slice_id = 6; */ - public Builder clearEndpointId() { - if (endpointIdBuilder_ == null) { - endpointId_ = null; + public Builder clearSliceId() { + if (sliceIdBuilder_ == null) { + sliceId_ = null; onChanged(); } else { - endpointId_ = null; - endpointIdBuilder_ = null; + sliceId_ = null; + sliceIdBuilder_ = null; } return this; } /** - * .context.EndPointId endpoint_id = 6; + * .context.SliceId slice_id = 6; */ - public context.ContextOuterClass.EndPointId.Builder getEndpointIdBuilder() { + public context.ContextOuterClass.SliceId.Builder getSliceIdBuilder() { onChanged(); - return getEndpointIdFieldBuilder().getBuilder(); + return getSliceIdFieldBuilder().getBuilder(); } /** - * .context.EndPointId endpoint_id = 6; + * .context.SliceId slice_id = 6; */ - public context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder() { - if (endpointIdBuilder_ != null) { - return endpointIdBuilder_.getMessageOrBuilder(); + public context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder() { + if (sliceIdBuilder_ != null) { + return sliceIdBuilder_.getMessageOrBuilder(); } else { - return endpointId_ == null ? - context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; + return sliceId_ == null ? + context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; } } /** - * .context.EndPointId endpoint_id = 6; + * .context.SliceId slice_id = 6; */ private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder> - getEndpointIdFieldBuilder() { - if (endpointIdBuilder_ == null) { - endpointIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder>( - getEndpointId(), + context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder> + getSliceIdFieldBuilder() { + if (sliceIdBuilder_ == null) { + sliceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder>( + getSliceId(), getParentForChildren(), isClean()); - endpointId_ = null; + sliceId_ = null; } - return endpointIdBuilder_; + return sliceIdBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); } - private context.ContextOuterClass.ServiceId serviceId_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder> serviceIdBuilder_; - /** - * .context.ServiceId service_id = 7; - * @return Whether the serviceId field is set. - */ - public boolean hasServiceId() { - return serviceIdBuilder_ != null || serviceId_ != null; - } - /** - * .context.ServiceId service_id = 7; - * @return The serviceId. - */ - public context.ContextOuterClass.ServiceId getServiceId() { - if (serviceIdBuilder_ == null) { - return serviceId_ == null ? context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; - } else { - return serviceIdBuilder_.getMessage(); - } - } - /** - * .context.ServiceId service_id = 7; - */ - public Builder setServiceId(context.ContextOuterClass.ServiceId value) { - if (serviceIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - serviceId_ = value; - onChanged(); - } else { - serviceIdBuilder_.setMessage(value); - } - - return this; - } - /** - * .context.ServiceId service_id = 7; - */ - public Builder setServiceId( - context.ContextOuterClass.ServiceId.Builder builderForValue) { - if (serviceIdBuilder_ == null) { - serviceId_ = builderForValue.build(); - onChanged(); - } else { - serviceIdBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .context.ServiceId service_id = 7; - */ - public Builder mergeServiceId(context.ContextOuterClass.ServiceId value) { - if (serviceIdBuilder_ == null) { - if (serviceId_ != null) { - serviceId_ = - context.ContextOuterClass.ServiceId.newBuilder(serviceId_).mergeFrom(value).buildPartial(); - } else { - serviceId_ = value; - } - onChanged(); - } else { - serviceIdBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .context.ServiceId service_id = 7; - */ - public Builder clearServiceId() { - if (serviceIdBuilder_ == null) { - serviceId_ = null; - onChanged(); - } else { - serviceId_ = null; - serviceIdBuilder_ = null; - } - - return this; - } - /** - * .context.ServiceId service_id = 7; - */ - public context.ContextOuterClass.ServiceId.Builder getServiceIdBuilder() { - - onChanged(); - return getServiceIdFieldBuilder().getBuilder(); - } - /** - * .context.ServiceId service_id = 7; - */ - public context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder() { - if (serviceIdBuilder_ != null) { - return serviceIdBuilder_.getMessageOrBuilder(); - } else { - return serviceId_ == null ? - context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; - } - } - /** - * .context.ServiceId service_id = 7; - */ - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder> - getServiceIdFieldBuilder() { - if (serviceIdBuilder_ == null) { - serviceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder>( - getServiceId(), - getParentForChildren(), - isClean()); - serviceId_ = null; - } - return serviceIdBuilder_; - } - - private context.ContextOuterClass.SliceId sliceId_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder> sliceIdBuilder_; - /** - * .context.SliceId slice_id = 8; - * @return Whether the sliceId field is set. - */ - public boolean hasSliceId() { - return sliceIdBuilder_ != null || sliceId_ != null; - } - /** - * .context.SliceId slice_id = 8; - * @return The sliceId. - */ - public context.ContextOuterClass.SliceId getSliceId() { - if (sliceIdBuilder_ == null) { - return sliceId_ == null ? context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; - } else { - return sliceIdBuilder_.getMessage(); - } - } - /** - * .context.SliceId slice_id = 8; - */ - public Builder setSliceId(context.ContextOuterClass.SliceId value) { - if (sliceIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - sliceId_ = value; - onChanged(); - } else { - sliceIdBuilder_.setMessage(value); - } - - return this; - } - /** - * .context.SliceId slice_id = 8; - */ - public Builder setSliceId( - context.ContextOuterClass.SliceId.Builder builderForValue) { - if (sliceIdBuilder_ == null) { - sliceId_ = builderForValue.build(); - onChanged(); - } else { - sliceIdBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .context.SliceId slice_id = 8; - */ - public Builder mergeSliceId(context.ContextOuterClass.SliceId value) { - if (sliceIdBuilder_ == null) { - if (sliceId_ != null) { - sliceId_ = - context.ContextOuterClass.SliceId.newBuilder(sliceId_).mergeFrom(value).buildPartial(); - } else { - sliceId_ = value; - } - onChanged(); - } else { - sliceIdBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .context.SliceId slice_id = 8; - */ - public Builder clearSliceId() { - if (sliceIdBuilder_ == null) { - sliceId_ = null; - onChanged(); - } else { - sliceId_ = null; - sliceIdBuilder_ = null; - } - - return this; - } - /** - * .context.SliceId slice_id = 8; - */ - public context.ContextOuterClass.SliceId.Builder getSliceIdBuilder() { - - onChanged(); - return getSliceIdFieldBuilder().getBuilder(); - } - /** - * .context.SliceId slice_id = 8; - */ - public context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder() { - if (sliceIdBuilder_ != null) { - return sliceIdBuilder_.getMessageOrBuilder(); - } else { - return sliceId_ == null ? - context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; - } - } - /** - * .context.SliceId slice_id = 8; - */ - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder> - getSliceIdFieldBuilder() { - if (sliceIdBuilder_ == null) { - sliceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder>( - getSliceId(), - getParentForChildren(), - isClean()); - sliceId_ = null; - } - return sliceIdBuilder_; - } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); } @@ -2079,61 +1501,140 @@ public final class Monitoring { } - public interface MonitorKpiRequestOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.MonitorKpiRequest) + public interface BundleKpiDescriptorOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.BundleKpiDescriptor) com.google.protobuf.MessageOrBuilder { /** - * .monitoring.KpiId kpi_id = 1; - * @return Whether the kpiId field is set. + * string kpi_description = 1; + * @return The kpiDescription. */ - boolean hasKpiId(); + java.lang.String getKpiDescription(); /** - * .monitoring.KpiId kpi_id = 1; - * @return The kpiId. + * string kpi_description = 1; + * @return The bytes for kpiDescription. */ - monitoring.Monitoring.KpiId getKpiId(); + com.google.protobuf.ByteString + getKpiDescriptionBytes(); + /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 2; */ - monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder(); - + java.util.List + getKpiIdListList(); /** - * float monitoring_window_s = 2; - * @return The monitoringWindowS. + * repeated .monitoring.KpiId kpi_id_list = 2; */ - float getMonitoringWindowS(); - + monitoring.Monitoring.KpiId getKpiIdList(int index); /** - * 
-     * Pending add field to reflect Available Device Protocols
-     *
- * - * float sampling_rate_s = 3; - * @return The samplingRateS. + * repeated .monitoring.KpiId kpi_id_list = 2; */ - float getSamplingRateS(); + int getKpiIdListCount(); + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + java.util.List + getKpiIdListOrBuilderList(); + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + monitoring.Monitoring.KpiIdOrBuilder getKpiIdListOrBuilder( + int index); + + /** + * .kpi_sample_types.KpiSampleType kpi_sample_type = 3; + * @return The enum numeric value on the wire for kpiSampleType. + */ + int getKpiSampleTypeValue(); + /** + * .kpi_sample_types.KpiSampleType kpi_sample_type = 3; + * @return The kpiSampleType. + */ + kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType(); + + /** + * .context.DeviceId device_id = 4; + * @return Whether the deviceId field is set. + */ + boolean hasDeviceId(); + /** + * .context.DeviceId device_id = 4; + * @return The deviceId. + */ + context.ContextOuterClass.DeviceId getDeviceId(); + /** + * .context.DeviceId device_id = 4; + */ + context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder(); + + /** + * .context.EndPointId endpoint_id = 5; + * @return Whether the endpointId field is set. + */ + boolean hasEndpointId(); + /** + * .context.EndPointId endpoint_id = 5; + * @return The endpointId. + */ + context.ContextOuterClass.EndPointId getEndpointId(); + /** + * .context.EndPointId endpoint_id = 5; + */ + context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder(); + + /** + * .context.ServiceId service_id = 6; + * @return Whether the serviceId field is set. + */ + boolean hasServiceId(); + /** + * .context.ServiceId service_id = 6; + * @return The serviceId. + */ + context.ContextOuterClass.ServiceId getServiceId(); + /** + * .context.ServiceId service_id = 6; + */ + context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder(); + + /** + * .context.SliceId slice_id = 7; + * @return Whether the sliceId field is set. + */ + boolean hasSliceId(); + /** + * .context.SliceId slice_id = 7; + * @return The sliceId. + */ + context.ContextOuterClass.SliceId getSliceId(); + /** + * .context.SliceId slice_id = 7; + */ + context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder(); } /** - * Protobuf type {@code monitoring.MonitorKpiRequest} + * Protobuf type {@code monitoring.BundleKpiDescriptor} */ - public static final class MonitorKpiRequest extends + public static final class BundleKpiDescriptor extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.MonitorKpiRequest) - MonitorKpiRequestOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.BundleKpiDescriptor) + BundleKpiDescriptorOrBuilder { private static final long serialVersionUID = 0L; - // Use MonitorKpiRequest.newBuilder() to construct. - private MonitorKpiRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use BundleKpiDescriptor.newBuilder() to construct. + private BundleKpiDescriptor(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private MonitorKpiRequest() { + private BundleKpiDescriptor() { + kpiDescription_ = ""; + kpiIdList_ = java.util.Collections.emptyList(); + kpiSampleType_ = 0; } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new MonitorKpiRequest(); + return new BundleKpiDescriptor(); } @java.lang.Override @@ -2141,7 +1642,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private MonitorKpiRequest( + private BundleKpiDescriptor( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -2149,6 +1650,7 @@ public final class Monitoring { if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } + int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -2160,26 +1662,76 @@ public final class Monitoring { done = true; break; case 10: { - monitoring.Monitoring.KpiId.Builder subBuilder = null; - if (kpiId_ != null) { - subBuilder = kpiId_.toBuilder(); + java.lang.String s = input.readStringRequireUtf8(); + + kpiDescription_ = s; + break; + } + case 18: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + kpiIdList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; } - kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry); + kpiIdList_.add( + input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry)); + break; + } + case 24: { + int rawValue = input.readEnum(); + + kpiSampleType_ = rawValue; + break; + } + case 34: { + context.ContextOuterClass.DeviceId.Builder subBuilder = null; + if (deviceId_ != null) { + subBuilder = deviceId_.toBuilder(); + } + deviceId_ = input.readMessage(context.ContextOuterClass.DeviceId.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(kpiId_); - kpiId_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(deviceId_); + deviceId_ = subBuilder.buildPartial(); } break; } - case 21: { + case 42: { + context.ContextOuterClass.EndPointId.Builder subBuilder = null; + if (endpointId_ != null) { + subBuilder = endpointId_.toBuilder(); + } + endpointId_ = input.readMessage(context.ContextOuterClass.EndPointId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(endpointId_); + endpointId_ = subBuilder.buildPartial(); + } - monitoringWindowS_ = input.readFloat(); break; } - case 29: { + case 50: { + context.ContextOuterClass.ServiceId.Builder subBuilder = null; + if (serviceId_ != null) { + subBuilder = serviceId_.toBuilder(); + } + serviceId_ = input.readMessage(context.ContextOuterClass.ServiceId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(serviceId_); + serviceId_ = subBuilder.buildPartial(); + } + + break; + } + case 58: { + context.ContextOuterClass.SliceId.Builder subBuilder = null; + if (sliceId_ != null) { + subBuilder = sliceId_.toBuilder(); + } + sliceId_ = input.readMessage(context.ContextOuterClass.SliceId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(sliceId_); + sliceId_ = subBuilder.buildPartial(); + } - samplingRateS_ = input.readFloat(); break; } default: { @@ -2197,99 +1749,263 @@ public final class Monitoring { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + kpiIdList_ = java.util.Collections.unmodifiableList(kpiIdList_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_descriptor; + return monitoring.Monitoring.internal_static_monitoring_BundleKpiDescriptor_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_BundleKpiDescriptor_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.MonitorKpiRequest.class, monitoring.Monitoring.MonitorKpiRequest.Builder.class); + monitoring.Monitoring.BundleKpiDescriptor.class, monitoring.Monitoring.BundleKpiDescriptor.Builder.class); } - public static final int KPI_ID_FIELD_NUMBER = 1; - private monitoring.Monitoring.KpiId kpiId_; + public static final int KPI_DESCRIPTION_FIELD_NUMBER = 1; + private volatile java.lang.Object kpiDescription_; /** - * .monitoring.KpiId kpi_id = 1; - * @return Whether the kpiId field is set. + * string kpi_description = 1; + * @return The kpiDescription. */ @java.lang.Override - public boolean hasKpiId() { - return kpiId_ != null; + public java.lang.String getKpiDescription() { + java.lang.Object ref = kpiDescription_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kpiDescription_ = s; + return s; + } } /** - * .monitoring.KpiId kpi_id = 1; - * @return The kpiId. + * string kpi_description = 1; + * @return The bytes for kpiDescription. */ @java.lang.Override - public monitoring.Monitoring.KpiId getKpiId() { - return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + public com.google.protobuf.ByteString + getKpiDescriptionBytes() { + java.lang.Object ref = kpiDescription_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + kpiDescription_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } } + + public static final int KPI_ID_LIST_FIELD_NUMBER = 2; + private java.util.List kpiIdList_; /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 2; */ @java.lang.Override - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { - return getKpiId(); + public java.util.List getKpiIdListList() { + return kpiIdList_; } - - public static final int MONITORING_WINDOW_S_FIELD_NUMBER = 2; - private float monitoringWindowS_; /** - * float monitoring_window_s = 2; - * @return The monitoringWindowS. + * repeated .monitoring.KpiId kpi_id_list = 2; */ @java.lang.Override - public float getMonitoringWindowS() { - return monitoringWindowS_; + public java.util.List + getKpiIdListOrBuilderList() { + return kpiIdList_; } - - public static final int SAMPLING_RATE_S_FIELD_NUMBER = 3; - private float samplingRateS_; /** - * 
-     * Pending add field to reflect Available Device Protocols
-     *
- * - * float sampling_rate_s = 3; - * @return The samplingRateS. + * repeated .monitoring.KpiId kpi_id_list = 2; */ @java.lang.Override - public float getSamplingRateS() { - return samplingRateS_; + public int getKpiIdListCount() { + return kpiIdList_.size(); } - - private byte memoizedIsInitialized = -1; + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ @java.lang.Override - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - memoizedIsInitialized = 1; - return true; + public monitoring.Monitoring.KpiId getKpiIdList(int index) { + return kpiIdList_.get(index); } - + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - if (kpiId_ != null) { - output.writeMessage(1, getKpiId()); - } - if (monitoringWindowS_ != 0F) { - output.writeFloat(2, monitoringWindowS_); - } - if (samplingRateS_ != 0F) { - output.writeFloat(3, samplingRateS_); - } - unknownFields.writeTo(output); + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdListOrBuilder( + int index) { + return kpiIdList_.get(index); + } + + public static final int KPI_SAMPLE_TYPE_FIELD_NUMBER = 3; + private int kpiSampleType_; + /** + * .kpi_sample_types.KpiSampleType kpi_sample_type = 3; + * @return The enum numeric value on the wire for kpiSampleType. + */ + @java.lang.Override public int getKpiSampleTypeValue() { + return kpiSampleType_; + } + /** + * .kpi_sample_types.KpiSampleType kpi_sample_type = 3; + * @return The kpiSampleType. + */ + @java.lang.Override public kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType() { + @SuppressWarnings("deprecation") + kpi_sample_types.KpiSampleTypes.KpiSampleType result = kpi_sample_types.KpiSampleTypes.KpiSampleType.valueOf(kpiSampleType_); + return result == null ? kpi_sample_types.KpiSampleTypes.KpiSampleType.UNRECOGNIZED : result; + } + + public static final int DEVICE_ID_FIELD_NUMBER = 4; + private context.ContextOuterClass.DeviceId deviceId_; + /** + * .context.DeviceId device_id = 4; + * @return Whether the deviceId field is set. + */ + @java.lang.Override + public boolean hasDeviceId() { + return deviceId_ != null; + } + /** + * .context.DeviceId device_id = 4; + * @return The deviceId. + */ + @java.lang.Override + public context.ContextOuterClass.DeviceId getDeviceId() { + return deviceId_ == null ? context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; + } + /** + * .context.DeviceId device_id = 4; + */ + @java.lang.Override + public context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder() { + return getDeviceId(); + } + + public static final int ENDPOINT_ID_FIELD_NUMBER = 5; + private context.ContextOuterClass.EndPointId endpointId_; + /** + * .context.EndPointId endpoint_id = 5; + * @return Whether the endpointId field is set. + */ + @java.lang.Override + public boolean hasEndpointId() { + return endpointId_ != null; + } + /** + * .context.EndPointId endpoint_id = 5; + * @return The endpointId. + */ + @java.lang.Override + public context.ContextOuterClass.EndPointId getEndpointId() { + return endpointId_ == null ? context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; + } + /** + * .context.EndPointId endpoint_id = 5; + */ + @java.lang.Override + public context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder() { + return getEndpointId(); + } + + public static final int SERVICE_ID_FIELD_NUMBER = 6; + private context.ContextOuterClass.ServiceId serviceId_; + /** + * .context.ServiceId service_id = 6; + * @return Whether the serviceId field is set. + */ + @java.lang.Override + public boolean hasServiceId() { + return serviceId_ != null; + } + /** + * .context.ServiceId service_id = 6; + * @return The serviceId. + */ + @java.lang.Override + public context.ContextOuterClass.ServiceId getServiceId() { + return serviceId_ == null ? context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; + } + /** + * .context.ServiceId service_id = 6; + */ + @java.lang.Override + public context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder() { + return getServiceId(); + } + + public static final int SLICE_ID_FIELD_NUMBER = 7; + private context.ContextOuterClass.SliceId sliceId_; + /** + * .context.SliceId slice_id = 7; + * @return Whether the sliceId field is set. + */ + @java.lang.Override + public boolean hasSliceId() { + return sliceId_ != null; + } + /** + * .context.SliceId slice_id = 7; + * @return The sliceId. + */ + @java.lang.Override + public context.ContextOuterClass.SliceId getSliceId() { + return sliceId_ == null ? context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; + } + /** + * .context.SliceId slice_id = 7; + */ + @java.lang.Override + public context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder() { + return getSliceId(); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!getKpiDescriptionBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, kpiDescription_); + } + for (int i = 0; i < kpiIdList_.size(); i++) { + output.writeMessage(2, kpiIdList_.get(i)); + } + if (kpiSampleType_ != kpi_sample_types.KpiSampleTypes.KpiSampleType.KPISAMPLETYPE_UNKNOWN.getNumber()) { + output.writeEnum(3, kpiSampleType_); + } + if (deviceId_ != null) { + output.writeMessage(4, getDeviceId()); + } + if (endpointId_ != null) { + output.writeMessage(5, getEndpointId()); + } + if (serviceId_ != null) { + output.writeMessage(6, getServiceId()); + } + if (sliceId_ != null) { + output.writeMessage(7, getSliceId()); + } + unknownFields.writeTo(output); } @java.lang.Override @@ -2298,17 +2014,32 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (kpiId_ != null) { + if (!getKpiDescriptionBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, kpiDescription_); + } + for (int i = 0; i < kpiIdList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getKpiId()); + .computeMessageSize(2, kpiIdList_.get(i)); } - if (monitoringWindowS_ != 0F) { + if (kpiSampleType_ != kpi_sample_types.KpiSampleTypes.KpiSampleType.KPISAMPLETYPE_UNKNOWN.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(2, monitoringWindowS_); + .computeEnumSize(3, kpiSampleType_); } - if (samplingRateS_ != 0F) { + if (deviceId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(3, samplingRateS_); + .computeMessageSize(4, getDeviceId()); + } + if (endpointId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, getEndpointId()); + } + if (serviceId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(6, getServiceId()); + } + if (sliceId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(7, getSliceId()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -2320,22 +2051,36 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.MonitorKpiRequest)) { + if (!(obj instanceof monitoring.Monitoring.BundleKpiDescriptor)) { return super.equals(obj); } - monitoring.Monitoring.MonitorKpiRequest other = (monitoring.Monitoring.MonitorKpiRequest) obj; + monitoring.Monitoring.BundleKpiDescriptor other = (monitoring.Monitoring.BundleKpiDescriptor) obj; - if (hasKpiId() != other.hasKpiId()) return false; - if (hasKpiId()) { - if (!getKpiId() - .equals(other.getKpiId())) return false; + if (!getKpiDescription() + .equals(other.getKpiDescription())) return false; + if (!getKpiIdListList() + .equals(other.getKpiIdListList())) return false; + if (kpiSampleType_ != other.kpiSampleType_) return false; + if (hasDeviceId() != other.hasDeviceId()) return false; + if (hasDeviceId()) { + if (!getDeviceId() + .equals(other.getDeviceId())) return false; + } + if (hasEndpointId() != other.hasEndpointId()) return false; + if (hasEndpointId()) { + if (!getEndpointId() + .equals(other.getEndpointId())) return false; + } + if (hasServiceId() != other.hasServiceId()) return false; + if (hasServiceId()) { + if (!getServiceId() + .equals(other.getServiceId())) return false; + } + if (hasSliceId() != other.hasSliceId()) return false; + if (hasSliceId()) { + if (!getSliceId() + .equals(other.getSliceId())) return false; } - if (java.lang.Float.floatToIntBits(getMonitoringWindowS()) - != java.lang.Float.floatToIntBits( - other.getMonitoringWindowS())) return false; - if (java.lang.Float.floatToIntBits(getSamplingRateS()) - != java.lang.Float.floatToIntBits( - other.getSamplingRateS())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -2347,84 +2092,98 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasKpiId()) { - hash = (37 * hash) + KPI_ID_FIELD_NUMBER; - hash = (53 * hash) + getKpiId().hashCode(); + hash = (37 * hash) + KPI_DESCRIPTION_FIELD_NUMBER; + hash = (53 * hash) + getKpiDescription().hashCode(); + if (getKpiIdListCount() > 0) { + hash = (37 * hash) + KPI_ID_LIST_FIELD_NUMBER; + hash = (53 * hash) + getKpiIdListList().hashCode(); + } + hash = (37 * hash) + KPI_SAMPLE_TYPE_FIELD_NUMBER; + hash = (53 * hash) + kpiSampleType_; + if (hasDeviceId()) { + hash = (37 * hash) + DEVICE_ID_FIELD_NUMBER; + hash = (53 * hash) + getDeviceId().hashCode(); + } + if (hasEndpointId()) { + hash = (37 * hash) + ENDPOINT_ID_FIELD_NUMBER; + hash = (53 * hash) + getEndpointId().hashCode(); + } + if (hasServiceId()) { + hash = (37 * hash) + SERVICE_ID_FIELD_NUMBER; + hash = (53 * hash) + getServiceId().hashCode(); + } + if (hasSliceId()) { + hash = (37 * hash) + SLICE_ID_FIELD_NUMBER; + hash = (53 * hash) + getSliceId().hashCode(); } - hash = (37 * hash) + MONITORING_WINDOW_S_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getMonitoringWindowS()); - hash = (37 * hash) + SAMPLING_RATE_S_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getSamplingRateS()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom( + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom( + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom( + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom( + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom(byte[] data) + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom( + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom( + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.MonitorKpiRequest parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.BundleKpiDescriptor parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.MonitorKpiRequest parseDelimitedFrom( + public static monitoring.Monitoring.BundleKpiDescriptor parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom( + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.MonitorKpiRequest parseFrom( + public static monitoring.Monitoring.BundleKpiDescriptor parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2437,7 +2196,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.MonitorKpiRequest prototype) { + public static Builder newBuilder(monitoring.Monitoring.BundleKpiDescriptor prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -2453,26 +2212,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.MonitorKpiRequest} + * Protobuf type {@code monitoring.BundleKpiDescriptor} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.MonitorKpiRequest) - monitoring.Monitoring.MonitorKpiRequestOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.BundleKpiDescriptor) + monitoring.Monitoring.BundleKpiDescriptorOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_descriptor; + return monitoring.Monitoring.internal_static_monitoring_BundleKpiDescriptor_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_BundleKpiDescriptor_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.MonitorKpiRequest.class, monitoring.Monitoring.MonitorKpiRequest.Builder.class); + monitoring.Monitoring.BundleKpiDescriptor.class, monitoring.Monitoring.BundleKpiDescriptor.Builder.class); } - // Construct using monitoring.Monitoring.MonitorKpiRequest.newBuilder() + // Construct using monitoring.Monitoring.BundleKpiDescriptor.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -2485,38 +2244,63 @@ public final class Monitoring { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { + getKpiIdListFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); - if (kpiIdBuilder_ == null) { - kpiId_ = null; - } else { - kpiId_ = null; - kpiIdBuilder_ = null; - } - monitoringWindowS_ = 0F; + kpiDescription_ = ""; - samplingRateS_ = 0F; + if (kpiIdListBuilder_ == null) { + kpiIdList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + kpiIdListBuilder_.clear(); + } + kpiSampleType_ = 0; + if (deviceIdBuilder_ == null) { + deviceId_ = null; + } else { + deviceId_ = null; + deviceIdBuilder_ = null; + } + if (endpointIdBuilder_ == null) { + endpointId_ = null; + } else { + endpointId_ = null; + endpointIdBuilder_ = null; + } + if (serviceIdBuilder_ == null) { + serviceId_ = null; + } else { + serviceId_ = null; + serviceIdBuilder_ = null; + } + if (sliceIdBuilder_ == null) { + sliceId_ = null; + } else { + sliceId_ = null; + sliceIdBuilder_ = null; + } return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_descriptor; + return monitoring.Monitoring.internal_static_monitoring_BundleKpiDescriptor_descriptor; } @java.lang.Override - public monitoring.Monitoring.MonitorKpiRequest getDefaultInstanceForType() { - return monitoring.Monitoring.MonitorKpiRequest.getDefaultInstance(); + public monitoring.Monitoring.BundleKpiDescriptor getDefaultInstanceForType() { + return monitoring.Monitoring.BundleKpiDescriptor.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.MonitorKpiRequest build() { - monitoring.Monitoring.MonitorKpiRequest result = buildPartial(); + public monitoring.Monitoring.BundleKpiDescriptor build() { + monitoring.Monitoring.BundleKpiDescriptor result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -2524,15 +2308,40 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.MonitorKpiRequest buildPartial() { - monitoring.Monitoring.MonitorKpiRequest result = new monitoring.Monitoring.MonitorKpiRequest(this); - if (kpiIdBuilder_ == null) { - result.kpiId_ = kpiId_; + public monitoring.Monitoring.BundleKpiDescriptor buildPartial() { + monitoring.Monitoring.BundleKpiDescriptor result = new monitoring.Monitoring.BundleKpiDescriptor(this); + int from_bitField0_ = bitField0_; + result.kpiDescription_ = kpiDescription_; + if (kpiIdListBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + kpiIdList_ = java.util.Collections.unmodifiableList(kpiIdList_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.kpiIdList_ = kpiIdList_; } else { - result.kpiId_ = kpiIdBuilder_.build(); + result.kpiIdList_ = kpiIdListBuilder_.build(); + } + result.kpiSampleType_ = kpiSampleType_; + if (deviceIdBuilder_ == null) { + result.deviceId_ = deviceId_; + } else { + result.deviceId_ = deviceIdBuilder_.build(); + } + if (endpointIdBuilder_ == null) { + result.endpointId_ = endpointId_; + } else { + result.endpointId_ = endpointIdBuilder_.build(); + } + if (serviceIdBuilder_ == null) { + result.serviceId_ = serviceId_; + } else { + result.serviceId_ = serviceIdBuilder_.build(); + } + if (sliceIdBuilder_ == null) { + result.sliceId_ = sliceId_; + } else { + result.sliceId_ = sliceIdBuilder_.build(); } - result.monitoringWindowS_ = monitoringWindowS_; - result.samplingRateS_ = samplingRateS_; onBuilt(); return result; } @@ -2571,24 +2380,60 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.MonitorKpiRequest) { - return mergeFrom((monitoring.Monitoring.MonitorKpiRequest)other); + if (other instanceof monitoring.Monitoring.BundleKpiDescriptor) { + return mergeFrom((monitoring.Monitoring.BundleKpiDescriptor)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.MonitorKpiRequest other) { - if (other == monitoring.Monitoring.MonitorKpiRequest.getDefaultInstance()) return this; - if (other.hasKpiId()) { - mergeKpiId(other.getKpiId()); + public Builder mergeFrom(monitoring.Monitoring.BundleKpiDescriptor other) { + if (other == monitoring.Monitoring.BundleKpiDescriptor.getDefaultInstance()) return this; + if (!other.getKpiDescription().isEmpty()) { + kpiDescription_ = other.kpiDescription_; + onChanged(); } - if (other.getMonitoringWindowS() != 0F) { - setMonitoringWindowS(other.getMonitoringWindowS()); + if (kpiIdListBuilder_ == null) { + if (!other.kpiIdList_.isEmpty()) { + if (kpiIdList_.isEmpty()) { + kpiIdList_ = other.kpiIdList_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureKpiIdListIsMutable(); + kpiIdList_.addAll(other.kpiIdList_); + } + onChanged(); + } + } else { + if (!other.kpiIdList_.isEmpty()) { + if (kpiIdListBuilder_.isEmpty()) { + kpiIdListBuilder_.dispose(); + kpiIdListBuilder_ = null; + kpiIdList_ = other.kpiIdList_; + bitField0_ = (bitField0_ & ~0x00000001); + kpiIdListBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getKpiIdListFieldBuilder() : null; + } else { + kpiIdListBuilder_.addAllMessages(other.kpiIdList_); + } + } } - if (other.getSamplingRateS() != 0F) { - setSamplingRateS(other.getSamplingRateS()); + if (other.kpiSampleType_ != 0) { + setKpiSampleTypeValue(other.getKpiSampleTypeValue()); + } + if (other.hasDeviceId()) { + mergeDeviceId(other.getDeviceId()); + } + if (other.hasEndpointId()) { + mergeEndpointId(other.getEndpointId()); + } + if (other.hasServiceId()) { + mergeServiceId(other.getServiceId()); + } + if (other.hasSliceId()) { + mergeSliceId(other.getSliceId()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -2605,11 +2450,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.MonitorKpiRequest parsedMessage = null; + monitoring.Monitoring.BundleKpiDescriptor parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.MonitorKpiRequest) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.BundleKpiDescriptor) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -2618,377 +2463,1055 @@ public final class Monitoring { } return this; } + private int bitField0_; - private monitoring.Monitoring.KpiId kpiId_; - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; + private java.lang.Object kpiDescription_ = ""; /** - * .monitoring.KpiId kpi_id = 1; - * @return Whether the kpiId field is set. + * string kpi_description = 1; + * @return The kpiDescription. */ - public boolean hasKpiId() { - return kpiIdBuilder_ != null || kpiId_ != null; + public java.lang.String getKpiDescription() { + java.lang.Object ref = kpiDescription_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kpiDescription_ = s; + return s; + } else { + return (java.lang.String) ref; + } } /** - * .monitoring.KpiId kpi_id = 1; - * @return The kpiId. + * string kpi_description = 1; + * @return The bytes for kpiDescription. */ - public monitoring.Monitoring.KpiId getKpiId() { - if (kpiIdBuilder_ == null) { - return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + public com.google.protobuf.ByteString + getKpiDescriptionBytes() { + java.lang.Object ref = kpiDescription_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + kpiDescription_ = b; + return b; } else { - return kpiIdBuilder_.getMessage(); + return (com.google.protobuf.ByteString) ref; } } /** - * .monitoring.KpiId kpi_id = 1; + * string kpi_description = 1; + * @param value The kpiDescription to set. + * @return This builder for chaining. */ - public Builder setKpiId(monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - kpiId_ = value; - onChanged(); - } else { - kpiIdBuilder_.setMessage(value); - } - + public Builder setKpiDescription( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + kpiDescription_ = value; + onChanged(); return this; } /** - * .monitoring.KpiId kpi_id = 1; + * string kpi_description = 1; + * @return This builder for chaining. */ - public Builder setKpiId( - monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdBuilder_ == null) { - kpiId_ = builderForValue.build(); - onChanged(); - } else { - kpiIdBuilder_.setMessage(builderForValue.build()); - } - + public Builder clearKpiDescription() { + + kpiDescription_ = getDefaultInstance().getKpiDescription(); + onChanged(); return this; } /** - * .monitoring.KpiId kpi_id = 1; + * string kpi_description = 1; + * @param value The bytes for kpiDescription to set. + * @return This builder for chaining. */ - public Builder mergeKpiId(monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (kpiId_ != null) { - kpiId_ = - monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial(); - } else { - kpiId_ = value; - } - onChanged(); - } else { - kpiIdBuilder_.mergeFrom(value); - } - + public Builder setKpiDescriptionBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + kpiDescription_ = value; + onChanged(); return this; } + + private java.util.List kpiIdList_ = + java.util.Collections.emptyList(); + private void ensureKpiIdListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + kpiIdList_ = new java.util.ArrayList(kpiIdList_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdListBuilder_; + /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 2; */ - public Builder clearKpiId() { - if (kpiIdBuilder_ == null) { - kpiId_ = null; - onChanged(); + public java.util.List getKpiIdListList() { + if (kpiIdListBuilder_ == null) { + return java.util.Collections.unmodifiableList(kpiIdList_); } else { - kpiId_ = null; - kpiIdBuilder_ = null; + return kpiIdListBuilder_.getMessageList(); } - - return this; } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 2; */ - public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() { - - onChanged(); - return getKpiIdFieldBuilder().getBuilder(); + public int getKpiIdListCount() { + if (kpiIdListBuilder_ == null) { + return kpiIdList_.size(); + } else { + return kpiIdListBuilder_.getCount(); + } } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 2; */ - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { - if (kpiIdBuilder_ != null) { - return kpiIdBuilder_.getMessageOrBuilder(); + public monitoring.Monitoring.KpiId getKpiIdList(int index) { + if (kpiIdListBuilder_ == null) { + return kpiIdList_.get(index); } else { - return kpiId_ == null ? - monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + return kpiIdListBuilder_.getMessage(index); } } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 2; */ - private com.google.protobuf.SingleFieldBuilderV3< + public Builder setKpiIdList( + int index, monitoring.Monitoring.KpiId value) { + if (kpiIdListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiIdListIsMutable(); + kpiIdList_.set(index, value); + onChanged(); + } else { + kpiIdListBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public Builder setKpiIdList( + int index, monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + kpiIdList_.set(index, builderForValue.build()); + onChanged(); + } else { + kpiIdListBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public Builder addKpiIdList(monitoring.Monitoring.KpiId value) { + if (kpiIdListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiIdListIsMutable(); + kpiIdList_.add(value); + onChanged(); + } else { + kpiIdListBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public Builder addKpiIdList( + int index, monitoring.Monitoring.KpiId value) { + if (kpiIdListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiIdListIsMutable(); + kpiIdList_.add(index, value); + onChanged(); + } else { + kpiIdListBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public Builder addKpiIdList( + monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + kpiIdList_.add(builderForValue.build()); + onChanged(); + } else { + kpiIdListBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public Builder addKpiIdList( + int index, monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + kpiIdList_.add(index, builderForValue.build()); + onChanged(); + } else { + kpiIdListBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public Builder addAllKpiIdList( + java.lang.Iterable values) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, kpiIdList_); + onChanged(); + } else { + kpiIdListBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public Builder clearKpiIdList() { + if (kpiIdListBuilder_ == null) { + kpiIdList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + kpiIdListBuilder_.clear(); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public Builder removeKpiIdList(int index) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + kpiIdList_.remove(index); + onChanged(); + } else { + kpiIdListBuilder_.remove(index); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public monitoring.Monitoring.KpiId.Builder getKpiIdListBuilder( + int index) { + return getKpiIdListFieldBuilder().getBuilder(index); + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdListOrBuilder( + int index) { + if (kpiIdListBuilder_ == null) { + return kpiIdList_.get(index); } else { + return kpiIdListBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public java.util.List + getKpiIdListOrBuilderList() { + if (kpiIdListBuilder_ != null) { + return kpiIdListBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(kpiIdList_); + } + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public monitoring.Monitoring.KpiId.Builder addKpiIdListBuilder() { + return getKpiIdListFieldBuilder().addBuilder( + monitoring.Monitoring.KpiId.getDefaultInstance()); + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public monitoring.Monitoring.KpiId.Builder addKpiIdListBuilder( + int index) { + return getKpiIdListFieldBuilder().addBuilder( + index, monitoring.Monitoring.KpiId.getDefaultInstance()); + } + /** + * repeated .monitoring.KpiId kpi_id_list = 2; + */ + public java.util.List + getKpiIdListBuilderList() { + return getKpiIdListFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> - getKpiIdFieldBuilder() { - if (kpiIdBuilder_ == null) { - kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getKpiIdListFieldBuilder() { + if (kpiIdListBuilder_ == null) { + kpiIdListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( - getKpiId(), + kpiIdList_, + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); - kpiId_ = null; + kpiIdList_ = null; } - return kpiIdBuilder_; + return kpiIdListBuilder_; } - private float monitoringWindowS_ ; - /** - * float monitoring_window_s = 2; - * @return The monitoringWindowS. - */ - @java.lang.Override - public float getMonitoringWindowS() { - return monitoringWindowS_; - } + private int kpiSampleType_ = 0; /** - * float monitoring_window_s = 2; - * @param value The monitoringWindowS to set. - * @return This builder for chaining. + * .kpi_sample_types.KpiSampleType kpi_sample_type = 3; + * @return The enum numeric value on the wire for kpiSampleType. */ - public Builder setMonitoringWindowS(float value) { - - monitoringWindowS_ = value; - onChanged(); - return this; + @java.lang.Override public int getKpiSampleTypeValue() { + return kpiSampleType_; } /** - * float monitoring_window_s = 2; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 3; + * @param value The enum numeric value on the wire for kpiSampleType to set. * @return This builder for chaining. */ - public Builder clearMonitoringWindowS() { + public Builder setKpiSampleTypeValue(int value) { - monitoringWindowS_ = 0F; + kpiSampleType_ = value; onChanged(); return this; } - - private float samplingRateS_ ; /** - * 
-       * Pending add field to reflect Available Device Protocols
-       *
- * - * float sampling_rate_s = 3; - * @return The samplingRateS. + * .kpi_sample_types.KpiSampleType kpi_sample_type = 3; + * @return The kpiSampleType. */ @java.lang.Override - public float getSamplingRateS() { - return samplingRateS_; + public kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType() { + @SuppressWarnings("deprecation") + kpi_sample_types.KpiSampleTypes.KpiSampleType result = kpi_sample_types.KpiSampleTypes.KpiSampleType.valueOf(kpiSampleType_); + return result == null ? kpi_sample_types.KpiSampleTypes.KpiSampleType.UNRECOGNIZED : result; } /** - * 
-       * Pending add field to reflect Available Device Protocols
-       *
- * - * float sampling_rate_s = 3; - * @param value The samplingRateS to set. + * .kpi_sample_types.KpiSampleType kpi_sample_type = 3; + * @param value The kpiSampleType to set. * @return This builder for chaining. */ - public Builder setSamplingRateS(float value) { + public Builder setKpiSampleType(kpi_sample_types.KpiSampleTypes.KpiSampleType value) { + if (value == null) { + throw new NullPointerException(); + } - samplingRateS_ = value; + kpiSampleType_ = value.getNumber(); onChanged(); return this; } /** - * 
-       * Pending add field to reflect Available Device Protocols
-       *
- * - * float sampling_rate_s = 3; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 3; * @return This builder for chaining. */ - public Builder clearSamplingRateS() { + public Builder clearKpiSampleType() { - samplingRateS_ = 0F; + kpiSampleType_ = 0; onChanged(); return this; } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); + + private context.ContextOuterClass.DeviceId deviceId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder> deviceIdBuilder_; + /** + * .context.DeviceId device_id = 4; + * @return Whether the deviceId field is set. + */ + public boolean hasDeviceId() { + return deviceIdBuilder_ != null || deviceId_ != null; + } + /** + * .context.DeviceId device_id = 4; + * @return The deviceId. + */ + public context.ContextOuterClass.DeviceId getDeviceId() { + if (deviceIdBuilder_ == null) { + return deviceId_ == null ? context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; + } else { + return deviceIdBuilder_.getMessage(); + } } + /** + * .context.DeviceId device_id = 4; + */ + public Builder setDeviceId(context.ContextOuterClass.DeviceId value) { + if (deviceIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + deviceId_ = value; + onChanged(); + } else { + deviceIdBuilder_.setMessage(value); + } - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); + return this; } + /** + * .context.DeviceId device_id = 4; + */ + public Builder setDeviceId( + context.ContextOuterClass.DeviceId.Builder builderForValue) { + if (deviceIdBuilder_ == null) { + deviceId_ = builderForValue.build(); + onChanged(); + } else { + deviceIdBuilder_.setMessage(builderForValue.build()); + } + return this; + } + /** + * .context.DeviceId device_id = 4; + */ + public Builder mergeDeviceId(context.ContextOuterClass.DeviceId value) { + if (deviceIdBuilder_ == null) { + if (deviceId_ != null) { + deviceId_ = + context.ContextOuterClass.DeviceId.newBuilder(deviceId_).mergeFrom(value).buildPartial(); + } else { + deviceId_ = value; + } + onChanged(); + } else { + deviceIdBuilder_.mergeFrom(value); + } - // @@protoc_insertion_point(builder_scope:monitoring.MonitorKpiRequest) - } + return this; + } + /** + * .context.DeviceId device_id = 4; + */ + public Builder clearDeviceId() { + if (deviceIdBuilder_ == null) { + deviceId_ = null; + onChanged(); + } else { + deviceId_ = null; + deviceIdBuilder_ = null; + } - // @@protoc_insertion_point(class_scope:monitoring.MonitorKpiRequest) - private static final monitoring.Monitoring.MonitorKpiRequest DEFAULT_INSTANCE; - static { - DEFAULT_INSTANCE = new monitoring.Monitoring.MonitorKpiRequest(); - } + return this; + } + /** + * .context.DeviceId device_id = 4; + */ + public context.ContextOuterClass.DeviceId.Builder getDeviceIdBuilder() { + + onChanged(); + return getDeviceIdFieldBuilder().getBuilder(); + } + /** + * .context.DeviceId device_id = 4; + */ + public context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder() { + if (deviceIdBuilder_ != null) { + return deviceIdBuilder_.getMessageOrBuilder(); + } else { + return deviceId_ == null ? + context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; + } + } + /** + * .context.DeviceId device_id = 4; + */ + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder> + getDeviceIdFieldBuilder() { + if (deviceIdBuilder_ == null) { + deviceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder>( + getDeviceId(), + getParentForChildren(), + isClean()); + deviceId_ = null; + } + return deviceIdBuilder_; + } - public static monitoring.Monitoring.MonitorKpiRequest getDefaultInstance() { - return DEFAULT_INSTANCE; - } + private context.ContextOuterClass.EndPointId endpointId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder> endpointIdBuilder_; + /** + * .context.EndPointId endpoint_id = 5; + * @return Whether the endpointId field is set. + */ + public boolean hasEndpointId() { + return endpointIdBuilder_ != null || endpointId_ != null; + } + /** + * .context.EndPointId endpoint_id = 5; + * @return The endpointId. + */ + public context.ContextOuterClass.EndPointId getEndpointId() { + if (endpointIdBuilder_ == null) { + return endpointId_ == null ? context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; + } else { + return endpointIdBuilder_.getMessage(); + } + } + /** + * .context.EndPointId endpoint_id = 5; + */ + public Builder setEndpointId(context.ContextOuterClass.EndPointId value) { + if (endpointIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + endpointId_ = value; + onChanged(); + } else { + endpointIdBuilder_.setMessage(value); + } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public MonitorKpiRequest parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new MonitorKpiRequest(input, extensionRegistry); + return this; } - }; + /** + * .context.EndPointId endpoint_id = 5; + */ + public Builder setEndpointId( + context.ContextOuterClass.EndPointId.Builder builderForValue) { + if (endpointIdBuilder_ == null) { + endpointId_ = builderForValue.build(); + onChanged(); + } else { + endpointIdBuilder_.setMessage(builderForValue.build()); + } - public static com.google.protobuf.Parser parser() { - return PARSER; - } + return this; + } + /** + * .context.EndPointId endpoint_id = 5; + */ + public Builder mergeEndpointId(context.ContextOuterClass.EndPointId value) { + if (endpointIdBuilder_ == null) { + if (endpointId_ != null) { + endpointId_ = + context.ContextOuterClass.EndPointId.newBuilder(endpointId_).mergeFrom(value).buildPartial(); + } else { + endpointId_ = value; + } + onChanged(); + } else { + endpointIdBuilder_.mergeFrom(value); + } - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } + return this; + } + /** + * .context.EndPointId endpoint_id = 5; + */ + public Builder clearEndpointId() { + if (endpointIdBuilder_ == null) { + endpointId_ = null; + onChanged(); + } else { + endpointId_ = null; + endpointIdBuilder_ = null; + } - @java.lang.Override - public monitoring.Monitoring.MonitorKpiRequest getDefaultInstanceForType() { - return DEFAULT_INSTANCE; - } + return this; + } + /** + * .context.EndPointId endpoint_id = 5; + */ + public context.ContextOuterClass.EndPointId.Builder getEndpointIdBuilder() { + + onChanged(); + return getEndpointIdFieldBuilder().getBuilder(); + } + /** + * .context.EndPointId endpoint_id = 5; + */ + public context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder() { + if (endpointIdBuilder_ != null) { + return endpointIdBuilder_.getMessageOrBuilder(); + } else { + return endpointId_ == null ? + context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; + } + } + /** + * .context.EndPointId endpoint_id = 5; + */ + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder> + getEndpointIdFieldBuilder() { + if (endpointIdBuilder_ == null) { + endpointIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder>( + getEndpointId(), + getParentForChildren(), + isClean()); + endpointId_ = null; + } + return endpointIdBuilder_; + } - } + private context.ContextOuterClass.ServiceId serviceId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder> serviceIdBuilder_; + /** + * .context.ServiceId service_id = 6; + * @return Whether the serviceId field is set. + */ + public boolean hasServiceId() { + return serviceIdBuilder_ != null || serviceId_ != null; + } + /** + * .context.ServiceId service_id = 6; + * @return The serviceId. + */ + public context.ContextOuterClass.ServiceId getServiceId() { + if (serviceIdBuilder_ == null) { + return serviceId_ == null ? context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; + } else { + return serviceIdBuilder_.getMessage(); + } + } + /** + * .context.ServiceId service_id = 6; + */ + public Builder setServiceId(context.ContextOuterClass.ServiceId value) { + if (serviceIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + serviceId_ = value; + onChanged(); + } else { + serviceIdBuilder_.setMessage(value); + } - public interface KpiQueryOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.KpiQuery) + return this; + } + /** + * .context.ServiceId service_id = 6; + */ + public Builder setServiceId( + context.ContextOuterClass.ServiceId.Builder builderForValue) { + if (serviceIdBuilder_ == null) { + serviceId_ = builderForValue.build(); + onChanged(); + } else { + serviceIdBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .context.ServiceId service_id = 6; + */ + public Builder mergeServiceId(context.ContextOuterClass.ServiceId value) { + if (serviceIdBuilder_ == null) { + if (serviceId_ != null) { + serviceId_ = + context.ContextOuterClass.ServiceId.newBuilder(serviceId_).mergeFrom(value).buildPartial(); + } else { + serviceId_ = value; + } + onChanged(); + } else { + serviceIdBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .context.ServiceId service_id = 6; + */ + public Builder clearServiceId() { + if (serviceIdBuilder_ == null) { + serviceId_ = null; + onChanged(); + } else { + serviceId_ = null; + serviceIdBuilder_ = null; + } + + return this; + } + /** + * .context.ServiceId service_id = 6; + */ + public context.ContextOuterClass.ServiceId.Builder getServiceIdBuilder() { + + onChanged(); + return getServiceIdFieldBuilder().getBuilder(); + } + /** + * .context.ServiceId service_id = 6; + */ + public context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder() { + if (serviceIdBuilder_ != null) { + return serviceIdBuilder_.getMessageOrBuilder(); + } else { + return serviceId_ == null ? + context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; + } + } + /** + * .context.ServiceId service_id = 6; + */ + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder> + getServiceIdFieldBuilder() { + if (serviceIdBuilder_ == null) { + serviceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder>( + getServiceId(), + getParentForChildren(), + isClean()); + serviceId_ = null; + } + return serviceIdBuilder_; + } + + private context.ContextOuterClass.SliceId sliceId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder> sliceIdBuilder_; + /** + * .context.SliceId slice_id = 7; + * @return Whether the sliceId field is set. + */ + public boolean hasSliceId() { + return sliceIdBuilder_ != null || sliceId_ != null; + } + /** + * .context.SliceId slice_id = 7; + * @return The sliceId. + */ + public context.ContextOuterClass.SliceId getSliceId() { + if (sliceIdBuilder_ == null) { + return sliceId_ == null ? context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; + } else { + return sliceIdBuilder_.getMessage(); + } + } + /** + * .context.SliceId slice_id = 7; + */ + public Builder setSliceId(context.ContextOuterClass.SliceId value) { + if (sliceIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + sliceId_ = value; + onChanged(); + } else { + sliceIdBuilder_.setMessage(value); + } + + return this; + } + /** + * .context.SliceId slice_id = 7; + */ + public Builder setSliceId( + context.ContextOuterClass.SliceId.Builder builderForValue) { + if (sliceIdBuilder_ == null) { + sliceId_ = builderForValue.build(); + onChanged(); + } else { + sliceIdBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .context.SliceId slice_id = 7; + */ + public Builder mergeSliceId(context.ContextOuterClass.SliceId value) { + if (sliceIdBuilder_ == null) { + if (sliceId_ != null) { + sliceId_ = + context.ContextOuterClass.SliceId.newBuilder(sliceId_).mergeFrom(value).buildPartial(); + } else { + sliceId_ = value; + } + onChanged(); + } else { + sliceIdBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .context.SliceId slice_id = 7; + */ + public Builder clearSliceId() { + if (sliceIdBuilder_ == null) { + sliceId_ = null; + onChanged(); + } else { + sliceId_ = null; + sliceIdBuilder_ = null; + } + + return this; + } + /** + * .context.SliceId slice_id = 7; + */ + public context.ContextOuterClass.SliceId.Builder getSliceIdBuilder() { + + onChanged(); + return getSliceIdFieldBuilder().getBuilder(); + } + /** + * .context.SliceId slice_id = 7; + */ + public context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder() { + if (sliceIdBuilder_ != null) { + return sliceIdBuilder_.getMessageOrBuilder(); + } else { + return sliceId_ == null ? + context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; + } + } + /** + * .context.SliceId slice_id = 7; + */ + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder> + getSliceIdFieldBuilder() { + if (sliceIdBuilder_ == null) { + sliceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder>( + getSliceId(), + getParentForChildren(), + isClean()); + sliceId_ = null; + } + return sliceIdBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:monitoring.BundleKpiDescriptor) + } + + // @@protoc_insertion_point(class_scope:monitoring.BundleKpiDescriptor) + private static final monitoring.Monitoring.BundleKpiDescriptor DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new monitoring.Monitoring.BundleKpiDescriptor(); + } + + public static monitoring.Monitoring.BundleKpiDescriptor getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public BundleKpiDescriptor parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new BundleKpiDescriptor(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public monitoring.Monitoring.BundleKpiDescriptor getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface EditedKpiDescriptorOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.EditedKpiDescriptor) com.google.protobuf.MessageOrBuilder { /** - * repeated .monitoring.KpiId kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; + * @return Whether the kpiId field is set. + */ + boolean hasKpiId(); + /** + * .monitoring.KpiId kpi_id = 1; + * @return The kpiId. + */ + monitoring.Monitoring.KpiId getKpiId(); + /** + * .monitoring.KpiId kpi_id = 1; + */ + monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder(); + + /** + * string kpi_description = 2; + * @return The kpiDescription. + */ + java.lang.String getKpiDescription(); + /** + * string kpi_description = 2; + * @return The bytes for kpiDescription. + */ + com.google.protobuf.ByteString + getKpiDescriptionBytes(); + + /** + * repeated .monitoring.KpiId kpi_id_list = 3; */ java.util.List - getKpiIdList(); + getKpiIdListList(); /** - * repeated .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 3; */ - monitoring.Monitoring.KpiId getKpiId(int index); + monitoring.Monitoring.KpiId getKpiIdList(int index); /** - * repeated .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 3; */ - int getKpiIdCount(); + int getKpiIdListCount(); /** - * repeated .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 3; */ java.util.List - getKpiIdOrBuilderList(); + getKpiIdListOrBuilderList(); /** - * repeated .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 3; */ - monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder( + monitoring.Monitoring.KpiIdOrBuilder getKpiIdListOrBuilder( int index); /** - * float monitoring_window_s = 2; - * @return The monitoringWindowS. + * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * @return The enum numeric value on the wire for kpiSampleType. */ - float getMonitoringWindowS(); + int getKpiSampleTypeValue(); + /** + * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * @return The kpiSampleType. + */ + kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType(); /** - * float sampling_rate_s = 3; - * @return The samplingRateS. + * .context.DeviceId device_id = 5; + * @return Whether the deviceId field is set. */ - float getSamplingRateS(); + boolean hasDeviceId(); + /** + * .context.DeviceId device_id = 5; + * @return The deviceId. + */ + context.ContextOuterClass.DeviceId getDeviceId(); + /** + * .context.DeviceId device_id = 5; + */ + context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder(); /** - * 
-     * used when you want something like "get the last N many samples
-     *
- * - * uint32 last_n_samples = 4; - * @return The lastNSamples. + * .context.EndPointId endpoint_id = 6; + * @return Whether the endpointId field is set. */ - int getLastNSamples(); + boolean hasEndpointId(); + /** + * .context.EndPointId endpoint_id = 6; + * @return The endpointId. + */ + context.ContextOuterClass.EndPointId getEndpointId(); + /** + * .context.EndPointId endpoint_id = 6; + */ + context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder(); /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; - * @return Whether the startTimestamp field is set. + * .context.ServiceId service_id = 7; + * @return Whether the serviceId field is set. */ - boolean hasStartTimestamp(); + boolean hasServiceId(); /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; - * @return The startTimestamp. + * .context.ServiceId service_id = 7; + * @return The serviceId. */ - context.ContextOuterClass.Timestamp getStartTimestamp(); + context.ContextOuterClass.ServiceId getServiceId(); /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; + * .context.ServiceId service_id = 7; */ - context.ContextOuterClass.TimestampOrBuilder getStartTimestampOrBuilder(); + context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder(); /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; - * @return Whether the endTimestamp field is set. + * .context.SliceId slice_id = 8; + * @return Whether the sliceId field is set. */ - boolean hasEndTimestamp(); + boolean hasSliceId(); /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; - * @return The endTimestamp. + * .context.SliceId slice_id = 8; + * @return The sliceId. */ - context.ContextOuterClass.Timestamp getEndTimestamp(); + context.ContextOuterClass.SliceId getSliceId(); /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; + * .context.SliceId slice_id = 8; */ - context.ContextOuterClass.TimestampOrBuilder getEndTimestampOrBuilder(); + context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder(); } /** - * Protobuf type {@code monitoring.KpiQuery} + * Protobuf type {@code monitoring.EditedKpiDescriptor} */ - public static final class KpiQuery extends + public static final class EditedKpiDescriptor extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.KpiQuery) - KpiQueryOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.EditedKpiDescriptor) + EditedKpiDescriptorOrBuilder { private static final long serialVersionUID = 0L; - // Use KpiQuery.newBuilder() to construct. - private KpiQuery(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use EditedKpiDescriptor.newBuilder() to construct. + private EditedKpiDescriptor(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private KpiQuery() { - kpiId_ = java.util.Collections.emptyList(); + private EditedKpiDescriptor() { + kpiDescription_ = ""; + kpiIdList_ = java.util.Collections.emptyList(); + kpiSampleType_ = 0; } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new KpiQuery(); + return new EditedKpiDescriptor(); } @java.lang.Override @@ -2996,7 +3519,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private KpiQuery( + private EditedKpiDescriptor( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -3015,52 +3538,88 @@ public final class Monitoring { case 0: done = true; break; - case 10: { + case 10: { + monitoring.Monitoring.KpiId.Builder subBuilder = null; + if (kpiId_ != null) { + subBuilder = kpiId_.toBuilder(); + } + kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(kpiId_); + kpiId_ = subBuilder.buildPartial(); + } + + break; + } + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + + kpiDescription_ = s; + break; + } + case 26: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - kpiId_ = new java.util.ArrayList(); + kpiIdList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - kpiId_.add( + kpiIdList_.add( input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry)); break; } - case 21: { + case 32: { + int rawValue = input.readEnum(); - monitoringWindowS_ = input.readFloat(); + kpiSampleType_ = rawValue; break; } - case 29: { + case 42: { + context.ContextOuterClass.DeviceId.Builder subBuilder = null; + if (deviceId_ != null) { + subBuilder = deviceId_.toBuilder(); + } + deviceId_ = input.readMessage(context.ContextOuterClass.DeviceId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(deviceId_); + deviceId_ = subBuilder.buildPartial(); + } - samplingRateS_ = input.readFloat(); break; } - case 32: { + case 50: { + context.ContextOuterClass.EndPointId.Builder subBuilder = null; + if (endpointId_ != null) { + subBuilder = endpointId_.toBuilder(); + } + endpointId_ = input.readMessage(context.ContextOuterClass.EndPointId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(endpointId_); + endpointId_ = subBuilder.buildPartial(); + } - lastNSamples_ = input.readUInt32(); break; } - case 42: { - context.ContextOuterClass.Timestamp.Builder subBuilder = null; - if (startTimestamp_ != null) { - subBuilder = startTimestamp_.toBuilder(); + case 58: { + context.ContextOuterClass.ServiceId.Builder subBuilder = null; + if (serviceId_ != null) { + subBuilder = serviceId_.toBuilder(); } - startTimestamp_ = input.readMessage(context.ContextOuterClass.Timestamp.parser(), extensionRegistry); + serviceId_ = input.readMessage(context.ContextOuterClass.ServiceId.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(startTimestamp_); - startTimestamp_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(serviceId_); + serviceId_ = subBuilder.buildPartial(); } break; } - case 50: { - context.ContextOuterClass.Timestamp.Builder subBuilder = null; - if (endTimestamp_ != null) { - subBuilder = endTimestamp_.toBuilder(); + case 66: { + context.ContextOuterClass.SliceId.Builder subBuilder = null; + if (sliceId_ != null) { + subBuilder = sliceId_.toBuilder(); } - endTimestamp_ = input.readMessage(context.ContextOuterClass.Timestamp.parser(), extensionRegistry); + sliceId_ = input.readMessage(context.ContextOuterClass.SliceId.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(endTimestamp_); - endTimestamp_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(sliceId_); + sliceId_ = subBuilder.buildPartial(); } break; @@ -3081,7 +3640,7 @@ public final class Monitoring { e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { - kpiId_ = java.util.Collections.unmodifiableList(kpiId_); + kpiIdList_ = java.util.Collections.unmodifiableList(kpiIdList_); } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -3089,1280 +3648,1732 @@ public final class Monitoring { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiQuery_descriptor; + return monitoring.Monitoring.internal_static_monitoring_EditedKpiDescriptor_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiQuery_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_EditedKpiDescriptor_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiQuery.class, monitoring.Monitoring.KpiQuery.Builder.class); + monitoring.Monitoring.EditedKpiDescriptor.class, monitoring.Monitoring.EditedKpiDescriptor.Builder.class); } public static final int KPI_ID_FIELD_NUMBER = 1; - private java.util.List kpiId_; + private monitoring.Monitoring.KpiId kpiId_; /** - * repeated .monitoring.KpiId kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; + * @return Whether the kpiId field is set. + */ + @java.lang.Override + public boolean hasKpiId() { + return kpiId_ != null; + } + /** + * .monitoring.KpiId kpi_id = 1; + * @return The kpiId. + */ + @java.lang.Override + public monitoring.Monitoring.KpiId getKpiId() { + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + } + /** + * .monitoring.KpiId kpi_id = 1; + */ + @java.lang.Override + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { + return getKpiId(); + } + + public static final int KPI_DESCRIPTION_FIELD_NUMBER = 2; + private volatile java.lang.Object kpiDescription_; + /** + * string kpi_description = 2; + * @return The kpiDescription. + */ + @java.lang.Override + public java.lang.String getKpiDescription() { + java.lang.Object ref = kpiDescription_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kpiDescription_ = s; + return s; + } + } + /** + * string kpi_description = 2; + * @return The bytes for kpiDescription. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getKpiDescriptionBytes() { + java.lang.Object ref = kpiDescription_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + kpiDescription_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int KPI_ID_LIST_FIELD_NUMBER = 3; + private java.util.List kpiIdList_; + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + @java.lang.Override + public java.util.List getKpiIdListList() { + return kpiIdList_; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + @java.lang.Override + public java.util.List + getKpiIdListOrBuilderList() { + return kpiIdList_; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + @java.lang.Override + public int getKpiIdListCount() { + return kpiIdList_.size(); + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + @java.lang.Override + public monitoring.Monitoring.KpiId getKpiIdList(int index) { + return kpiIdList_.get(index); + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + @java.lang.Override + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdListOrBuilder( + int index) { + return kpiIdList_.get(index); + } + + public static final int KPI_SAMPLE_TYPE_FIELD_NUMBER = 4; + private int kpiSampleType_; + /** + * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * @return The enum numeric value on the wire for kpiSampleType. + */ + @java.lang.Override public int getKpiSampleTypeValue() { + return kpiSampleType_; + } + /** + * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * @return The kpiSampleType. + */ + @java.lang.Override public kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType() { + @SuppressWarnings("deprecation") + kpi_sample_types.KpiSampleTypes.KpiSampleType result = kpi_sample_types.KpiSampleTypes.KpiSampleType.valueOf(kpiSampleType_); + return result == null ? kpi_sample_types.KpiSampleTypes.KpiSampleType.UNRECOGNIZED : result; + } + + public static final int DEVICE_ID_FIELD_NUMBER = 5; + private context.ContextOuterClass.DeviceId deviceId_; + /** + * .context.DeviceId device_id = 5; + * @return Whether the deviceId field is set. + */ + @java.lang.Override + public boolean hasDeviceId() { + return deviceId_ != null; + } + /** + * .context.DeviceId device_id = 5; + * @return The deviceId. + */ + @java.lang.Override + public context.ContextOuterClass.DeviceId getDeviceId() { + return deviceId_ == null ? context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; + } + /** + * .context.DeviceId device_id = 5; + */ + @java.lang.Override + public context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder() { + return getDeviceId(); + } + + public static final int ENDPOINT_ID_FIELD_NUMBER = 6; + private context.ContextOuterClass.EndPointId endpointId_; + /** + * .context.EndPointId endpoint_id = 6; + * @return Whether the endpointId field is set. + */ + @java.lang.Override + public boolean hasEndpointId() { + return endpointId_ != null; + } + /** + * .context.EndPointId endpoint_id = 6; + * @return The endpointId. + */ + @java.lang.Override + public context.ContextOuterClass.EndPointId getEndpointId() { + return endpointId_ == null ? context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; + } + /** + * .context.EndPointId endpoint_id = 6; + */ + @java.lang.Override + public context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder() { + return getEndpointId(); + } + + public static final int SERVICE_ID_FIELD_NUMBER = 7; + private context.ContextOuterClass.ServiceId serviceId_; + /** + * .context.ServiceId service_id = 7; + * @return Whether the serviceId field is set. + */ + @java.lang.Override + public boolean hasServiceId() { + return serviceId_ != null; + } + /** + * .context.ServiceId service_id = 7; + * @return The serviceId. */ @java.lang.Override - public java.util.List getKpiIdList() { - return kpiId_; + public context.ContextOuterClass.ServiceId getServiceId() { + return serviceId_ == null ? context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.ServiceId service_id = 7; */ @java.lang.Override - public java.util.List - getKpiIdOrBuilderList() { - return kpiId_; + public context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder() { + return getServiceId(); } + + public static final int SLICE_ID_FIELD_NUMBER = 8; + private context.ContextOuterClass.SliceId sliceId_; /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.SliceId slice_id = 8; + * @return Whether the sliceId field is set. */ @java.lang.Override - public int getKpiIdCount() { - return kpiId_.size(); + public boolean hasSliceId() { + return sliceId_ != null; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.SliceId slice_id = 8; + * @return The sliceId. */ @java.lang.Override - public monitoring.Monitoring.KpiId getKpiId(int index) { - return kpiId_.get(index); + public context.ContextOuterClass.SliceId getSliceId() { + return sliceId_ == null ? context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.SliceId slice_id = 8; */ @java.lang.Override - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder( - int index) { - return kpiId_.get(index); + public context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder() { + return getSliceId(); } - public static final int MONITORING_WINDOW_S_FIELD_NUMBER = 2; - private float monitoringWindowS_; - /** - * float monitoring_window_s = 2; - * @return The monitoringWindowS. - */ + private byte memoizedIsInitialized = -1; @java.lang.Override - public float getMonitoringWindowS() { - return monitoringWindowS_; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; } - public static final int SAMPLING_RATE_S_FIELD_NUMBER = 3; - private float samplingRateS_; - /** - * float sampling_rate_s = 3; - * @return The samplingRateS. - */ @java.lang.Override - public float getSamplingRateS() { - return samplingRateS_; + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (kpiId_ != null) { + output.writeMessage(1, getKpiId()); + } + if (!getKpiDescriptionBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, kpiDescription_); + } + for (int i = 0; i < kpiIdList_.size(); i++) { + output.writeMessage(3, kpiIdList_.get(i)); + } + if (kpiSampleType_ != kpi_sample_types.KpiSampleTypes.KpiSampleType.KPISAMPLETYPE_UNKNOWN.getNumber()) { + output.writeEnum(4, kpiSampleType_); + } + if (deviceId_ != null) { + output.writeMessage(5, getDeviceId()); + } + if (endpointId_ != null) { + output.writeMessage(6, getEndpointId()); + } + if (serviceId_ != null) { + output.writeMessage(7, getServiceId()); + } + if (sliceId_ != null) { + output.writeMessage(8, getSliceId()); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (kpiId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getKpiId()); + } + if (!getKpiDescriptionBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, kpiDescription_); + } + for (int i = 0; i < kpiIdList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, kpiIdList_.get(i)); + } + if (kpiSampleType_ != kpi_sample_types.KpiSampleTypes.KpiSampleType.KPISAMPLETYPE_UNKNOWN.getNumber()) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(4, kpiSampleType_); + } + if (deviceId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, getDeviceId()); + } + if (endpointId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(6, getEndpointId()); + } + if (serviceId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(7, getServiceId()); + } + if (sliceId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(8, getSliceId()); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof monitoring.Monitoring.EditedKpiDescriptor)) { + return super.equals(obj); + } + monitoring.Monitoring.EditedKpiDescriptor other = (monitoring.Monitoring.EditedKpiDescriptor) obj; + + if (hasKpiId() != other.hasKpiId()) return false; + if (hasKpiId()) { + if (!getKpiId() + .equals(other.getKpiId())) return false; + } + if (!getKpiDescription() + .equals(other.getKpiDescription())) return false; + if (!getKpiIdListList() + .equals(other.getKpiIdListList())) return false; + if (kpiSampleType_ != other.kpiSampleType_) return false; + if (hasDeviceId() != other.hasDeviceId()) return false; + if (hasDeviceId()) { + if (!getDeviceId() + .equals(other.getDeviceId())) return false; + } + if (hasEndpointId() != other.hasEndpointId()) return false; + if (hasEndpointId()) { + if (!getEndpointId() + .equals(other.getEndpointId())) return false; + } + if (hasServiceId() != other.hasServiceId()) return false; + if (hasServiceId()) { + if (!getServiceId() + .equals(other.getServiceId())) return false; + } + if (hasSliceId() != other.hasSliceId()) return false; + if (hasSliceId()) { + if (!getSliceId() + .equals(other.getSliceId())) return false; + } + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasKpiId()) { + hash = (37 * hash) + KPI_ID_FIELD_NUMBER; + hash = (53 * hash) + getKpiId().hashCode(); + } + hash = (37 * hash) + KPI_DESCRIPTION_FIELD_NUMBER; + hash = (53 * hash) + getKpiDescription().hashCode(); + if (getKpiIdListCount() > 0) { + hash = (37 * hash) + KPI_ID_LIST_FIELD_NUMBER; + hash = (53 * hash) + getKpiIdListList().hashCode(); + } + hash = (37 * hash) + KPI_SAMPLE_TYPE_FIELD_NUMBER; + hash = (53 * hash) + kpiSampleType_; + if (hasDeviceId()) { + hash = (37 * hash) + DEVICE_ID_FIELD_NUMBER; + hash = (53 * hash) + getDeviceId().hashCode(); + } + if (hasEndpointId()) { + hash = (37 * hash) + ENDPOINT_ID_FIELD_NUMBER; + hash = (53 * hash) + getEndpointId().hashCode(); + } + if (hasServiceId()) { + hash = (37 * hash) + SERVICE_ID_FIELD_NUMBER; + hash = (53 * hash) + getServiceId().hashCode(); + } + if (hasSliceId()) { + hash = (37 * hash) + SLICE_ID_FIELD_NUMBER; + hash = (53 * hash) + getSliceId().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - - public static final int LAST_N_SAMPLES_FIELD_NUMBER = 4; - private int lastNSamples_; - /** - * 
-     * used when you want something like "get the last N many samples
-     *
- * - * uint32 last_n_samples = 4; - * @return The lastNSamples. - */ - @java.lang.Override - public int getLastNSamples() { - return lastNSamples_; + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static monitoring.Monitoring.EditedKpiDescriptor parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } - public static final int START_TIMESTAMP_FIELD_NUMBER = 5; - private context.ContextOuterClass.Timestamp startTimestamp_; - /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; - * @return Whether the startTimestamp field is set. - */ @java.lang.Override - public boolean hasStartTimestamp() { - return startTimestamp_ != null; + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); } - /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; - * @return The startTimestamp. - */ - @java.lang.Override - public context.ContextOuterClass.Timestamp getStartTimestamp() { - return startTimestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : startTimestamp_; + public static Builder newBuilder(monitoring.Monitoring.EditedKpiDescriptor prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; - */ @java.lang.Override - public context.ContextOuterClass.TimestampOrBuilder getStartTimestampOrBuilder() { - return getStartTimestamp(); + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } - public static final int END_TIMESTAMP_FIELD_NUMBER = 6; - private context.ContextOuterClass.Timestamp endTimestamp_; - /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; - * @return Whether the endTimestamp field is set. - */ - @java.lang.Override - public boolean hasEndTimestamp() { - return endTimestamp_ != null; - } - /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; - * @return The endTimestamp. - */ @java.lang.Override - public context.ContextOuterClass.Timestamp getEndTimestamp() { - return endTimestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : endTimestamp_; + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; } /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; + * Protobuf type {@code monitoring.EditedKpiDescriptor} */ - @java.lang.Override - public context.ContextOuterClass.TimestampOrBuilder getEndTimestampOrBuilder() { - return getEndTimestamp(); - } + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:monitoring.EditedKpiDescriptor) + monitoring.Monitoring.EditedKpiDescriptorOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return monitoring.Monitoring.internal_static_monitoring_EditedKpiDescriptor_descriptor; + } - private byte memoizedIsInitialized = -1; - @java.lang.Override - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return monitoring.Monitoring.internal_static_monitoring_EditedKpiDescriptor_fieldAccessorTable + .ensureFieldAccessorsInitialized( + monitoring.Monitoring.EditedKpiDescriptor.class, monitoring.Monitoring.EditedKpiDescriptor.Builder.class); + } - memoizedIsInitialized = 1; - return true; - } + // Construct using monitoring.Monitoring.EditedKpiDescriptor.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } - @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - for (int i = 0; i < kpiId_.size(); i++) { - output.writeMessage(1, kpiId_.get(i)); + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); } - if (monitoringWindowS_ != 0F) { - output.writeFloat(2, monitoringWindowS_); + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getKpiIdListFieldBuilder(); + } } - if (samplingRateS_ != 0F) { - output.writeFloat(3, samplingRateS_); + @java.lang.Override + public Builder clear() { + super.clear(); + if (kpiIdBuilder_ == null) { + kpiId_ = null; + } else { + kpiId_ = null; + kpiIdBuilder_ = null; + } + kpiDescription_ = ""; + + if (kpiIdListBuilder_ == null) { + kpiIdList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + kpiIdListBuilder_.clear(); + } + kpiSampleType_ = 0; + + if (deviceIdBuilder_ == null) { + deviceId_ = null; + } else { + deviceId_ = null; + deviceIdBuilder_ = null; + } + if (endpointIdBuilder_ == null) { + endpointId_ = null; + } else { + endpointId_ = null; + endpointIdBuilder_ = null; + } + if (serviceIdBuilder_ == null) { + serviceId_ = null; + } else { + serviceId_ = null; + serviceIdBuilder_ = null; + } + if (sliceIdBuilder_ == null) { + sliceId_ = null; + } else { + sliceId_ = null; + sliceIdBuilder_ = null; + } + return this; } - if (lastNSamples_ != 0) { - output.writeUInt32(4, lastNSamples_); + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return monitoring.Monitoring.internal_static_monitoring_EditedKpiDescriptor_descriptor; } - if (startTimestamp_ != null) { - output.writeMessage(5, getStartTimestamp()); + + @java.lang.Override + public monitoring.Monitoring.EditedKpiDescriptor getDefaultInstanceForType() { + return monitoring.Monitoring.EditedKpiDescriptor.getDefaultInstance(); } - if (endTimestamp_ != null) { - output.writeMessage(6, getEndTimestamp()); + + @java.lang.Override + public monitoring.Monitoring.EditedKpiDescriptor build() { + monitoring.Monitoring.EditedKpiDescriptor result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; } - unknownFields.writeTo(output); - } - @java.lang.Override - public int getSerializedSize() { - int size = memoizedSize; - if (size != -1) return size; + @java.lang.Override + public monitoring.Monitoring.EditedKpiDescriptor buildPartial() { + monitoring.Monitoring.EditedKpiDescriptor result = new monitoring.Monitoring.EditedKpiDescriptor(this); + int from_bitField0_ = bitField0_; + if (kpiIdBuilder_ == null) { + result.kpiId_ = kpiId_; + } else { + result.kpiId_ = kpiIdBuilder_.build(); + } + result.kpiDescription_ = kpiDescription_; + if (kpiIdListBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + kpiIdList_ = java.util.Collections.unmodifiableList(kpiIdList_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.kpiIdList_ = kpiIdList_; + } else { + result.kpiIdList_ = kpiIdListBuilder_.build(); + } + result.kpiSampleType_ = kpiSampleType_; + if (deviceIdBuilder_ == null) { + result.deviceId_ = deviceId_; + } else { + result.deviceId_ = deviceIdBuilder_.build(); + } + if (endpointIdBuilder_ == null) { + result.endpointId_ = endpointId_; + } else { + result.endpointId_ = endpointIdBuilder_.build(); + } + if (serviceIdBuilder_ == null) { + result.serviceId_ = serviceId_; + } else { + result.serviceId_ = serviceIdBuilder_.build(); + } + if (sliceIdBuilder_ == null) { + result.sliceId_ = sliceId_; + } else { + result.sliceId_ = sliceIdBuilder_.build(); + } + onBuilt(); + return result; + } - size = 0; - for (int i = 0; i < kpiId_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, kpiId_.get(i)); + @java.lang.Override + public Builder clone() { + return super.clone(); } - if (monitoringWindowS_ != 0F) { - size += com.google.protobuf.CodedOutputStream - .computeFloatSize(2, monitoringWindowS_); + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); } - if (samplingRateS_ != 0F) { - size += com.google.protobuf.CodedOutputStream - .computeFloatSize(3, samplingRateS_); + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); } - if (lastNSamples_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, lastNSamples_); + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); } - if (startTimestamp_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, getStartTimestamp()); + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); } - if (endTimestamp_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, getEndTimestamp()); + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof monitoring.Monitoring.EditedKpiDescriptor) { + return mergeFrom((monitoring.Monitoring.EditedKpiDescriptor)other); + } else { + super.mergeFrom(other); + return this; + } } - size += unknownFields.getSerializedSize(); - memoizedSize = size; - return size; - } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof monitoring.Monitoring.KpiQuery)) { - return super.equals(obj); + public Builder mergeFrom(monitoring.Monitoring.EditedKpiDescriptor other) { + if (other == monitoring.Monitoring.EditedKpiDescriptor.getDefaultInstance()) return this; + if (other.hasKpiId()) { + mergeKpiId(other.getKpiId()); + } + if (!other.getKpiDescription().isEmpty()) { + kpiDescription_ = other.kpiDescription_; + onChanged(); + } + if (kpiIdListBuilder_ == null) { + if (!other.kpiIdList_.isEmpty()) { + if (kpiIdList_.isEmpty()) { + kpiIdList_ = other.kpiIdList_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureKpiIdListIsMutable(); + kpiIdList_.addAll(other.kpiIdList_); + } + onChanged(); + } + } else { + if (!other.kpiIdList_.isEmpty()) { + if (kpiIdListBuilder_.isEmpty()) { + kpiIdListBuilder_.dispose(); + kpiIdListBuilder_ = null; + kpiIdList_ = other.kpiIdList_; + bitField0_ = (bitField0_ & ~0x00000001); + kpiIdListBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getKpiIdListFieldBuilder() : null; + } else { + kpiIdListBuilder_.addAllMessages(other.kpiIdList_); + } + } + } + if (other.kpiSampleType_ != 0) { + setKpiSampleTypeValue(other.getKpiSampleTypeValue()); + } + if (other.hasDeviceId()) { + mergeDeviceId(other.getDeviceId()); + } + if (other.hasEndpointId()) { + mergeEndpointId(other.getEndpointId()); + } + if (other.hasServiceId()) { + mergeServiceId(other.getServiceId()); + } + if (other.hasSliceId()) { + mergeSliceId(other.getSliceId()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; } - monitoring.Monitoring.KpiQuery other = (monitoring.Monitoring.KpiQuery) obj; - if (!getKpiIdList() - .equals(other.getKpiIdList())) return false; - if (java.lang.Float.floatToIntBits(getMonitoringWindowS()) - != java.lang.Float.floatToIntBits( - other.getMonitoringWindowS())) return false; - if (java.lang.Float.floatToIntBits(getSamplingRateS()) - != java.lang.Float.floatToIntBits( - other.getSamplingRateS())) return false; - if (getLastNSamples() - != other.getLastNSamples()) return false; - if (hasStartTimestamp() != other.hasStartTimestamp()) return false; - if (hasStartTimestamp()) { - if (!getStartTimestamp() - .equals(other.getStartTimestamp())) return false; - } - if (hasEndTimestamp() != other.hasEndTimestamp()) return false; - if (hasEndTimestamp()) { - if (!getEndTimestamp() - .equals(other.getEndTimestamp())) return false; + @java.lang.Override + public final boolean isInitialized() { + return true; } - if (!unknownFields.equals(other.unknownFields)) return false; - return true; - } - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; - } - int hash = 41; - hash = (19 * hash) + getDescriptor().hashCode(); - if (getKpiIdCount() > 0) { - hash = (37 * hash) + KPI_ID_FIELD_NUMBER; - hash = (53 * hash) + getKpiIdList().hashCode(); + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + monitoring.Monitoring.EditedKpiDescriptor parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (monitoring.Monitoring.EditedKpiDescriptor) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; } - hash = (37 * hash) + MONITORING_WINDOW_S_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getMonitoringWindowS()); - hash = (37 * hash) + SAMPLING_RATE_S_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getSamplingRateS()); - hash = (37 * hash) + LAST_N_SAMPLES_FIELD_NUMBER; - hash = (53 * hash) + getLastNSamples(); - if (hasStartTimestamp()) { - hash = (37 * hash) + START_TIMESTAMP_FIELD_NUMBER; - hash = (53 * hash) + getStartTimestamp().hashCode(); + private int bitField0_; + + private monitoring.Monitoring.KpiId kpiId_; + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; + /** + * .monitoring.KpiId kpi_id = 1; + * @return Whether the kpiId field is set. + */ + public boolean hasKpiId() { + return kpiIdBuilder_ != null || kpiId_ != null; } - if (hasEndTimestamp()) { - hash = (37 * hash) + END_TIMESTAMP_FIELD_NUMBER; - hash = (53 * hash) + getEndTimestamp().hashCode(); + /** + * .monitoring.KpiId kpi_id = 1; + * @return The kpiId. + */ + public monitoring.Monitoring.KpiId getKpiId() { + if (kpiIdBuilder_ == null) { + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + } else { + return kpiIdBuilder_.getMessage(); + } } - hash = (29 * hash) + unknownFields.hashCode(); - memoizedHashCode = hash; - return hash; - } - - public static monitoring.Monitoring.KpiQuery parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static monitoring.Monitoring.KpiQuery parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static monitoring.Monitoring.KpiQuery parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static monitoring.Monitoring.KpiQuery parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static monitoring.Monitoring.KpiQuery parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static monitoring.Monitoring.KpiQuery parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static monitoring.Monitoring.KpiQuery parseFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static monitoring.Monitoring.KpiQuery parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - public static monitoring.Monitoring.KpiQuery parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); - } - public static monitoring.Monitoring.KpiQuery parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); - } - public static monitoring.Monitoring.KpiQuery parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static monitoring.Monitoring.KpiQuery parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - - @java.lang.Override - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder() { - return DEFAULT_INSTANCE.toBuilder(); - } - public static Builder newBuilder(monitoring.Monitoring.KpiQuery prototype) { - return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); - } - @java.lang.Override - public Builder toBuilder() { - return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); - } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code monitoring.KpiQuery} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.KpiQuery) - monitoring.Monitoring.KpiQueryOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiQuery_descriptor; + /** + * .monitoring.KpiId kpi_id = 1; + */ + public Builder setKpiId(monitoring.Monitoring.KpiId value) { + if (kpiIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + kpiId_ = value; + onChanged(); + } else { + kpiIdBuilder_.setMessage(value); + } + + return this; } + /** + * .monitoring.KpiId kpi_id = 1; + */ + public Builder setKpiId( + monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdBuilder_ == null) { + kpiId_ = builderForValue.build(); + onChanged(); + } else { + kpiIdBuilder_.setMessage(builderForValue.build()); + } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiQuery_fieldAccessorTable - .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiQuery.class, monitoring.Monitoring.KpiQuery.Builder.class); + return this; } + /** + * .monitoring.KpiId kpi_id = 1; + */ + public Builder mergeKpiId(monitoring.Monitoring.KpiId value) { + if (kpiIdBuilder_ == null) { + if (kpiId_ != null) { + kpiId_ = + monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial(); + } else { + kpiId_ = value; + } + onChanged(); + } else { + kpiIdBuilder_.mergeFrom(value); + } - // Construct using monitoring.Monitoring.KpiQuery.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); + return this; } + /** + * .monitoring.KpiId kpi_id = 1; + */ + public Builder clearKpiId() { + if (kpiIdBuilder_ == null) { + kpiId_ = null; + onChanged(); + } else { + kpiId_ = null; + kpiIdBuilder_ = null; + } - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); + return this; } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getKpiIdFieldBuilder(); + /** + * .monitoring.KpiId kpi_id = 1; + */ + public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() { + + onChanged(); + return getKpiIdFieldBuilder().getBuilder(); + } + /** + * .monitoring.KpiId kpi_id = 1; + */ + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { + if (kpiIdBuilder_ != null) { + return kpiIdBuilder_.getMessageOrBuilder(); + } else { + return kpiId_ == null ? + monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } } - @java.lang.Override - public Builder clear() { - super.clear(); + /** + * .monitoring.KpiId kpi_id = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> + getKpiIdFieldBuilder() { if (kpiIdBuilder_ == null) { - kpiId_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( + getKpiId(), + getParentForChildren(), + isClean()); + kpiId_ = null; + } + return kpiIdBuilder_; + } + + private java.lang.Object kpiDescription_ = ""; + /** + * string kpi_description = 2; + * @return The kpiDescription. + */ + public java.lang.String getKpiDescription() { + java.lang.Object ref = kpiDescription_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kpiDescription_ = s; + return s; } else { - kpiIdBuilder_.clear(); + return (java.lang.String) ref; } - monitoringWindowS_ = 0F; + } + /** + * string kpi_description = 2; + * @return The bytes for kpiDescription. + */ + public com.google.protobuf.ByteString + getKpiDescriptionBytes() { + java.lang.Object ref = kpiDescription_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + kpiDescription_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string kpi_description = 2; + * @param value The kpiDescription to set. + * @return This builder for chaining. + */ + public Builder setKpiDescription( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + kpiDescription_ = value; + onChanged(); + return this; + } + /** + * string kpi_description = 2; + * @return This builder for chaining. + */ + public Builder clearKpiDescription() { + + kpiDescription_ = getDefaultInstance().getKpiDescription(); + onChanged(); + return this; + } + /** + * string kpi_description = 2; + * @param value The bytes for kpiDescription to set. + * @return This builder for chaining. + */ + public Builder setKpiDescriptionBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + kpiDescription_ = value; + onChanged(); + return this; + } - samplingRateS_ = 0F; + private java.util.List kpiIdList_ = + java.util.Collections.emptyList(); + private void ensureKpiIdListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + kpiIdList_ = new java.util.ArrayList(kpiIdList_); + bitField0_ |= 0x00000001; + } + } - lastNSamples_ = 0; + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdListBuilder_; - if (startTimestampBuilder_ == null) { - startTimestamp_ = null; + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public java.util.List getKpiIdListList() { + if (kpiIdListBuilder_ == null) { + return java.util.Collections.unmodifiableList(kpiIdList_); + } else { + return kpiIdListBuilder_.getMessageList(); + } + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public int getKpiIdListCount() { + if (kpiIdListBuilder_ == null) { + return kpiIdList_.size(); + } else { + return kpiIdListBuilder_.getCount(); + } + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public monitoring.Monitoring.KpiId getKpiIdList(int index) { + if (kpiIdListBuilder_ == null) { + return kpiIdList_.get(index); + } else { + return kpiIdListBuilder_.getMessage(index); + } + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public Builder setKpiIdList( + int index, monitoring.Monitoring.KpiId value) { + if (kpiIdListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiIdListIsMutable(); + kpiIdList_.set(index, value); + onChanged(); + } else { + kpiIdListBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public Builder setKpiIdList( + int index, monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + kpiIdList_.set(index, builderForValue.build()); + onChanged(); } else { - startTimestamp_ = null; - startTimestampBuilder_ = null; + kpiIdListBuilder_.setMessage(index, builderForValue.build()); } - if (endTimestampBuilder_ == null) { - endTimestamp_ = null; + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public Builder addKpiIdList(monitoring.Monitoring.KpiId value) { + if (kpiIdListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiIdListIsMutable(); + kpiIdList_.add(value); + onChanged(); } else { - endTimestamp_ = null; - endTimestampBuilder_ = null; + kpiIdListBuilder_.addMessage(value); } return this; } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_KpiQuery_descriptor; - } - - @java.lang.Override - public monitoring.Monitoring.KpiQuery getDefaultInstanceForType() { - return monitoring.Monitoring.KpiQuery.getDefaultInstance(); - } - - @java.lang.Override - public monitoring.Monitoring.KpiQuery build() { - monitoring.Monitoring.KpiQuery result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - @java.lang.Override - public monitoring.Monitoring.KpiQuery buildPartial() { - monitoring.Monitoring.KpiQuery result = new monitoring.Monitoring.KpiQuery(this); - int from_bitField0_ = bitField0_; - if (kpiIdBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { - kpiId_ = java.util.Collections.unmodifiableList(kpiId_); - bitField0_ = (bitField0_ & ~0x00000001); + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public Builder addKpiIdList( + int index, monitoring.Monitoring.KpiId value) { + if (kpiIdListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); } - result.kpiId_ = kpiId_; + ensureKpiIdListIsMutable(); + kpiIdList_.add(index, value); + onChanged(); } else { - result.kpiId_ = kpiIdBuilder_.build(); + kpiIdListBuilder_.addMessage(index, value); } - result.monitoringWindowS_ = monitoringWindowS_; - result.samplingRateS_ = samplingRateS_; - result.lastNSamples_ = lastNSamples_; - if (startTimestampBuilder_ == null) { - result.startTimestamp_ = startTimestamp_; + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public Builder addKpiIdList( + monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + kpiIdList_.add(builderForValue.build()); + onChanged(); } else { - result.startTimestamp_ = startTimestampBuilder_.build(); + kpiIdListBuilder_.addMessage(builderForValue.build()); } - if (endTimestampBuilder_ == null) { - result.endTimestamp_ = endTimestamp_; + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public Builder addKpiIdList( + int index, monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + kpiIdList_.add(index, builderForValue.build()); + onChanged(); } else { - result.endTimestamp_ = endTimestampBuilder_.build(); + kpiIdListBuilder_.addMessage(index, builderForValue.build()); } - onBuilt(); - return result; - } - - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); + return this; } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.KpiQuery) { - return mergeFrom((monitoring.Monitoring.KpiQuery)other); + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public Builder addAllKpiIdList( + java.lang.Iterable values) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, kpiIdList_); + onChanged(); } else { - super.mergeFrom(other); - return this; + kpiIdListBuilder_.addAllMessages(values); } + return this; } - - public Builder mergeFrom(monitoring.Monitoring.KpiQuery other) { - if (other == monitoring.Monitoring.KpiQuery.getDefaultInstance()) return this; - if (kpiIdBuilder_ == null) { - if (!other.kpiId_.isEmpty()) { - if (kpiId_.isEmpty()) { - kpiId_ = other.kpiId_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureKpiIdIsMutable(); - kpiId_.addAll(other.kpiId_); - } - onChanged(); - } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public Builder clearKpiIdList() { + if (kpiIdListBuilder_ == null) { + kpiIdList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); } else { - if (!other.kpiId_.isEmpty()) { - if (kpiIdBuilder_.isEmpty()) { - kpiIdBuilder_.dispose(); - kpiIdBuilder_ = null; - kpiId_ = other.kpiId_; - bitField0_ = (bitField0_ & ~0x00000001); - kpiIdBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getKpiIdFieldBuilder() : null; - } else { - kpiIdBuilder_.addAllMessages(other.kpiId_); - } - } - } - if (other.getMonitoringWindowS() != 0F) { - setMonitoringWindowS(other.getMonitoringWindowS()); - } - if (other.getSamplingRateS() != 0F) { - setSamplingRateS(other.getSamplingRateS()); - } - if (other.getLastNSamples() != 0) { - setLastNSamples(other.getLastNSamples()); - } - if (other.hasStartTimestamp()) { - mergeStartTimestamp(other.getStartTimestamp()); + kpiIdListBuilder_.clear(); } - if (other.hasEndTimestamp()) { - mergeEndTimestamp(other.getEndTimestamp()); + return this; + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public Builder removeKpiIdList(int index) { + if (kpiIdListBuilder_ == null) { + ensureKpiIdListIsMutable(); + kpiIdList_.remove(index); + onChanged(); + } else { + kpiIdListBuilder_.remove(index); } - this.mergeUnknownFields(other.unknownFields); - onChanged(); return this; } - - @java.lang.Override - public final boolean isInitialized() { - return true; + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public monitoring.Monitoring.KpiId.Builder getKpiIdListBuilder( + int index) { + return getKpiIdListFieldBuilder().getBuilder(index); } - - @java.lang.Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - monitoring.Monitoring.KpiQuery parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.KpiQuery) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdListOrBuilder( + int index) { + if (kpiIdListBuilder_ == null) { + return kpiIdList_.get(index); } else { + return kpiIdListBuilder_.getMessageOrBuilder(index); } - return this; } - private int bitField0_; - - private java.util.List kpiId_ = - java.util.Collections.emptyList(); - private void ensureKpiIdIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - kpiId_ = new java.util.ArrayList(kpiId_); - bitField0_ |= 0x00000001; - } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public java.util.List + getKpiIdListOrBuilderList() { + if (kpiIdListBuilder_ != null) { + return kpiIdListBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(kpiIdList_); + } + } + /** + * repeated .monitoring.KpiId kpi_id_list = 3; + */ + public monitoring.Monitoring.KpiId.Builder addKpiIdListBuilder() { + return getKpiIdListFieldBuilder().addBuilder( + monitoring.Monitoring.KpiId.getDefaultInstance()); } - - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; - /** - * repeated .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 3; */ - public java.util.List getKpiIdList() { - if (kpiIdBuilder_ == null) { - return java.util.Collections.unmodifiableList(kpiId_); - } else { - return kpiIdBuilder_.getMessageList(); - } + public monitoring.Monitoring.KpiId.Builder addKpiIdListBuilder( + int index) { + return getKpiIdListFieldBuilder().addBuilder( + index, monitoring.Monitoring.KpiId.getDefaultInstance()); } /** - * repeated .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id_list = 3; */ - public int getKpiIdCount() { - if (kpiIdBuilder_ == null) { - return kpiId_.size(); - } else { - return kpiIdBuilder_.getCount(); + public java.util.List + getKpiIdListBuilderList() { + return getKpiIdListFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> + getKpiIdListFieldBuilder() { + if (kpiIdListBuilder_ == null) { + kpiIdListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( + kpiIdList_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + kpiIdList_ = null; } + return kpiIdListBuilder_; } + + private int kpiSampleType_ = 0; /** - * repeated .monitoring.KpiId kpi_id = 1; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * @return The enum numeric value on the wire for kpiSampleType. */ - public monitoring.Monitoring.KpiId getKpiId(int index) { - if (kpiIdBuilder_ == null) { - return kpiId_.get(index); - } else { - return kpiIdBuilder_.getMessage(index); - } + @java.lang.Override public int getKpiSampleTypeValue() { + return kpiSampleType_; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * @param value The enum numeric value on the wire for kpiSampleType to set. + * @return This builder for chaining. */ - public Builder setKpiId( - int index, monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiIdIsMutable(); - kpiId_.set(index, value); - onChanged(); - } else { - kpiIdBuilder_.setMessage(index, value); - } + public Builder setKpiSampleTypeValue(int value) { + + kpiSampleType_ = value; + onChanged(); return this; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * @return The kpiSampleType. */ - public Builder setKpiId( - int index, monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - kpiId_.set(index, builderForValue.build()); - onChanged(); - } else { - kpiIdBuilder_.setMessage(index, builderForValue.build()); - } - return this; + @java.lang.Override + public kpi_sample_types.KpiSampleTypes.KpiSampleType getKpiSampleType() { + @SuppressWarnings("deprecation") + kpi_sample_types.KpiSampleTypes.KpiSampleType result = kpi_sample_types.KpiSampleTypes.KpiSampleType.valueOf(kpiSampleType_); + return result == null ? kpi_sample_types.KpiSampleTypes.KpiSampleType.UNRECOGNIZED : result; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * @param value The kpiSampleType to set. + * @return This builder for chaining. */ - public Builder addKpiId(monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiIdIsMutable(); - kpiId_.add(value); - onChanged(); - } else { - kpiIdBuilder_.addMessage(value); + public Builder setKpiSampleType(kpi_sample_types.KpiSampleTypes.KpiSampleType value) { + if (value == null) { + throw new NullPointerException(); } + + kpiSampleType_ = value.getNumber(); + onChanged(); return this; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .kpi_sample_types.KpiSampleType kpi_sample_type = 4; + * @return This builder for chaining. */ - public Builder addKpiId( - int index, monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiIdIsMutable(); - kpiId_.add(index, value); - onChanged(); - } else { - kpiIdBuilder_.addMessage(index, value); - } + public Builder clearKpiSampleType() { + + kpiSampleType_ = 0; + onChanged(); return this; } + + private context.ContextOuterClass.DeviceId deviceId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder> deviceIdBuilder_; /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.DeviceId device_id = 5; + * @return Whether the deviceId field is set. */ - public Builder addKpiId( - monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - kpiId_.add(builderForValue.build()); - onChanged(); - } else { - kpiIdBuilder_.addMessage(builderForValue.build()); - } - return this; + public boolean hasDeviceId() { + return deviceIdBuilder_ != null || deviceId_ != null; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.DeviceId device_id = 5; + * @return The deviceId. */ - public Builder addKpiId( - int index, monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - kpiId_.add(index, builderForValue.build()); - onChanged(); + public context.ContextOuterClass.DeviceId getDeviceId() { + if (deviceIdBuilder_ == null) { + return deviceId_ == null ? context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; } else { - kpiIdBuilder_.addMessage(index, builderForValue.build()); + return deviceIdBuilder_.getMessage(); } - return this; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.DeviceId device_id = 5; */ - public Builder addAllKpiId( - java.lang.Iterable values) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, kpiId_); + public Builder setDeviceId(context.ContextOuterClass.DeviceId value) { + if (deviceIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + deviceId_ = value; onChanged(); } else { - kpiIdBuilder_.addAllMessages(values); + deviceIdBuilder_.setMessage(value); } + return this; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.DeviceId device_id = 5; */ - public Builder clearKpiId() { - if (kpiIdBuilder_ == null) { - kpiId_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + public Builder setDeviceId( + context.ContextOuterClass.DeviceId.Builder builderForValue) { + if (deviceIdBuilder_ == null) { + deviceId_ = builderForValue.build(); onChanged(); } else { - kpiIdBuilder_.clear(); + deviceIdBuilder_.setMessage(builderForValue.build()); } + return this; } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.DeviceId device_id = 5; */ - public Builder removeKpiId(int index) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - kpiId_.remove(index); + public Builder mergeDeviceId(context.ContextOuterClass.DeviceId value) { + if (deviceIdBuilder_ == null) { + if (deviceId_ != null) { + deviceId_ = + context.ContextOuterClass.DeviceId.newBuilder(deviceId_).mergeFrom(value).buildPartial(); + } else { + deviceId_ = value; + } onChanged(); } else { - kpiIdBuilder_.remove(index); + deviceIdBuilder_.mergeFrom(value); } + return this; } /** - * repeated .monitoring.KpiId kpi_id = 1; - */ - public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder( - int index) { - return getKpiIdFieldBuilder().getBuilder(index); - } - /** - * repeated .monitoring.KpiId kpi_id = 1; - */ - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder( - int index) { - if (kpiIdBuilder_ == null) { - return kpiId_.get(index); } else { - return kpiIdBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.DeviceId device_id = 5; */ - public java.util.List - getKpiIdOrBuilderList() { - if (kpiIdBuilder_ != null) { - return kpiIdBuilder_.getMessageOrBuilderList(); + public Builder clearDeviceId() { + if (deviceIdBuilder_ == null) { + deviceId_ = null; + onChanged(); } else { - return java.util.Collections.unmodifiableList(kpiId_); + deviceId_ = null; + deviceIdBuilder_ = null; } + + return this; } /** - * repeated .monitoring.KpiId kpi_id = 1; - */ - public monitoring.Monitoring.KpiId.Builder addKpiIdBuilder() { - return getKpiIdFieldBuilder().addBuilder( - monitoring.Monitoring.KpiId.getDefaultInstance()); - } - /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.DeviceId device_id = 5; */ - public monitoring.Monitoring.KpiId.Builder addKpiIdBuilder( - int index) { - return getKpiIdFieldBuilder().addBuilder( - index, monitoring.Monitoring.KpiId.getDefaultInstance()); + public context.ContextOuterClass.DeviceId.Builder getDeviceIdBuilder() { + + onChanged(); + return getDeviceIdFieldBuilder().getBuilder(); } /** - * repeated .monitoring.KpiId kpi_id = 1; + * .context.DeviceId device_id = 5; */ - public java.util.List - getKpiIdBuilderList() { - return getKpiIdFieldBuilder().getBuilderList(); + public context.ContextOuterClass.DeviceIdOrBuilder getDeviceIdOrBuilder() { + if (deviceIdBuilder_ != null) { + return deviceIdBuilder_.getMessageOrBuilder(); + } else { + return deviceId_ == null ? + context.ContextOuterClass.DeviceId.getDefaultInstance() : deviceId_; + } } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> - getKpiIdFieldBuilder() { - if (kpiIdBuilder_ == null) { - kpiIdBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( - kpiId_, - ((bitField0_ & 0x00000001) != 0), + /** + * .context.DeviceId device_id = 5; + */ + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder> + getDeviceIdFieldBuilder() { + if (deviceIdBuilder_ == null) { + deviceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.DeviceId, context.ContextOuterClass.DeviceId.Builder, context.ContextOuterClass.DeviceIdOrBuilder>( + getDeviceId(), getParentForChildren(), isClean()); - kpiId_ = null; + deviceId_ = null; } - return kpiIdBuilder_; + return deviceIdBuilder_; } - private float monitoringWindowS_ ; + private context.ContextOuterClass.EndPointId endpointId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder> endpointIdBuilder_; /** - * float monitoring_window_s = 2; - * @return The monitoringWindowS. + * .context.EndPointId endpoint_id = 6; + * @return Whether the endpointId field is set. */ - @java.lang.Override - public float getMonitoringWindowS() { - return monitoringWindowS_; + public boolean hasEndpointId() { + return endpointIdBuilder_ != null || endpointId_ != null; } /** - * float monitoring_window_s = 2; - * @param value The monitoringWindowS to set. - * @return This builder for chaining. + * .context.EndPointId endpoint_id = 6; + * @return The endpointId. */ - public Builder setMonitoringWindowS(float value) { - - monitoringWindowS_ = value; - onChanged(); - return this; + public context.ContextOuterClass.EndPointId getEndpointId() { + if (endpointIdBuilder_ == null) { + return endpointId_ == null ? context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; + } else { + return endpointIdBuilder_.getMessage(); + } } /** - * float monitoring_window_s = 2; - * @return This builder for chaining. + * .context.EndPointId endpoint_id = 6; */ - public Builder clearMonitoringWindowS() { - - monitoringWindowS_ = 0F; - onChanged(); + public Builder setEndpointId(context.ContextOuterClass.EndPointId value) { + if (endpointIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + endpointId_ = value; + onChanged(); + } else { + endpointIdBuilder_.setMessage(value); + } + return this; } - - private float samplingRateS_ ; /** - * float sampling_rate_s = 3; - * @return The samplingRateS. + * .context.EndPointId endpoint_id = 6; */ - @java.lang.Override - public float getSamplingRateS() { - return samplingRateS_; + public Builder setEndpointId( + context.ContextOuterClass.EndPointId.Builder builderForValue) { + if (endpointIdBuilder_ == null) { + endpointId_ = builderForValue.build(); + onChanged(); + } else { + endpointIdBuilder_.setMessage(builderForValue.build()); + } + + return this; } /** - * float sampling_rate_s = 3; - * @param value The samplingRateS to set. - * @return This builder for chaining. + * .context.EndPointId endpoint_id = 6; */ - public Builder setSamplingRateS(float value) { - - samplingRateS_ = value; - onChanged(); + public Builder mergeEndpointId(context.ContextOuterClass.EndPointId value) { + if (endpointIdBuilder_ == null) { + if (endpointId_ != null) { + endpointId_ = + context.ContextOuterClass.EndPointId.newBuilder(endpointId_).mergeFrom(value).buildPartial(); + } else { + endpointId_ = value; + } + onChanged(); + } else { + endpointIdBuilder_.mergeFrom(value); + } + return this; } /** - * float sampling_rate_s = 3; - * @return This builder for chaining. + * .context.EndPointId endpoint_id = 6; */ - public Builder clearSamplingRateS() { - - samplingRateS_ = 0F; - onChanged(); + public Builder clearEndpointId() { + if (endpointIdBuilder_ == null) { + endpointId_ = null; + onChanged(); + } else { + endpointId_ = null; + endpointIdBuilder_ = null; + } + return this; } - - private int lastNSamples_ ; /** - * 
-       * used when you want something like "get the last N many samples
-       *
- * - * uint32 last_n_samples = 4; - * @return The lastNSamples. + * .context.EndPointId endpoint_id = 6; */ - @java.lang.Override - public int getLastNSamples() { - return lastNSamples_; + public context.ContextOuterClass.EndPointId.Builder getEndpointIdBuilder() { + + onChanged(); + return getEndpointIdFieldBuilder().getBuilder(); } /** - * 
-       * used when you want something like "get the last N many samples
-       *
- * - * uint32 last_n_samples = 4; - * @param value The lastNSamples to set. - * @return This builder for chaining. + * .context.EndPointId endpoint_id = 6; */ - public Builder setLastNSamples(int value) { - - lastNSamples_ = value; - onChanged(); - return this; + public context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder() { + if (endpointIdBuilder_ != null) { + return endpointIdBuilder_.getMessageOrBuilder(); + } else { + return endpointId_ == null ? + context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_; + } } /** - * 
-       * used when you want something like "get the last N many samples
-       *
- * - * uint32 last_n_samples = 4; - * @return This builder for chaining. + * .context.EndPointId endpoint_id = 6; */ - public Builder clearLastNSamples() { - - lastNSamples_ = 0; - onChanged(); - return this; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder> + getEndpointIdFieldBuilder() { + if (endpointIdBuilder_ == null) { + endpointIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.EndPointId, context.ContextOuterClass.EndPointId.Builder, context.ContextOuterClass.EndPointIdOrBuilder>( + getEndpointId(), + getParentForChildren(), + isClean()); + endpointId_ = null; + } + return endpointIdBuilder_; } - private context.ContextOuterClass.Timestamp startTimestamp_; + private context.ContextOuterClass.ServiceId serviceId_; private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> startTimestampBuilder_; + context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder> serviceIdBuilder_; /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; - * @return Whether the startTimestamp field is set. + * .context.ServiceId service_id = 7; + * @return Whether the serviceId field is set. */ - public boolean hasStartTimestamp() { - return startTimestampBuilder_ != null || startTimestamp_ != null; + public boolean hasServiceId() { + return serviceIdBuilder_ != null || serviceId_ != null; } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; - * @return The startTimestamp. + * .context.ServiceId service_id = 7; + * @return The serviceId. */ - public context.ContextOuterClass.Timestamp getStartTimestamp() { - if (startTimestampBuilder_ == null) { - return startTimestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : startTimestamp_; + public context.ContextOuterClass.ServiceId getServiceId() { + if (serviceIdBuilder_ == null) { + return serviceId_ == null ? context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; } else { - return startTimestampBuilder_.getMessage(); + return serviceIdBuilder_.getMessage(); } } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * .context.ServiceId service_id = 7; */ - public Builder setStartTimestamp(context.ContextOuterClass.Timestamp value) { - if (startTimestampBuilder_ == null) { + public Builder setServiceId(context.ContextOuterClass.ServiceId value) { + if (serviceIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - startTimestamp_ = value; + serviceId_ = value; onChanged(); } else { - startTimestampBuilder_.setMessage(value); + serviceIdBuilder_.setMessage(value); } return this; } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * .context.ServiceId service_id = 7; */ - public Builder setStartTimestamp( - context.ContextOuterClass.Timestamp.Builder builderForValue) { - if (startTimestampBuilder_ == null) { - startTimestamp_ = builderForValue.build(); + public Builder setServiceId( + context.ContextOuterClass.ServiceId.Builder builderForValue) { + if (serviceIdBuilder_ == null) { + serviceId_ = builderForValue.build(); onChanged(); } else { - startTimestampBuilder_.setMessage(builderForValue.build()); + serviceIdBuilder_.setMessage(builderForValue.build()); } return this; } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * .context.ServiceId service_id = 7; */ - public Builder mergeStartTimestamp(context.ContextOuterClass.Timestamp value) { - if (startTimestampBuilder_ == null) { - if (startTimestamp_ != null) { - startTimestamp_ = - context.ContextOuterClass.Timestamp.newBuilder(startTimestamp_).mergeFrom(value).buildPartial(); + public Builder mergeServiceId(context.ContextOuterClass.ServiceId value) { + if (serviceIdBuilder_ == null) { + if (serviceId_ != null) { + serviceId_ = + context.ContextOuterClass.ServiceId.newBuilder(serviceId_).mergeFrom(value).buildPartial(); } else { - startTimestamp_ = value; + serviceId_ = value; } onChanged(); } else { - startTimestampBuilder_.mergeFrom(value); + serviceIdBuilder_.mergeFrom(value); } return this; } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * .context.ServiceId service_id = 7; */ - public Builder clearStartTimestamp() { - if (startTimestampBuilder_ == null) { - startTimestamp_ = null; + public Builder clearServiceId() { + if (serviceIdBuilder_ == null) { + serviceId_ = null; onChanged(); } else { - startTimestamp_ = null; - startTimestampBuilder_ = null; + serviceId_ = null; + serviceIdBuilder_ = null; } return this; } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * .context.ServiceId service_id = 7; */ - public context.ContextOuterClass.Timestamp.Builder getStartTimestampBuilder() { + public context.ContextOuterClass.ServiceId.Builder getServiceIdBuilder() { onChanged(); - return getStartTimestampFieldBuilder().getBuilder(); + return getServiceIdFieldBuilder().getBuilder(); } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * .context.ServiceId service_id = 7; */ - public context.ContextOuterClass.TimestampOrBuilder getStartTimestampOrBuilder() { - if (startTimestampBuilder_ != null) { - return startTimestampBuilder_.getMessageOrBuilder(); + public context.ContextOuterClass.ServiceIdOrBuilder getServiceIdOrBuilder() { + if (serviceIdBuilder_ != null) { + return serviceIdBuilder_.getMessageOrBuilder(); } else { - return startTimestamp_ == null ? - context.ContextOuterClass.Timestamp.getDefaultInstance() : startTimestamp_; + return serviceId_ == null ? + context.ContextOuterClass.ServiceId.getDefaultInstance() : serviceId_; } } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * .context.ServiceId service_id = 7; */ private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> - getStartTimestampFieldBuilder() { - if (startTimestampBuilder_ == null) { - startTimestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>( - getStartTimestamp(), + context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder> + getServiceIdFieldBuilder() { + if (serviceIdBuilder_ == null) { + serviceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.ServiceId, context.ContextOuterClass.ServiceId.Builder, context.ContextOuterClass.ServiceIdOrBuilder>( + getServiceId(), getParentForChildren(), isClean()); - startTimestamp_ = null; + serviceId_ = null; } - return startTimestampBuilder_; + return serviceIdBuilder_; } - private context.ContextOuterClass.Timestamp endTimestamp_; + private context.ContextOuterClass.SliceId sliceId_; private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> endTimestampBuilder_; + context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder> sliceIdBuilder_; /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; - * @return Whether the endTimestamp field is set. + * .context.SliceId slice_id = 8; + * @return Whether the sliceId field is set. */ - public boolean hasEndTimestamp() { - return endTimestampBuilder_ != null || endTimestamp_ != null; + public boolean hasSliceId() { + return sliceIdBuilder_ != null || sliceId_ != null; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; - * @return The endTimestamp. + * .context.SliceId slice_id = 8; + * @return The sliceId. */ - public context.ContextOuterClass.Timestamp getEndTimestamp() { - if (endTimestampBuilder_ == null) { - return endTimestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : endTimestamp_; + public context.ContextOuterClass.SliceId getSliceId() { + if (sliceIdBuilder_ == null) { + return sliceId_ == null ? context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; } else { - return endTimestampBuilder_.getMessage(); + return sliceIdBuilder_.getMessage(); } } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * .context.SliceId slice_id = 8; */ - public Builder setEndTimestamp(context.ContextOuterClass.Timestamp value) { - if (endTimestampBuilder_ == null) { + public Builder setSliceId(context.ContextOuterClass.SliceId value) { + if (sliceIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - endTimestamp_ = value; + sliceId_ = value; onChanged(); } else { - endTimestampBuilder_.setMessage(value); + sliceIdBuilder_.setMessage(value); } return this; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * .context.SliceId slice_id = 8; */ - public Builder setEndTimestamp( - context.ContextOuterClass.Timestamp.Builder builderForValue) { - if (endTimestampBuilder_ == null) { - endTimestamp_ = builderForValue.build(); + public Builder setSliceId( + context.ContextOuterClass.SliceId.Builder builderForValue) { + if (sliceIdBuilder_ == null) { + sliceId_ = builderForValue.build(); onChanged(); } else { - endTimestampBuilder_.setMessage(builderForValue.build()); + sliceIdBuilder_.setMessage(builderForValue.build()); } return this; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * .context.SliceId slice_id = 8; */ - public Builder mergeEndTimestamp(context.ContextOuterClass.Timestamp value) { - if (endTimestampBuilder_ == null) { - if (endTimestamp_ != null) { - endTimestamp_ = - context.ContextOuterClass.Timestamp.newBuilder(endTimestamp_).mergeFrom(value).buildPartial(); + public Builder mergeSliceId(context.ContextOuterClass.SliceId value) { + if (sliceIdBuilder_ == null) { + if (sliceId_ != null) { + sliceId_ = + context.ContextOuterClass.SliceId.newBuilder(sliceId_).mergeFrom(value).buildPartial(); } else { - endTimestamp_ = value; + sliceId_ = value; } onChanged(); } else { - endTimestampBuilder_.mergeFrom(value); + sliceIdBuilder_.mergeFrom(value); } return this; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * .context.SliceId slice_id = 8; */ - public Builder clearEndTimestamp() { - if (endTimestampBuilder_ == null) { - endTimestamp_ = null; + public Builder clearSliceId() { + if (sliceIdBuilder_ == null) { + sliceId_ = null; onChanged(); } else { - endTimestamp_ = null; - endTimestampBuilder_ = null; + sliceId_ = null; + sliceIdBuilder_ = null; } return this; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * .context.SliceId slice_id = 8; */ - public context.ContextOuterClass.Timestamp.Builder getEndTimestampBuilder() { + public context.ContextOuterClass.SliceId.Builder getSliceIdBuilder() { onChanged(); - return getEndTimestampFieldBuilder().getBuilder(); + return getSliceIdFieldBuilder().getBuilder(); } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * .context.SliceId slice_id = 8; */ - public context.ContextOuterClass.TimestampOrBuilder getEndTimestampOrBuilder() { - if (endTimestampBuilder_ != null) { - return endTimestampBuilder_.getMessageOrBuilder(); + public context.ContextOuterClass.SliceIdOrBuilder getSliceIdOrBuilder() { + if (sliceIdBuilder_ != null) { + return sliceIdBuilder_.getMessageOrBuilder(); } else { - return endTimestamp_ == null ? - context.ContextOuterClass.Timestamp.getDefaultInstance() : endTimestamp_; + return sliceId_ == null ? + context.ContextOuterClass.SliceId.getDefaultInstance() : sliceId_; } } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * .context.SliceId slice_id = 8; */ private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> - getEndTimestampFieldBuilder() { - if (endTimestampBuilder_ == null) { - endTimestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>( - getEndTimestamp(), + context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder> + getSliceIdFieldBuilder() { + if (sliceIdBuilder_ == null) { + sliceIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.SliceId, context.ContextOuterClass.SliceId.Builder, context.ContextOuterClass.SliceIdOrBuilder>( + getSliceId(), getParentForChildren(), isClean()); - endTimestamp_ = null; + sliceId_ = null; } - return endTimestampBuilder_; + return sliceIdBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -4377,85 +5388,101 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.KpiQuery) + // @@protoc_insertion_point(builder_scope:monitoring.EditedKpiDescriptor) } - // @@protoc_insertion_point(class_scope:monitoring.KpiQuery) - private static final monitoring.Monitoring.KpiQuery DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.EditedKpiDescriptor) + private static final monitoring.Monitoring.EditedKpiDescriptor DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.KpiQuery(); + DEFAULT_INSTANCE = new monitoring.Monitoring.EditedKpiDescriptor(); } - public static monitoring.Monitoring.KpiQuery getDefaultInstance() { + public static monitoring.Monitoring.EditedKpiDescriptor getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public KpiQuery parsePartialFrom( + public EditedKpiDescriptor parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new KpiQuery(input, extensionRegistry); + return new EditedKpiDescriptor(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.KpiQuery getDefaultInstanceForType() { + public monitoring.Monitoring.EditedKpiDescriptor getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface KpiIdOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.KpiId) + public interface MonitorKpiRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.MonitorKpiRequest) com.google.protobuf.MessageOrBuilder { /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; * @return Whether the kpiId field is set. */ boolean hasKpiId(); /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; * @return The kpiId. */ - context.ContextOuterClass.Uuid getKpiId(); + monitoring.Monitoring.KpiId getKpiId(); /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - context.ContextOuterClass.UuidOrBuilder getKpiIdOrBuilder(); + monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder(); + + /** + * float monitoring_window_s = 2; + * @return The monitoringWindowS. + */ + float getMonitoringWindowS(); + + /** + * 
+     * Pending add field to reflect Available Device Protocols
+     *
+ * + * float sampling_rate_s = 3; + * @return The samplingRateS. + */ + float getSamplingRateS(); } /** - * Protobuf type {@code monitoring.KpiId} + * Protobuf type {@code monitoring.MonitorKpiRequest} */ - public static final class KpiId extends + public static final class MonitorKpiRequest extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.KpiId) - KpiIdOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.MonitorKpiRequest) + MonitorKpiRequestOrBuilder { private static final long serialVersionUID = 0L; - // Use KpiId.newBuilder() to construct. - private KpiId(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use MonitorKpiRequest.newBuilder() to construct. + private MonitorKpiRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private KpiId() { + private MonitorKpiRequest() { } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new KpiId(); + return new MonitorKpiRequest(); } @java.lang.Override @@ -4463,7 +5490,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private KpiId( + private MonitorKpiRequest( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -4482,11 +5509,11 @@ public final class Monitoring { done = true; break; case 10: { - context.ContextOuterClass.Uuid.Builder subBuilder = null; + monitoring.Monitoring.KpiId.Builder subBuilder = null; if (kpiId_ != null) { subBuilder = kpiId_.toBuilder(); } - kpiId_ = input.readMessage(context.ContextOuterClass.Uuid.parser(), extensionRegistry); + kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(kpiId_); kpiId_ = subBuilder.buildPartial(); @@ -4494,6 +5521,16 @@ public final class Monitoring { break; } + case 21: { + + monitoringWindowS_ = input.readFloat(); + break; + } + case 29: { + + samplingRateS_ = input.readFloat(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -4515,21 +5552,21 @@ public final class Monitoring { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiId_descriptor; + return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiId_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiId.class, monitoring.Monitoring.KpiId.Builder.class); + monitoring.Monitoring.MonitorKpiRequest.class, monitoring.Monitoring.MonitorKpiRequest.Builder.class); } public static final int KPI_ID_FIELD_NUMBER = 1; - private context.ContextOuterClass.Uuid kpiId_; + private monitoring.Monitoring.KpiId kpiId_; /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; * @return Whether the kpiId field is set. */ @java.lang.Override @@ -4537,21 +5574,47 @@ public final class Monitoring { return kpiId_ != null; } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; * @return The kpiId. */ @java.lang.Override - public context.ContextOuterClass.Uuid getKpiId() { - return kpiId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : kpiId_; + public monitoring.Monitoring.KpiId getKpiId() { + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; */ @java.lang.Override - public context.ContextOuterClass.UuidOrBuilder getKpiIdOrBuilder() { + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { return getKpiId(); } + public static final int MONITORING_WINDOW_S_FIELD_NUMBER = 2; + private float monitoringWindowS_; + /** + * float monitoring_window_s = 2; + * @return The monitoringWindowS. + */ + @java.lang.Override + public float getMonitoringWindowS() { + return monitoringWindowS_; + } + + public static final int SAMPLING_RATE_S_FIELD_NUMBER = 3; + private float samplingRateS_; + /** + * 
+     * Pending add field to reflect Available Device Protocols
+     *
+ * + * float sampling_rate_s = 3; + * @return The samplingRateS. + */ + @java.lang.Override + public float getSamplingRateS() { + return samplingRateS_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -4569,6 +5632,12 @@ public final class Monitoring { if (kpiId_ != null) { output.writeMessage(1, getKpiId()); } + if (monitoringWindowS_ != 0F) { + output.writeFloat(2, monitoringWindowS_); + } + if (samplingRateS_ != 0F) { + output.writeFloat(3, samplingRateS_); + } unknownFields.writeTo(output); } @@ -4582,6 +5651,14 @@ public final class Monitoring { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, getKpiId()); } + if (monitoringWindowS_ != 0F) { + size += com.google.protobuf.CodedOutputStream + .computeFloatSize(2, monitoringWindowS_); + } + if (samplingRateS_ != 0F) { + size += com.google.protobuf.CodedOutputStream + .computeFloatSize(3, samplingRateS_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -4592,16 +5669,22 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.KpiId)) { + if (!(obj instanceof monitoring.Monitoring.MonitorKpiRequest)) { return super.equals(obj); } - monitoring.Monitoring.KpiId other = (monitoring.Monitoring.KpiId) obj; + monitoring.Monitoring.MonitorKpiRequest other = (monitoring.Monitoring.MonitorKpiRequest) obj; if (hasKpiId() != other.hasKpiId()) return false; if (hasKpiId()) { if (!getKpiId() .equals(other.getKpiId())) return false; } + if (java.lang.Float.floatToIntBits(getMonitoringWindowS()) + != java.lang.Float.floatToIntBits( + other.getMonitoringWindowS())) return false; + if (java.lang.Float.floatToIntBits(getSamplingRateS()) + != java.lang.Float.floatToIntBits( + other.getSamplingRateS())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -4617,74 +5700,80 @@ public final class Monitoring { hash = (37 * hash) + KPI_ID_FIELD_NUMBER; hash = (53 * hash) + getKpiId().hashCode(); } + hash = (37 * hash) + MONITORING_WINDOW_S_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getMonitoringWindowS()); + hash = (37 * hash) + SAMPLING_RATE_S_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getSamplingRateS()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.KpiId parseFrom( + public static monitoring.Monitoring.MonitorKpiRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiId parseFrom( + public static monitoring.Monitoring.MonitorKpiRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiId parseFrom( + public static monitoring.Monitoring.MonitorKpiRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiId parseFrom( + public static monitoring.Monitoring.MonitorKpiRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiId parseFrom(byte[] data) + public static monitoring.Monitoring.MonitorKpiRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiId parseFrom( + public static monitoring.Monitoring.MonitorKpiRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiId parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.MonitorKpiRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiId parseFrom( + public static monitoring.Monitoring.MonitorKpiRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiId parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.MonitorKpiRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiId parseDelimitedFrom( + public static monitoring.Monitoring.MonitorKpiRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiId parseFrom( + public static monitoring.Monitoring.MonitorKpiRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiId parseFrom( + public static monitoring.Monitoring.MonitorKpiRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4697,7 +5786,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.KpiId prototype) { + public static Builder newBuilder(monitoring.Monitoring.MonitorKpiRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -4713,26 +5802,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.KpiId} + * Protobuf type {@code monitoring.MonitorKpiRequest} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.KpiId) - monitoring.Monitoring.KpiIdOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.MonitorKpiRequest) + monitoring.Monitoring.MonitorKpiRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiId_descriptor; + return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiId_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiId.class, monitoring.Monitoring.KpiId.Builder.class); + monitoring.Monitoring.MonitorKpiRequest.class, monitoring.Monitoring.MonitorKpiRequest.Builder.class); } - // Construct using monitoring.Monitoring.KpiId.newBuilder() + // Construct using monitoring.Monitoring.MonitorKpiRequest.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -4756,23 +5845,27 @@ public final class Monitoring { kpiId_ = null; kpiIdBuilder_ = null; } + monitoringWindowS_ = 0F; + + samplingRateS_ = 0F; + return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_KpiId_descriptor; + return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_descriptor; } @java.lang.Override - public monitoring.Monitoring.KpiId getDefaultInstanceForType() { - return monitoring.Monitoring.KpiId.getDefaultInstance(); + public monitoring.Monitoring.MonitorKpiRequest getDefaultInstanceForType() { + return monitoring.Monitoring.MonitorKpiRequest.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.KpiId build() { - monitoring.Monitoring.KpiId result = buildPartial(); + public monitoring.Monitoring.MonitorKpiRequest build() { + monitoring.Monitoring.MonitorKpiRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -4780,13 +5873,15 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.KpiId buildPartial() { - monitoring.Monitoring.KpiId result = new monitoring.Monitoring.KpiId(this); + public monitoring.Monitoring.MonitorKpiRequest buildPartial() { + monitoring.Monitoring.MonitorKpiRequest result = new monitoring.Monitoring.MonitorKpiRequest(this); if (kpiIdBuilder_ == null) { result.kpiId_ = kpiId_; } else { result.kpiId_ = kpiIdBuilder_.build(); } + result.monitoringWindowS_ = monitoringWindowS_; + result.samplingRateS_ = samplingRateS_; onBuilt(); return result; } @@ -4825,19 +5920,25 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.KpiId) { - return mergeFrom((monitoring.Monitoring.KpiId)other); + if (other instanceof monitoring.Monitoring.MonitorKpiRequest) { + return mergeFrom((monitoring.Monitoring.MonitorKpiRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.KpiId other) { - if (other == monitoring.Monitoring.KpiId.getDefaultInstance()) return this; + public Builder mergeFrom(monitoring.Monitoring.MonitorKpiRequest other) { + if (other == monitoring.Monitoring.MonitorKpiRequest.getDefaultInstance()) return this; if (other.hasKpiId()) { mergeKpiId(other.getKpiId()); } + if (other.getMonitoringWindowS() != 0F) { + setMonitoringWindowS(other.getMonitoringWindowS()); + } + if (other.getSamplingRateS() != 0F) { + setSamplingRateS(other.getSamplingRateS()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -4853,11 +5954,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.KpiId parsedMessage = null; + monitoring.Monitoring.MonitorKpiRequest parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.KpiId) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.MonitorKpiRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -4867,31 +5968,31 @@ public final class Monitoring { return this; } - private context.ContextOuterClass.Uuid kpiId_; + private monitoring.Monitoring.KpiId kpiId_; private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> kpiIdBuilder_; + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; * @return Whether the kpiId field is set. */ public boolean hasKpiId() { return kpiIdBuilder_ != null || kpiId_ != null; } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; * @return The kpiId. */ - public context.ContextOuterClass.Uuid getKpiId() { + public monitoring.Monitoring.KpiId getKpiId() { if (kpiIdBuilder_ == null) { - return kpiId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : kpiId_; + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } else { return kpiIdBuilder_.getMessage(); } } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public Builder setKpiId(context.ContextOuterClass.Uuid value) { + public Builder setKpiId(monitoring.Monitoring.KpiId value) { if (kpiIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -4905,10 +6006,10 @@ public final class Monitoring { return this; } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; */ public Builder setKpiId( - context.ContextOuterClass.Uuid.Builder builderForValue) { + monitoring.Monitoring.KpiId.Builder builderForValue) { if (kpiIdBuilder_ == null) { kpiId_ = builderForValue.build(); onChanged(); @@ -4919,13 +6020,13 @@ public final class Monitoring { return this; } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public Builder mergeKpiId(context.ContextOuterClass.Uuid value) { + public Builder mergeKpiId(monitoring.Monitoring.KpiId value) { if (kpiIdBuilder_ == null) { if (kpiId_ != null) { kpiId_ = - context.ContextOuterClass.Uuid.newBuilder(kpiId_).mergeFrom(value).buildPartial(); + monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial(); } else { kpiId_ = value; } @@ -4937,7 +6038,7 @@ public final class Monitoring { return this; } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; */ public Builder clearKpiId() { if (kpiIdBuilder_ == null) { @@ -4951,33 +6052,33 @@ public final class Monitoring { return this; } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public context.ContextOuterClass.Uuid.Builder getKpiIdBuilder() { + public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() { onChanged(); return getKpiIdFieldBuilder().getBuilder(); } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public context.ContextOuterClass.UuidOrBuilder getKpiIdOrBuilder() { + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { if (kpiIdBuilder_ != null) { return kpiIdBuilder_.getMessageOrBuilder(); } else { return kpiId_ == null ? - context.ContextOuterClass.Uuid.getDefaultInstance() : kpiId_; + monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } } /** - * .context.Uuid kpi_id = 1; + * .monitoring.KpiId kpi_id = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> getKpiIdFieldBuilder() { if (kpiIdBuilder_ == null) { kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder>( + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( getKpiId(), getParentForChildren(), isClean()); @@ -4985,6 +6086,80 @@ public final class Monitoring { } return kpiIdBuilder_; } + + private float monitoringWindowS_ ; + /** + * float monitoring_window_s = 2; + * @return The monitoringWindowS. + */ + @java.lang.Override + public float getMonitoringWindowS() { + return monitoringWindowS_; + } + /** + * float monitoring_window_s = 2; + * @param value The monitoringWindowS to set. + * @return This builder for chaining. + */ + public Builder setMonitoringWindowS(float value) { + + monitoringWindowS_ = value; + onChanged(); + return this; + } + /** + * float monitoring_window_s = 2; + * @return This builder for chaining. + */ + public Builder clearMonitoringWindowS() { + + monitoringWindowS_ = 0F; + onChanged(); + return this; + } + + private float samplingRateS_ ; + /** + * 
+       * Pending add field to reflect Available Device Protocols
+       *
+ * + * float sampling_rate_s = 3; + * @return The samplingRateS. + */ + @java.lang.Override + public float getSamplingRateS() { + return samplingRateS_; + } + /** + * 
+       * Pending add field to reflect Available Device Protocols
+       *
+ * + * float sampling_rate_s = 3; + * @param value The samplingRateS to set. + * @return This builder for chaining. + */ + public Builder setSamplingRateS(float value) { + + samplingRateS_ = value; + onChanged(); + return this; + } + /** + * 
+       * Pending add field to reflect Available Device Protocols
+       *
+ * + * float sampling_rate_s = 3; + * @return This builder for chaining. + */ + public Builder clearSamplingRateS() { + + samplingRateS_ = 0F; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -4998,115 +6173,159 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.KpiId) + // @@protoc_insertion_point(builder_scope:monitoring.MonitorKpiRequest) } - // @@protoc_insertion_point(class_scope:monitoring.KpiId) - private static final monitoring.Monitoring.KpiId DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.MonitorKpiRequest) + private static final monitoring.Monitoring.MonitorKpiRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.KpiId(); + DEFAULT_INSTANCE = new monitoring.Monitoring.MonitorKpiRequest(); } - public static monitoring.Monitoring.KpiId getDefaultInstance() { + public static monitoring.Monitoring.MonitorKpiRequest getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public KpiId parsePartialFrom( + public MonitorKpiRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new KpiId(input, extensionRegistry); + return new MonitorKpiRequest(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.KpiId getDefaultInstanceForType() { + public monitoring.Monitoring.MonitorKpiRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface KpiOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.Kpi) + public interface KpiQueryOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.KpiQuery) com.google.protobuf.MessageOrBuilder { /** - * .monitoring.KpiId kpi_id = 1; - * @return Whether the kpiId field is set. + * repeated .monitoring.KpiId kpi_id = 1; */ - boolean hasKpiId(); + java.util.List + getKpiIdList(); /** - * .monitoring.KpiId kpi_id = 1; - * @return The kpiId. + * repeated .monitoring.KpiId kpi_id = 1; + */ + monitoring.Monitoring.KpiId getKpiId(int index); + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + int getKpiIdCount(); + /** + * repeated .monitoring.KpiId kpi_id = 1; */ - monitoring.Monitoring.KpiId getKpiId(); + java.util.List + getKpiIdOrBuilderList(); /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id = 1; */ - monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder(); + monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder( + int index); /** - * .context.Timestamp timestamp = 2; - * @return Whether the timestamp field is set. + * float monitoring_window_s = 2; + * @return The monitoringWindowS. */ - boolean hasTimestamp(); + float getMonitoringWindowS(); + /** - * .context.Timestamp timestamp = 2; - * @return The timestamp. + * float sampling_rate_s = 3; + * @return The samplingRateS. */ - context.ContextOuterClass.Timestamp getTimestamp(); + float getSamplingRateS(); + /** - * .context.Timestamp timestamp = 2; + * 
+     * used when you want something like "get the last N many samples
+     *
+ * + * uint32 last_n_samples = 4; + * @return The lastNSamples. */ - context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder(); + int getLastNSamples(); /** - * .monitoring.KpiValue kpi_value = 3; - * @return Whether the kpiValue field is set. + * 
+     * used when you want something like "get the samples since X date/time"
+     *
+ * + * string start_date = 5; + * @return The startDate. */ - boolean hasKpiValue(); + java.lang.String getStartDate(); /** - * .monitoring.KpiValue kpi_value = 3; - * @return The kpiValue. + * 
+     * used when you want something like "get the samples since X date/time"
+     *
+ * + * string start_date = 5; + * @return The bytes for startDate. */ - monitoring.Monitoring.KpiValue getKpiValue(); + com.google.protobuf.ByteString + getStartDateBytes(); + /** - * .monitoring.KpiValue kpi_value = 3; + * 
+     * used when you want something like "get the samples until X date/time"
+     *
+ * + * string end_date = 6; + * @return The endDate. */ - monitoring.Monitoring.KpiValueOrBuilder getKpiValueOrBuilder(); + java.lang.String getEndDate(); + /** + * 
+     * used when you want something like "get the samples until X date/time"
+     *
+ * + * string end_date = 6; + * @return The bytes for endDate. + */ + com.google.protobuf.ByteString + getEndDateBytes(); } /** - * Protobuf type {@code monitoring.Kpi} + * Protobuf type {@code monitoring.KpiQuery} */ - public static final class Kpi extends + public static final class KpiQuery extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.Kpi) - KpiOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.KpiQuery) + KpiQueryOrBuilder { private static final long serialVersionUID = 0L; - // Use Kpi.newBuilder() to construct. - private Kpi(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use KpiQuery.newBuilder() to construct. + private KpiQuery(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private Kpi() { + private KpiQuery() { + kpiId_ = java.util.Collections.emptyList(); + startDate_ = ""; + endDate_ = ""; } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new Kpi(); + return new KpiQuery(); } @java.lang.Override @@ -5114,7 +6333,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private Kpi( + private KpiQuery( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -5122,6 +6341,7 @@ public final class Monitoring { if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } + int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -5133,42 +6353,39 @@ public final class Monitoring { done = true; break; case 10: { - monitoring.Monitoring.KpiId.Builder subBuilder = null; - if (kpiId_ != null) { - subBuilder = kpiId_.toBuilder(); - } - kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(kpiId_); - kpiId_ = subBuilder.buildPartial(); + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + kpiId_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; } + kpiId_.add( + input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry)); + break; + } + case 21: { + monitoringWindowS_ = input.readFloat(); break; } - case 18: { - context.ContextOuterClass.Timestamp.Builder subBuilder = null; - if (timestamp_ != null) { - subBuilder = timestamp_.toBuilder(); - } - timestamp_ = input.readMessage(context.ContextOuterClass.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(timestamp_); - timestamp_ = subBuilder.buildPartial(); - } + case 29: { + samplingRateS_ = input.readFloat(); break; } - case 26: { - monitoring.Monitoring.KpiValue.Builder subBuilder = null; - if (kpiValue_ != null) { - subBuilder = kpiValue_.toBuilder(); - } - kpiValue_ = input.readMessage(monitoring.Monitoring.KpiValue.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(kpiValue_); - kpiValue_ = subBuilder.buildPartial(); - } + case 32: { + + lastNSamples_ = input.readUInt32(); + break; + } + case 42: { + java.lang.String s = input.readStringRequireUtf8(); + + startDate_ = s; + break; + } + case 50: { + java.lang.String s = input.readStringRequireUtf8(); + endDate_ = s; break; } default: { @@ -5186,99 +6403,193 @@ public final class Monitoring { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + kpiId_ = java.util.Collections.unmodifiableList(kpiId_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_Kpi_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiQuery_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_Kpi_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiQuery_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.Kpi.class, monitoring.Monitoring.Kpi.Builder.class); + monitoring.Monitoring.KpiQuery.class, monitoring.Monitoring.KpiQuery.Builder.class); } public static final int KPI_ID_FIELD_NUMBER = 1; - private monitoring.Monitoring.KpiId kpiId_; + private java.util.List kpiId_; /** - * .monitoring.KpiId kpi_id = 1; - * @return Whether the kpiId field is set. + * repeated .monitoring.KpiId kpi_id = 1; */ @java.lang.Override - public boolean hasKpiId() { - return kpiId_ != null; + public java.util.List getKpiIdList() { + return kpiId_; } /** - * .monitoring.KpiId kpi_id = 1; - * @return The kpiId. + * repeated .monitoring.KpiId kpi_id = 1; */ @java.lang.Override - public monitoring.Monitoring.KpiId getKpiId() { - return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + public java.util.List + getKpiIdOrBuilderList() { + return kpiId_; } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id = 1; */ @java.lang.Override - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { - return getKpiId(); + public int getKpiIdCount() { + return kpiId_.size(); + } + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + @java.lang.Override + public monitoring.Monitoring.KpiId getKpiId(int index) { + return kpiId_.get(index); + } + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + @java.lang.Override + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder( + int index) { + return kpiId_.get(index); } - public static final int TIMESTAMP_FIELD_NUMBER = 2; - private context.ContextOuterClass.Timestamp timestamp_; + public static final int MONITORING_WINDOW_S_FIELD_NUMBER = 2; + private float monitoringWindowS_; /** - * .context.Timestamp timestamp = 2; - * @return Whether the timestamp field is set. + * float monitoring_window_s = 2; + * @return The monitoringWindowS. */ @java.lang.Override - public boolean hasTimestamp() { - return timestamp_ != null; + public float getMonitoringWindowS() { + return monitoringWindowS_; } + + public static final int SAMPLING_RATE_S_FIELD_NUMBER = 3; + private float samplingRateS_; /** - * .context.Timestamp timestamp = 2; - * @return The timestamp. + * float sampling_rate_s = 3; + * @return The samplingRateS. */ @java.lang.Override - public context.ContextOuterClass.Timestamp getTimestamp() { - return timestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_; + public float getSamplingRateS() { + return samplingRateS_; } + + public static final int LAST_N_SAMPLES_FIELD_NUMBER = 4; + private int lastNSamples_; /** - * .context.Timestamp timestamp = 2; + * 
+     * used when you want something like "get the last N many samples
+     *
+ * + * uint32 last_n_samples = 4; + * @return The lastNSamples. */ @java.lang.Override - public context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder() { - return getTimestamp(); + public int getLastNSamples() { + return lastNSamples_; } - public static final int KPI_VALUE_FIELD_NUMBER = 3; - private monitoring.Monitoring.KpiValue kpiValue_; + public static final int START_DATE_FIELD_NUMBER = 5; + private volatile java.lang.Object startDate_; /** - * .monitoring.KpiValue kpi_value = 3; - * @return Whether the kpiValue field is set. + * 
+     * used when you want something like "get the samples since X date/time"
+     *
+ * + * string start_date = 5; + * @return The startDate. */ @java.lang.Override - public boolean hasKpiValue() { - return kpiValue_ != null; + public java.lang.String getStartDate() { + java.lang.Object ref = startDate_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + startDate_ = s; + return s; + } } /** - * .monitoring.KpiValue kpi_value = 3; - * @return The kpiValue. + * 
+     * used when you want something like "get the samples since X date/time"
+     *
+ * + * string start_date = 5; + * @return The bytes for startDate. */ @java.lang.Override - public monitoring.Monitoring.KpiValue getKpiValue() { - return kpiValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiValue_; + public com.google.protobuf.ByteString + getStartDateBytes() { + java.lang.Object ref = startDate_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + startDate_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } } + + public static final int END_DATE_FIELD_NUMBER = 6; + private volatile java.lang.Object endDate_; /** - * .monitoring.KpiValue kpi_value = 3; + * 
+     * used when you want something like "get the samples until X date/time"
+     *
+ * + * string end_date = 6; + * @return The endDate. */ @java.lang.Override - public monitoring.Monitoring.KpiValueOrBuilder getKpiValueOrBuilder() { - return getKpiValue(); + public java.lang.String getEndDate() { + java.lang.Object ref = endDate_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + endDate_ = s; + return s; + } + } + /** + * 
+     * used when you want something like "get the samples until X date/time"
+     *
+ * + * string end_date = 6; + * @return The bytes for endDate. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getEndDateBytes() { + java.lang.Object ref = endDate_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + endDate_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } } private byte memoizedIsInitialized = -1; @@ -5295,14 +6606,23 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (kpiId_ != null) { - output.writeMessage(1, getKpiId()); + for (int i = 0; i < kpiId_.size(); i++) { + output.writeMessage(1, kpiId_.get(i)); } - if (timestamp_ != null) { - output.writeMessage(2, getTimestamp()); + if (monitoringWindowS_ != 0F) { + output.writeFloat(2, monitoringWindowS_); } - if (kpiValue_ != null) { - output.writeMessage(3, getKpiValue()); + if (samplingRateS_ != 0F) { + output.writeFloat(3, samplingRateS_); + } + if (lastNSamples_ != 0) { + output.writeUInt32(4, lastNSamples_); + } + if (!getStartDateBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, startDate_); + } + if (!getEndDateBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 6, endDate_); } unknownFields.writeTo(output); } @@ -5313,17 +6633,27 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (kpiId_ != null) { + for (int i = 0; i < kpiId_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getKpiId()); + .computeMessageSize(1, kpiId_.get(i)); + } + if (monitoringWindowS_ != 0F) { + size += com.google.protobuf.CodedOutputStream + .computeFloatSize(2, monitoringWindowS_); } - if (timestamp_ != null) { + if (samplingRateS_ != 0F) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, getTimestamp()); + .computeFloatSize(3, samplingRateS_); } - if (kpiValue_ != null) { + if (lastNSamples_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, getKpiValue()); + .computeUInt32Size(4, lastNSamples_); + } + if (!getStartDateBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, startDate_); + } + if (!getEndDateBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, endDate_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -5335,26 +6665,25 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.Kpi)) { + if (!(obj instanceof monitoring.Monitoring.KpiQuery)) { return super.equals(obj); } - monitoring.Monitoring.Kpi other = (monitoring.Monitoring.Kpi) obj; + monitoring.Monitoring.KpiQuery other = (monitoring.Monitoring.KpiQuery) obj; - if (hasKpiId() != other.hasKpiId()) return false; - if (hasKpiId()) { - if (!getKpiId() - .equals(other.getKpiId())) return false; - } - if (hasTimestamp() != other.hasTimestamp()) return false; - if (hasTimestamp()) { - if (!getTimestamp() - .equals(other.getTimestamp())) return false; - } - if (hasKpiValue() != other.hasKpiValue()) return false; - if (hasKpiValue()) { - if (!getKpiValue() - .equals(other.getKpiValue())) return false; - } + if (!getKpiIdList() + .equals(other.getKpiIdList())) return false; + if (java.lang.Float.floatToIntBits(getMonitoringWindowS()) + != java.lang.Float.floatToIntBits( + other.getMonitoringWindowS())) return false; + if (java.lang.Float.floatToIntBits(getSamplingRateS()) + != java.lang.Float.floatToIntBits( + other.getSamplingRateS())) return false; + if (getLastNSamples() + != other.getLastNSamples()) return false; + if (!getStartDate() + .equals(other.getStartDate())) return false; + if (!getEndDate() + .equals(other.getEndDate())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -5366,86 +6695,90 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasKpiId()) { + if (getKpiIdCount() > 0) { hash = (37 * hash) + KPI_ID_FIELD_NUMBER; - hash = (53 * hash) + getKpiId().hashCode(); - } - if (hasTimestamp()) { - hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER; - hash = (53 * hash) + getTimestamp().hashCode(); - } - if (hasKpiValue()) { - hash = (37 * hash) + KPI_VALUE_FIELD_NUMBER; - hash = (53 * hash) + getKpiValue().hashCode(); + hash = (53 * hash) + getKpiIdList().hashCode(); } + hash = (37 * hash) + MONITORING_WINDOW_S_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getMonitoringWindowS()); + hash = (37 * hash) + SAMPLING_RATE_S_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getSamplingRateS()); + hash = (37 * hash) + LAST_N_SAMPLES_FIELD_NUMBER; + hash = (53 * hash) + getLastNSamples(); + hash = (37 * hash) + START_DATE_FIELD_NUMBER; + hash = (53 * hash) + getStartDate().hashCode(); + hash = (37 * hash) + END_DATE_FIELD_NUMBER; + hash = (53 * hash) + getEndDate().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.Kpi parseFrom( + public static monitoring.Monitoring.KpiQuery parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.Kpi parseFrom( + public static monitoring.Monitoring.KpiQuery parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.Kpi parseFrom( + public static monitoring.Monitoring.KpiQuery parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.Kpi parseFrom( + public static monitoring.Monitoring.KpiQuery parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.Kpi parseFrom(byte[] data) + public static monitoring.Monitoring.KpiQuery parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.Kpi parseFrom( + public static monitoring.Monitoring.KpiQuery parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.Kpi parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiQuery parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.Kpi parseFrom( + public static monitoring.Monitoring.KpiQuery parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.Kpi parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiQuery parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.Kpi parseDelimitedFrom( + public static monitoring.Monitoring.KpiQuery parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.Kpi parseFrom( + public static monitoring.Monitoring.KpiQuery parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.Kpi parseFrom( + public static monitoring.Monitoring.KpiQuery parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -5458,7 +6791,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.Kpi prototype) { + public static Builder newBuilder(monitoring.Monitoring.KpiQuery prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -5474,26 +6807,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.Kpi} + * Protobuf type {@code monitoring.KpiQuery} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.Kpi) - monitoring.Monitoring.KpiOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.KpiQuery) + monitoring.Monitoring.KpiQueryOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_Kpi_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiQuery_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_Kpi_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiQuery_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.Kpi.class, monitoring.Monitoring.Kpi.Builder.class); + monitoring.Monitoring.KpiQuery.class, monitoring.Monitoring.KpiQuery.Builder.class); } - // Construct using monitoring.Monitoring.Kpi.newBuilder() + // Construct using monitoring.Monitoring.KpiQuery.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -5506,46 +6839,45 @@ public final class Monitoring { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { + getKpiIdFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); if (kpiIdBuilder_ == null) { - kpiId_ = null; - } else { - kpiId_ = null; - kpiIdBuilder_ = null; - } - if (timestampBuilder_ == null) { - timestamp_ = null; - } else { - timestamp_ = null; - timestampBuilder_ = null; - } - if (kpiValueBuilder_ == null) { - kpiValue_ = null; + kpiId_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); } else { - kpiValue_ = null; - kpiValueBuilder_ = null; + kpiIdBuilder_.clear(); } + monitoringWindowS_ = 0F; + + samplingRateS_ = 0F; + + lastNSamples_ = 0; + + startDate_ = ""; + + endDate_ = ""; + return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_Kpi_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiQuery_descriptor; } @java.lang.Override - public monitoring.Monitoring.Kpi getDefaultInstanceForType() { - return monitoring.Monitoring.Kpi.getDefaultInstance(); + public monitoring.Monitoring.KpiQuery getDefaultInstanceForType() { + return monitoring.Monitoring.KpiQuery.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.Kpi build() { - monitoring.Monitoring.Kpi result = buildPartial(); + public monitoring.Monitoring.KpiQuery build() { + monitoring.Monitoring.KpiQuery result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -5553,23 +6885,23 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.Kpi buildPartial() { - monitoring.Monitoring.Kpi result = new monitoring.Monitoring.Kpi(this); + public monitoring.Monitoring.KpiQuery buildPartial() { + monitoring.Monitoring.KpiQuery result = new monitoring.Monitoring.KpiQuery(this); + int from_bitField0_ = bitField0_; if (kpiIdBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + kpiId_ = java.util.Collections.unmodifiableList(kpiId_); + bitField0_ = (bitField0_ & ~0x00000001); + } result.kpiId_ = kpiId_; } else { result.kpiId_ = kpiIdBuilder_.build(); } - if (timestampBuilder_ == null) { - result.timestamp_ = timestamp_; - } else { - result.timestamp_ = timestampBuilder_.build(); - } - if (kpiValueBuilder_ == null) { - result.kpiValue_ = kpiValue_; - } else { - result.kpiValue_ = kpiValueBuilder_.build(); - } + result.monitoringWindowS_ = monitoringWindowS_; + result.samplingRateS_ = samplingRateS_; + result.lastNSamples_ = lastNSamples_; + result.startDate_ = startDate_; + result.endDate_ = endDate_; onBuilt(); return result; } @@ -5608,24 +6940,58 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.Kpi) { - return mergeFrom((monitoring.Monitoring.Kpi)other); + if (other instanceof monitoring.Monitoring.KpiQuery) { + return mergeFrom((monitoring.Monitoring.KpiQuery)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.Kpi other) { - if (other == monitoring.Monitoring.Kpi.getDefaultInstance()) return this; - if (other.hasKpiId()) { - mergeKpiId(other.getKpiId()); + public Builder mergeFrom(monitoring.Monitoring.KpiQuery other) { + if (other == monitoring.Monitoring.KpiQuery.getDefaultInstance()) return this; + if (kpiIdBuilder_ == null) { + if (!other.kpiId_.isEmpty()) { + if (kpiId_.isEmpty()) { + kpiId_ = other.kpiId_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureKpiIdIsMutable(); + kpiId_.addAll(other.kpiId_); + } + onChanged(); + } + } else { + if (!other.kpiId_.isEmpty()) { + if (kpiIdBuilder_.isEmpty()) { + kpiIdBuilder_.dispose(); + kpiIdBuilder_ = null; + kpiId_ = other.kpiId_; + bitField0_ = (bitField0_ & ~0x00000001); + kpiIdBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getKpiIdFieldBuilder() : null; + } else { + kpiIdBuilder_.addAllMessages(other.kpiId_); + } + } } - if (other.hasTimestamp()) { - mergeTimestamp(other.getTimestamp()); + if (other.getMonitoringWindowS() != 0F) { + setMonitoringWindowS(other.getMonitoringWindowS()); } - if (other.hasKpiValue()) { - mergeKpiValue(other.getKpiValue()); + if (other.getSamplingRateS() != 0F) { + setSamplingRateS(other.getSamplingRateS()); + } + if (other.getLastNSamples() != 0) { + setLastNSamples(other.getLastNSamples()); + } + if (!other.getStartDate().isEmpty()) { + startDate_ = other.startDate_; + onChanged(); + } + if (!other.getEndDate().isEmpty()) { + endDate_ = other.endDate_; + onChanged(); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -5642,11 +7008,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.Kpi parsedMessage = null; + monitoring.Monitoring.KpiQuery parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.Kpi) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.KpiQuery) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -5655,119 +7021,241 @@ public final class Monitoring { } return this; } - - private monitoring.Monitoring.KpiId kpiId_; - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; + private int bitField0_; + + private java.util.List kpiId_ = + java.util.Collections.emptyList(); + private void ensureKpiIdIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + kpiId_ = new java.util.ArrayList(kpiId_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; + + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + public java.util.List getKpiIdList() { + if (kpiIdBuilder_ == null) { + return java.util.Collections.unmodifiableList(kpiId_); + } else { + return kpiIdBuilder_.getMessageList(); + } + } + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + public int getKpiIdCount() { + if (kpiIdBuilder_ == null) { + return kpiId_.size(); + } else { + return kpiIdBuilder_.getCount(); + } + } + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + public monitoring.Monitoring.KpiId getKpiId(int index) { + if (kpiIdBuilder_ == null) { + return kpiId_.get(index); + } else { + return kpiIdBuilder_.getMessage(index); + } + } + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + public Builder setKpiId( + int index, monitoring.Monitoring.KpiId value) { + if (kpiIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiIdIsMutable(); + kpiId_.set(index, value); + onChanged(); + } else { + kpiIdBuilder_.setMessage(index, value); + } + return this; + } /** - * .monitoring.KpiId kpi_id = 1; - * @return Whether the kpiId field is set. + * repeated .monitoring.KpiId kpi_id = 1; */ - public boolean hasKpiId() { - return kpiIdBuilder_ != null || kpiId_ != null; + public Builder setKpiId( + int index, monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdBuilder_ == null) { + ensureKpiIdIsMutable(); + kpiId_.set(index, builderForValue.build()); + onChanged(); + } else { + kpiIdBuilder_.setMessage(index, builderForValue.build()); + } + return this; } /** - * .monitoring.KpiId kpi_id = 1; - * @return The kpiId. + * repeated .monitoring.KpiId kpi_id = 1; */ - public monitoring.Monitoring.KpiId getKpiId() { + public Builder addKpiId(monitoring.Monitoring.KpiId value) { if (kpiIdBuilder_ == null) { - return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + if (value == null) { + throw new NullPointerException(); + } + ensureKpiIdIsMutable(); + kpiId_.add(value); + onChanged(); } else { - return kpiIdBuilder_.getMessage(); + kpiIdBuilder_.addMessage(value); } + return this; } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id = 1; */ - public Builder setKpiId(monitoring.Monitoring.KpiId value) { + public Builder addKpiId( + int index, monitoring.Monitoring.KpiId value) { if (kpiIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - kpiId_ = value; + ensureKpiIdIsMutable(); + kpiId_.add(index, value); onChanged(); } else { - kpiIdBuilder_.setMessage(value); + kpiIdBuilder_.addMessage(index, value); } - return this; } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id = 1; */ - public Builder setKpiId( + public Builder addKpiId( monitoring.Monitoring.KpiId.Builder builderForValue) { if (kpiIdBuilder_ == null) { - kpiId_ = builderForValue.build(); + ensureKpiIdIsMutable(); + kpiId_.add(builderForValue.build()); onChanged(); } else { - kpiIdBuilder_.setMessage(builderForValue.build()); + kpiIdBuilder_.addMessage(builderForValue.build()); } - return this; } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id = 1; */ - public Builder mergeKpiId(monitoring.Monitoring.KpiId value) { + public Builder addKpiId( + int index, monitoring.Monitoring.KpiId.Builder builderForValue) { if (kpiIdBuilder_ == null) { - if (kpiId_ != null) { - kpiId_ = - monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial(); - } else { - kpiId_ = value; - } + ensureKpiIdIsMutable(); + kpiId_.add(index, builderForValue.build()); onChanged(); } else { - kpiIdBuilder_.mergeFrom(value); + kpiIdBuilder_.addMessage(index, builderForValue.build()); } - return this; } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id = 1; + */ + public Builder addAllKpiId( + java.lang.Iterable values) { + if (kpiIdBuilder_ == null) { + ensureKpiIdIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, kpiId_); + onChanged(); + } else { + kpiIdBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .monitoring.KpiId kpi_id = 1; */ public Builder clearKpiId() { if (kpiIdBuilder_ == null) { - kpiId_ = null; + kpiId_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { - kpiId_ = null; - kpiIdBuilder_ = null; + kpiIdBuilder_.clear(); } - return this; } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id = 1; */ - public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() { - - onChanged(); - return getKpiIdFieldBuilder().getBuilder(); + public Builder removeKpiId(int index) { + if (kpiIdBuilder_ == null) { + ensureKpiIdIsMutable(); + kpiId_.remove(index); + onChanged(); + } else { + kpiIdBuilder_.remove(index); + } + return this; } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id = 1; */ - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { + public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder( + int index) { + return getKpiIdFieldBuilder().getBuilder(index); + } + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder( + int index) { + if (kpiIdBuilder_ == null) { + return kpiId_.get(index); } else { + return kpiIdBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + public java.util.List + getKpiIdOrBuilderList() { if (kpiIdBuilder_ != null) { - return kpiIdBuilder_.getMessageOrBuilder(); + return kpiIdBuilder_.getMessageOrBuilderList(); } else { - return kpiId_ == null ? - monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + return java.util.Collections.unmodifiableList(kpiId_); } } /** - * .monitoring.KpiId kpi_id = 1; + * repeated .monitoring.KpiId kpi_id = 1; */ - private com.google.protobuf.SingleFieldBuilderV3< + public monitoring.Monitoring.KpiId.Builder addKpiIdBuilder() { + return getKpiIdFieldBuilder().addBuilder( + monitoring.Monitoring.KpiId.getDefaultInstance()); + } + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + public monitoring.Monitoring.KpiId.Builder addKpiIdBuilder( + int index) { + return getKpiIdFieldBuilder().addBuilder( + index, monitoring.Monitoring.KpiId.getDefaultInstance()); + } + /** + * repeated .monitoring.KpiId kpi_id = 1; + */ + public java.util.List + getKpiIdBuilderList() { + return getKpiIdFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> getKpiIdFieldBuilder() { if (kpiIdBuilder_ == null) { - kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + kpiIdBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( - getKpiId(), + kpiId_, + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); kpiId_ = null; @@ -5775,242 +7263,301 @@ public final class Monitoring { return kpiIdBuilder_; } - private context.ContextOuterClass.Timestamp timestamp_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> timestampBuilder_; + private float monitoringWindowS_ ; /** - * .context.Timestamp timestamp = 2; - * @return Whether the timestamp field is set. + * float monitoring_window_s = 2; + * @return The monitoringWindowS. */ - public boolean hasTimestamp() { - return timestampBuilder_ != null || timestamp_ != null; + @java.lang.Override + public float getMonitoringWindowS() { + return monitoringWindowS_; } /** - * .context.Timestamp timestamp = 2; - * @return The timestamp. + * float monitoring_window_s = 2; + * @param value The monitoringWindowS to set. + * @return This builder for chaining. */ - public context.ContextOuterClass.Timestamp getTimestamp() { - if (timestampBuilder_ == null) { - return timestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_; - } else { - return timestampBuilder_.getMessage(); - } + public Builder setMonitoringWindowS(float value) { + + monitoringWindowS_ = value; + onChanged(); + return this; } /** - * .context.Timestamp timestamp = 2; + * float monitoring_window_s = 2; + * @return This builder for chaining. */ - public Builder setTimestamp(context.ContextOuterClass.Timestamp value) { - if (timestampBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - timestamp_ = value; - onChanged(); - } else { - timestampBuilder_.setMessage(value); - } - + public Builder clearMonitoringWindowS() { + + monitoringWindowS_ = 0F; + onChanged(); return this; } + + private float samplingRateS_ ; + /** + * float sampling_rate_s = 3; + * @return The samplingRateS. + */ + @java.lang.Override + public float getSamplingRateS() { + return samplingRateS_; + } /** - * .context.Timestamp timestamp = 2; + * float sampling_rate_s = 3; + * @param value The samplingRateS to set. + * @return This builder for chaining. */ - public Builder setTimestamp( - context.ContextOuterClass.Timestamp.Builder builderForValue) { - if (timestampBuilder_ == null) { - timestamp_ = builderForValue.build(); - onChanged(); - } else { - timestampBuilder_.setMessage(builderForValue.build()); - } - + public Builder setSamplingRateS(float value) { + + samplingRateS_ = value; + onChanged(); return this; } /** - * .context.Timestamp timestamp = 2; + * float sampling_rate_s = 3; + * @return This builder for chaining. */ - public Builder mergeTimestamp(context.ContextOuterClass.Timestamp value) { - if (timestampBuilder_ == null) { - if (timestamp_ != null) { - timestamp_ = - context.ContextOuterClass.Timestamp.newBuilder(timestamp_).mergeFrom(value).buildPartial(); - } else { - timestamp_ = value; - } - onChanged(); - } else { - timestampBuilder_.mergeFrom(value); - } - + public Builder clearSamplingRateS() { + + samplingRateS_ = 0F; + onChanged(); return this; } + + private int lastNSamples_ ; /** - * .context.Timestamp timestamp = 2; + * 
+       * used when you want something like "get the last N many samples
+       *
+ * + * uint32 last_n_samples = 4; + * @return The lastNSamples. */ - public Builder clearTimestamp() { - if (timestampBuilder_ == null) { - timestamp_ = null; - onChanged(); - } else { - timestamp_ = null; - timestampBuilder_ = null; - } - + @java.lang.Override + public int getLastNSamples() { + return lastNSamples_; + } + /** + * 
+       * used when you want something like "get the last N many samples
+       *
+ * + * uint32 last_n_samples = 4; + * @param value The lastNSamples to set. + * @return This builder for chaining. + */ + public Builder setLastNSamples(int value) { + + lastNSamples_ = value; + onChanged(); return this; } /** - * .context.Timestamp timestamp = 2; + * 
+       * used when you want something like "get the last N many samples
+       *
+ * + * uint32 last_n_samples = 4; + * @return This builder for chaining. */ - public context.ContextOuterClass.Timestamp.Builder getTimestampBuilder() { + public Builder clearLastNSamples() { + lastNSamples_ = 0; onChanged(); - return getTimestampFieldBuilder().getBuilder(); + return this; } + + private java.lang.Object startDate_ = ""; /** - * .context.Timestamp timestamp = 2; + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 5; + * @return The startDate. */ - public context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder() { - if (timestampBuilder_ != null) { - return timestampBuilder_.getMessageOrBuilder(); + public java.lang.String getStartDate() { + java.lang.Object ref = startDate_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + startDate_ = s; + return s; } else { - return timestamp_ == null ? - context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_; + return (java.lang.String) ref; } } /** - * .context.Timestamp timestamp = 2; + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 5; + * @return The bytes for startDate. */ - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> - getTimestampFieldBuilder() { - if (timestampBuilder_ == null) { - timestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>( - getTimestamp(), - getParentForChildren(), - isClean()); - timestamp_ = null; + public com.google.protobuf.ByteString + getStartDateBytes() { + java.lang.Object ref = startDate_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + startDate_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; } - return timestampBuilder_; } - - private monitoring.Monitoring.KpiValue kpiValue_; - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> kpiValueBuilder_; /** - * .monitoring.KpiValue kpi_value = 3; - * @return Whether the kpiValue field is set. + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 5; + * @param value The startDate to set. + * @return This builder for chaining. */ - public boolean hasKpiValue() { - return kpiValueBuilder_ != null || kpiValue_ != null; + public Builder setStartDate( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + startDate_ = value; + onChanged(); + return this; } /** - * .monitoring.KpiValue kpi_value = 3; - * @return The kpiValue. + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 5; + * @return This builder for chaining. */ - public monitoring.Monitoring.KpiValue getKpiValue() { - if (kpiValueBuilder_ == null) { - return kpiValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiValue_; - } else { - return kpiValueBuilder_.getMessage(); - } + public Builder clearStartDate() { + + startDate_ = getDefaultInstance().getStartDate(); + onChanged(); + return this; } /** - * .monitoring.KpiValue kpi_value = 3; + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 5; + * @param value The bytes for startDate to set. + * @return This builder for chaining. */ - public Builder setKpiValue(monitoring.Monitoring.KpiValue value) { - if (kpiValueBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - kpiValue_ = value; - onChanged(); - } else { - kpiValueBuilder_.setMessage(value); - } - + public Builder setStartDateBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + startDate_ = value; + onChanged(); return this; } + + private java.lang.Object endDate_ = ""; /** - * .monitoring.KpiValue kpi_value = 3; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 6; + * @return The endDate. */ - public Builder setKpiValue( - monitoring.Monitoring.KpiValue.Builder builderForValue) { - if (kpiValueBuilder_ == null) { - kpiValue_ = builderForValue.build(); - onChanged(); + public java.lang.String getEndDate() { + java.lang.Object ref = endDate_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + endDate_ = s; + return s; } else { - kpiValueBuilder_.setMessage(builderForValue.build()); + return (java.lang.String) ref; } - - return this; } /** - * .monitoring.KpiValue kpi_value = 3; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 6; + * @return The bytes for endDate. */ - public Builder mergeKpiValue(monitoring.Monitoring.KpiValue value) { - if (kpiValueBuilder_ == null) { - if (kpiValue_ != null) { - kpiValue_ = - monitoring.Monitoring.KpiValue.newBuilder(kpiValue_).mergeFrom(value).buildPartial(); - } else { - kpiValue_ = value; - } - onChanged(); + public com.google.protobuf.ByteString + getEndDateBytes() { + java.lang.Object ref = endDate_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + endDate_ = b; + return b; } else { - kpiValueBuilder_.mergeFrom(value); + return (com.google.protobuf.ByteString) ref; } - - return this; } /** - * .monitoring.KpiValue kpi_value = 3; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 6; + * @param value The endDate to set. + * @return This builder for chaining. */ - public Builder clearKpiValue() { - if (kpiValueBuilder_ == null) { - kpiValue_ = null; - onChanged(); - } else { - kpiValue_ = null; - kpiValueBuilder_ = null; - } - + public Builder setEndDate( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + endDate_ = value; + onChanged(); return this; } /** - * .monitoring.KpiValue kpi_value = 3; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 6; + * @return This builder for chaining. */ - public monitoring.Monitoring.KpiValue.Builder getKpiValueBuilder() { + public Builder clearEndDate() { + endDate_ = getDefaultInstance().getEndDate(); onChanged(); - return getKpiValueFieldBuilder().getBuilder(); - } - /** - * .monitoring.KpiValue kpi_value = 3; - */ - public monitoring.Monitoring.KpiValueOrBuilder getKpiValueOrBuilder() { - if (kpiValueBuilder_ != null) { - return kpiValueBuilder_.getMessageOrBuilder(); - } else { - return kpiValue_ == null ? - monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiValue_; - } + return this; } /** - * .monitoring.KpiValue kpi_value = 3; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 6; + * @param value The bytes for endDate to set. + * @return This builder for chaining. */ - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> - getKpiValueFieldBuilder() { - if (kpiValueBuilder_ == null) { - kpiValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder>( - getKpiValue(), - getParentForChildren(), - isClean()); - kpiValue_ = null; - } - return kpiValueBuilder_; + public Builder setEndDateBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + endDate_ = value; + onChanged(); + return this; } @java.lang.Override public final Builder setUnknownFields( @@ -6025,130 +7572,85 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.Kpi) + // @@protoc_insertion_point(builder_scope:monitoring.KpiQuery) } - // @@protoc_insertion_point(class_scope:monitoring.Kpi) - private static final monitoring.Monitoring.Kpi DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.KpiQuery) + private static final monitoring.Monitoring.KpiQuery DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.Kpi(); + DEFAULT_INSTANCE = new monitoring.Monitoring.KpiQuery(); } - public static monitoring.Monitoring.Kpi getDefaultInstance() { + public static monitoring.Monitoring.KpiQuery getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public Kpi parsePartialFrom( + public KpiQuery parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Kpi(input, extensionRegistry); + return new KpiQuery(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.Kpi getDefaultInstanceForType() { + public monitoring.Monitoring.KpiQuery getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface KpiValueRangeOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.KpiValueRange) + public interface KpiIdOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.KpiId) com.google.protobuf.MessageOrBuilder { /** - * .monitoring.KpiValue kpiMinValue = 1; - * @return Whether the kpiMinValue field is set. - */ - boolean hasKpiMinValue(); - /** - * .monitoring.KpiValue kpiMinValue = 1; - * @return The kpiMinValue. - */ - monitoring.Monitoring.KpiValue getKpiMinValue(); - /** - * .monitoring.KpiValue kpiMinValue = 1; - */ - monitoring.Monitoring.KpiValueOrBuilder getKpiMinValueOrBuilder(); - - /** - * .monitoring.KpiValue kpiMaxValue = 2; - * @return Whether the kpiMaxValue field is set. - */ - boolean hasKpiMaxValue(); - /** - * .monitoring.KpiValue kpiMaxValue = 2; - * @return The kpiMaxValue. - */ - monitoring.Monitoring.KpiValue getKpiMaxValue(); - /** - * .monitoring.KpiValue kpiMaxValue = 2; - */ - monitoring.Monitoring.KpiValueOrBuilder getKpiMaxValueOrBuilder(); - - /** - * 
-     * by default True
-     *
- * - * bool inRange = 3; - * @return The inRange. + * .context.Uuid kpi_id = 1; + * @return Whether the kpiId field is set. */ - boolean getInRange(); - + boolean hasKpiId(); /** - * 
-     * False is outside the interval
-     *
- * - * bool includeMinValue = 4; - * @return The includeMinValue. + * .context.Uuid kpi_id = 1; + * @return The kpiId. */ - boolean getIncludeMinValue(); - + context.ContextOuterClass.Uuid getKpiId(); /** - * 
-     * False is outside the interval
-     *
- * - * bool includeMaxValue = 5; - * @return The includeMaxValue. + * .context.Uuid kpi_id = 1; */ - boolean getIncludeMaxValue(); + context.ContextOuterClass.UuidOrBuilder getKpiIdOrBuilder(); } /** - * Protobuf type {@code monitoring.KpiValueRange} + * Protobuf type {@code monitoring.KpiId} */ - public static final class KpiValueRange extends + public static final class KpiId extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.KpiValueRange) - KpiValueRangeOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.KpiId) + KpiIdOrBuilder { private static final long serialVersionUID = 0L; - // Use KpiValueRange.newBuilder() to construct. - private KpiValueRange(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use KpiId.newBuilder() to construct. + private KpiId(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private KpiValueRange() { + private KpiId() { } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new KpiValueRange(); + return new KpiId(); } @java.lang.Override @@ -6156,7 +7658,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private KpiValueRange( + private KpiId( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -6175,46 +7677,18 @@ public final class Monitoring { done = true; break; case 10: { - monitoring.Monitoring.KpiValue.Builder subBuilder = null; - if (kpiMinValue_ != null) { - subBuilder = kpiMinValue_.toBuilder(); - } - kpiMinValue_ = input.readMessage(monitoring.Monitoring.KpiValue.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(kpiMinValue_); - kpiMinValue_ = subBuilder.buildPartial(); - } - - break; - } - case 18: { - monitoring.Monitoring.KpiValue.Builder subBuilder = null; - if (kpiMaxValue_ != null) { - subBuilder = kpiMaxValue_.toBuilder(); + context.ContextOuterClass.Uuid.Builder subBuilder = null; + if (kpiId_ != null) { + subBuilder = kpiId_.toBuilder(); } - kpiMaxValue_ = input.readMessage(monitoring.Monitoring.KpiValue.parser(), extensionRegistry); + kpiId_ = input.readMessage(context.ContextOuterClass.Uuid.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(kpiMaxValue_); - kpiMaxValue_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(kpiId_); + kpiId_ = subBuilder.buildPartial(); } break; } - case 24: { - - inRange_ = input.readBool(); - break; - } - case 32: { - - includeMinValue_ = input.readBool(); - break; - } - case 40: { - - includeMaxValue_ = input.readBool(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -6236,112 +7710,41 @@ public final class Monitoring { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiId_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiId_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiValueRange.class, monitoring.Monitoring.KpiValueRange.Builder.class); - } - - public static final int KPIMINVALUE_FIELD_NUMBER = 1; - private monitoring.Monitoring.KpiValue kpiMinValue_; - /** - * .monitoring.KpiValue kpiMinValue = 1; - * @return Whether the kpiMinValue field is set. - */ - @java.lang.Override - public boolean hasKpiMinValue() { - return kpiMinValue_ != null; - } - /** - * .monitoring.KpiValue kpiMinValue = 1; - * @return The kpiMinValue. - */ - @java.lang.Override - public monitoring.Monitoring.KpiValue getKpiMinValue() { - return kpiMinValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMinValue_; - } - /** - * .monitoring.KpiValue kpiMinValue = 1; - */ - @java.lang.Override - public monitoring.Monitoring.KpiValueOrBuilder getKpiMinValueOrBuilder() { - return getKpiMinValue(); - } - - public static final int KPIMAXVALUE_FIELD_NUMBER = 2; - private monitoring.Monitoring.KpiValue kpiMaxValue_; - /** - * .monitoring.KpiValue kpiMaxValue = 2; - * @return Whether the kpiMaxValue field is set. - */ - @java.lang.Override - public boolean hasKpiMaxValue() { - return kpiMaxValue_ != null; - } - /** - * .monitoring.KpiValue kpiMaxValue = 2; - * @return The kpiMaxValue. - */ - @java.lang.Override - public monitoring.Monitoring.KpiValue getKpiMaxValue() { - return kpiMaxValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMaxValue_; - } - /** - * .monitoring.KpiValue kpiMaxValue = 2; - */ - @java.lang.Override - public monitoring.Monitoring.KpiValueOrBuilder getKpiMaxValueOrBuilder() { - return getKpiMaxValue(); + monitoring.Monitoring.KpiId.class, monitoring.Monitoring.KpiId.Builder.class); } - public static final int INRANGE_FIELD_NUMBER = 3; - private boolean inRange_; + public static final int KPI_ID_FIELD_NUMBER = 1; + private context.ContextOuterClass.Uuid kpiId_; /** - * 
-     * by default True
-     *
- * - * bool inRange = 3; - * @return The inRange. + * .context.Uuid kpi_id = 1; + * @return Whether the kpiId field is set. */ @java.lang.Override - public boolean getInRange() { - return inRange_; + public boolean hasKpiId() { + return kpiId_ != null; } - - public static final int INCLUDEMINVALUE_FIELD_NUMBER = 4; - private boolean includeMinValue_; /** - * 
-     * False is outside the interval
-     *
- * - * bool includeMinValue = 4; - * @return The includeMinValue. + * .context.Uuid kpi_id = 1; + * @return The kpiId. */ @java.lang.Override - public boolean getIncludeMinValue() { - return includeMinValue_; + public context.ContextOuterClass.Uuid getKpiId() { + return kpiId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : kpiId_; } - - public static final int INCLUDEMAXVALUE_FIELD_NUMBER = 5; - private boolean includeMaxValue_; /** - * 
-     * False is outside the interval
-     *
- * - * bool includeMaxValue = 5; - * @return The includeMaxValue. + * .context.Uuid kpi_id = 1; */ @java.lang.Override - public boolean getIncludeMaxValue() { - return includeMaxValue_; + public context.ContextOuterClass.UuidOrBuilder getKpiIdOrBuilder() { + return getKpiId(); } private byte memoizedIsInitialized = -1; @@ -6358,20 +7761,8 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (kpiMinValue_ != null) { - output.writeMessage(1, getKpiMinValue()); - } - if (kpiMaxValue_ != null) { - output.writeMessage(2, getKpiMaxValue()); - } - if (inRange_ != false) { - output.writeBool(3, inRange_); - } - if (includeMinValue_ != false) { - output.writeBool(4, includeMinValue_); - } - if (includeMaxValue_ != false) { - output.writeBool(5, includeMaxValue_); + if (kpiId_ != null) { + output.writeMessage(1, getKpiId()); } unknownFields.writeTo(output); } @@ -6382,25 +7773,9 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (kpiMinValue_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getKpiMinValue()); - } - if (kpiMaxValue_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, getKpiMaxValue()); - } - if (inRange_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, inRange_); - } - if (includeMinValue_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(4, includeMinValue_); - } - if (includeMaxValue_ != false) { + if (kpiId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(5, includeMaxValue_); + .computeMessageSize(1, getKpiId()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -6412,27 +7787,16 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.KpiValueRange)) { + if (!(obj instanceof monitoring.Monitoring.KpiId)) { return super.equals(obj); } - monitoring.Monitoring.KpiValueRange other = (monitoring.Monitoring.KpiValueRange) obj; + monitoring.Monitoring.KpiId other = (monitoring.Monitoring.KpiId) obj; - if (hasKpiMinValue() != other.hasKpiMinValue()) return false; - if (hasKpiMinValue()) { - if (!getKpiMinValue() - .equals(other.getKpiMinValue())) return false; - } - if (hasKpiMaxValue() != other.hasKpiMaxValue()) return false; - if (hasKpiMaxValue()) { - if (!getKpiMaxValue() - .equals(other.getKpiMaxValue())) return false; + if (hasKpiId() != other.hasKpiId()) return false; + if (hasKpiId()) { + if (!getKpiId() + .equals(other.getKpiId())) return false; } - if (getInRange() - != other.getInRange()) return false; - if (getIncludeMinValue() - != other.getIncludeMinValue()) return false; - if (getIncludeMaxValue() - != other.getIncludeMaxValue()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -6444,91 +7808,78 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasKpiMinValue()) { - hash = (37 * hash) + KPIMINVALUE_FIELD_NUMBER; - hash = (53 * hash) + getKpiMinValue().hashCode(); - } - if (hasKpiMaxValue()) { - hash = (37 * hash) + KPIMAXVALUE_FIELD_NUMBER; - hash = (53 * hash) + getKpiMaxValue().hashCode(); + if (hasKpiId()) { + hash = (37 * hash) + KPI_ID_FIELD_NUMBER; + hash = (53 * hash) + getKpiId().hashCode(); } - hash = (37 * hash) + INRANGE_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getInRange()); - hash = (37 * hash) + INCLUDEMINVALUE_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIncludeMinValue()); - hash = (37 * hash) + INCLUDEMAXVALUE_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIncludeMaxValue()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.KpiValueRange parseFrom( + public static monitoring.Monitoring.KpiId parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiValueRange parseFrom( + public static monitoring.Monitoring.KpiId parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiValueRange parseFrom( + public static monitoring.Monitoring.KpiId parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiValueRange parseFrom( + public static monitoring.Monitoring.KpiId parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiValueRange parseFrom(byte[] data) + public static monitoring.Monitoring.KpiId parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiValueRange parseFrom( + public static monitoring.Monitoring.KpiId parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiValueRange parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiId parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiValueRange parseFrom( + public static monitoring.Monitoring.KpiId parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiValueRange parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiId parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiValueRange parseDelimitedFrom( + public static monitoring.Monitoring.KpiId parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiValueRange parseFrom( + public static monitoring.Monitoring.KpiId parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiValueRange parseFrom( + public static monitoring.Monitoring.KpiId parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -6541,7 +7892,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.KpiValueRange prototype) { + public static Builder newBuilder(monitoring.Monitoring.KpiId prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -6557,26 +7908,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.KpiValueRange} + * Protobuf type {@code monitoring.KpiId} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.KpiValueRange) - monitoring.Monitoring.KpiValueRangeOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.KpiId) + monitoring.Monitoring.KpiIdOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiId_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiId_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiValueRange.class, monitoring.Monitoring.KpiValueRange.Builder.class); + monitoring.Monitoring.KpiId.class, monitoring.Monitoring.KpiId.Builder.class); } - // Construct using monitoring.Monitoring.KpiValueRange.newBuilder() + // Construct using monitoring.Monitoring.KpiId.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -6586,528 +7937,248 @@ public final class Monitoring { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } - } - @java.lang.Override - public Builder clear() { - super.clear(); - if (kpiMinValueBuilder_ == null) { - kpiMinValue_ = null; - } else { - kpiMinValue_ = null; - kpiMinValueBuilder_ = null; - } - if (kpiMaxValueBuilder_ == null) { - kpiMaxValue_ = null; - } else { - kpiMaxValue_ = null; - kpiMaxValueBuilder_ = null; - } - inRange_ = false; - - includeMinValue_ = false; - - includeMaxValue_ = false; - - return this; - } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_descriptor; - } - - @java.lang.Override - public monitoring.Monitoring.KpiValueRange getDefaultInstanceForType() { - return monitoring.Monitoring.KpiValueRange.getDefaultInstance(); - } - - @java.lang.Override - public monitoring.Monitoring.KpiValueRange build() { - monitoring.Monitoring.KpiValueRange result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - @java.lang.Override - public monitoring.Monitoring.KpiValueRange buildPartial() { - monitoring.Monitoring.KpiValueRange result = new monitoring.Monitoring.KpiValueRange(this); - if (kpiMinValueBuilder_ == null) { - result.kpiMinValue_ = kpiMinValue_; - } else { - result.kpiMinValue_ = kpiMinValueBuilder_.build(); - } - if (kpiMaxValueBuilder_ == null) { - result.kpiMaxValue_ = kpiMaxValue_; - } else { - result.kpiMaxValue_ = kpiMaxValueBuilder_.build(); - } - result.inRange_ = inRange_; - result.includeMinValue_ = includeMinValue_; - result.includeMaxValue_ = includeMaxValue_; - onBuilt(); - return result; - } - - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.KpiValueRange) { - return mergeFrom((monitoring.Monitoring.KpiValueRange)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(monitoring.Monitoring.KpiValueRange other) { - if (other == monitoring.Monitoring.KpiValueRange.getDefaultInstance()) return this; - if (other.hasKpiMinValue()) { - mergeKpiMinValue(other.getKpiMinValue()); - } - if (other.hasKpiMaxValue()) { - mergeKpiMaxValue(other.getKpiMaxValue()); - } - if (other.getInRange() != false) { - setInRange(other.getInRange()); - } - if (other.getIncludeMinValue() != false) { - setIncludeMinValue(other.getIncludeMinValue()); - } - if (other.getIncludeMaxValue() != false) { - setIncludeMaxValue(other.getIncludeMaxValue()); - } - this.mergeUnknownFields(other.unknownFields); - onChanged(); - return this; - } - - @java.lang.Override - public final boolean isInitialized() { - return true; - } - - @java.lang.Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - monitoring.Monitoring.KpiValueRange parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.KpiValueRange) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - private monitoring.Monitoring.KpiValue kpiMinValue_; - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> kpiMinValueBuilder_; - /** - * .monitoring.KpiValue kpiMinValue = 1; - * @return Whether the kpiMinValue field is set. - */ - public boolean hasKpiMinValue() { - return kpiMinValueBuilder_ != null || kpiMinValue_ != null; - } - /** - * .monitoring.KpiValue kpiMinValue = 1; - * @return The kpiMinValue. - */ - public monitoring.Monitoring.KpiValue getKpiMinValue() { - if (kpiMinValueBuilder_ == null) { - return kpiMinValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMinValue_; - } else { - return kpiMinValueBuilder_.getMessage(); - } - } - /** - * .monitoring.KpiValue kpiMinValue = 1; - */ - public Builder setKpiMinValue(monitoring.Monitoring.KpiValue value) { - if (kpiMinValueBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - kpiMinValue_ = value; - onChanged(); - } else { - kpiMinValueBuilder_.setMessage(value); - } - - return this; - } - /** - * .monitoring.KpiValue kpiMinValue = 1; - */ - public Builder setKpiMinValue( - monitoring.Monitoring.KpiValue.Builder builderForValue) { - if (kpiMinValueBuilder_ == null) { - kpiMinValue_ = builderForValue.build(); - onChanged(); - } else { - kpiMinValueBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .monitoring.KpiValue kpiMinValue = 1; - */ - public Builder mergeKpiMinValue(monitoring.Monitoring.KpiValue value) { - if (kpiMinValueBuilder_ == null) { - if (kpiMinValue_ != null) { - kpiMinValue_ = - monitoring.Monitoring.KpiValue.newBuilder(kpiMinValue_).mergeFrom(value).buildPartial(); - } else { - kpiMinValue_ = value; - } - onChanged(); - } else { - kpiMinValueBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .monitoring.KpiValue kpiMinValue = 1; - */ - public Builder clearKpiMinValue() { - if (kpiMinValueBuilder_ == null) { - kpiMinValue_ = null; - onChanged(); - } else { - kpiMinValue_ = null; - kpiMinValueBuilder_ = null; - } - - return this; - } - /** - * .monitoring.KpiValue kpiMinValue = 1; - */ - public monitoring.Monitoring.KpiValue.Builder getKpiMinValueBuilder() { - - onChanged(); - return getKpiMinValueFieldBuilder().getBuilder(); + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } } - /** - * .monitoring.KpiValue kpiMinValue = 1; - */ - public monitoring.Monitoring.KpiValueOrBuilder getKpiMinValueOrBuilder() { - if (kpiMinValueBuilder_ != null) { - return kpiMinValueBuilder_.getMessageOrBuilder(); + @java.lang.Override + public Builder clear() { + super.clear(); + if (kpiIdBuilder_ == null) { + kpiId_ = null; } else { - return kpiMinValue_ == null ? - monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMinValue_; + kpiId_ = null; + kpiIdBuilder_ = null; } + return this; } - /** - * .monitoring.KpiValue kpiMinValue = 1; - */ - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> - getKpiMinValueFieldBuilder() { - if (kpiMinValueBuilder_ == null) { - kpiMinValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder>( - getKpiMinValue(), - getParentForChildren(), - isClean()); - kpiMinValue_ = null; - } - return kpiMinValueBuilder_; + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return monitoring.Monitoring.internal_static_monitoring_KpiId_descriptor; } - private monitoring.Monitoring.KpiValue kpiMaxValue_; - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> kpiMaxValueBuilder_; - /** - * .monitoring.KpiValue kpiMaxValue = 2; - * @return Whether the kpiMaxValue field is set. - */ - public boolean hasKpiMaxValue() { - return kpiMaxValueBuilder_ != null || kpiMaxValue_ != null; + @java.lang.Override + public monitoring.Monitoring.KpiId getDefaultInstanceForType() { + return monitoring.Monitoring.KpiId.getDefaultInstance(); } - /** - * .monitoring.KpiValue kpiMaxValue = 2; - * @return The kpiMaxValue. - */ - public monitoring.Monitoring.KpiValue getKpiMaxValue() { - if (kpiMaxValueBuilder_ == null) { - return kpiMaxValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMaxValue_; - } else { - return kpiMaxValueBuilder_.getMessage(); + + @java.lang.Override + public monitoring.Monitoring.KpiId build() { + monitoring.Monitoring.KpiId result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); } + return result; } - /** - * .monitoring.KpiValue kpiMaxValue = 2; - */ - public Builder setKpiMaxValue(monitoring.Monitoring.KpiValue value) { - if (kpiMaxValueBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - kpiMaxValue_ = value; - onChanged(); + + @java.lang.Override + public monitoring.Monitoring.KpiId buildPartial() { + monitoring.Monitoring.KpiId result = new monitoring.Monitoring.KpiId(this); + if (kpiIdBuilder_ == null) { + result.kpiId_ = kpiId_; } else { - kpiMaxValueBuilder_.setMessage(value); + result.kpiId_ = kpiIdBuilder_.build(); } + onBuilt(); + return result; + } - return this; + @java.lang.Override + public Builder clone() { + return super.clone(); } - /** - * .monitoring.KpiValue kpiMaxValue = 2; - */ - public Builder setKpiMaxValue( - monitoring.Monitoring.KpiValue.Builder builderForValue) { - if (kpiMaxValueBuilder_ == null) { - kpiMaxValue_ = builderForValue.build(); - onChanged(); + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof monitoring.Monitoring.KpiId) { + return mergeFrom((monitoring.Monitoring.KpiId)other); } else { - kpiMaxValueBuilder_.setMessage(builderForValue.build()); + super.mergeFrom(other); + return this; } + } + public Builder mergeFrom(monitoring.Monitoring.KpiId other) { + if (other == monitoring.Monitoring.KpiId.getDefaultInstance()) return this; + if (other.hasKpiId()) { + mergeKpiId(other.getKpiId()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); return this; } - /** - * .monitoring.KpiValue kpiMaxValue = 2; - */ - public Builder mergeKpiMaxValue(monitoring.Monitoring.KpiValue value) { - if (kpiMaxValueBuilder_ == null) { - if (kpiMaxValue_ != null) { - kpiMaxValue_ = - monitoring.Monitoring.KpiValue.newBuilder(kpiMaxValue_).mergeFrom(value).buildPartial(); - } else { - kpiMaxValue_ = value; - } - onChanged(); - } else { - kpiMaxValueBuilder_.mergeFrom(value); - } - return this; + @java.lang.Override + public final boolean isInitialized() { + return true; } - /** - * .monitoring.KpiValue kpiMaxValue = 2; - */ - public Builder clearKpiMaxValue() { - if (kpiMaxValueBuilder_ == null) { - kpiMaxValue_ = null; - onChanged(); - } else { - kpiMaxValue_ = null; - kpiMaxValueBuilder_ = null; - } + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + monitoring.Monitoring.KpiId parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (monitoring.Monitoring.KpiId) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } return this; } + + private context.ContextOuterClass.Uuid kpiId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> kpiIdBuilder_; /** - * .monitoring.KpiValue kpiMaxValue = 2; + * .context.Uuid kpi_id = 1; + * @return Whether the kpiId field is set. */ - public monitoring.Monitoring.KpiValue.Builder getKpiMaxValueBuilder() { - - onChanged(); - return getKpiMaxValueFieldBuilder().getBuilder(); + public boolean hasKpiId() { + return kpiIdBuilder_ != null || kpiId_ != null; } /** - * .monitoring.KpiValue kpiMaxValue = 2; + * .context.Uuid kpi_id = 1; + * @return The kpiId. */ - public monitoring.Monitoring.KpiValueOrBuilder getKpiMaxValueOrBuilder() { - if (kpiMaxValueBuilder_ != null) { - return kpiMaxValueBuilder_.getMessageOrBuilder(); + public context.ContextOuterClass.Uuid getKpiId() { + if (kpiIdBuilder_ == null) { + return kpiId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : kpiId_; } else { - return kpiMaxValue_ == null ? - monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMaxValue_; - } - } - /** - * .monitoring.KpiValue kpiMaxValue = 2; - */ - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> - getKpiMaxValueFieldBuilder() { - if (kpiMaxValueBuilder_ == null) { - kpiMaxValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder>( - getKpiMaxValue(), - getParentForChildren(), - isClean()); - kpiMaxValue_ = null; + return kpiIdBuilder_.getMessage(); } - return kpiMaxValueBuilder_; - } - - private boolean inRange_ ; - /** - * 
-       * by default True
-       *
- * - * bool inRange = 3; - * @return The inRange. - */ - @java.lang.Override - public boolean getInRange() { - return inRange_; - } - /** - * 
-       * by default True
-       *
- * - * bool inRange = 3; - * @param value The inRange to set. - * @return This builder for chaining. - */ - public Builder setInRange(boolean value) { - - inRange_ = value; - onChanged(); - return this; } /** - * 
-       * by default True
-       *
- * - * bool inRange = 3; - * @return This builder for chaining. + * .context.Uuid kpi_id = 1; */ - public Builder clearInRange() { - - inRange_ = false; - onChanged(); + public Builder setKpiId(context.ContextOuterClass.Uuid value) { + if (kpiIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + kpiId_ = value; + onChanged(); + } else { + kpiIdBuilder_.setMessage(value); + } + return this; } - - private boolean includeMinValue_ ; /** - * 
-       * False is outside the interval
-       *
- * - * bool includeMinValue = 4; - * @return The includeMinValue. + * .context.Uuid kpi_id = 1; */ - @java.lang.Override - public boolean getIncludeMinValue() { - return includeMinValue_; + public Builder setKpiId( + context.ContextOuterClass.Uuid.Builder builderForValue) { + if (kpiIdBuilder_ == null) { + kpiId_ = builderForValue.build(); + onChanged(); + } else { + kpiIdBuilder_.setMessage(builderForValue.build()); + } + + return this; } /** - * 
-       * False is outside the interval
-       *
- * - * bool includeMinValue = 4; - * @param value The includeMinValue to set. - * @return This builder for chaining. + * .context.Uuid kpi_id = 1; */ - public Builder setIncludeMinValue(boolean value) { - - includeMinValue_ = value; - onChanged(); + public Builder mergeKpiId(context.ContextOuterClass.Uuid value) { + if (kpiIdBuilder_ == null) { + if (kpiId_ != null) { + kpiId_ = + context.ContextOuterClass.Uuid.newBuilder(kpiId_).mergeFrom(value).buildPartial(); + } else { + kpiId_ = value; + } + onChanged(); + } else { + kpiIdBuilder_.mergeFrom(value); + } + return this; } /** - * 
-       * False is outside the interval
-       *
- * - * bool includeMinValue = 4; - * @return This builder for chaining. + * .context.Uuid kpi_id = 1; */ - public Builder clearIncludeMinValue() { - - includeMinValue_ = false; - onChanged(); + public Builder clearKpiId() { + if (kpiIdBuilder_ == null) { + kpiId_ = null; + onChanged(); + } else { + kpiId_ = null; + kpiIdBuilder_ = null; + } + return this; } - - private boolean includeMaxValue_ ; /** - * 
-       * False is outside the interval
-       *
- * - * bool includeMaxValue = 5; - * @return The includeMaxValue. + * .context.Uuid kpi_id = 1; */ - @java.lang.Override - public boolean getIncludeMaxValue() { - return includeMaxValue_; + public context.ContextOuterClass.Uuid.Builder getKpiIdBuilder() { + + onChanged(); + return getKpiIdFieldBuilder().getBuilder(); } /** - * 
-       * False is outside the interval
-       *
- * - * bool includeMaxValue = 5; - * @param value The includeMaxValue to set. - * @return This builder for chaining. + * .context.Uuid kpi_id = 1; */ - public Builder setIncludeMaxValue(boolean value) { - - includeMaxValue_ = value; - onChanged(); - return this; + public context.ContextOuterClass.UuidOrBuilder getKpiIdOrBuilder() { + if (kpiIdBuilder_ != null) { + return kpiIdBuilder_.getMessageOrBuilder(); + } else { + return kpiId_ == null ? + context.ContextOuterClass.Uuid.getDefaultInstance() : kpiId_; + } } /** - * 
-       * False is outside the interval
-       *
- * - * bool includeMaxValue = 5; - * @return This builder for chaining. + * .context.Uuid kpi_id = 1; */ - public Builder clearIncludeMaxValue() { - - includeMaxValue_ = false; - onChanged(); - return this; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> + getKpiIdFieldBuilder() { + if (kpiIdBuilder_ == null) { + kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder>( + getKpiId(), + getParentForChildren(), + isClean()); + kpiId_ = null; + } + return kpiIdBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -7122,155 +8193,113 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.KpiValueRange) + // @@protoc_insertion_point(builder_scope:monitoring.KpiId) } - // @@protoc_insertion_point(class_scope:monitoring.KpiValueRange) - private static final monitoring.Monitoring.KpiValueRange DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.KpiId) + private static final monitoring.Monitoring.KpiId DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.KpiValueRange(); + DEFAULT_INSTANCE = new monitoring.Monitoring.KpiId(); } - public static monitoring.Monitoring.KpiValueRange getDefaultInstance() { + public static monitoring.Monitoring.KpiId getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public KpiValueRange parsePartialFrom( + public KpiId parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new KpiValueRange(input, extensionRegistry); + return new KpiId(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.KpiValueRange getDefaultInstanceForType() { + public monitoring.Monitoring.KpiId getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface KpiValueOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.KpiValue) + public interface KpiOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.Kpi) com.google.protobuf.MessageOrBuilder { /** - * int32 int32Val = 1; - * @return Whether the int32Val field is set. - */ - boolean hasInt32Val(); - /** - * int32 int32Val = 1; - * @return The int32Val. - */ - int getInt32Val(); - - /** - * uint32 uint32Val = 2; - * @return Whether the uint32Val field is set. - */ - boolean hasUint32Val(); - /** - * uint32 uint32Val = 2; - * @return The uint32Val. - */ - int getUint32Val(); - - /** - * int64 int64Val = 3; - * @return Whether the int64Val field is set. - */ - boolean hasInt64Val(); - /** - * int64 int64Val = 3; - * @return The int64Val. + * .monitoring.KpiId kpi_id = 1; + * @return Whether the kpiId field is set. */ - long getInt64Val(); - + boolean hasKpiId(); /** - * uint64 uint64Val = 4; - * @return Whether the uint64Val field is set. + * .monitoring.KpiId kpi_id = 1; + * @return The kpiId. */ - boolean hasUint64Val(); + monitoring.Monitoring.KpiId getKpiId(); /** - * uint64 uint64Val = 4; - * @return The uint64Val. + * .monitoring.KpiId kpi_id = 1; */ - long getUint64Val(); + monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder(); /** - * float floatVal = 5; - * @return Whether the floatVal field is set. + * string timestamp = 2; + * @return The timestamp. */ - boolean hasFloatVal(); + java.lang.String getTimestamp(); /** - * float floatVal = 5; - * @return The floatVal. + * string timestamp = 2; + * @return The bytes for timestamp. */ - float getFloatVal(); + com.google.protobuf.ByteString + getTimestampBytes(); /** - * string stringVal = 6; - * @return Whether the stringVal field is set. - */ - boolean hasStringVal(); - /** - * string stringVal = 6; - * @return The stringVal. - */ - java.lang.String getStringVal(); - /** - * string stringVal = 6; - * @return The bytes for stringVal. + * .monitoring.KpiValue kpi_value = 3; + * @return Whether the kpiValue field is set. */ - com.google.protobuf.ByteString - getStringValBytes(); - + boolean hasKpiValue(); /** - * bool boolVal = 7; - * @return Whether the boolVal field is set. + * .monitoring.KpiValue kpi_value = 3; + * @return The kpiValue. */ - boolean hasBoolVal(); + monitoring.Monitoring.KpiValue getKpiValue(); /** - * bool boolVal = 7; - * @return The boolVal. + * .monitoring.KpiValue kpi_value = 3; */ - boolean getBoolVal(); - - public monitoring.Monitoring.KpiValue.ValueCase getValueCase(); + monitoring.Monitoring.KpiValueOrBuilder getKpiValueOrBuilder(); } /** - * Protobuf type {@code monitoring.KpiValue} + * Protobuf type {@code monitoring.Kpi} */ - public static final class KpiValue extends + public static final class Kpi extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.KpiValue) - KpiValueOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.Kpi) + KpiOrBuilder { private static final long serialVersionUID = 0L; - // Use KpiValue.newBuilder() to construct. - private KpiValue(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use Kpi.newBuilder() to construct. + private Kpi(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private KpiValue() { + private Kpi() { + timestamp_ = ""; } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new KpiValue(); + return new Kpi(); } @java.lang.Override @@ -7278,7 +8307,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private KpiValue( + private Kpi( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -7296,40 +8325,36 @@ public final class Monitoring { case 0: done = true; break; - case 8: { - valueCase_ = 1; - value_ = input.readInt32(); - break; - } - case 16: { - valueCase_ = 2; - value_ = input.readUInt32(); - break; - } - case 24: { - valueCase_ = 3; - value_ = input.readInt64(); - break; - } - case 32: { - valueCase_ = 4; - value_ = input.readUInt64(); - break; - } - case 45: { - valueCase_ = 5; - value_ = input.readFloat(); + case 10: { + monitoring.Monitoring.KpiId.Builder subBuilder = null; + if (kpiId_ != null) { + subBuilder = kpiId_.toBuilder(); + } + kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(kpiId_); + kpiId_ = subBuilder.buildPartial(); + } + break; } - case 50: { + case 18: { java.lang.String s = input.readStringRequireUtf8(); - valueCase_ = 6; - value_ = s; + + timestamp_ = s; break; } - case 56: { - valueCase_ = 7; - value_ = input.readBool(); + case 26: { + monitoring.Monitoring.KpiValue.Builder subBuilder = null; + if (kpiValue_ != null) { + subBuilder = kpiValue_.toBuilder(); + } + kpiValue_ = input.readMessage(monitoring.Monitoring.KpiValue.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(kpiValue_); + kpiValue_ = subBuilder.buildPartial(); + } + break; } default: { @@ -7353,244 +8378,105 @@ public final class Monitoring { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiValue_descriptor; + return monitoring.Monitoring.internal_static_monitoring_Kpi_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiValue_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_Kpi_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiValue.class, monitoring.Monitoring.KpiValue.Builder.class); - } - - private int valueCase_ = 0; - private java.lang.Object value_; - public enum ValueCase - implements com.google.protobuf.Internal.EnumLite, - com.google.protobuf.AbstractMessage.InternalOneOfEnum { - INT32VAL(1), - UINT32VAL(2), - INT64VAL(3), - UINT64VAL(4), - FLOATVAL(5), - STRINGVAL(6), - BOOLVAL(7), - VALUE_NOT_SET(0); - private final int value; - private ValueCase(int value) { - this.value = value; - } - /** - * @param value The number of the enum to look for. - * @return The enum associated with the given number. - * @deprecated Use {@link #forNumber(int)} instead. - */ - @java.lang.Deprecated - public static ValueCase valueOf(int value) { - return forNumber(value); - } - - public static ValueCase forNumber(int value) { - switch (value) { - case 1: return INT32VAL; - case 2: return UINT32VAL; - case 3: return INT64VAL; - case 4: return UINT64VAL; - case 5: return FLOATVAL; - case 6: return STRINGVAL; - case 7: return BOOLVAL; - case 0: return VALUE_NOT_SET; - default: return null; - } - } - public int getNumber() { - return this.value; - } - }; - - public ValueCase - getValueCase() { - return ValueCase.forNumber( - valueCase_); - } - - public static final int INT32VAL_FIELD_NUMBER = 1; - /** - * int32 int32Val = 1; - * @return Whether the int32Val field is set. - */ - @java.lang.Override - public boolean hasInt32Val() { - return valueCase_ == 1; - } - /** - * int32 int32Val = 1; - * @return The int32Val. - */ - @java.lang.Override - public int getInt32Val() { - if (valueCase_ == 1) { - return (java.lang.Integer) value_; - } - return 0; - } - - public static final int UINT32VAL_FIELD_NUMBER = 2; - /** - * uint32 uint32Val = 2; - * @return Whether the uint32Val field is set. - */ - @java.lang.Override - public boolean hasUint32Val() { - return valueCase_ == 2; - } - /** - * uint32 uint32Val = 2; - * @return The uint32Val. - */ - @java.lang.Override - public int getUint32Val() { - if (valueCase_ == 2) { - return (java.lang.Integer) value_; - } - return 0; + monitoring.Monitoring.Kpi.class, monitoring.Monitoring.Kpi.Builder.class); } - public static final int INT64VAL_FIELD_NUMBER = 3; - /** - * int64 int64Val = 3; - * @return Whether the int64Val field is set. - */ - @java.lang.Override - public boolean hasInt64Val() { - return valueCase_ == 3; - } + public static final int KPI_ID_FIELD_NUMBER = 1; + private monitoring.Monitoring.KpiId kpiId_; /** - * int64 int64Val = 3; - * @return The int64Val. + * .monitoring.KpiId kpi_id = 1; + * @return Whether the kpiId field is set. */ @java.lang.Override - public long getInt64Val() { - if (valueCase_ == 3) { - return (java.lang.Long) value_; - } - return 0L; + public boolean hasKpiId() { + return kpiId_ != null; } - - public static final int UINT64VAL_FIELD_NUMBER = 4; /** - * uint64 uint64Val = 4; - * @return Whether the uint64Val field is set. + * .monitoring.KpiId kpi_id = 1; + * @return The kpiId. */ @java.lang.Override - public boolean hasUint64Val() { - return valueCase_ == 4; + public monitoring.Monitoring.KpiId getKpiId() { + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } /** - * uint64 uint64Val = 4; - * @return The uint64Val. + * .monitoring.KpiId kpi_id = 1; */ @java.lang.Override - public long getUint64Val() { - if (valueCase_ == 4) { - return (java.lang.Long) value_; - } - return 0L; + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { + return getKpiId(); } - public static final int FLOATVAL_FIELD_NUMBER = 5; - /** - * float floatVal = 5; - * @return Whether the floatVal field is set. - */ - @java.lang.Override - public boolean hasFloatVal() { - return valueCase_ == 5; - } + public static final int TIMESTAMP_FIELD_NUMBER = 2; + private volatile java.lang.Object timestamp_; /** - * float floatVal = 5; - * @return The floatVal. + * string timestamp = 2; + * @return The timestamp. */ @java.lang.Override - public float getFloatVal() { - if (valueCase_ == 5) { - return (java.lang.Float) value_; - } - return 0F; - } - - public static final int STRINGVAL_FIELD_NUMBER = 6; - /** - * string stringVal = 6; - * @return Whether the stringVal field is set. - */ - public boolean hasStringVal() { - return valueCase_ == 6; - } - /** - * string stringVal = 6; - * @return The stringVal. - */ - public java.lang.String getStringVal() { - java.lang.Object ref = ""; - if (valueCase_ == 6) { - ref = value_; - } + public java.lang.String getTimestamp() { + java.lang.Object ref = timestamp_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - if (valueCase_ == 6) { - value_ = s; - } + timestamp_ = s; return s; } } /** - * string stringVal = 6; - * @return The bytes for stringVal. + * string timestamp = 2; + * @return The bytes for timestamp. */ + @java.lang.Override public com.google.protobuf.ByteString - getStringValBytes() { - java.lang.Object ref = ""; - if (valueCase_ == 6) { - ref = value_; - } + getTimestampBytes() { + java.lang.Object ref = timestamp_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - if (valueCase_ == 6) { - value_ = b; - } + timestamp_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - public static final int BOOLVAL_FIELD_NUMBER = 7; + public static final int KPI_VALUE_FIELD_NUMBER = 3; + private monitoring.Monitoring.KpiValue kpiValue_; /** - * bool boolVal = 7; - * @return Whether the boolVal field is set. + * .monitoring.KpiValue kpi_value = 3; + * @return Whether the kpiValue field is set. */ @java.lang.Override - public boolean hasBoolVal() { - return valueCase_ == 7; + public boolean hasKpiValue() { + return kpiValue_ != null; } /** - * bool boolVal = 7; - * @return The boolVal. + * .monitoring.KpiValue kpi_value = 3; + * @return The kpiValue. */ @java.lang.Override - public boolean getBoolVal() { - if (valueCase_ == 7) { - return (java.lang.Boolean) value_; - } - return false; + public monitoring.Monitoring.KpiValue getKpiValue() { + return kpiValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiValue_; + } + /** + * .monitoring.KpiValue kpi_value = 3; + */ + @java.lang.Override + public monitoring.Monitoring.KpiValueOrBuilder getKpiValueOrBuilder() { + return getKpiValue(); } private byte memoizedIsInitialized = -1; @@ -7607,32 +8493,14 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (valueCase_ == 1) { - output.writeInt32( - 1, (int)((java.lang.Integer) value_)); - } - if (valueCase_ == 2) { - output.writeUInt32( - 2, (int)((java.lang.Integer) value_)); - } - if (valueCase_ == 3) { - output.writeInt64( - 3, (long)((java.lang.Long) value_)); - } - if (valueCase_ == 4) { - output.writeUInt64( - 4, (long)((java.lang.Long) value_)); - } - if (valueCase_ == 5) { - output.writeFloat( - 5, (float)((java.lang.Float) value_)); + if (kpiId_ != null) { + output.writeMessage(1, getKpiId()); } - if (valueCase_ == 6) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 6, value_); + if (!getTimestampBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, timestamp_); } - if (valueCase_ == 7) { - output.writeBool( - 7, (boolean)((java.lang.Boolean) value_)); + if (kpiValue_ != null) { + output.writeMessage(3, getKpiValue()); } unknownFields.writeTo(output); } @@ -7643,38 +8511,16 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (valueCase_ == 1) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size( - 1, (int)((java.lang.Integer) value_)); - } - if (valueCase_ == 2) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size( - 2, (int)((java.lang.Integer) value_)); - } - if (valueCase_ == 3) { - size += com.google.protobuf.CodedOutputStream - .computeInt64Size( - 3, (long)((java.lang.Long) value_)); - } - if (valueCase_ == 4) { - size += com.google.protobuf.CodedOutputStream - .computeUInt64Size( - 4, (long)((java.lang.Long) value_)); - } - if (valueCase_ == 5) { + if (kpiId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize( - 5, (float)((java.lang.Float) value_)); + .computeMessageSize(1, getKpiId()); } - if (valueCase_ == 6) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, value_); + if (!getTimestampBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, timestamp_); } - if (valueCase_ == 7) { + if (kpiValue_ != null) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize( - 7, (boolean)((java.lang.Boolean) value_)); + .computeMessageSize(3, getKpiValue()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -7686,44 +8532,22 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.KpiValue)) { + if (!(obj instanceof monitoring.Monitoring.Kpi)) { return super.equals(obj); } - monitoring.Monitoring.KpiValue other = (monitoring.Monitoring.KpiValue) obj; + monitoring.Monitoring.Kpi other = (monitoring.Monitoring.Kpi) obj; - if (!getValueCase().equals(other.getValueCase())) return false; - switch (valueCase_) { - case 1: - if (getInt32Val() - != other.getInt32Val()) return false; - break; - case 2: - if (getUint32Val() - != other.getUint32Val()) return false; - break; - case 3: - if (getInt64Val() - != other.getInt64Val()) return false; - break; - case 4: - if (getUint64Val() - != other.getUint64Val()) return false; - break; - case 5: - if (java.lang.Float.floatToIntBits(getFloatVal()) - != java.lang.Float.floatToIntBits( - other.getFloatVal())) return false; - break; - case 6: - if (!getStringVal() - .equals(other.getStringVal())) return false; - break; - case 7: - if (getBoolVal() - != other.getBoolVal()) return false; - break; - case 0: - default: + if (hasKpiId() != other.hasKpiId()) return false; + if (hasKpiId()) { + if (!getKpiId() + .equals(other.getKpiId())) return false; + } + if (!getTimestamp() + .equals(other.getTimestamp())) return false; + if (hasKpiValue() != other.hasKpiValue()) return false; + if (hasKpiValue()) { + if (!getKpiValue() + .equals(other.getKpiValue())) return false; } if (!unknownFields.equals(other.unknownFields)) return false; return true; @@ -7736,110 +8560,84 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - switch (valueCase_) { - case 1: - hash = (37 * hash) + INT32VAL_FIELD_NUMBER; - hash = (53 * hash) + getInt32Val(); - break; - case 2: - hash = (37 * hash) + UINT32VAL_FIELD_NUMBER; - hash = (53 * hash) + getUint32Val(); - break; - case 3: - hash = (37 * hash) + INT64VAL_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getInt64Val()); - break; - case 4: - hash = (37 * hash) + UINT64VAL_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getUint64Val()); - break; - case 5: - hash = (37 * hash) + FLOATVAL_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getFloatVal()); - break; - case 6: - hash = (37 * hash) + STRINGVAL_FIELD_NUMBER; - hash = (53 * hash) + getStringVal().hashCode(); - break; - case 7: - hash = (37 * hash) + BOOLVAL_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getBoolVal()); - break; - case 0: - default: + if (hasKpiId()) { + hash = (37 * hash) + KPI_ID_FIELD_NUMBER; + hash = (53 * hash) + getKpiId().hashCode(); + } + hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER; + hash = (53 * hash) + getTimestamp().hashCode(); + if (hasKpiValue()) { + hash = (37 * hash) + KPI_VALUE_FIELD_NUMBER; + hash = (53 * hash) + getKpiValue().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.KpiValue parseFrom( + public static monitoring.Monitoring.Kpi parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiValue parseFrom( + public static monitoring.Monitoring.Kpi parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiValue parseFrom( + public static monitoring.Monitoring.Kpi parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiValue parseFrom( + public static monitoring.Monitoring.Kpi parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiValue parseFrom(byte[] data) + public static monitoring.Monitoring.Kpi parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiValue parseFrom( + public static monitoring.Monitoring.Kpi parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiValue parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.Kpi parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiValue parseFrom( + public static monitoring.Monitoring.Kpi parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiValue parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.Kpi parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiValue parseDelimitedFrom( + public static monitoring.Monitoring.Kpi parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiValue parseFrom( + public static monitoring.Monitoring.Kpi parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiValue parseFrom( + public static monitoring.Monitoring.Kpi parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -7852,7 +8650,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.KpiValue prototype) { + public static Builder newBuilder(monitoring.Monitoring.Kpi prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -7868,26 +8666,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.KpiValue} + * Protobuf type {@code monitoring.Kpi} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.KpiValue) - monitoring.Monitoring.KpiValueOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.Kpi) + monitoring.Monitoring.KpiOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiValue_descriptor; + return monitoring.Monitoring.internal_static_monitoring_Kpi_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiValue_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_Kpi_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiValue.class, monitoring.Monitoring.KpiValue.Builder.class); + monitoring.Monitoring.Kpi.class, monitoring.Monitoring.Kpi.Builder.class); } - // Construct using monitoring.Monitoring.KpiValue.newBuilder() + // Construct using monitoring.Monitoring.Kpi.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -7905,25 +8703,37 @@ public final class Monitoring { @java.lang.Override public Builder clear() { super.clear(); - valueCase_ = 0; - value_ = null; + if (kpiIdBuilder_ == null) { + kpiId_ = null; + } else { + kpiId_ = null; + kpiIdBuilder_ = null; + } + timestamp_ = ""; + + if (kpiValueBuilder_ == null) { + kpiValue_ = null; + } else { + kpiValue_ = null; + kpiValueBuilder_ = null; + } return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_KpiValue_descriptor; + return monitoring.Monitoring.internal_static_monitoring_Kpi_descriptor; } @java.lang.Override - public monitoring.Monitoring.KpiValue getDefaultInstanceForType() { - return monitoring.Monitoring.KpiValue.getDefaultInstance(); + public monitoring.Monitoring.Kpi getDefaultInstanceForType() { + return monitoring.Monitoring.Kpi.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.KpiValue build() { - monitoring.Monitoring.KpiValue result = buildPartial(); + public monitoring.Monitoring.Kpi build() { + monitoring.Monitoring.Kpi result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -7931,30 +8741,19 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.KpiValue buildPartial() { - monitoring.Monitoring.KpiValue result = new monitoring.Monitoring.KpiValue(this); - if (valueCase_ == 1) { - result.value_ = value_; - } - if (valueCase_ == 2) { - result.value_ = value_; - } - if (valueCase_ == 3) { - result.value_ = value_; - } - if (valueCase_ == 4) { - result.value_ = value_; - } - if (valueCase_ == 5) { - result.value_ = value_; - } - if (valueCase_ == 6) { - result.value_ = value_; + public monitoring.Monitoring.Kpi buildPartial() { + monitoring.Monitoring.Kpi result = new monitoring.Monitoring.Kpi(this); + if (kpiIdBuilder_ == null) { + result.kpiId_ = kpiId_; + } else { + result.kpiId_ = kpiIdBuilder_.build(); } - if (valueCase_ == 7) { - result.value_ = value_; + result.timestamp_ = timestamp_; + if (kpiValueBuilder_ == null) { + result.kpiValue_ = kpiValue_; + } else { + result.kpiValue_ = kpiValueBuilder_.build(); } - result.valueCase_ = valueCase_; onBuilt(); return result; } @@ -7993,50 +8792,25 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.KpiValue) { - return mergeFrom((monitoring.Monitoring.KpiValue)other); + if (other instanceof monitoring.Monitoring.Kpi) { + return mergeFrom((monitoring.Monitoring.Kpi)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.KpiValue other) { - if (other == monitoring.Monitoring.KpiValue.getDefaultInstance()) return this; - switch (other.getValueCase()) { - case INT32VAL: { - setInt32Val(other.getInt32Val()); - break; - } - case UINT32VAL: { - setUint32Val(other.getUint32Val()); - break; - } - case INT64VAL: { - setInt64Val(other.getInt64Val()); - break; - } - case UINT64VAL: { - setUint64Val(other.getUint64Val()); - break; - } - case FLOATVAL: { - setFloatVal(other.getFloatVal()); - break; - } - case STRINGVAL: { - valueCase_ = 6; - value_ = other.value_; - onChanged(); - break; - } - case BOOLVAL: { - setBoolVal(other.getBoolVal()); - break; - } - case VALUE_NOT_SET: { - break; - } + public Builder mergeFrom(monitoring.Monitoring.Kpi other) { + if (other == monitoring.Monitoring.Kpi.getDefaultInstance()) return this; + if (other.hasKpiId()) { + mergeKpiId(other.getKpiId()); + } + if (!other.getTimestamp().isEmpty()) { + timestamp_ = other.timestamp_; + onChanged(); + } + if (other.hasKpiValue()) { + mergeKpiValue(other.getKpiValue()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -8053,11 +8827,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.KpiValue parsedMessage = null; + monitoring.Monitoring.Kpi parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.KpiValue) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.Kpi) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -8066,364 +8840,320 @@ public final class Monitoring { } return this; } - private int valueCase_ = 0; - private java.lang.Object value_; - public ValueCase - getValueCase() { - return ValueCase.forNumber( - valueCase_); - } - - public Builder clearValue() { - valueCase_ = 0; - value_ = null; - onChanged(); - return this; - } - - - /** - * int32 int32Val = 1; - * @return Whether the int32Val field is set. - */ - public boolean hasInt32Val() { - return valueCase_ == 1; - } - /** - * int32 int32Val = 1; - * @return The int32Val. - */ - public int getInt32Val() { - if (valueCase_ == 1) { - return (java.lang.Integer) value_; - } - return 0; - } - /** - * int32 int32Val = 1; - * @param value The int32Val to set. - * @return This builder for chaining. - */ - public Builder setInt32Val(int value) { - valueCase_ = 1; - value_ = value; - onChanged(); - return this; - } - /** - * int32 int32Val = 1; - * @return This builder for chaining. - */ - public Builder clearInt32Val() { - if (valueCase_ == 1) { - valueCase_ = 0; - value_ = null; - onChanged(); - } - return this; - } - - /** - * uint32 uint32Val = 2; - * @return Whether the uint32Val field is set. - */ - public boolean hasUint32Val() { - return valueCase_ == 2; - } - /** - * uint32 uint32Val = 2; - * @return The uint32Val. - */ - public int getUint32Val() { - if (valueCase_ == 2) { - return (java.lang.Integer) value_; - } - return 0; - } - /** - * uint32 uint32Val = 2; - * @param value The uint32Val to set. - * @return This builder for chaining. - */ - public Builder setUint32Val(int value) { - valueCase_ = 2; - value_ = value; - onChanged(); - return this; - } - /** - * uint32 uint32Val = 2; - * @return This builder for chaining. - */ - public Builder clearUint32Val() { - if (valueCase_ == 2) { - valueCase_ = 0; - value_ = null; - onChanged(); - } - return this; - } + private monitoring.Monitoring.KpiId kpiId_; + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; /** - * int64 int64Val = 3; - * @return Whether the int64Val field is set. + * .monitoring.KpiId kpi_id = 1; + * @return Whether the kpiId field is set. */ - public boolean hasInt64Val() { - return valueCase_ == 3; + public boolean hasKpiId() { + return kpiIdBuilder_ != null || kpiId_ != null; } /** - * int64 int64Val = 3; - * @return The int64Val. + * .monitoring.KpiId kpi_id = 1; + * @return The kpiId. */ - public long getInt64Val() { - if (valueCase_ == 3) { - return (java.lang.Long) value_; + public monitoring.Monitoring.KpiId getKpiId() { + if (kpiIdBuilder_ == null) { + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + } else { + return kpiIdBuilder_.getMessage(); } - return 0L; - } - /** - * int64 int64Val = 3; - * @param value The int64Val to set. - * @return This builder for chaining. - */ - public Builder setInt64Val(long value) { - valueCase_ = 3; - value_ = value; - onChanged(); - return this; } /** - * int64 int64Val = 3; - * @return This builder for chaining. + * .monitoring.KpiId kpi_id = 1; */ - public Builder clearInt64Val() { - if (valueCase_ == 3) { - valueCase_ = 0; - value_ = null; + public Builder setKpiId(monitoring.Monitoring.KpiId value) { + if (kpiIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + kpiId_ = value; onChanged(); - } - return this; - } + } else { + kpiIdBuilder_.setMessage(value); + } - /** - * uint64 uint64Val = 4; - * @return Whether the uint64Val field is set. - */ - public boolean hasUint64Val() { - return valueCase_ == 4; + return this; } /** - * uint64 uint64Val = 4; - * @return The uint64Val. + * .monitoring.KpiId kpi_id = 1; */ - public long getUint64Val() { - if (valueCase_ == 4) { - return (java.lang.Long) value_; + public Builder setKpiId( + monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdBuilder_ == null) { + kpiId_ = builderForValue.build(); + onChanged(); + } else { + kpiIdBuilder_.setMessage(builderForValue.build()); } - return 0L; - } - /** - * uint64 uint64Val = 4; - * @param value The uint64Val to set. - * @return This builder for chaining. - */ - public Builder setUint64Val(long value) { - valueCase_ = 4; - value_ = value; - onChanged(); + return this; } /** - * uint64 uint64Val = 4; - * @return This builder for chaining. + * .monitoring.KpiId kpi_id = 1; */ - public Builder clearUint64Val() { - if (valueCase_ == 4) { - valueCase_ = 0; - value_ = null; + public Builder mergeKpiId(monitoring.Monitoring.KpiId value) { + if (kpiIdBuilder_ == null) { + if (kpiId_ != null) { + kpiId_ = + monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial(); + } else { + kpiId_ = value; + } onChanged(); + } else { + kpiIdBuilder_.mergeFrom(value); } - return this; - } - /** - * float floatVal = 5; - * @return Whether the floatVal field is set. - */ - public boolean hasFloatVal() { - return valueCase_ == 5; + return this; } /** - * float floatVal = 5; - * @return The floatVal. + * .monitoring.KpiId kpi_id = 1; */ - public float getFloatVal() { - if (valueCase_ == 5) { - return (java.lang.Float) value_; + public Builder clearKpiId() { + if (kpiIdBuilder_ == null) { + kpiId_ = null; + onChanged(); + } else { + kpiId_ = null; + kpiIdBuilder_ = null; } - return 0F; + + return this; } /** - * float floatVal = 5; - * @param value The floatVal to set. - * @return This builder for chaining. + * .monitoring.KpiId kpi_id = 1; */ - public Builder setFloatVal(float value) { - valueCase_ = 5; - value_ = value; + public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() { + onChanged(); - return this; + return getKpiIdFieldBuilder().getBuilder(); } /** - * float floatVal = 5; - * @return This builder for chaining. + * .monitoring.KpiId kpi_id = 1; */ - public Builder clearFloatVal() { - if (valueCase_ == 5) { - valueCase_ = 0; - value_ = null; - onChanged(); + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { + if (kpiIdBuilder_ != null) { + return kpiIdBuilder_.getMessageOrBuilder(); + } else { + return kpiId_ == null ? + monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } - return this; } - /** - * string stringVal = 6; - * @return Whether the stringVal field is set. + * .monitoring.KpiId kpi_id = 1; */ - @java.lang.Override - public boolean hasStringVal() { - return valueCase_ == 6; + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> + getKpiIdFieldBuilder() { + if (kpiIdBuilder_ == null) { + kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( + getKpiId(), + getParentForChildren(), + isClean()); + kpiId_ = null; + } + return kpiIdBuilder_; } + + private java.lang.Object timestamp_ = ""; /** - * string stringVal = 6; - * @return The stringVal. + * string timestamp = 2; + * @return The timestamp. */ - @java.lang.Override - public java.lang.String getStringVal() { - java.lang.Object ref = ""; - if (valueCase_ == 6) { - ref = value_; - } + public java.lang.String getTimestamp() { + java.lang.Object ref = timestamp_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - if (valueCase_ == 6) { - value_ = s; - } + timestamp_ = s; return s; } else { return (java.lang.String) ref; } } /** - * string stringVal = 6; - * @return The bytes for stringVal. + * string timestamp = 2; + * @return The bytes for timestamp. */ - @java.lang.Override public com.google.protobuf.ByteString - getStringValBytes() { - java.lang.Object ref = ""; - if (valueCase_ == 6) { - ref = value_; - } + getTimestampBytes() { + java.lang.Object ref = timestamp_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - if (valueCase_ == 6) { - value_ = b; - } + timestamp_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * string stringVal = 6; - * @param value The stringVal to set. + * string timestamp = 2; + * @param value The timestamp to set. * @return This builder for chaining. */ - public Builder setStringVal( + public Builder setTimestamp( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - valueCase_ = 6; - value_ = value; + + timestamp_ = value; onChanged(); return this; } /** - * string stringVal = 6; + * string timestamp = 2; * @return This builder for chaining. */ - public Builder clearStringVal() { - if (valueCase_ == 6) { - valueCase_ = 0; - value_ = null; - onChanged(); - } + public Builder clearTimestamp() { + + timestamp_ = getDefaultInstance().getTimestamp(); + onChanged(); return this; } /** - * string stringVal = 6; - * @param value The bytes for stringVal to set. + * string timestamp = 2; + * @param value The bytes for timestamp to set. * @return This builder for chaining. */ - public Builder setStringValBytes( + public Builder setTimestampBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - valueCase_ = 6; - value_ = value; + + timestamp_ = value; onChanged(); return this; } + private monitoring.Monitoring.KpiValue kpiValue_; + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> kpiValueBuilder_; /** - * bool boolVal = 7; - * @return Whether the boolVal field is set. + * .monitoring.KpiValue kpi_value = 3; + * @return Whether the kpiValue field is set. */ - public boolean hasBoolVal() { - return valueCase_ == 7; + public boolean hasKpiValue() { + return kpiValueBuilder_ != null || kpiValue_ != null; } /** - * bool boolVal = 7; - * @return The boolVal. + * .monitoring.KpiValue kpi_value = 3; + * @return The kpiValue. */ - public boolean getBoolVal() { - if (valueCase_ == 7) { - return (java.lang.Boolean) value_; + public monitoring.Monitoring.KpiValue getKpiValue() { + if (kpiValueBuilder_ == null) { + return kpiValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiValue_; + } else { + return kpiValueBuilder_.getMessage(); } - return false; } /** - * bool boolVal = 7; - * @param value The boolVal to set. - * @return This builder for chaining. + * .monitoring.KpiValue kpi_value = 3; */ - public Builder setBoolVal(boolean value) { - valueCase_ = 7; - value_ = value; - onChanged(); + public Builder setKpiValue(monitoring.Monitoring.KpiValue value) { + if (kpiValueBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + kpiValue_ = value; + onChanged(); + } else { + kpiValueBuilder_.setMessage(value); + } + return this; } /** - * bool boolVal = 7; - * @return This builder for chaining. + * .monitoring.KpiValue kpi_value = 3; */ - public Builder clearBoolVal() { - if (valueCase_ == 7) { - valueCase_ = 0; - value_ = null; + public Builder setKpiValue( + monitoring.Monitoring.KpiValue.Builder builderForValue) { + if (kpiValueBuilder_ == null) { + kpiValue_ = builderForValue.build(); + onChanged(); + } else { + kpiValueBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .monitoring.KpiValue kpi_value = 3; + */ + public Builder mergeKpiValue(monitoring.Monitoring.KpiValue value) { + if (kpiValueBuilder_ == null) { + if (kpiValue_ != null) { + kpiValue_ = + monitoring.Monitoring.KpiValue.newBuilder(kpiValue_).mergeFrom(value).buildPartial(); + } else { + kpiValue_ = value; + } + onChanged(); + } else { + kpiValueBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .monitoring.KpiValue kpi_value = 3; + */ + public Builder clearKpiValue() { + if (kpiValueBuilder_ == null) { + kpiValue_ = null; onChanged(); + } else { + kpiValue_ = null; + kpiValueBuilder_ = null; } + return this; } + /** + * .monitoring.KpiValue kpi_value = 3; + */ + public monitoring.Monitoring.KpiValue.Builder getKpiValueBuilder() { + + onChanged(); + return getKpiValueFieldBuilder().getBuilder(); + } + /** + * .monitoring.KpiValue kpi_value = 3; + */ + public monitoring.Monitoring.KpiValueOrBuilder getKpiValueOrBuilder() { + if (kpiValueBuilder_ != null) { + return kpiValueBuilder_.getMessageOrBuilder(); + } else { + return kpiValue_ == null ? + monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiValue_; + } + } + /** + * .monitoring.KpiValue kpi_value = 3; + */ + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> + getKpiValueFieldBuilder() { + if (kpiValueBuilder_ == null) { + kpiValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder>( + getKpiValue(), + getParentForChildren(), + isClean()); + kpiValue_ = null; + } + return kpiValueBuilder_; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -8437,95 +9167,100 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.KpiValue) + // @@protoc_insertion_point(builder_scope:monitoring.Kpi) } - // @@protoc_insertion_point(class_scope:monitoring.KpiValue) - private static final monitoring.Monitoring.KpiValue DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.Kpi) + private static final monitoring.Monitoring.Kpi DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.KpiValue(); + DEFAULT_INSTANCE = new monitoring.Monitoring.Kpi(); } - public static monitoring.Monitoring.KpiValue getDefaultInstance() { + public static monitoring.Monitoring.Kpi getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public KpiValue parsePartialFrom( + public Kpi parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new KpiValue(input, extensionRegistry); + return new Kpi(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.KpiValue getDefaultInstanceForType() { + public monitoring.Monitoring.Kpi getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface KpiListOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.KpiList) + public interface KpiValueRangeOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.KpiValueRange) com.google.protobuf.MessageOrBuilder { /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; + * @return Whether the kpiMinValue field is set. */ - java.util.List - getKpiListList(); + boolean hasKpiMinValue(); /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; + * @return The kpiMinValue. */ - monitoring.Monitoring.Kpi getKpiList(int index); + monitoring.Monitoring.KpiValue getKpiMinValue(); /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; */ - int getKpiListCount(); + monitoring.Monitoring.KpiValueOrBuilder getKpiMinValueOrBuilder(); + /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; + * @return Whether the kpiMaxValue field is set. */ - java.util.List - getKpiListOrBuilderList(); + boolean hasKpiMaxValue(); /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; + * @return The kpiMaxValue. */ - monitoring.Monitoring.KpiOrBuilder getKpiListOrBuilder( - int index); + monitoring.Monitoring.KpiValue getKpiMaxValue(); + /** + * .monitoring.KpiValue kpiMaxValue = 2; + */ + monitoring.Monitoring.KpiValueOrBuilder getKpiMaxValueOrBuilder(); } /** - * Protobuf type {@code monitoring.KpiList} + * Protobuf type {@code monitoring.KpiValueRange} */ - public static final class KpiList extends + public static final class KpiValueRange extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.KpiList) - KpiListOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.KpiValueRange) + KpiValueRangeOrBuilder { private static final long serialVersionUID = 0L; - // Use KpiList.newBuilder() to construct. - private KpiList(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use KpiValueRange.newBuilder() to construct. + private KpiValueRange(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private KpiList() { - kpiList_ = java.util.Collections.emptyList(); + private KpiValueRange() { } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new KpiList(); + return new KpiValueRange(); } @java.lang.Override @@ -8533,7 +9268,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private KpiList( + private KpiValueRange( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -8541,7 +9276,6 @@ public final class Monitoring { if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -8553,12 +9287,29 @@ public final class Monitoring { done = true; break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - kpiList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; + monitoring.Monitoring.KpiValue.Builder subBuilder = null; + if (kpiMinValue_ != null) { + subBuilder = kpiMinValue_.toBuilder(); } - kpiList_.add( - input.readMessage(monitoring.Monitoring.Kpi.parser(), extensionRegistry)); + kpiMinValue_ = input.readMessage(monitoring.Monitoring.KpiValue.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(kpiMinValue_); + kpiMinValue_ = subBuilder.buildPartial(); + } + + break; + } + case 18: { + monitoring.Monitoring.KpiValue.Builder subBuilder = null; + if (kpiMaxValue_ != null) { + subBuilder = kpiMaxValue_.toBuilder(); + } + kpiMaxValue_ = input.readMessage(monitoring.Monitoring.KpiValue.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(kpiMaxValue_); + kpiMaxValue_ = subBuilder.buildPartial(); + } + break; } default: { @@ -8576,64 +9327,73 @@ public final class Monitoring { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - kpiList_ = java.util.Collections.unmodifiableList(kpiList_); - } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiList_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiList_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiList.class, monitoring.Monitoring.KpiList.Builder.class); + monitoring.Monitoring.KpiValueRange.class, monitoring.Monitoring.KpiValueRange.Builder.class); } - public static final int KPI_LIST_FIELD_NUMBER = 1; - private java.util.List kpiList_; + public static final int KPIMINVALUE_FIELD_NUMBER = 1; + private monitoring.Monitoring.KpiValue kpiMinValue_; /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; + * @return Whether the kpiMinValue field is set. */ @java.lang.Override - public java.util.List getKpiListList() { - return kpiList_; + public boolean hasKpiMinValue() { + return kpiMinValue_ != null; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; + * @return The kpiMinValue. */ @java.lang.Override - public java.util.List - getKpiListOrBuilderList() { - return kpiList_; + public monitoring.Monitoring.KpiValue getKpiMinValue() { + return kpiMinValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMinValue_; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; */ @java.lang.Override - public int getKpiListCount() { - return kpiList_.size(); + public monitoring.Monitoring.KpiValueOrBuilder getKpiMinValueOrBuilder() { + return getKpiMinValue(); } + + public static final int KPIMAXVALUE_FIELD_NUMBER = 2; + private monitoring.Monitoring.KpiValue kpiMaxValue_; /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; + * @return Whether the kpiMaxValue field is set. */ @java.lang.Override - public monitoring.Monitoring.Kpi getKpiList(int index) { - return kpiList_.get(index); + public boolean hasKpiMaxValue() { + return kpiMaxValue_ != null; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; + * @return The kpiMaxValue. */ @java.lang.Override - public monitoring.Monitoring.KpiOrBuilder getKpiListOrBuilder( - int index) { - return kpiList_.get(index); + public monitoring.Monitoring.KpiValue getKpiMaxValue() { + return kpiMaxValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMaxValue_; + } + /** + * .monitoring.KpiValue kpiMaxValue = 2; + */ + @java.lang.Override + public monitoring.Monitoring.KpiValueOrBuilder getKpiMaxValueOrBuilder() { + return getKpiMaxValue(); } private byte memoizedIsInitialized = -1; @@ -8650,8 +9410,11 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - for (int i = 0; i < kpiList_.size(); i++) { - output.writeMessage(1, kpiList_.get(i)); + if (kpiMinValue_ != null) { + output.writeMessage(1, getKpiMinValue()); + } + if (kpiMaxValue_ != null) { + output.writeMessage(2, getKpiMaxValue()); } unknownFields.writeTo(output); } @@ -8662,9 +9425,13 @@ public final class Monitoring { if (size != -1) return size; size = 0; - for (int i = 0; i < kpiList_.size(); i++) { + if (kpiMinValue_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, kpiList_.get(i)); + .computeMessageSize(1, getKpiMinValue()); + } + if (kpiMaxValue_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, getKpiMaxValue()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -8676,13 +9443,21 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.KpiList)) { + if (!(obj instanceof monitoring.Monitoring.KpiValueRange)) { return super.equals(obj); } - monitoring.Monitoring.KpiList other = (monitoring.Monitoring.KpiList) obj; + monitoring.Monitoring.KpiValueRange other = (monitoring.Monitoring.KpiValueRange) obj; - if (!getKpiListList() - .equals(other.getKpiListList())) return false; + if (hasKpiMinValue() != other.hasKpiMinValue()) return false; + if (hasKpiMinValue()) { + if (!getKpiMinValue() + .equals(other.getKpiMinValue())) return false; + } + if (hasKpiMaxValue() != other.hasKpiMaxValue()) return false; + if (hasKpiMaxValue()) { + if (!getKpiMaxValue() + .equals(other.getKpiMaxValue())) return false; + } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -8694,78 +9469,82 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getKpiListCount() > 0) { - hash = (37 * hash) + KPI_LIST_FIELD_NUMBER; - hash = (53 * hash) + getKpiListList().hashCode(); + if (hasKpiMinValue()) { + hash = (37 * hash) + KPIMINVALUE_FIELD_NUMBER; + hash = (53 * hash) + getKpiMinValue().hashCode(); + } + if (hasKpiMaxValue()) { + hash = (37 * hash) + KPIMAXVALUE_FIELD_NUMBER; + hash = (53 * hash) + getKpiMaxValue().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.KpiList parseFrom( + public static monitoring.Monitoring.KpiValueRange parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiList parseFrom( + public static monitoring.Monitoring.KpiValueRange parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiList parseFrom( + public static monitoring.Monitoring.KpiValueRange parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiList parseFrom( + public static monitoring.Monitoring.KpiValueRange parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiList parseFrom(byte[] data) + public static monitoring.Monitoring.KpiValueRange parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiList parseFrom( + public static monitoring.Monitoring.KpiValueRange parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiList parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiValueRange parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiList parseFrom( + public static monitoring.Monitoring.KpiValueRange parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiList parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiValueRange parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiList parseDelimitedFrom( + public static monitoring.Monitoring.KpiValueRange parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiList parseFrom( + public static monitoring.Monitoring.KpiValueRange parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiList parseFrom( + public static monitoring.Monitoring.KpiValueRange parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -8778,7 +9557,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.KpiList prototype) { + public static Builder newBuilder(monitoring.Monitoring.KpiValueRange prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -8794,26 +9573,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.KpiList} + * Protobuf type {@code monitoring.KpiValueRange} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.KpiList) - monitoring.Monitoring.KpiListOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.KpiValueRange) + monitoring.Monitoring.KpiValueRangeOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiList_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiList_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiList.class, monitoring.Monitoring.KpiList.Builder.class); + monitoring.Monitoring.KpiValueRange.class, monitoring.Monitoring.KpiValueRange.Builder.class); } - // Construct using monitoring.Monitoring.KpiList.newBuilder() + // Construct using monitoring.Monitoring.KpiValueRange.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -8826,17 +9605,22 @@ public final class Monitoring { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getKpiListFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); - if (kpiListBuilder_ == null) { - kpiList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + if (kpiMinValueBuilder_ == null) { + kpiMinValue_ = null; } else { - kpiListBuilder_.clear(); + kpiMinValue_ = null; + kpiMinValueBuilder_ = null; + } + if (kpiMaxValueBuilder_ == null) { + kpiMaxValue_ = null; + } else { + kpiMaxValue_ = null; + kpiMaxValueBuilder_ = null; } return this; } @@ -8844,17 +9628,17 @@ public final class Monitoring { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_KpiList_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_descriptor; } @java.lang.Override - public monitoring.Monitoring.KpiList getDefaultInstanceForType() { - return monitoring.Monitoring.KpiList.getDefaultInstance(); + public monitoring.Monitoring.KpiValueRange getDefaultInstanceForType() { + return monitoring.Monitoring.KpiValueRange.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.KpiList build() { - monitoring.Monitoring.KpiList result = buildPartial(); + public monitoring.Monitoring.KpiValueRange build() { + monitoring.Monitoring.KpiValueRange result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -8862,17 +9646,17 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.KpiList buildPartial() { - monitoring.Monitoring.KpiList result = new monitoring.Monitoring.KpiList(this); - int from_bitField0_ = bitField0_; - if (kpiListBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { - kpiList_ = java.util.Collections.unmodifiableList(kpiList_); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.kpiList_ = kpiList_; + public monitoring.Monitoring.KpiValueRange buildPartial() { + monitoring.Monitoring.KpiValueRange result = new monitoring.Monitoring.KpiValueRange(this); + if (kpiMinValueBuilder_ == null) { + result.kpiMinValue_ = kpiMinValue_; } else { - result.kpiList_ = kpiListBuilder_.build(); + result.kpiMinValue_ = kpiMinValueBuilder_.build(); + } + if (kpiMaxValueBuilder_ == null) { + result.kpiMaxValue_ = kpiMaxValue_; + } else { + result.kpiMaxValue_ = kpiMaxValueBuilder_.build(); } onBuilt(); return result; @@ -8912,41 +9696,21 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.KpiList) { - return mergeFrom((monitoring.Monitoring.KpiList)other); + if (other instanceof monitoring.Monitoring.KpiValueRange) { + return mergeFrom((monitoring.Monitoring.KpiValueRange)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.KpiList other) { - if (other == monitoring.Monitoring.KpiList.getDefaultInstance()) return this; - if (kpiListBuilder_ == null) { - if (!other.kpiList_.isEmpty()) { - if (kpiList_.isEmpty()) { - kpiList_ = other.kpiList_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureKpiListIsMutable(); - kpiList_.addAll(other.kpiList_); - } - onChanged(); - } - } else { - if (!other.kpiList_.isEmpty()) { - if (kpiListBuilder_.isEmpty()) { - kpiListBuilder_.dispose(); - kpiListBuilder_ = null; - kpiList_ = other.kpiList_; - bitField0_ = (bitField0_ & ~0x00000001); - kpiListBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getKpiListFieldBuilder() : null; - } else { - kpiListBuilder_.addAllMessages(other.kpiList_); - } - } + public Builder mergeFrom(monitoring.Monitoring.KpiValueRange other) { + if (other == monitoring.Monitoring.KpiValueRange.getDefaultInstance()) return this; + if (other.hasKpiMinValue()) { + mergeKpiMinValue(other.getKpiMinValue()); + } + if (other.hasKpiMaxValue()) { + mergeKpiMaxValue(other.getKpiMaxValue()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -8963,11 +9727,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.KpiList parsedMessage = null; + monitoring.Monitoring.KpiValueRange parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.KpiList) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.KpiValueRange) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -8976,246 +9740,243 @@ public final class Monitoring { } return this; } - private int bitField0_; - - private java.util.List kpiList_ = - java.util.Collections.emptyList(); - private void ensureKpiListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - kpiList_ = new java.util.ArrayList(kpiList_); - bitField0_ |= 0x00000001; - } - } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.Kpi, monitoring.Monitoring.Kpi.Builder, monitoring.Monitoring.KpiOrBuilder> kpiListBuilder_; - - /** - * repeated .monitoring.Kpi kpi_list = 1; - */ - public java.util.List getKpiListList() { - if (kpiListBuilder_ == null) { - return java.util.Collections.unmodifiableList(kpiList_); - } else { - return kpiListBuilder_.getMessageList(); - } - } + private monitoring.Monitoring.KpiValue kpiMinValue_; + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> kpiMinValueBuilder_; /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; + * @return Whether the kpiMinValue field is set. */ - public int getKpiListCount() { - if (kpiListBuilder_ == null) { - return kpiList_.size(); - } else { - return kpiListBuilder_.getCount(); - } + public boolean hasKpiMinValue() { + return kpiMinValueBuilder_ != null || kpiMinValue_ != null; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; + * @return The kpiMinValue. */ - public monitoring.Monitoring.Kpi getKpiList(int index) { - if (kpiListBuilder_ == null) { - return kpiList_.get(index); + public monitoring.Monitoring.KpiValue getKpiMinValue() { + if (kpiMinValueBuilder_ == null) { + return kpiMinValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMinValue_; } else { - return kpiListBuilder_.getMessage(index); + return kpiMinValueBuilder_.getMessage(); } } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; */ - public Builder setKpiList( - int index, monitoring.Monitoring.Kpi value) { - if (kpiListBuilder_ == null) { + public Builder setKpiMinValue(monitoring.Monitoring.KpiValue value) { + if (kpiMinValueBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureKpiListIsMutable(); - kpiList_.set(index, value); + kpiMinValue_ = value; onChanged(); } else { - kpiListBuilder_.setMessage(index, value); + kpiMinValueBuilder_.setMessage(value); } + return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; */ - public Builder setKpiList( - int index, monitoring.Monitoring.Kpi.Builder builderForValue) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - kpiList_.set(index, builderForValue.build()); + public Builder setKpiMinValue( + monitoring.Monitoring.KpiValue.Builder builderForValue) { + if (kpiMinValueBuilder_ == null) { + kpiMinValue_ = builderForValue.build(); onChanged(); } else { - kpiListBuilder_.setMessage(index, builderForValue.build()); + kpiMinValueBuilder_.setMessage(builderForValue.build()); } + return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; */ - public Builder addKpiList(monitoring.Monitoring.Kpi value) { - if (kpiListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); + public Builder mergeKpiMinValue(monitoring.Monitoring.KpiValue value) { + if (kpiMinValueBuilder_ == null) { + if (kpiMinValue_ != null) { + kpiMinValue_ = + monitoring.Monitoring.KpiValue.newBuilder(kpiMinValue_).mergeFrom(value).buildPartial(); + } else { + kpiMinValue_ = value; } - ensureKpiListIsMutable(); - kpiList_.add(value); onChanged(); } else { - kpiListBuilder_.addMessage(value); + kpiMinValueBuilder_.mergeFrom(value); } + return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; */ - public Builder addKpiList( - int index, monitoring.Monitoring.Kpi value) { - if (kpiListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiListIsMutable(); - kpiList_.add(index, value); + public Builder clearKpiMinValue() { + if (kpiMinValueBuilder_ == null) { + kpiMinValue_ = null; onChanged(); } else { - kpiListBuilder_.addMessage(index, value); + kpiMinValue_ = null; + kpiMinValueBuilder_ = null; } + return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; */ - public Builder addKpiList( - monitoring.Monitoring.Kpi.Builder builderForValue) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - kpiList_.add(builderForValue.build()); - onChanged(); + public monitoring.Monitoring.KpiValue.Builder getKpiMinValueBuilder() { + + onChanged(); + return getKpiMinValueFieldBuilder().getBuilder(); + } + /** + * .monitoring.KpiValue kpiMinValue = 1; + */ + public monitoring.Monitoring.KpiValueOrBuilder getKpiMinValueOrBuilder() { + if (kpiMinValueBuilder_ != null) { + return kpiMinValueBuilder_.getMessageOrBuilder(); } else { - kpiListBuilder_.addMessage(builderForValue.build()); + return kpiMinValue_ == null ? + monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMinValue_; } - return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMinValue = 1; */ - public Builder addKpiList( - int index, monitoring.Monitoring.Kpi.Builder builderForValue) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - kpiList_.add(index, builderForValue.build()); - onChanged(); + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> + getKpiMinValueFieldBuilder() { + if (kpiMinValueBuilder_ == null) { + kpiMinValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder>( + getKpiMinValue(), + getParentForChildren(), + isClean()); + kpiMinValue_ = null; + } + return kpiMinValueBuilder_; + } + + private monitoring.Monitoring.KpiValue kpiMaxValue_; + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> kpiMaxValueBuilder_; + /** + * .monitoring.KpiValue kpiMaxValue = 2; + * @return Whether the kpiMaxValue field is set. + */ + public boolean hasKpiMaxValue() { + return kpiMaxValueBuilder_ != null || kpiMaxValue_ != null; + } + /** + * .monitoring.KpiValue kpiMaxValue = 2; + * @return The kpiMaxValue. + */ + public monitoring.Monitoring.KpiValue getKpiMaxValue() { + if (kpiMaxValueBuilder_ == null) { + return kpiMaxValue_ == null ? monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMaxValue_; } else { - kpiListBuilder_.addMessage(index, builderForValue.build()); + return kpiMaxValueBuilder_.getMessage(); } - return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; */ - public Builder addAllKpiList( - java.lang.Iterable values) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, kpiList_); + public Builder setKpiMaxValue(monitoring.Monitoring.KpiValue value) { + if (kpiMaxValueBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + kpiMaxValue_ = value; onChanged(); } else { - kpiListBuilder_.addAllMessages(values); + kpiMaxValueBuilder_.setMessage(value); } + return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; */ - public Builder clearKpiList() { - if (kpiListBuilder_ == null) { - kpiList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + public Builder setKpiMaxValue( + monitoring.Monitoring.KpiValue.Builder builderForValue) { + if (kpiMaxValueBuilder_ == null) { + kpiMaxValue_ = builderForValue.build(); onChanged(); } else { - kpiListBuilder_.clear(); + kpiMaxValueBuilder_.setMessage(builderForValue.build()); } + return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; */ - public Builder removeKpiList(int index) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - kpiList_.remove(index); + public Builder mergeKpiMaxValue(monitoring.Monitoring.KpiValue value) { + if (kpiMaxValueBuilder_ == null) { + if (kpiMaxValue_ != null) { + kpiMaxValue_ = + monitoring.Monitoring.KpiValue.newBuilder(kpiMaxValue_).mergeFrom(value).buildPartial(); + } else { + kpiMaxValue_ = value; + } onChanged(); } else { - kpiListBuilder_.remove(index); + kpiMaxValueBuilder_.mergeFrom(value); } + return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; - */ - public monitoring.Monitoring.Kpi.Builder getKpiListBuilder( - int index) { - return getKpiListFieldBuilder().getBuilder(index); - } - /** - * repeated .monitoring.Kpi kpi_list = 1; - */ - public monitoring.Monitoring.KpiOrBuilder getKpiListOrBuilder( - int index) { - if (kpiListBuilder_ == null) { - return kpiList_.get(index); } else { - return kpiListBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; */ - public java.util.List - getKpiListOrBuilderList() { - if (kpiListBuilder_ != null) { - return kpiListBuilder_.getMessageOrBuilderList(); + public Builder clearKpiMaxValue() { + if (kpiMaxValueBuilder_ == null) { + kpiMaxValue_ = null; + onChanged(); } else { - return java.util.Collections.unmodifiableList(kpiList_); + kpiMaxValue_ = null; + kpiMaxValueBuilder_ = null; } + + return this; } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; */ - public monitoring.Monitoring.Kpi.Builder addKpiListBuilder() { - return getKpiListFieldBuilder().addBuilder( - monitoring.Monitoring.Kpi.getDefaultInstance()); + public monitoring.Monitoring.KpiValue.Builder getKpiMaxValueBuilder() { + + onChanged(); + return getKpiMaxValueFieldBuilder().getBuilder(); } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; */ - public monitoring.Monitoring.Kpi.Builder addKpiListBuilder( - int index) { - return getKpiListFieldBuilder().addBuilder( - index, monitoring.Monitoring.Kpi.getDefaultInstance()); + public monitoring.Monitoring.KpiValueOrBuilder getKpiMaxValueOrBuilder() { + if (kpiMaxValueBuilder_ != null) { + return kpiMaxValueBuilder_.getMessageOrBuilder(); + } else { + return kpiMaxValue_ == null ? + monitoring.Monitoring.KpiValue.getDefaultInstance() : kpiMaxValue_; + } } /** - * repeated .monitoring.Kpi kpi_list = 1; + * .monitoring.KpiValue kpiMaxValue = 2; */ - public java.util.List - getKpiListBuilderList() { - return getKpiListFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.Kpi, monitoring.Monitoring.Kpi.Builder, monitoring.Monitoring.KpiOrBuilder> - getKpiListFieldBuilder() { - if (kpiListBuilder_ == null) { - kpiListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.Kpi, monitoring.Monitoring.Kpi.Builder, monitoring.Monitoring.KpiOrBuilder>( - kpiList_, - ((bitField0_ & 0x00000001) != 0), + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder> + getKpiMaxValueFieldBuilder() { + if (kpiMaxValueBuilder_ == null) { + kpiMaxValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValue, monitoring.Monitoring.KpiValue.Builder, monitoring.Monitoring.KpiValueOrBuilder>( + getKpiMaxValue(), getParentForChildren(), isClean()); - kpiList_ = null; + kpiMaxValue_ = null; } - return kpiListBuilder_; + return kpiMaxValueBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -9230,95 +9991,122 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.KpiList) + // @@protoc_insertion_point(builder_scope:monitoring.KpiValueRange) } - // @@protoc_insertion_point(class_scope:monitoring.KpiList) - private static final monitoring.Monitoring.KpiList DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.KpiValueRange) + private static final monitoring.Monitoring.KpiValueRange DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.KpiList(); + DEFAULT_INSTANCE = new monitoring.Monitoring.KpiValueRange(); } - public static monitoring.Monitoring.KpiList getDefaultInstance() { + public static monitoring.Monitoring.KpiValueRange getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public KpiList parsePartialFrom( + public KpiValueRange parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new KpiList(input, extensionRegistry); + return new KpiValueRange(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.KpiList getDefaultInstanceForType() { + public monitoring.Monitoring.KpiValueRange getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface KpiDescriptorListOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptorList) + public interface KpiValueOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.KpiValue) com.google.protobuf.MessageOrBuilder { /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * uint32 intVal = 1; + * @return Whether the intVal field is set. */ - java.util.List - getKpiDescriptorListList(); + boolean hasIntVal(); /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * uint32 intVal = 1; + * @return The intVal. */ - monitoring.Monitoring.KpiDescriptor getKpiDescriptorList(int index); + int getIntVal(); + /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * float floatVal = 2; + * @return Whether the floatVal field is set. */ - int getKpiDescriptorListCount(); + boolean hasFloatVal(); /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * float floatVal = 2; + * @return The floatVal. */ - java.util.List - getKpiDescriptorListOrBuilderList(); + float getFloatVal(); + /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * string stringVal = 3; + * @return Whether the stringVal field is set. */ - monitoring.Monitoring.KpiDescriptorOrBuilder getKpiDescriptorListOrBuilder( - int index); + boolean hasStringVal(); + /** + * string stringVal = 3; + * @return The stringVal. + */ + java.lang.String getStringVal(); + /** + * string stringVal = 3; + * @return The bytes for stringVal. + */ + com.google.protobuf.ByteString + getStringValBytes(); + + /** + * bool boolVal = 4; + * @return Whether the boolVal field is set. + */ + boolean hasBoolVal(); + /** + * bool boolVal = 4; + * @return The boolVal. + */ + boolean getBoolVal(); + + public monitoring.Monitoring.KpiValue.ValueCase getValueCase(); } /** - * Protobuf type {@code monitoring.KpiDescriptorList} + * Protobuf type {@code monitoring.KpiValue} */ - public static final class KpiDescriptorList extends + public static final class KpiValue extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptorList) - KpiDescriptorListOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.KpiValue) + KpiValueOrBuilder { private static final long serialVersionUID = 0L; - // Use KpiDescriptorList.newBuilder() to construct. - private KpiDescriptorList(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use KpiValue.newBuilder() to construct. + private KpiValue(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private KpiDescriptorList() { - kpiDescriptorList_ = java.util.Collections.emptyList(); + private KpiValue() { } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new KpiDescriptorList(); + return new KpiValue(); } @java.lang.Override @@ -9326,7 +10114,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private KpiDescriptorList( + private KpiValue( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -9334,7 +10122,6 @@ public final class Monitoring { if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -9345,13 +10132,25 @@ public final class Monitoring { case 0: done = true; break; - case 10: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - kpiDescriptorList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - kpiDescriptorList_.add( - input.readMessage(monitoring.Monitoring.KpiDescriptor.parser(), extensionRegistry)); + case 8: { + valueCase_ = 1; + value_ = input.readUInt32(); + break; + } + case 21: { + valueCase_ = 2; + value_ = input.readFloat(); + break; + } + case 26: { + java.lang.String s = input.readStringRequireUtf8(); + valueCase_ = 3; + value_ = s; + break; + } + case 32: { + valueCase_ = 4; + value_ = input.readBool(); break; } default: { @@ -9369,64 +10168,181 @@ public final class Monitoring { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - kpiDescriptorList_ = java.util.Collections.unmodifiableList(kpiDescriptorList_); + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return monitoring.Monitoring.internal_static_monitoring_KpiValue_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return monitoring.Monitoring.internal_static_monitoring_KpiValue_fieldAccessorTable + .ensureFieldAccessorsInitialized( + monitoring.Monitoring.KpiValue.class, monitoring.Monitoring.KpiValue.Builder.class); + } + + private int valueCase_ = 0; + private java.lang.Object value_; + public enum ValueCase + implements com.google.protobuf.Internal.EnumLite, + com.google.protobuf.AbstractMessage.InternalOneOfEnum { + INTVAL(1), + FLOATVAL(2), + STRINGVAL(3), + BOOLVAL(4), + VALUE_NOT_SET(0); + private final int value; + private ValueCase(int value) { + this.value = value; + } + /** + * @param value The number of the enum to look for. + * @return The enum associated with the given number. + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static ValueCase valueOf(int value) { + return forNumber(value); + } + + public static ValueCase forNumber(int value) { + switch (value) { + case 1: return INTVAL; + case 2: return FLOATVAL; + case 3: return STRINGVAL; + case 4: return BOOLVAL; + case 0: return VALUE_NOT_SET; + default: return null; } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_descriptor; + public int getNumber() { + return this.value; + } + }; + + public ValueCase + getValueCase() { + return ValueCase.forNumber( + valueCase_); } + public static final int INTVAL_FIELD_NUMBER = 1; + /** + * uint32 intVal = 1; + * @return Whether the intVal field is set. + */ @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_fieldAccessorTable - .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiDescriptorList.class, monitoring.Monitoring.KpiDescriptorList.Builder.class); + public boolean hasIntVal() { + return valueCase_ == 1; } - - public static final int KPI_DESCRIPTOR_LIST_FIELD_NUMBER = 1; - private java.util.List kpiDescriptorList_; /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * uint32 intVal = 1; + * @return The intVal. */ @java.lang.Override - public java.util.List getKpiDescriptorListList() { - return kpiDescriptorList_; + public int getIntVal() { + if (valueCase_ == 1) { + return (java.lang.Integer) value_; + } + return 0; } + + public static final int FLOATVAL_FIELD_NUMBER = 2; /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * float floatVal = 2; + * @return Whether the floatVal field is set. */ @java.lang.Override - public java.util.List - getKpiDescriptorListOrBuilderList() { - return kpiDescriptorList_; + public boolean hasFloatVal() { + return valueCase_ == 2; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * float floatVal = 2; + * @return The floatVal. */ @java.lang.Override - public int getKpiDescriptorListCount() { - return kpiDescriptorList_.size(); + public float getFloatVal() { + if (valueCase_ == 2) { + return (java.lang.Float) value_; + } + return 0F; } + + public static final int STRINGVAL_FIELD_NUMBER = 3; /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * string stringVal = 3; + * @return Whether the stringVal field is set. + */ + public boolean hasStringVal() { + return valueCase_ == 3; + } + /** + * string stringVal = 3; + * @return The stringVal. + */ + public java.lang.String getStringVal() { + java.lang.Object ref = ""; + if (valueCase_ == 3) { + ref = value_; + } + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (valueCase_ == 3) { + value_ = s; + } + return s; + } + } + /** + * string stringVal = 3; + * @return The bytes for stringVal. + */ + public com.google.protobuf.ByteString + getStringValBytes() { + java.lang.Object ref = ""; + if (valueCase_ == 3) { + ref = value_; + } + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + if (valueCase_ == 3) { + value_ = b; + } + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int BOOLVAL_FIELD_NUMBER = 4; + /** + * bool boolVal = 4; + * @return Whether the boolVal field is set. */ @java.lang.Override - public monitoring.Monitoring.KpiDescriptor getKpiDescriptorList(int index) { - return kpiDescriptorList_.get(index); + public boolean hasBoolVal() { + return valueCase_ == 4; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * bool boolVal = 4; + * @return The boolVal. */ @java.lang.Override - public monitoring.Monitoring.KpiDescriptorOrBuilder getKpiDescriptorListOrBuilder( - int index) { - return kpiDescriptorList_.get(index); + public boolean getBoolVal() { + if (valueCase_ == 4) { + return (java.lang.Boolean) value_; + } + return false; } private byte memoizedIsInitialized = -1; @@ -9443,8 +10359,20 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - for (int i = 0; i < kpiDescriptorList_.size(); i++) { - output.writeMessage(1, kpiDescriptorList_.get(i)); + if (valueCase_ == 1) { + output.writeUInt32( + 1, (int)((java.lang.Integer) value_)); + } + if (valueCase_ == 2) { + output.writeFloat( + 2, (float)((java.lang.Float) value_)); + } + if (valueCase_ == 3) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, value_); + } + if (valueCase_ == 4) { + output.writeBool( + 4, (boolean)((java.lang.Boolean) value_)); } unknownFields.writeTo(output); } @@ -9455,9 +10383,23 @@ public final class Monitoring { if (size != -1) return size; size = 0; - for (int i = 0; i < kpiDescriptorList_.size(); i++) { + if (valueCase_ == 1) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, kpiDescriptorList_.get(i)); + .computeUInt32Size( + 1, (int)((java.lang.Integer) value_)); + } + if (valueCase_ == 2) { + size += com.google.protobuf.CodedOutputStream + .computeFloatSize( + 2, (float)((java.lang.Float) value_)); + } + if (valueCase_ == 3) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, value_); + } + if (valueCase_ == 4) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize( + 4, (boolean)((java.lang.Boolean) value_)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -9469,13 +10411,33 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.KpiDescriptorList)) { + if (!(obj instanceof monitoring.Monitoring.KpiValue)) { return super.equals(obj); } - monitoring.Monitoring.KpiDescriptorList other = (monitoring.Monitoring.KpiDescriptorList) obj; + monitoring.Monitoring.KpiValue other = (monitoring.Monitoring.KpiValue) obj; - if (!getKpiDescriptorListList() - .equals(other.getKpiDescriptorListList())) return false; + if (!getValueCase().equals(other.getValueCase())) return false; + switch (valueCase_) { + case 1: + if (getIntVal() + != other.getIntVal()) return false; + break; + case 2: + if (java.lang.Float.floatToIntBits(getFloatVal()) + != java.lang.Float.floatToIntBits( + other.getFloatVal())) return false; + break; + case 3: + if (!getStringVal() + .equals(other.getStringVal())) return false; + break; + case 4: + if (getBoolVal() + != other.getBoolVal()) return false; + break; + case 0: + default: + } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -9487,78 +10449,96 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getKpiDescriptorListCount() > 0) { - hash = (37 * hash) + KPI_DESCRIPTOR_LIST_FIELD_NUMBER; - hash = (53 * hash) + getKpiDescriptorListList().hashCode(); + switch (valueCase_) { + case 1: + hash = (37 * hash) + INTVAL_FIELD_NUMBER; + hash = (53 * hash) + getIntVal(); + break; + case 2: + hash = (37 * hash) + FLOATVAL_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getFloatVal()); + break; + case 3: + hash = (37 * hash) + STRINGVAL_FIELD_NUMBER; + hash = (53 * hash) + getStringVal().hashCode(); + break; + case 4: + hash = (37 * hash) + BOOLVAL_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getBoolVal()); + break; + case 0: + default: } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.KpiDescriptorList parseFrom( + public static monitoring.Monitoring.KpiValue parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiDescriptorList parseFrom( + public static monitoring.Monitoring.KpiValue parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiDescriptorList parseFrom( + public static monitoring.Monitoring.KpiValue parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiDescriptorList parseFrom( + public static monitoring.Monitoring.KpiValue parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiDescriptorList parseFrom(byte[] data) + public static monitoring.Monitoring.KpiValue parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.KpiDescriptorList parseFrom( + public static monitoring.Monitoring.KpiValue parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.KpiDescriptorList parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiValue parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiDescriptorList parseFrom( + public static monitoring.Monitoring.KpiValue parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiDescriptorList parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiValue parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiDescriptorList parseDelimitedFrom( + public static monitoring.Monitoring.KpiValue parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.KpiDescriptorList parseFrom( + public static monitoring.Monitoring.KpiValue parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.KpiDescriptorList parseFrom( + public static monitoring.Monitoring.KpiValue parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -9571,7 +10551,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.KpiDescriptorList prototype) { + public static Builder newBuilder(monitoring.Monitoring.KpiValue prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -9587,26 +10567,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.KpiDescriptorList} + * Protobuf type {@code monitoring.KpiValue} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptorList) - monitoring.Monitoring.KpiDescriptorListOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.KpiValue) + monitoring.Monitoring.KpiValueOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiValue_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiValue_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.KpiDescriptorList.class, monitoring.Monitoring.KpiDescriptorList.Builder.class); + monitoring.Monitoring.KpiValue.class, monitoring.Monitoring.KpiValue.Builder.class); } - // Construct using monitoring.Monitoring.KpiDescriptorList.newBuilder() + // Construct using monitoring.Monitoring.KpiValue.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -9619,35 +10599,30 @@ public final class Monitoring { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getKpiDescriptorListFieldBuilder(); } } @java.lang.Override public Builder clear() { - super.clear(); - if (kpiDescriptorListBuilder_ == null) { - kpiDescriptorList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - } else { - kpiDescriptorListBuilder_.clear(); - } + super.clear(); + valueCase_ = 0; + value_ = null; return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiValue_descriptor; } @java.lang.Override - public monitoring.Monitoring.KpiDescriptorList getDefaultInstanceForType() { - return monitoring.Monitoring.KpiDescriptorList.getDefaultInstance(); + public monitoring.Monitoring.KpiValue getDefaultInstanceForType() { + return monitoring.Monitoring.KpiValue.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.KpiDescriptorList build() { - monitoring.Monitoring.KpiDescriptorList result = buildPartial(); + public monitoring.Monitoring.KpiValue build() { + monitoring.Monitoring.KpiValue result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -9655,18 +10630,21 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.KpiDescriptorList buildPartial() { - monitoring.Monitoring.KpiDescriptorList result = new monitoring.Monitoring.KpiDescriptorList(this); - int from_bitField0_ = bitField0_; - if (kpiDescriptorListBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { - kpiDescriptorList_ = java.util.Collections.unmodifiableList(kpiDescriptorList_); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.kpiDescriptorList_ = kpiDescriptorList_; - } else { - result.kpiDescriptorList_ = kpiDescriptorListBuilder_.build(); + public monitoring.Monitoring.KpiValue buildPartial() { + monitoring.Monitoring.KpiValue result = new monitoring.Monitoring.KpiValue(this); + if (valueCase_ == 1) { + result.value_ = value_; + } + if (valueCase_ == 2) { + result.value_ = value_; + } + if (valueCase_ == 3) { + result.value_ = value_; + } + if (valueCase_ == 4) { + result.value_ = value_; } + result.valueCase_ = valueCase_; onBuilt(); return result; } @@ -9705,40 +10683,37 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.KpiDescriptorList) { - return mergeFrom((monitoring.Monitoring.KpiDescriptorList)other); + if (other instanceof monitoring.Monitoring.KpiValue) { + return mergeFrom((monitoring.Monitoring.KpiValue)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.KpiDescriptorList other) { - if (other == monitoring.Monitoring.KpiDescriptorList.getDefaultInstance()) return this; - if (kpiDescriptorListBuilder_ == null) { - if (!other.kpiDescriptorList_.isEmpty()) { - if (kpiDescriptorList_.isEmpty()) { - kpiDescriptorList_ = other.kpiDescriptorList_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureKpiDescriptorListIsMutable(); - kpiDescriptorList_.addAll(other.kpiDescriptorList_); - } + public Builder mergeFrom(monitoring.Monitoring.KpiValue other) { + if (other == monitoring.Monitoring.KpiValue.getDefaultInstance()) return this; + switch (other.getValueCase()) { + case INTVAL: { + setIntVal(other.getIntVal()); + break; + } + case FLOATVAL: { + setFloatVal(other.getFloatVal()); + break; + } + case STRINGVAL: { + valueCase_ = 3; + value_ = other.value_; onChanged(); + break; } - } else { - if (!other.kpiDescriptorList_.isEmpty()) { - if (kpiDescriptorListBuilder_.isEmpty()) { - kpiDescriptorListBuilder_.dispose(); - kpiDescriptorListBuilder_ = null; - kpiDescriptorList_ = other.kpiDescriptorList_; - bitField0_ = (bitField0_ & ~0x00000001); - kpiDescriptorListBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getKpiDescriptorListFieldBuilder() : null; - } else { - kpiDescriptorListBuilder_.addAllMessages(other.kpiDescriptorList_); - } + case BOOLVAL: { + setBoolVal(other.getBoolVal()); + break; + } + case VALUE_NOT_SET: { + break; } } this.mergeUnknownFields(other.unknownFields); @@ -9756,11 +10731,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.KpiDescriptorList parsedMessage = null; + monitoring.Monitoring.KpiValue parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.KpiDescriptorList) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.KpiValue) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -9769,246 +10744,240 @@ public final class Monitoring { } return this; } - private int bitField0_; + private int valueCase_ = 0; + private java.lang.Object value_; + public ValueCase + getValueCase() { + return ValueCase.forNumber( + valueCase_); + } - private java.util.List kpiDescriptorList_ = - java.util.Collections.emptyList(); - private void ensureKpiDescriptorListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - kpiDescriptorList_ = new java.util.ArrayList(kpiDescriptorList_); - bitField0_ |= 0x00000001; - } + public Builder clearValue() { + valueCase_ = 0; + value_ = null; + onChanged(); + return this; } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiDescriptor, monitoring.Monitoring.KpiDescriptor.Builder, monitoring.Monitoring.KpiDescriptorOrBuilder> kpiDescriptorListBuilder_; /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * uint32 intVal = 1; + * @return Whether the intVal field is set. */ - public java.util.List getKpiDescriptorListList() { - if (kpiDescriptorListBuilder_ == null) { - return java.util.Collections.unmodifiableList(kpiDescriptorList_); - } else { - return kpiDescriptorListBuilder_.getMessageList(); - } + public boolean hasIntVal() { + return valueCase_ == 1; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * uint32 intVal = 1; + * @return The intVal. */ - public int getKpiDescriptorListCount() { - if (kpiDescriptorListBuilder_ == null) { - return kpiDescriptorList_.size(); - } else { - return kpiDescriptorListBuilder_.getCount(); + public int getIntVal() { + if (valueCase_ == 1) { + return (java.lang.Integer) value_; } + return 0; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * uint32 intVal = 1; + * @param value The intVal to set. + * @return This builder for chaining. */ - public monitoring.Monitoring.KpiDescriptor getKpiDescriptorList(int index) { - if (kpiDescriptorListBuilder_ == null) { - return kpiDescriptorList_.get(index); - } else { - return kpiDescriptorListBuilder_.getMessage(index); - } + public Builder setIntVal(int value) { + valueCase_ = 1; + value_ = value; + onChanged(); + return this; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * uint32 intVal = 1; + * @return This builder for chaining. */ - public Builder setKpiDescriptorList( - int index, monitoring.Monitoring.KpiDescriptor value) { - if (kpiDescriptorListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiDescriptorListIsMutable(); - kpiDescriptorList_.set(index, value); + public Builder clearIntVal() { + if (valueCase_ == 1) { + valueCase_ = 0; + value_ = null; onChanged(); - } else { - kpiDescriptorListBuilder_.setMessage(index, value); } return this; } + /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * float floatVal = 2; + * @return Whether the floatVal field is set. */ - public Builder setKpiDescriptorList( - int index, monitoring.Monitoring.KpiDescriptor.Builder builderForValue) { - if (kpiDescriptorListBuilder_ == null) { - ensureKpiDescriptorListIsMutable(); - kpiDescriptorList_.set(index, builderForValue.build()); - onChanged(); - } else { - kpiDescriptorListBuilder_.setMessage(index, builderForValue.build()); - } - return this; + public boolean hasFloatVal() { + return valueCase_ == 2; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * float floatVal = 2; + * @return The floatVal. */ - public Builder addKpiDescriptorList(monitoring.Monitoring.KpiDescriptor value) { - if (kpiDescriptorListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiDescriptorListIsMutable(); - kpiDescriptorList_.add(value); - onChanged(); - } else { - kpiDescriptorListBuilder_.addMessage(value); + public float getFloatVal() { + if (valueCase_ == 2) { + return (java.lang.Float) value_; } - return this; + return 0F; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * float floatVal = 2; + * @param value The floatVal to set. + * @return This builder for chaining. */ - public Builder addKpiDescriptorList( - int index, monitoring.Monitoring.KpiDescriptor value) { - if (kpiDescriptorListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiDescriptorListIsMutable(); - kpiDescriptorList_.add(index, value); - onChanged(); - } else { - kpiDescriptorListBuilder_.addMessage(index, value); - } + public Builder setFloatVal(float value) { + valueCase_ = 2; + value_ = value; + onChanged(); return this; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * float floatVal = 2; + * @return This builder for chaining. */ - public Builder addKpiDescriptorList( - monitoring.Monitoring.KpiDescriptor.Builder builderForValue) { - if (kpiDescriptorListBuilder_ == null) { - ensureKpiDescriptorListIsMutable(); - kpiDescriptorList_.add(builderForValue.build()); + public Builder clearFloatVal() { + if (valueCase_ == 2) { + valueCase_ = 0; + value_ = null; onChanged(); - } else { - kpiDescriptorListBuilder_.addMessage(builderForValue.build()); } return this; } + /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * string stringVal = 3; + * @return Whether the stringVal field is set. */ - public Builder addKpiDescriptorList( - int index, monitoring.Monitoring.KpiDescriptor.Builder builderForValue) { - if (kpiDescriptorListBuilder_ == null) { - ensureKpiDescriptorListIsMutable(); - kpiDescriptorList_.add(index, builderForValue.build()); - onChanged(); - } else { - kpiDescriptorListBuilder_.addMessage(index, builderForValue.build()); - } - return this; + @java.lang.Override + public boolean hasStringVal() { + return valueCase_ == 3; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * string stringVal = 3; + * @return The stringVal. */ - public Builder addAllKpiDescriptorList( - java.lang.Iterable values) { - if (kpiDescriptorListBuilder_ == null) { - ensureKpiDescriptorListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, kpiDescriptorList_); - onChanged(); + @java.lang.Override + public java.lang.String getStringVal() { + java.lang.Object ref = ""; + if (valueCase_ == 3) { + ref = value_; + } + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (valueCase_ == 3) { + value_ = s; + } + return s; } else { - kpiDescriptorListBuilder_.addAllMessages(values); + return (java.lang.String) ref; } - return this; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * string stringVal = 3; + * @return The bytes for stringVal. */ - public Builder clearKpiDescriptorList() { - if (kpiDescriptorListBuilder_ == null) { - kpiDescriptorList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); + @java.lang.Override + public com.google.protobuf.ByteString + getStringValBytes() { + java.lang.Object ref = ""; + if (valueCase_ == 3) { + ref = value_; + } + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + if (valueCase_ == 3) { + value_ = b; + } + return b; } else { - kpiDescriptorListBuilder_.clear(); + return (com.google.protobuf.ByteString) ref; } + } + /** + * string stringVal = 3; + * @param value The stringVal to set. + * @return This builder for chaining. + */ + public Builder setStringVal( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + valueCase_ = 3; + value_ = value; + onChanged(); return this; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * string stringVal = 3; + * @return This builder for chaining. */ - public Builder removeKpiDescriptorList(int index) { - if (kpiDescriptorListBuilder_ == null) { - ensureKpiDescriptorListIsMutable(); - kpiDescriptorList_.remove(index); + public Builder clearStringVal() { + if (valueCase_ == 3) { + valueCase_ = 0; + value_ = null; onChanged(); - } else { - kpiDescriptorListBuilder_.remove(index); } return this; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * string stringVal = 3; + * @param value The bytes for stringVal to set. + * @return This builder for chaining. */ - public monitoring.Monitoring.KpiDescriptor.Builder getKpiDescriptorListBuilder( - int index) { - return getKpiDescriptorListFieldBuilder().getBuilder(index); + public Builder setStringValBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + valueCase_ = 3; + value_ = value; + onChanged(); + return this; } + /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * bool boolVal = 4; + * @return Whether the boolVal field is set. */ - public monitoring.Monitoring.KpiDescriptorOrBuilder getKpiDescriptorListOrBuilder( - int index) { - if (kpiDescriptorListBuilder_ == null) { - return kpiDescriptorList_.get(index); } else { - return kpiDescriptorListBuilder_.getMessageOrBuilder(index); - } + public boolean hasBoolVal() { + return valueCase_ == 4; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * bool boolVal = 4; + * @return The boolVal. */ - public java.util.List - getKpiDescriptorListOrBuilderList() { - if (kpiDescriptorListBuilder_ != null) { - return kpiDescriptorListBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(kpiDescriptorList_); + public boolean getBoolVal() { + if (valueCase_ == 4) { + return (java.lang.Boolean) value_; } + return false; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; - */ - public monitoring.Monitoring.KpiDescriptor.Builder addKpiDescriptorListBuilder() { - return getKpiDescriptorListFieldBuilder().addBuilder( - monitoring.Monitoring.KpiDescriptor.getDefaultInstance()); - } - /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * bool boolVal = 4; + * @param value The boolVal to set. + * @return This builder for chaining. */ - public monitoring.Monitoring.KpiDescriptor.Builder addKpiDescriptorListBuilder( - int index) { - return getKpiDescriptorListFieldBuilder().addBuilder( - index, monitoring.Monitoring.KpiDescriptor.getDefaultInstance()); + public Builder setBoolVal(boolean value) { + valueCase_ = 4; + value_ = value; + onChanged(); + return this; } /** - * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + * bool boolVal = 4; + * @return This builder for chaining. */ - public java.util.List - getKpiDescriptorListBuilderList() { - return getKpiDescriptorListFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiDescriptor, monitoring.Monitoring.KpiDescriptor.Builder, monitoring.Monitoring.KpiDescriptorOrBuilder> - getKpiDescriptorListFieldBuilder() { - if (kpiDescriptorListBuilder_ == null) { - kpiDescriptorListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiDescriptor, monitoring.Monitoring.KpiDescriptor.Builder, monitoring.Monitoring.KpiDescriptorOrBuilder>( - kpiDescriptorList_, - ((bitField0_ & 0x00000001) != 0), - getParentForChildren(), - isClean()); - kpiDescriptorList_ = null; + public Builder clearBoolVal() { + if (valueCase_ == 4) { + valueCase_ = 0; + value_ = null; + onChanged(); } - return kpiDescriptorListBuilder_; + return this; } @java.lang.Override public final Builder setUnknownFields( @@ -10023,166 +10992,95 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.KpiDescriptorList) + // @@protoc_insertion_point(builder_scope:monitoring.KpiValue) } - // @@protoc_insertion_point(class_scope:monitoring.KpiDescriptorList) - private static final monitoring.Monitoring.KpiDescriptorList DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.KpiValue) + private static final monitoring.Monitoring.KpiValue DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.KpiDescriptorList(); + DEFAULT_INSTANCE = new monitoring.Monitoring.KpiValue(); } - public static monitoring.Monitoring.KpiDescriptorList getDefaultInstance() { + public static monitoring.Monitoring.KpiValue getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public KpiDescriptorList parsePartialFrom( + public KpiValue parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new KpiDescriptorList(input, extensionRegistry); + return new KpiValue(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.KpiDescriptorList getDefaultInstanceForType() { + public monitoring.Monitoring.KpiValue getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface SubsDescriptorOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.SubsDescriptor) + public interface KpiListOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.KpiList) com.google.protobuf.MessageOrBuilder { /** - * .monitoring.SubscriptionID subs_id = 1; - * @return Whether the subsId field is set. - */ - boolean hasSubsId(); - /** - * .monitoring.SubscriptionID subs_id = 1; - * @return The subsId. - */ - monitoring.Monitoring.SubscriptionID getSubsId(); - /** - * .monitoring.SubscriptionID subs_id = 1; - */ - monitoring.Monitoring.SubscriptionIDOrBuilder getSubsIdOrBuilder(); - - /** - * .monitoring.KpiId kpi_id = 2; - * @return Whether the kpiId field is set. - */ - boolean hasKpiId(); - /** - * .monitoring.KpiId kpi_id = 2; - * @return The kpiId. - */ - monitoring.Monitoring.KpiId getKpiId(); - /** - * .monitoring.KpiId kpi_id = 2; - */ - monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder(); - - /** - * float sampling_duration_s = 3; - * @return The samplingDurationS. - */ - float getSamplingDurationS(); - - /** - * float sampling_interval_s = 4; - * @return The samplingIntervalS. - */ - float getSamplingIntervalS(); - - /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; - * @return Whether the startTimestamp field is set. - */ - boolean hasStartTimestamp(); - /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; - * @return The startTimestamp. + * repeated .monitoring.Kpi kpi_list = 1; */ - context.ContextOuterClass.Timestamp getStartTimestamp(); + java.util.List + getKpiListList(); /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; + * repeated .monitoring.Kpi kpi_list = 1; */ - context.ContextOuterClass.TimestampOrBuilder getStartTimestampOrBuilder(); - + monitoring.Monitoring.Kpi getKpiList(int index); /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; - * @return Whether the endTimestamp field is set. + * repeated .monitoring.Kpi kpi_list = 1; */ - boolean hasEndTimestamp(); + int getKpiListCount(); /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; - * @return The endTimestamp. + * repeated .monitoring.Kpi kpi_list = 1; */ - context.ContextOuterClass.Timestamp getEndTimestamp(); + java.util.List + getKpiListOrBuilderList(); /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; + * repeated .monitoring.Kpi kpi_list = 1; */ - context.ContextOuterClass.TimestampOrBuilder getEndTimestampOrBuilder(); + monitoring.Monitoring.KpiOrBuilder getKpiListOrBuilder( + int index); } /** - * Protobuf type {@code monitoring.SubsDescriptor} + * Protobuf type {@code monitoring.KpiList} */ - public static final class SubsDescriptor extends + public static final class KpiList extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.SubsDescriptor) - SubsDescriptorOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.KpiList) + KpiListOrBuilder { private static final long serialVersionUID = 0L; - // Use SubsDescriptor.newBuilder() to construct. - private SubsDescriptor(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use KpiList.newBuilder() to construct. + private KpiList(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private SubsDescriptor() { + private KpiList() { + kpiList_ = java.util.Collections.emptyList(); } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new SubsDescriptor(); + return new KpiList(); } @java.lang.Override @@ -10190,7 +11088,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private SubsDescriptor( + private KpiList( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -10198,6 +11096,7 @@ public final class Monitoring { if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } + int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -10209,65 +11108,12 @@ public final class Monitoring { done = true; break; case 10: { - monitoring.Monitoring.SubscriptionID.Builder subBuilder = null; - if (subsId_ != null) { - subBuilder = subsId_.toBuilder(); - } - subsId_ = input.readMessage(monitoring.Monitoring.SubscriptionID.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(subsId_); - subsId_ = subBuilder.buildPartial(); - } - - break; - } - case 18: { - monitoring.Monitoring.KpiId.Builder subBuilder = null; - if (kpiId_ != null) { - subBuilder = kpiId_.toBuilder(); - } - kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(kpiId_); - kpiId_ = subBuilder.buildPartial(); - } - - break; - } - case 29: { - - samplingDurationS_ = input.readFloat(); - break; - } - case 37: { - - samplingIntervalS_ = input.readFloat(); - break; - } - case 42: { - context.ContextOuterClass.Timestamp.Builder subBuilder = null; - if (startTimestamp_ != null) { - subBuilder = startTimestamp_.toBuilder(); - } - startTimestamp_ = input.readMessage(context.ContextOuterClass.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(startTimestamp_); - startTimestamp_ = subBuilder.buildPartial(); - } - - break; - } - case 50: { - context.ContextOuterClass.Timestamp.Builder subBuilder = null; - if (endTimestamp_ != null) { - subBuilder = endTimestamp_.toBuilder(); - } - endTimestamp_ = input.readMessage(context.ContextOuterClass.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(endTimestamp_); - endTimestamp_ = subBuilder.buildPartial(); + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + kpiList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; } - + kpiList_.add( + input.readMessage(monitoring.Monitoring.Kpi.parser(), extensionRegistry)); break; } default: { @@ -10285,171 +11131,64 @@ public final class Monitoring { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + kpiList_ = java.util.Collections.unmodifiableList(kpiList_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiList_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiList_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.SubsDescriptor.class, monitoring.Monitoring.SubsDescriptor.Builder.class); - } - - public static final int SUBS_ID_FIELD_NUMBER = 1; - private monitoring.Monitoring.SubscriptionID subsId_; - /** - * .monitoring.SubscriptionID subs_id = 1; - * @return Whether the subsId field is set. - */ - @java.lang.Override - public boolean hasSubsId() { - return subsId_ != null; - } - /** - * .monitoring.SubscriptionID subs_id = 1; - * @return The subsId. - */ - @java.lang.Override - public monitoring.Monitoring.SubscriptionID getSubsId() { - return subsId_ == null ? monitoring.Monitoring.SubscriptionID.getDefaultInstance() : subsId_; - } - /** - * .monitoring.SubscriptionID subs_id = 1; - */ - @java.lang.Override - public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsIdOrBuilder() { - return getSubsId(); - } - - public static final int KPI_ID_FIELD_NUMBER = 2; - private monitoring.Monitoring.KpiId kpiId_; - /** - * .monitoring.KpiId kpi_id = 2; - * @return Whether the kpiId field is set. - */ - @java.lang.Override - public boolean hasKpiId() { - return kpiId_ != null; - } - /** - * .monitoring.KpiId kpi_id = 2; - * @return The kpiId. - */ - @java.lang.Override - public monitoring.Monitoring.KpiId getKpiId() { - return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; - } - /** - * .monitoring.KpiId kpi_id = 2; - */ - @java.lang.Override - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { - return getKpiId(); - } - - public static final int SAMPLING_DURATION_S_FIELD_NUMBER = 3; - private float samplingDurationS_; - /** - * float sampling_duration_s = 3; - * @return The samplingDurationS. - */ - @java.lang.Override - public float getSamplingDurationS() { - return samplingDurationS_; - } - - public static final int SAMPLING_INTERVAL_S_FIELD_NUMBER = 4; - private float samplingIntervalS_; - /** - * float sampling_interval_s = 4; - * @return The samplingIntervalS. - */ - @java.lang.Override - public float getSamplingIntervalS() { - return samplingIntervalS_; + monitoring.Monitoring.KpiList.class, monitoring.Monitoring.KpiList.Builder.class); } - public static final int START_TIMESTAMP_FIELD_NUMBER = 5; - private context.ContextOuterClass.Timestamp startTimestamp_; - /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; - * @return Whether the startTimestamp field is set. - */ - @java.lang.Override - public boolean hasStartTimestamp() { - return startTimestamp_ != null; - } + public static final int KPI_LIST_FIELD_NUMBER = 1; + private java.util.List kpiList_; /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; - * @return The startTimestamp. + * repeated .monitoring.Kpi kpi_list = 1; */ @java.lang.Override - public context.ContextOuterClass.Timestamp getStartTimestamp() { - return startTimestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : startTimestamp_; + public java.util.List getKpiListList() { + return kpiList_; } /** - * 
-     * used when you want something like "get the samples since X date/time"
-     *
- * - * .context.Timestamp start_timestamp = 5; + * repeated .monitoring.Kpi kpi_list = 1; */ @java.lang.Override - public context.ContextOuterClass.TimestampOrBuilder getStartTimestampOrBuilder() { - return getStartTimestamp(); + public java.util.List + getKpiListOrBuilderList() { + return kpiList_; } - - public static final int END_TIMESTAMP_FIELD_NUMBER = 6; - private context.ContextOuterClass.Timestamp endTimestamp_; /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; - * @return Whether the endTimestamp field is set. + * repeated .monitoring.Kpi kpi_list = 1; */ @java.lang.Override - public boolean hasEndTimestamp() { - return endTimestamp_ != null; + public int getKpiListCount() { + return kpiList_.size(); } /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; - * @return The endTimestamp. + * repeated .monitoring.Kpi kpi_list = 1; */ @java.lang.Override - public context.ContextOuterClass.Timestamp getEndTimestamp() { - return endTimestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : endTimestamp_; + public monitoring.Monitoring.Kpi getKpiList(int index) { + return kpiList_.get(index); } /** - * 
-     * used when you want something like "get the samples until X date/time"
-     *
- * - * .context.Timestamp end_timestamp = 6; + * repeated .monitoring.Kpi kpi_list = 1; */ @java.lang.Override - public context.ContextOuterClass.TimestampOrBuilder getEndTimestampOrBuilder() { - return getEndTimestamp(); + public monitoring.Monitoring.KpiOrBuilder getKpiListOrBuilder( + int index) { + return kpiList_.get(index); } private byte memoizedIsInitialized = -1; @@ -10466,23 +11205,8 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (subsId_ != null) { - output.writeMessage(1, getSubsId()); - } - if (kpiId_ != null) { - output.writeMessage(2, getKpiId()); - } - if (samplingDurationS_ != 0F) { - output.writeFloat(3, samplingDurationS_); - } - if (samplingIntervalS_ != 0F) { - output.writeFloat(4, samplingIntervalS_); - } - if (startTimestamp_ != null) { - output.writeMessage(5, getStartTimestamp()); - } - if (endTimestamp_ != null) { - output.writeMessage(6, getEndTimestamp()); + for (int i = 0; i < kpiList_.size(); i++) { + output.writeMessage(1, kpiList_.get(i)); } unknownFields.writeTo(output); } @@ -10493,29 +11217,9 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (subsId_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getSubsId()); - } - if (kpiId_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, getKpiId()); - } - if (samplingDurationS_ != 0F) { - size += com.google.protobuf.CodedOutputStream - .computeFloatSize(3, samplingDurationS_); - } - if (samplingIntervalS_ != 0F) { - size += com.google.protobuf.CodedOutputStream - .computeFloatSize(4, samplingIntervalS_); - } - if (startTimestamp_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, getStartTimestamp()); - } - if (endTimestamp_ != null) { + for (int i = 0; i < kpiList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, getEndTimestamp()); + .computeMessageSize(1, kpiList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -10527,37 +11231,13 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.SubsDescriptor)) { + if (!(obj instanceof monitoring.Monitoring.KpiList)) { return super.equals(obj); } - monitoring.Monitoring.SubsDescriptor other = (monitoring.Monitoring.SubsDescriptor) obj; + monitoring.Monitoring.KpiList other = (monitoring.Monitoring.KpiList) obj; - if (hasSubsId() != other.hasSubsId()) return false; - if (hasSubsId()) { - if (!getSubsId() - .equals(other.getSubsId())) return false; - } - if (hasKpiId() != other.hasKpiId()) return false; - if (hasKpiId()) { - if (!getKpiId() - .equals(other.getKpiId())) return false; - } - if (java.lang.Float.floatToIntBits(getSamplingDurationS()) - != java.lang.Float.floatToIntBits( - other.getSamplingDurationS())) return false; - if (java.lang.Float.floatToIntBits(getSamplingIntervalS()) - != java.lang.Float.floatToIntBits( - other.getSamplingIntervalS())) return false; - if (hasStartTimestamp() != other.hasStartTimestamp()) return false; - if (hasStartTimestamp()) { - if (!getStartTimestamp() - .equals(other.getStartTimestamp())) return false; - } - if (hasEndTimestamp() != other.hasEndTimestamp()) return false; - if (hasEndTimestamp()) { - if (!getEndTimestamp() - .equals(other.getEndTimestamp())) return false; - } + if (!getKpiListList() + .equals(other.getKpiListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -10569,96 +11249,78 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasSubsId()) { - hash = (37 * hash) + SUBS_ID_FIELD_NUMBER; - hash = (53 * hash) + getSubsId().hashCode(); - } - if (hasKpiId()) { - hash = (37 * hash) + KPI_ID_FIELD_NUMBER; - hash = (53 * hash) + getKpiId().hashCode(); - } - hash = (37 * hash) + SAMPLING_DURATION_S_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getSamplingDurationS()); - hash = (37 * hash) + SAMPLING_INTERVAL_S_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getSamplingIntervalS()); - if (hasStartTimestamp()) { - hash = (37 * hash) + START_TIMESTAMP_FIELD_NUMBER; - hash = (53 * hash) + getStartTimestamp().hashCode(); - } - if (hasEndTimestamp()) { - hash = (37 * hash) + END_TIMESTAMP_FIELD_NUMBER; - hash = (53 * hash) + getEndTimestamp().hashCode(); + if (getKpiListCount() > 0) { + hash = (37 * hash) + KPI_LIST_FIELD_NUMBER; + hash = (53 * hash) + getKpiListList().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.SubsDescriptor parseFrom( + public static monitoring.Monitoring.KpiList parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubsDescriptor parseFrom( + public static monitoring.Monitoring.KpiList parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubsDescriptor parseFrom( + public static monitoring.Monitoring.KpiList parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubsDescriptor parseFrom( + public static monitoring.Monitoring.KpiList parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubsDescriptor parseFrom(byte[] data) + public static monitoring.Monitoring.KpiList parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubsDescriptor parseFrom( + public static monitoring.Monitoring.KpiList parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubsDescriptor parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiList parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubsDescriptor parseFrom( + public static monitoring.Monitoring.KpiList parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.SubsDescriptor parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiList parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubsDescriptor parseDelimitedFrom( + public static monitoring.Monitoring.KpiList parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.SubsDescriptor parseFrom( + public static monitoring.Monitoring.KpiList parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubsDescriptor parseFrom( + public static monitoring.Monitoring.KpiList parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -10671,7 +11333,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.SubsDescriptor prototype) { + public static Builder newBuilder(monitoring.Monitoring.KpiList prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -10686,823 +11348,429 @@ public final class Monitoring { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code monitoring.SubsDescriptor} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.SubsDescriptor) - monitoring.Monitoring.SubsDescriptorOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_fieldAccessorTable - .ensureFieldAccessorsInitialized( - monitoring.Monitoring.SubsDescriptor.class, monitoring.Monitoring.SubsDescriptor.Builder.class); - } - - // Construct using monitoring.Monitoring.SubsDescriptor.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } - } - @java.lang.Override - public Builder clear() { - super.clear(); - if (subsIdBuilder_ == null) { - subsId_ = null; - } else { - subsId_ = null; - subsIdBuilder_ = null; - } - if (kpiIdBuilder_ == null) { - kpiId_ = null; - } else { - kpiId_ = null; - kpiIdBuilder_ = null; - } - samplingDurationS_ = 0F; - - samplingIntervalS_ = 0F; - - if (startTimestampBuilder_ == null) { - startTimestamp_ = null; - } else { - startTimestamp_ = null; - startTimestampBuilder_ = null; - } - if (endTimestampBuilder_ == null) { - endTimestamp_ = null; - } else { - endTimestamp_ = null; - endTimestampBuilder_ = null; - } - return this; - } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_descriptor; - } - - @java.lang.Override - public monitoring.Monitoring.SubsDescriptor getDefaultInstanceForType() { - return monitoring.Monitoring.SubsDescriptor.getDefaultInstance(); - } - - @java.lang.Override - public monitoring.Monitoring.SubsDescriptor build() { - monitoring.Monitoring.SubsDescriptor result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - @java.lang.Override - public monitoring.Monitoring.SubsDescriptor buildPartial() { - monitoring.Monitoring.SubsDescriptor result = new monitoring.Monitoring.SubsDescriptor(this); - if (subsIdBuilder_ == null) { - result.subsId_ = subsId_; - } else { - result.subsId_ = subsIdBuilder_.build(); - } - if (kpiIdBuilder_ == null) { - result.kpiId_ = kpiId_; - } else { - result.kpiId_ = kpiIdBuilder_.build(); - } - result.samplingDurationS_ = samplingDurationS_; - result.samplingIntervalS_ = samplingIntervalS_; - if (startTimestampBuilder_ == null) { - result.startTimestamp_ = startTimestamp_; - } else { - result.startTimestamp_ = startTimestampBuilder_.build(); - } - if (endTimestampBuilder_ == null) { - result.endTimestamp_ = endTimestamp_; - } else { - result.endTimestamp_ = endTimestampBuilder_.build(); - } - onBuilt(); - return result; - } - - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.SubsDescriptor) { - return mergeFrom((monitoring.Monitoring.SubsDescriptor)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(monitoring.Monitoring.SubsDescriptor other) { - if (other == monitoring.Monitoring.SubsDescriptor.getDefaultInstance()) return this; - if (other.hasSubsId()) { - mergeSubsId(other.getSubsId()); - } - if (other.hasKpiId()) { - mergeKpiId(other.getKpiId()); - } - if (other.getSamplingDurationS() != 0F) { - setSamplingDurationS(other.getSamplingDurationS()); - } - if (other.getSamplingIntervalS() != 0F) { - setSamplingIntervalS(other.getSamplingIntervalS()); - } - if (other.hasStartTimestamp()) { - mergeStartTimestamp(other.getStartTimestamp()); - } - if (other.hasEndTimestamp()) { - mergeEndTimestamp(other.getEndTimestamp()); - } - this.mergeUnknownFields(other.unknownFields); - onChanged(); - return this; - } - - @java.lang.Override - public final boolean isInitialized() { - return true; - } - - @java.lang.Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - monitoring.Monitoring.SubsDescriptor parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.SubsDescriptor) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - private monitoring.Monitoring.SubscriptionID subsId_; - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> subsIdBuilder_; - /** - * .monitoring.SubscriptionID subs_id = 1; - * @return Whether the subsId field is set. - */ - public boolean hasSubsId() { - return subsIdBuilder_ != null || subsId_ != null; - } - /** - * .monitoring.SubscriptionID subs_id = 1; - * @return The subsId. - */ - public monitoring.Monitoring.SubscriptionID getSubsId() { - if (subsIdBuilder_ == null) { - return subsId_ == null ? monitoring.Monitoring.SubscriptionID.getDefaultInstance() : subsId_; - } else { - return subsIdBuilder_.getMessage(); - } - } - /** - * .monitoring.SubscriptionID subs_id = 1; - */ - public Builder setSubsId(monitoring.Monitoring.SubscriptionID value) { - if (subsIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - subsId_ = value; - onChanged(); - } else { - subsIdBuilder_.setMessage(value); - } - - return this; - } - /** - * .monitoring.SubscriptionID subs_id = 1; - */ - public Builder setSubsId( - monitoring.Monitoring.SubscriptionID.Builder builderForValue) { - if (subsIdBuilder_ == null) { - subsId_ = builderForValue.build(); - onChanged(); - } else { - subsIdBuilder_.setMessage(builderForValue.build()); - } - - return this; + /** + * Protobuf type {@code monitoring.KpiList} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:monitoring.KpiList) + monitoring.Monitoring.KpiListOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return monitoring.Monitoring.internal_static_monitoring_KpiList_descriptor; } - /** - * .monitoring.SubscriptionID subs_id = 1; - */ - public Builder mergeSubsId(monitoring.Monitoring.SubscriptionID value) { - if (subsIdBuilder_ == null) { - if (subsId_ != null) { - subsId_ = - monitoring.Monitoring.SubscriptionID.newBuilder(subsId_).mergeFrom(value).buildPartial(); - } else { - subsId_ = value; - } - onChanged(); - } else { - subsIdBuilder_.mergeFrom(value); - } - return this; + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return monitoring.Monitoring.internal_static_monitoring_KpiList_fieldAccessorTable + .ensureFieldAccessorsInitialized( + monitoring.Monitoring.KpiList.class, monitoring.Monitoring.KpiList.Builder.class); } - /** - * .monitoring.SubscriptionID subs_id = 1; - */ - public Builder clearSubsId() { - if (subsIdBuilder_ == null) { - subsId_ = null; - onChanged(); - } else { - subsId_ = null; - subsIdBuilder_ = null; - } - return this; + // Construct using monitoring.Monitoring.KpiList.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); } - /** - * .monitoring.SubscriptionID subs_id = 1; - */ - public monitoring.Monitoring.SubscriptionID.Builder getSubsIdBuilder() { - - onChanged(); - return getSubsIdFieldBuilder().getBuilder(); + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); } - /** - * .monitoring.SubscriptionID subs_id = 1; - */ - public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsIdOrBuilder() { - if (subsIdBuilder_ != null) { - return subsIdBuilder_.getMessageOrBuilder(); - } else { - return subsId_ == null ? - monitoring.Monitoring.SubscriptionID.getDefaultInstance() : subsId_; + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getKpiListFieldBuilder(); } } - /** - * .monitoring.SubscriptionID subs_id = 1; - */ - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> - getSubsIdFieldBuilder() { - if (subsIdBuilder_ == null) { - subsIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder>( - getSubsId(), - getParentForChildren(), - isClean()); - subsId_ = null; + @java.lang.Override + public Builder clear() { + super.clear(); + if (kpiListBuilder_ == null) { + kpiList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + kpiListBuilder_.clear(); } - return subsIdBuilder_; + return this; } - private monitoring.Monitoring.KpiId kpiId_; - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; - /** - * .monitoring.KpiId kpi_id = 2; - * @return Whether the kpiId field is set. - */ - public boolean hasKpiId() { - return kpiIdBuilder_ != null || kpiId_ != null; - } - /** - * .monitoring.KpiId kpi_id = 2; - * @return The kpiId. - */ - public monitoring.Monitoring.KpiId getKpiId() { - if (kpiIdBuilder_ == null) { - return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; - } else { - return kpiIdBuilder_.getMessage(); - } + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return monitoring.Monitoring.internal_static_monitoring_KpiList_descriptor; } - /** - * .monitoring.KpiId kpi_id = 2; - */ - public Builder setKpiId(monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - kpiId_ = value; - onChanged(); - } else { - kpiIdBuilder_.setMessage(value); - } - return this; + @java.lang.Override + public monitoring.Monitoring.KpiList getDefaultInstanceForType() { + return monitoring.Monitoring.KpiList.getDefaultInstance(); } - /** - * .monitoring.KpiId kpi_id = 2; - */ - public Builder setKpiId( - monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdBuilder_ == null) { - kpiId_ = builderForValue.build(); - onChanged(); - } else { - kpiIdBuilder_.setMessage(builderForValue.build()); - } - return this; + @java.lang.Override + public monitoring.Monitoring.KpiList build() { + monitoring.Monitoring.KpiList result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; } - /** - * .monitoring.KpiId kpi_id = 2; - */ - public Builder mergeKpiId(monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (kpiId_ != null) { - kpiId_ = - monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial(); - } else { - kpiId_ = value; + + @java.lang.Override + public monitoring.Monitoring.KpiList buildPartial() { + monitoring.Monitoring.KpiList result = new monitoring.Monitoring.KpiList(this); + int from_bitField0_ = bitField0_; + if (kpiListBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + kpiList_ = java.util.Collections.unmodifiableList(kpiList_); + bitField0_ = (bitField0_ & ~0x00000001); } - onChanged(); + result.kpiList_ = kpiList_; } else { - kpiIdBuilder_.mergeFrom(value); + result.kpiList_ = kpiListBuilder_.build(); } - - return this; + onBuilt(); + return result; } - /** - * .monitoring.KpiId kpi_id = 2; - */ - public Builder clearKpiId() { - if (kpiIdBuilder_ == null) { - kpiId_ = null; - onChanged(); - } else { - kpiId_ = null; - kpiIdBuilder_ = null; - } - return this; + @java.lang.Override + public Builder clone() { + return super.clone(); } - /** - * .monitoring.KpiId kpi_id = 2; - */ - public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() { - - onChanged(); - return getKpiIdFieldBuilder().getBuilder(); + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); } - /** - * .monitoring.KpiId kpi_id = 2; - */ - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { - if (kpiIdBuilder_ != null) { - return kpiIdBuilder_.getMessageOrBuilder(); - } else { - return kpiId_ == null ? - monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; - } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); } - /** - * .monitoring.KpiId kpi_id = 2; - */ - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> - getKpiIdFieldBuilder() { - if (kpiIdBuilder_ == null) { - kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( - getKpiId(), - getParentForChildren(), - isClean()); - kpiId_ = null; - } - return kpiIdBuilder_; + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); } - - private float samplingDurationS_ ; - /** - * float sampling_duration_s = 3; - * @return The samplingDurationS. - */ @java.lang.Override - public float getSamplingDurationS() { - return samplingDurationS_; + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); } - /** - * float sampling_duration_s = 3; - * @param value The samplingDurationS to set. - * @return This builder for chaining. - */ - public Builder setSamplingDurationS(float value) { - - samplingDurationS_ = value; - onChanged(); - return this; + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); } - /** - * float sampling_duration_s = 3; - * @return This builder for chaining. - */ - public Builder clearSamplingDurationS() { - - samplingDurationS_ = 0F; + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof monitoring.Monitoring.KpiList) { + return mergeFrom((monitoring.Monitoring.KpiList)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(monitoring.Monitoring.KpiList other) { + if (other == monitoring.Monitoring.KpiList.getDefaultInstance()) return this; + if (kpiListBuilder_ == null) { + if (!other.kpiList_.isEmpty()) { + if (kpiList_.isEmpty()) { + kpiList_ = other.kpiList_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureKpiListIsMutable(); + kpiList_.addAll(other.kpiList_); + } + onChanged(); + } + } else { + if (!other.kpiList_.isEmpty()) { + if (kpiListBuilder_.isEmpty()) { + kpiListBuilder_.dispose(); + kpiListBuilder_ = null; + kpiList_ = other.kpiList_; + bitField0_ = (bitField0_ & ~0x00000001); + kpiListBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getKpiListFieldBuilder() : null; + } else { + kpiListBuilder_.addAllMessages(other.kpiList_); + } + } + } + this.mergeUnknownFields(other.unknownFields); onChanged(); return this; } - private float samplingIntervalS_ ; - /** - * float sampling_interval_s = 4; - * @return The samplingIntervalS. - */ @java.lang.Override - public float getSamplingIntervalS() { - return samplingIntervalS_; + public final boolean isInitialized() { + return true; } - /** - * float sampling_interval_s = 4; - * @param value The samplingIntervalS to set. - * @return This builder for chaining. - */ - public Builder setSamplingIntervalS(float value) { - - samplingIntervalS_ = value; - onChanged(); + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + monitoring.Monitoring.KpiList parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (monitoring.Monitoring.KpiList) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } return this; } + private int bitField0_; + + private java.util.List kpiList_ = + java.util.Collections.emptyList(); + private void ensureKpiListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + kpiList_ = new java.util.ArrayList(kpiList_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.Kpi, monitoring.Monitoring.Kpi.Builder, monitoring.Monitoring.KpiOrBuilder> kpiListBuilder_; + /** - * float sampling_interval_s = 4; - * @return This builder for chaining. + * repeated .monitoring.Kpi kpi_list = 1; */ - public Builder clearSamplingIntervalS() { - - samplingIntervalS_ = 0F; - onChanged(); - return this; + public java.util.List getKpiListList() { + if (kpiListBuilder_ == null) { + return java.util.Collections.unmodifiableList(kpiList_); + } else { + return kpiListBuilder_.getMessageList(); + } } - - private context.ContextOuterClass.Timestamp startTimestamp_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> startTimestampBuilder_; /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; - * @return Whether the startTimestamp field is set. + * repeated .monitoring.Kpi kpi_list = 1; */ - public boolean hasStartTimestamp() { - return startTimestampBuilder_ != null || startTimestamp_ != null; + public int getKpiListCount() { + if (kpiListBuilder_ == null) { + return kpiList_.size(); + } else { + return kpiListBuilder_.getCount(); + } } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; - * @return The startTimestamp. + * repeated .monitoring.Kpi kpi_list = 1; */ - public context.ContextOuterClass.Timestamp getStartTimestamp() { - if (startTimestampBuilder_ == null) { - return startTimestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : startTimestamp_; + public monitoring.Monitoring.Kpi getKpiList(int index) { + if (kpiListBuilder_ == null) { + return kpiList_.get(index); } else { - return startTimestampBuilder_.getMessage(); + return kpiListBuilder_.getMessage(index); } } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * repeated .monitoring.Kpi kpi_list = 1; */ - public Builder setStartTimestamp(context.ContextOuterClass.Timestamp value) { - if (startTimestampBuilder_ == null) { + public Builder setKpiList( + int index, monitoring.Monitoring.Kpi value) { + if (kpiListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - startTimestamp_ = value; + ensureKpiListIsMutable(); + kpiList_.set(index, value); onChanged(); } else { - startTimestampBuilder_.setMessage(value); + kpiListBuilder_.setMessage(index, value); } - return this; } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * repeated .monitoring.Kpi kpi_list = 1; */ - public Builder setStartTimestamp( - context.ContextOuterClass.Timestamp.Builder builderForValue) { - if (startTimestampBuilder_ == null) { - startTimestamp_ = builderForValue.build(); + public Builder setKpiList( + int index, monitoring.Monitoring.Kpi.Builder builderForValue) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + kpiList_.set(index, builderForValue.build()); onChanged(); } else { - startTimestampBuilder_.setMessage(builderForValue.build()); + kpiListBuilder_.setMessage(index, builderForValue.build()); } - return this; } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * repeated .monitoring.Kpi kpi_list = 1; */ - public Builder mergeStartTimestamp(context.ContextOuterClass.Timestamp value) { - if (startTimestampBuilder_ == null) { - if (startTimestamp_ != null) { - startTimestamp_ = - context.ContextOuterClass.Timestamp.newBuilder(startTimestamp_).mergeFrom(value).buildPartial(); - } else { - startTimestamp_ = value; + public Builder addKpiList(monitoring.Monitoring.Kpi value) { + if (kpiListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); } + ensureKpiListIsMutable(); + kpiList_.add(value); onChanged(); } else { - startTimestampBuilder_.mergeFrom(value); + kpiListBuilder_.addMessage(value); } - return this; } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; + * repeated .monitoring.Kpi kpi_list = 1; */ - public Builder clearStartTimestamp() { - if (startTimestampBuilder_ == null) { - startTimestamp_ = null; + public Builder addKpiList( + int index, monitoring.Monitoring.Kpi value) { + if (kpiListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiListIsMutable(); + kpiList_.add(index, value); onChanged(); } else { - startTimestamp_ = null; - startTimestampBuilder_ = null; + kpiListBuilder_.addMessage(index, value); } - return this; } /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; - */ - public context.ContextOuterClass.Timestamp.Builder getStartTimestampBuilder() { - - onChanged(); - return getStartTimestampFieldBuilder().getBuilder(); - } - /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; - */ - public context.ContextOuterClass.TimestampOrBuilder getStartTimestampOrBuilder() { - if (startTimestampBuilder_ != null) { - return startTimestampBuilder_.getMessageOrBuilder(); - } else { - return startTimestamp_ == null ? - context.ContextOuterClass.Timestamp.getDefaultInstance() : startTimestamp_; - } - } - /** - * 
-       * used when you want something like "get the samples since X date/time"
-       *
- * - * .context.Timestamp start_timestamp = 5; - */ - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> - getStartTimestampFieldBuilder() { - if (startTimestampBuilder_ == null) { - startTimestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>( - getStartTimestamp(), - getParentForChildren(), - isClean()); - startTimestamp_ = null; - } - return startTimestampBuilder_; - } - - private context.ContextOuterClass.Timestamp endTimestamp_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> endTimestampBuilder_; - /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; - * @return Whether the endTimestamp field is set. - */ - public boolean hasEndTimestamp() { - return endTimestampBuilder_ != null || endTimestamp_ != null; - } - /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; - * @return The endTimestamp. + * repeated .monitoring.Kpi kpi_list = 1; */ - public context.ContextOuterClass.Timestamp getEndTimestamp() { - if (endTimestampBuilder_ == null) { - return endTimestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : endTimestamp_; + public Builder addKpiList( + monitoring.Monitoring.Kpi.Builder builderForValue) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + kpiList_.add(builderForValue.build()); + onChanged(); } else { - return endTimestampBuilder_.getMessage(); + kpiListBuilder_.addMessage(builderForValue.build()); } + return this; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * repeated .monitoring.Kpi kpi_list = 1; */ - public Builder setEndTimestamp(context.ContextOuterClass.Timestamp value) { - if (endTimestampBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - endTimestamp_ = value; + public Builder addKpiList( + int index, monitoring.Monitoring.Kpi.Builder builderForValue) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + kpiList_.add(index, builderForValue.build()); onChanged(); } else { - endTimestampBuilder_.setMessage(value); + kpiListBuilder_.addMessage(index, builderForValue.build()); } - return this; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * repeated .monitoring.Kpi kpi_list = 1; */ - public Builder setEndTimestamp( - context.ContextOuterClass.Timestamp.Builder builderForValue) { - if (endTimestampBuilder_ == null) { - endTimestamp_ = builderForValue.build(); + public Builder addAllKpiList( + java.lang.Iterable values) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, kpiList_); onChanged(); } else { - endTimestampBuilder_.setMessage(builderForValue.build()); + kpiListBuilder_.addAllMessages(values); } - return this; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * repeated .monitoring.Kpi kpi_list = 1; */ - public Builder mergeEndTimestamp(context.ContextOuterClass.Timestamp value) { - if (endTimestampBuilder_ == null) { - if (endTimestamp_ != null) { - endTimestamp_ = - context.ContextOuterClass.Timestamp.newBuilder(endTimestamp_).mergeFrom(value).buildPartial(); - } else { - endTimestamp_ = value; - } + public Builder clearKpiList() { + if (kpiListBuilder_ == null) { + kpiList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { - endTimestampBuilder_.mergeFrom(value); + kpiListBuilder_.clear(); } - return this; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * repeated .monitoring.Kpi kpi_list = 1; */ - public Builder clearEndTimestamp() { - if (endTimestampBuilder_ == null) { - endTimestamp_ = null; + public Builder removeKpiList(int index) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + kpiList_.remove(index); onChanged(); } else { - endTimestamp_ = null; - endTimestampBuilder_ = null; + kpiListBuilder_.remove(index); } - return this; } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * repeated .monitoring.Kpi kpi_list = 1; */ - public context.ContextOuterClass.Timestamp.Builder getEndTimestampBuilder() { - - onChanged(); - return getEndTimestampFieldBuilder().getBuilder(); + public monitoring.Monitoring.Kpi.Builder getKpiListBuilder( + int index) { + return getKpiListFieldBuilder().getBuilder(index); } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * repeated .monitoring.Kpi kpi_list = 1; + */ + public monitoring.Monitoring.KpiOrBuilder getKpiListOrBuilder( + int index) { + if (kpiListBuilder_ == null) { + return kpiList_.get(index); } else { + return kpiListBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .monitoring.Kpi kpi_list = 1; */ - public context.ContextOuterClass.TimestampOrBuilder getEndTimestampOrBuilder() { - if (endTimestampBuilder_ != null) { - return endTimestampBuilder_.getMessageOrBuilder(); + public java.util.List + getKpiListOrBuilderList() { + if (kpiListBuilder_ != null) { + return kpiListBuilder_.getMessageOrBuilderList(); } else { - return endTimestamp_ == null ? - context.ContextOuterClass.Timestamp.getDefaultInstance() : endTimestamp_; + return java.util.Collections.unmodifiableList(kpiList_); } } /** - * 
-       * used when you want something like "get the samples until X date/time"
-       *
- * - * .context.Timestamp end_timestamp = 6; + * repeated .monitoring.Kpi kpi_list = 1; */ - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> - getEndTimestampFieldBuilder() { - if (endTimestampBuilder_ == null) { - endTimestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>( - getEndTimestamp(), + public monitoring.Monitoring.Kpi.Builder addKpiListBuilder() { + return getKpiListFieldBuilder().addBuilder( + monitoring.Monitoring.Kpi.getDefaultInstance()); + } + /** + * repeated .monitoring.Kpi kpi_list = 1; + */ + public monitoring.Monitoring.Kpi.Builder addKpiListBuilder( + int index) { + return getKpiListFieldBuilder().addBuilder( + index, monitoring.Monitoring.Kpi.getDefaultInstance()); + } + /** + * repeated .monitoring.Kpi kpi_list = 1; + */ + public java.util.List + getKpiListBuilderList() { + return getKpiListFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.Kpi, monitoring.Monitoring.Kpi.Builder, monitoring.Monitoring.KpiOrBuilder> + getKpiListFieldBuilder() { + if (kpiListBuilder_ == null) { + kpiListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.Kpi, monitoring.Monitoring.Kpi.Builder, monitoring.Monitoring.KpiOrBuilder>( + kpiList_, + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); - endTimestamp_ = null; + kpiList_ = null; } - return endTimestampBuilder_; + return kpiListBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -11517,85 +11785,95 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.SubsDescriptor) + // @@protoc_insertion_point(builder_scope:monitoring.KpiList) } - // @@protoc_insertion_point(class_scope:monitoring.SubsDescriptor) - private static final monitoring.Monitoring.SubsDescriptor DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.KpiList) + private static final monitoring.Monitoring.KpiList DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.SubsDescriptor(); + DEFAULT_INSTANCE = new monitoring.Monitoring.KpiList(); } - public static monitoring.Monitoring.SubsDescriptor getDefaultInstance() { + public static monitoring.Monitoring.KpiList getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public SubsDescriptor parsePartialFrom( + public KpiList parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SubsDescriptor(input, extensionRegistry); + return new KpiList(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.SubsDescriptor getDefaultInstanceForType() { + public monitoring.Monitoring.KpiList getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface SubscriptionIDOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.SubscriptionID) + public interface KpiDescriptorListOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptorList) com.google.protobuf.MessageOrBuilder { /** - * .context.Uuid subs_id = 1; - * @return Whether the subsId field is set. + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - boolean hasSubsId(); + java.util.List + getKpiDescriptorListList(); /** - * .context.Uuid subs_id = 1; - * @return The subsId. + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - context.ContextOuterClass.Uuid getSubsId(); + monitoring.Monitoring.KpiDescriptor getKpiDescriptorList(int index); /** - * .context.Uuid subs_id = 1; + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - context.ContextOuterClass.UuidOrBuilder getSubsIdOrBuilder(); + int getKpiDescriptorListCount(); + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + java.util.List + getKpiDescriptorListOrBuilderList(); + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + monitoring.Monitoring.KpiDescriptorOrBuilder getKpiDescriptorListOrBuilder( + int index); } /** - * Protobuf type {@code monitoring.SubscriptionID} + * Protobuf type {@code monitoring.KpiDescriptorList} */ - public static final class SubscriptionID extends + public static final class KpiDescriptorList extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.SubscriptionID) - SubscriptionIDOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptorList) + KpiDescriptorListOrBuilder { private static final long serialVersionUID = 0L; - // Use SubscriptionID.newBuilder() to construct. - private SubscriptionID(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use KpiDescriptorList.newBuilder() to construct. + private KpiDescriptorList(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private SubscriptionID() { + private KpiDescriptorList() { + kpiDescriptorList_ = java.util.Collections.emptyList(); } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new SubscriptionID(); + return new KpiDescriptorList(); } @java.lang.Override @@ -11603,7 +11881,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private SubscriptionID( + private KpiDescriptorList( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -11611,6 +11889,7 @@ public final class Monitoring { if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } + int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -11622,16 +11901,12 @@ public final class Monitoring { done = true; break; case 10: { - context.ContextOuterClass.Uuid.Builder subBuilder = null; - if (subsId_ != null) { - subBuilder = subsId_.toBuilder(); - } - subsId_ = input.readMessage(context.ContextOuterClass.Uuid.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(subsId_); - subsId_ = subBuilder.buildPartial(); + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + kpiDescriptorList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; } - + kpiDescriptorList_.add( + input.readMessage(monitoring.Monitoring.KpiDescriptor.parser(), extensionRegistry)); break; } default: { @@ -11649,47 +11924,64 @@ public final class Monitoring { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + kpiDescriptorList_ = java.util.Collections.unmodifiableList(kpiDescriptorList_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.SubscriptionID.class, monitoring.Monitoring.SubscriptionID.Builder.class); + monitoring.Monitoring.KpiDescriptorList.class, monitoring.Monitoring.KpiDescriptorList.Builder.class); } - public static final int SUBS_ID_FIELD_NUMBER = 1; - private context.ContextOuterClass.Uuid subsId_; + public static final int KPI_DESCRIPTOR_LIST_FIELD_NUMBER = 1; + private java.util.List kpiDescriptorList_; /** - * .context.Uuid subs_id = 1; - * @return Whether the subsId field is set. + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ @java.lang.Override - public boolean hasSubsId() { - return subsId_ != null; + public java.util.List getKpiDescriptorListList() { + return kpiDescriptorList_; } /** - * .context.Uuid subs_id = 1; - * @return The subsId. + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ @java.lang.Override - public context.ContextOuterClass.Uuid getSubsId() { - return subsId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : subsId_; + public java.util.List + getKpiDescriptorListOrBuilderList() { + return kpiDescriptorList_; } /** - * .context.Uuid subs_id = 1; + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ @java.lang.Override - public context.ContextOuterClass.UuidOrBuilder getSubsIdOrBuilder() { - return getSubsId(); + public int getKpiDescriptorListCount() { + return kpiDescriptorList_.size(); + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + @java.lang.Override + public monitoring.Monitoring.KpiDescriptor getKpiDescriptorList(int index) { + return kpiDescriptorList_.get(index); + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + @java.lang.Override + public monitoring.Monitoring.KpiDescriptorOrBuilder getKpiDescriptorListOrBuilder( + int index) { + return kpiDescriptorList_.get(index); } private byte memoizedIsInitialized = -1; @@ -11706,8 +11998,8 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (subsId_ != null) { - output.writeMessage(1, getSubsId()); + for (int i = 0; i < kpiDescriptorList_.size(); i++) { + output.writeMessage(1, kpiDescriptorList_.get(i)); } unknownFields.writeTo(output); } @@ -11718,9 +12010,9 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (subsId_ != null) { + for (int i = 0; i < kpiDescriptorList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getSubsId()); + .computeMessageSize(1, kpiDescriptorList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -11732,16 +12024,13 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.SubscriptionID)) { + if (!(obj instanceof monitoring.Monitoring.KpiDescriptorList)) { return super.equals(obj); } - monitoring.Monitoring.SubscriptionID other = (monitoring.Monitoring.SubscriptionID) obj; + monitoring.Monitoring.KpiDescriptorList other = (monitoring.Monitoring.KpiDescriptorList) obj; - if (hasSubsId() != other.hasSubsId()) return false; - if (hasSubsId()) { - if (!getSubsId() - .equals(other.getSubsId())) return false; - } + if (!getKpiDescriptorListList() + .equals(other.getKpiDescriptorListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -11753,78 +12042,78 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasSubsId()) { - hash = (37 * hash) + SUBS_ID_FIELD_NUMBER; - hash = (53 * hash) + getSubsId().hashCode(); + if (getKpiDescriptorListCount() > 0) { + hash = (37 * hash) + KPI_DESCRIPTOR_LIST_FIELD_NUMBER; + hash = (53 * hash) + getKpiDescriptorListList().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.SubscriptionID parseFrom( + public static monitoring.Monitoring.KpiDescriptorList parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubscriptionID parseFrom( + public static monitoring.Monitoring.KpiDescriptorList parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubscriptionID parseFrom( + public static monitoring.Monitoring.KpiDescriptorList parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubscriptionID parseFrom( + public static monitoring.Monitoring.KpiDescriptorList parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubscriptionID parseFrom(byte[] data) + public static monitoring.Monitoring.KpiDescriptorList parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubscriptionID parseFrom( + public static monitoring.Monitoring.KpiDescriptorList parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubscriptionID parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiDescriptorList parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubscriptionID parseFrom( + public static monitoring.Monitoring.KpiDescriptorList parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.SubscriptionID parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.KpiDescriptorList parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubscriptionID parseDelimitedFrom( + public static monitoring.Monitoring.KpiDescriptorList parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.SubscriptionID parseFrom( + public static monitoring.Monitoring.KpiDescriptorList parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubscriptionID parseFrom( + public static monitoring.Monitoring.KpiDescriptorList parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -11837,7 +12126,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.SubscriptionID prototype) { + public static Builder newBuilder(monitoring.Monitoring.KpiDescriptorList prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -11853,26 +12142,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.SubscriptionID} + * Protobuf type {@code monitoring.KpiDescriptorList} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.SubscriptionID) - monitoring.Monitoring.SubscriptionIDOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptorList) + monitoring.Monitoring.KpiDescriptorListOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.SubscriptionID.class, monitoring.Monitoring.SubscriptionID.Builder.class); + monitoring.Monitoring.KpiDescriptorList.class, monitoring.Monitoring.KpiDescriptorList.Builder.class); } - // Construct using monitoring.Monitoring.SubscriptionID.newBuilder() + // Construct using monitoring.Monitoring.KpiDescriptorList.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -11885,16 +12174,17 @@ public final class Monitoring { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { + getKpiDescriptorListFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); - if (subsIdBuilder_ == null) { - subsId_ = null; + if (kpiDescriptorListBuilder_ == null) { + kpiDescriptorList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); } else { - subsId_ = null; - subsIdBuilder_ = null; + kpiDescriptorListBuilder_.clear(); } return this; } @@ -11902,17 +12192,17 @@ public final class Monitoring { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_descriptor; + return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_descriptor; } @java.lang.Override - public monitoring.Monitoring.SubscriptionID getDefaultInstanceForType() { - return monitoring.Monitoring.SubscriptionID.getDefaultInstance(); + public monitoring.Monitoring.KpiDescriptorList getDefaultInstanceForType() { + return monitoring.Monitoring.KpiDescriptorList.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.SubscriptionID build() { - monitoring.Monitoring.SubscriptionID result = buildPartial(); + public monitoring.Monitoring.KpiDescriptorList build() { + monitoring.Monitoring.KpiDescriptorList result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -11920,12 +12210,17 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.SubscriptionID buildPartial() { - monitoring.Monitoring.SubscriptionID result = new monitoring.Monitoring.SubscriptionID(this); - if (subsIdBuilder_ == null) { - result.subsId_ = subsId_; + public monitoring.Monitoring.KpiDescriptorList buildPartial() { + monitoring.Monitoring.KpiDescriptorList result = new monitoring.Monitoring.KpiDescriptorList(this); + int from_bitField0_ = bitField0_; + if (kpiDescriptorListBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + kpiDescriptorList_ = java.util.Collections.unmodifiableList(kpiDescriptorList_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.kpiDescriptorList_ = kpiDescriptorList_; } else { - result.subsId_ = subsIdBuilder_.build(); + result.kpiDescriptorList_ = kpiDescriptorListBuilder_.build(); } onBuilt(); return result; @@ -11965,18 +12260,41 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.SubscriptionID) { - return mergeFrom((monitoring.Monitoring.SubscriptionID)other); + if (other instanceof monitoring.Monitoring.KpiDescriptorList) { + return mergeFrom((monitoring.Monitoring.KpiDescriptorList)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.SubscriptionID other) { - if (other == monitoring.Monitoring.SubscriptionID.getDefaultInstance()) return this; - if (other.hasSubsId()) { - mergeSubsId(other.getSubsId()); + public Builder mergeFrom(monitoring.Monitoring.KpiDescriptorList other) { + if (other == monitoring.Monitoring.KpiDescriptorList.getDefaultInstance()) return this; + if (kpiDescriptorListBuilder_ == null) { + if (!other.kpiDescriptorList_.isEmpty()) { + if (kpiDescriptorList_.isEmpty()) { + kpiDescriptorList_ = other.kpiDescriptorList_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureKpiDescriptorListIsMutable(); + kpiDescriptorList_.addAll(other.kpiDescriptorList_); + } + onChanged(); + } + } else { + if (!other.kpiDescriptorList_.isEmpty()) { + if (kpiDescriptorListBuilder_.isEmpty()) { + kpiDescriptorListBuilder_.dispose(); + kpiDescriptorListBuilder_ = null; + kpiDescriptorList_ = other.kpiDescriptorList_; + bitField0_ = (bitField0_ & ~0x00000001); + kpiDescriptorListBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getKpiDescriptorListFieldBuilder() : null; + } else { + kpiDescriptorListBuilder_.addAllMessages(other.kpiDescriptorList_); + } + } } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -11993,11 +12311,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.SubscriptionID parsedMessage = null; + monitoring.Monitoring.KpiDescriptorList parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.SubscriptionID) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.KpiDescriptorList) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -12006,124 +12324,246 @@ public final class Monitoring { } return this; } + private int bitField0_; + + private java.util.List kpiDescriptorList_ = + java.util.Collections.emptyList(); + private void ensureKpiDescriptorListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + kpiDescriptorList_ = new java.util.ArrayList(kpiDescriptorList_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiDescriptor, monitoring.Monitoring.KpiDescriptor.Builder, monitoring.Monitoring.KpiDescriptorOrBuilder> kpiDescriptorListBuilder_; - private context.ContextOuterClass.Uuid subsId_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> subsIdBuilder_; /** - * .context.Uuid subs_id = 1; - * @return Whether the subsId field is set. + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - public boolean hasSubsId() { - return subsIdBuilder_ != null || subsId_ != null; + public java.util.List getKpiDescriptorListList() { + if (kpiDescriptorListBuilder_ == null) { + return java.util.Collections.unmodifiableList(kpiDescriptorList_); + } else { + return kpiDescriptorListBuilder_.getMessageList(); + } } /** - * .context.Uuid subs_id = 1; - * @return The subsId. + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - public context.ContextOuterClass.Uuid getSubsId() { - if (subsIdBuilder_ == null) { - return subsId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : subsId_; + public int getKpiDescriptorListCount() { + if (kpiDescriptorListBuilder_ == null) { + return kpiDescriptorList_.size(); } else { - return subsIdBuilder_.getMessage(); + return kpiDescriptorListBuilder_.getCount(); } } /** - * .context.Uuid subs_id = 1; + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - public Builder setSubsId(context.ContextOuterClass.Uuid value) { - if (subsIdBuilder_ == null) { + public monitoring.Monitoring.KpiDescriptor getKpiDescriptorList(int index) { + if (kpiDescriptorListBuilder_ == null) { + return kpiDescriptorList_.get(index); + } else { + return kpiDescriptorListBuilder_.getMessage(index); + } + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + public Builder setKpiDescriptorList( + int index, monitoring.Monitoring.KpiDescriptor value) { + if (kpiDescriptorListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - subsId_ = value; + ensureKpiDescriptorListIsMutable(); + kpiDescriptorList_.set(index, value); onChanged(); } else { - subsIdBuilder_.setMessage(value); + kpiDescriptorListBuilder_.setMessage(index, value); } - return this; } /** - * .context.Uuid subs_id = 1; + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - public Builder setSubsId( - context.ContextOuterClass.Uuid.Builder builderForValue) { - if (subsIdBuilder_ == null) { - subsId_ = builderForValue.build(); + public Builder setKpiDescriptorList( + int index, monitoring.Monitoring.KpiDescriptor.Builder builderForValue) { + if (kpiDescriptorListBuilder_ == null) { + ensureKpiDescriptorListIsMutable(); + kpiDescriptorList_.set(index, builderForValue.build()); + onChanged(); + } else { + kpiDescriptorListBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + public Builder addKpiDescriptorList(monitoring.Monitoring.KpiDescriptor value) { + if (kpiDescriptorListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiDescriptorListIsMutable(); + kpiDescriptorList_.add(value); + onChanged(); + } else { + kpiDescriptorListBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + public Builder addKpiDescriptorList( + int index, monitoring.Monitoring.KpiDescriptor value) { + if (kpiDescriptorListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiDescriptorListIsMutable(); + kpiDescriptorList_.add(index, value); + onChanged(); + } else { + kpiDescriptorListBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + public Builder addKpiDescriptorList( + monitoring.Monitoring.KpiDescriptor.Builder builderForValue) { + if (kpiDescriptorListBuilder_ == null) { + ensureKpiDescriptorListIsMutable(); + kpiDescriptorList_.add(builderForValue.build()); + onChanged(); + } else { + kpiDescriptorListBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + public Builder addKpiDescriptorList( + int index, monitoring.Monitoring.KpiDescriptor.Builder builderForValue) { + if (kpiDescriptorListBuilder_ == null) { + ensureKpiDescriptorListIsMutable(); + kpiDescriptorList_.add(index, builderForValue.build()); + onChanged(); + } else { + kpiDescriptorListBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + public Builder addAllKpiDescriptorList( + java.lang.Iterable values) { + if (kpiDescriptorListBuilder_ == null) { + ensureKpiDescriptorListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, kpiDescriptorList_); onChanged(); } else { - subsIdBuilder_.setMessage(builderForValue.build()); + kpiDescriptorListBuilder_.addAllMessages(values); } - return this; } /** - * .context.Uuid subs_id = 1; + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - public Builder mergeSubsId(context.ContextOuterClass.Uuid value) { - if (subsIdBuilder_ == null) { - if (subsId_ != null) { - subsId_ = - context.ContextOuterClass.Uuid.newBuilder(subsId_).mergeFrom(value).buildPartial(); - } else { - subsId_ = value; - } + public Builder clearKpiDescriptorList() { + if (kpiDescriptorListBuilder_ == null) { + kpiDescriptorList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { - subsIdBuilder_.mergeFrom(value); + kpiDescriptorListBuilder_.clear(); } - return this; } /** - * .context.Uuid subs_id = 1; + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - public Builder clearSubsId() { - if (subsIdBuilder_ == null) { - subsId_ = null; + public Builder removeKpiDescriptorList(int index) { + if (kpiDescriptorListBuilder_ == null) { + ensureKpiDescriptorListIsMutable(); + kpiDescriptorList_.remove(index); onChanged(); } else { - subsId_ = null; - subsIdBuilder_ = null; + kpiDescriptorListBuilder_.remove(index); } - return this; } /** - * .context.Uuid subs_id = 1; + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - public context.ContextOuterClass.Uuid.Builder getSubsIdBuilder() { - - onChanged(); - return getSubsIdFieldBuilder().getBuilder(); + public monitoring.Monitoring.KpiDescriptor.Builder getKpiDescriptorListBuilder( + int index) { + return getKpiDescriptorListFieldBuilder().getBuilder(index); } /** - * .context.Uuid subs_id = 1; + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - public context.ContextOuterClass.UuidOrBuilder getSubsIdOrBuilder() { - if (subsIdBuilder_ != null) { - return subsIdBuilder_.getMessageOrBuilder(); + public monitoring.Monitoring.KpiDescriptorOrBuilder getKpiDescriptorListOrBuilder( + int index) { + if (kpiDescriptorListBuilder_ == null) { + return kpiDescriptorList_.get(index); } else { + return kpiDescriptorListBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + public java.util.List + getKpiDescriptorListOrBuilderList() { + if (kpiDescriptorListBuilder_ != null) { + return kpiDescriptorListBuilder_.getMessageOrBuilderList(); } else { - return subsId_ == null ? - context.ContextOuterClass.Uuid.getDefaultInstance() : subsId_; + return java.util.Collections.unmodifiableList(kpiDescriptorList_); } } /** - * .context.Uuid subs_id = 1; + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; */ - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> - getSubsIdFieldBuilder() { - if (subsIdBuilder_ == null) { - subsIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder>( - getSubsId(), + public monitoring.Monitoring.KpiDescriptor.Builder addKpiDescriptorListBuilder() { + return getKpiDescriptorListFieldBuilder().addBuilder( + monitoring.Monitoring.KpiDescriptor.getDefaultInstance()); + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + public monitoring.Monitoring.KpiDescriptor.Builder addKpiDescriptorListBuilder( + int index) { + return getKpiDescriptorListFieldBuilder().addBuilder( + index, monitoring.Monitoring.KpiDescriptor.getDefaultInstance()); + } + /** + * repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1; + */ + public java.util.List + getKpiDescriptorListBuilderList() { + return getKpiDescriptorListFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiDescriptor, monitoring.Monitoring.KpiDescriptor.Builder, monitoring.Monitoring.KpiDescriptorOrBuilder> + getKpiDescriptorListFieldBuilder() { + if (kpiDescriptorListBuilder_ == null) { + kpiDescriptorListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiDescriptor, monitoring.Monitoring.KpiDescriptor.Builder, monitoring.Monitoring.KpiDescriptorOrBuilder>( + kpiDescriptorList_, + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); - subsId_ = null; + kpiDescriptorList_ = null; } - return subsIdBuilder_; + return kpiDescriptorListBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -12138,110 +12578,139 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.SubscriptionID) + // @@protoc_insertion_point(builder_scope:monitoring.KpiDescriptorList) } - // @@protoc_insertion_point(class_scope:monitoring.SubscriptionID) - private static final monitoring.Monitoring.SubscriptionID DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.KpiDescriptorList) + private static final monitoring.Monitoring.KpiDescriptorList DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.SubscriptionID(); + DEFAULT_INSTANCE = new monitoring.Monitoring.KpiDescriptorList(); } - public static monitoring.Monitoring.SubscriptionID getDefaultInstance() { + public static monitoring.Monitoring.KpiDescriptorList getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public SubscriptionID parsePartialFrom( + public KpiDescriptorList parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SubscriptionID(input, extensionRegistry); + return new KpiDescriptorList(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.SubscriptionID getDefaultInstanceForType() { + public monitoring.Monitoring.KpiDescriptorList getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface SubsResponseOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.SubsResponse) + public interface SubsDescriptorOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.SubsDescriptor) com.google.protobuf.MessageOrBuilder { /** - * .monitoring.SubscriptionID subs_id = 1; - * @return Whether the subsId field is set. + * .monitoring.KpiId kpi_id = 1; + * @return Whether the kpiId field is set. */ - boolean hasSubsId(); + boolean hasKpiId(); /** - * .monitoring.SubscriptionID subs_id = 1; - * @return The subsId. + * .monitoring.KpiId kpi_id = 1; + * @return The kpiId. */ - monitoring.Monitoring.SubscriptionID getSubsId(); + monitoring.Monitoring.KpiId getKpiId(); /** - * .monitoring.SubscriptionID subs_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - monitoring.Monitoring.SubscriptionIDOrBuilder getSubsIdOrBuilder(); + monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder(); /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_duration_s = 2; + * @return The samplingDurationS. */ - java.util.List - getKpiListList(); + float getSamplingDurationS(); + /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_interval_s = 3; + * @return The samplingIntervalS. */ - monitoring.Monitoring.KpiList getKpiList(int index); + float getSamplingIntervalS(); + /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+     * used when you want something like "get the samples since X date/time"
+     *
+ * + * string start_date = 4; + * @return The startDate. */ - int getKpiListCount(); + java.lang.String getStartDate(); /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+     * used when you want something like "get the samples since X date/time"
+     *
+ * + * string start_date = 4; + * @return The bytes for startDate. */ - java.util.List - getKpiListOrBuilderList(); + com.google.protobuf.ByteString + getStartDateBytes(); + /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+     * used when you want something like "get the samples until X date/time"
+     *
+ * + * string end_date = 5; + * @return The endDate. */ - monitoring.Monitoring.KpiListOrBuilder getKpiListOrBuilder( - int index); + java.lang.String getEndDate(); + /** + * 
+     * used when you want something like "get the samples until X date/time"
+     *
+ * + * string end_date = 5; + * @return The bytes for endDate. + */ + com.google.protobuf.ByteString + getEndDateBytes(); } /** - * Protobuf type {@code monitoring.SubsResponse} + * Protobuf type {@code monitoring.SubsDescriptor} */ - public static final class SubsResponse extends + public static final class SubsDescriptor extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.SubsResponse) - SubsResponseOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.SubsDescriptor) + SubsDescriptorOrBuilder { private static final long serialVersionUID = 0L; - // Use SubsResponse.newBuilder() to construct. - private SubsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use SubsDescriptor.newBuilder() to construct. + private SubsDescriptor(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private SubsResponse() { - kpiList_ = java.util.Collections.emptyList(); + private SubsDescriptor() { + startDate_ = ""; + endDate_ = ""; } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new SubsResponse(); + return new SubsDescriptor(); } @java.lang.Override @@ -12249,7 +12718,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private SubsResponse( + private SubsDescriptor( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -12257,7 +12726,6 @@ public final class Monitoring { if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -12269,25 +12737,38 @@ public final class Monitoring { done = true; break; case 10: { - monitoring.Monitoring.SubscriptionID.Builder subBuilder = null; - if (subsId_ != null) { - subBuilder = subsId_.toBuilder(); + monitoring.Monitoring.KpiId.Builder subBuilder = null; + if (kpiId_ != null) { + subBuilder = kpiId_.toBuilder(); } - subsId_ = input.readMessage(monitoring.Monitoring.SubscriptionID.parser(), extensionRegistry); + kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(subsId_); - subsId_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(kpiId_); + kpiId_ = subBuilder.buildPartial(); } break; } - case 18: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - kpiList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - kpiList_.add( - input.readMessage(monitoring.Monitoring.KpiList.parser(), extensionRegistry)); + case 21: { + + samplingDurationS_ = input.readFloat(); + break; + } + case 29: { + + samplingIntervalS_ = input.readFloat(); + break; + } + case 34: { + java.lang.String s = input.readStringRequireUtf8(); + + startDate_ = s; + break; + } + case 42: { + java.lang.String s = input.readStringRequireUtf8(); + + endDate_ = s; break; } default: { @@ -12305,90 +12786,161 @@ public final class Monitoring { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - kpiList_ = java.util.Collections.unmodifiableList(kpiList_); - } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_SubsResponse_descriptor; + return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_SubsResponse_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.SubsResponse.class, monitoring.Monitoring.SubsResponse.Builder.class); + monitoring.Monitoring.SubsDescriptor.class, monitoring.Monitoring.SubsDescriptor.Builder.class); } - public static final int SUBS_ID_FIELD_NUMBER = 1; - private monitoring.Monitoring.SubscriptionID subsId_; + public static final int KPI_ID_FIELD_NUMBER = 1; + private monitoring.Monitoring.KpiId kpiId_; /** - * .monitoring.SubscriptionID subs_id = 1; - * @return Whether the subsId field is set. + * .monitoring.KpiId kpi_id = 1; + * @return Whether the kpiId field is set. */ @java.lang.Override - public boolean hasSubsId() { - return subsId_ != null; + public boolean hasKpiId() { + return kpiId_ != null; } /** - * .monitoring.SubscriptionID subs_id = 1; - * @return The subsId. + * .monitoring.KpiId kpi_id = 1; + * @return The kpiId. */ @java.lang.Override - public monitoring.Monitoring.SubscriptionID getSubsId() { - return subsId_ == null ? monitoring.Monitoring.SubscriptionID.getDefaultInstance() : subsId_; + public monitoring.Monitoring.KpiId getKpiId() { + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } /** - * .monitoring.SubscriptionID subs_id = 1; + * .monitoring.KpiId kpi_id = 1; */ @java.lang.Override - public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsIdOrBuilder() { - return getSubsId(); + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { + return getKpiId(); } - public static final int KPI_LIST_FIELD_NUMBER = 2; - private java.util.List kpiList_; + public static final int SAMPLING_DURATION_S_FIELD_NUMBER = 2; + private float samplingDurationS_; /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_duration_s = 2; + * @return The samplingDurationS. */ @java.lang.Override - public java.util.List getKpiListList() { - return kpiList_; + public float getSamplingDurationS() { + return samplingDurationS_; } + + public static final int SAMPLING_INTERVAL_S_FIELD_NUMBER = 3; + private float samplingIntervalS_; /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_interval_s = 3; + * @return The samplingIntervalS. */ @java.lang.Override - public java.util.List - getKpiListOrBuilderList() { - return kpiList_; + public float getSamplingIntervalS() { + return samplingIntervalS_; } + + public static final int START_DATE_FIELD_NUMBER = 4; + private volatile java.lang.Object startDate_; /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+     * used when you want something like "get the samples since X date/time"
+     *
+ * + * string start_date = 4; + * @return The startDate. */ @java.lang.Override - public int getKpiListCount() { - return kpiList_.size(); + public java.lang.String getStartDate() { + java.lang.Object ref = startDate_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + startDate_ = s; + return s; + } } /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+     * used when you want something like "get the samples since X date/time"
+     *
+ * + * string start_date = 4; + * @return The bytes for startDate. */ @java.lang.Override - public monitoring.Monitoring.KpiList getKpiList(int index) { - return kpiList_.get(index); + public com.google.protobuf.ByteString + getStartDateBytes() { + java.lang.Object ref = startDate_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + startDate_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } } + + public static final int END_DATE_FIELD_NUMBER = 5; + private volatile java.lang.Object endDate_; /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+     * used when you want something like "get the samples until X date/time"
+     *
+ * + * string end_date = 5; + * @return The endDate. */ @java.lang.Override - public monitoring.Monitoring.KpiListOrBuilder getKpiListOrBuilder( - int index) { - return kpiList_.get(index); + public java.lang.String getEndDate() { + java.lang.Object ref = endDate_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + endDate_ = s; + return s; + } + } + /** + * 
+     * used when you want something like "get the samples until X date/time"
+     *
+ * + * string end_date = 5; + * @return The bytes for endDate. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getEndDateBytes() { + java.lang.Object ref = endDate_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + endDate_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } } private byte memoizedIsInitialized = -1; @@ -12405,11 +12957,20 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (subsId_ != null) { - output.writeMessage(1, getSubsId()); + if (kpiId_ != null) { + output.writeMessage(1, getKpiId()); } - for (int i = 0; i < kpiList_.size(); i++) { - output.writeMessage(2, kpiList_.get(i)); + if (samplingDurationS_ != 0F) { + output.writeFloat(2, samplingDurationS_); + } + if (samplingIntervalS_ != 0F) { + output.writeFloat(3, samplingIntervalS_); + } + if (!getStartDateBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 4, startDate_); + } + if (!getEndDateBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, endDate_); } unknownFields.writeTo(output); } @@ -12420,13 +12981,23 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (subsId_ != null) { + if (kpiId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getSubsId()); + .computeMessageSize(1, getKpiId()); } - for (int i = 0; i < kpiList_.size(); i++) { + if (samplingDurationS_ != 0F) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, kpiList_.get(i)); + .computeFloatSize(2, samplingDurationS_); + } + if (samplingIntervalS_ != 0F) { + size += com.google.protobuf.CodedOutputStream + .computeFloatSize(3, samplingIntervalS_); + } + if (!getStartDateBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, startDate_); + } + if (!getEndDateBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, endDate_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -12438,18 +13009,26 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.SubsResponse)) { + if (!(obj instanceof monitoring.Monitoring.SubsDescriptor)) { return super.equals(obj); } - monitoring.Monitoring.SubsResponse other = (monitoring.Monitoring.SubsResponse) obj; + monitoring.Monitoring.SubsDescriptor other = (monitoring.Monitoring.SubsDescriptor) obj; - if (hasSubsId() != other.hasSubsId()) return false; - if (hasSubsId()) { - if (!getSubsId() - .equals(other.getSubsId())) return false; + if (hasKpiId() != other.hasKpiId()) return false; + if (hasKpiId()) { + if (!getKpiId() + .equals(other.getKpiId())) return false; } - if (!getKpiListList() - .equals(other.getKpiListList())) return false; + if (java.lang.Float.floatToIntBits(getSamplingDurationS()) + != java.lang.Float.floatToIntBits( + other.getSamplingDurationS())) return false; + if (java.lang.Float.floatToIntBits(getSamplingIntervalS()) + != java.lang.Float.floatToIntBits( + other.getSamplingIntervalS())) return false; + if (!getStartDate() + .equals(other.getStartDate())) return false; + if (!getEndDate() + .equals(other.getEndDate())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -12461,82 +13040,88 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasSubsId()) { - hash = (37 * hash) + SUBS_ID_FIELD_NUMBER; - hash = (53 * hash) + getSubsId().hashCode(); - } - if (getKpiListCount() > 0) { - hash = (37 * hash) + KPI_LIST_FIELD_NUMBER; - hash = (53 * hash) + getKpiListList().hashCode(); + if (hasKpiId()) { + hash = (37 * hash) + KPI_ID_FIELD_NUMBER; + hash = (53 * hash) + getKpiId().hashCode(); } + hash = (37 * hash) + SAMPLING_DURATION_S_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getSamplingDurationS()); + hash = (37 * hash) + SAMPLING_INTERVAL_S_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getSamplingIntervalS()); + hash = (37 * hash) + START_DATE_FIELD_NUMBER; + hash = (53 * hash) + getStartDate().hashCode(); + hash = (37 * hash) + END_DATE_FIELD_NUMBER; + hash = (53 * hash) + getEndDate().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.SubsResponse parseFrom( + public static monitoring.Monitoring.SubsDescriptor parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubsResponse parseFrom( + public static monitoring.Monitoring.SubsDescriptor parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubsResponse parseFrom( + public static monitoring.Monitoring.SubsDescriptor parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubsResponse parseFrom( + public static monitoring.Monitoring.SubsDescriptor parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubsResponse parseFrom(byte[] data) + public static monitoring.Monitoring.SubsDescriptor parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubsResponse parseFrom( + public static monitoring.Monitoring.SubsDescriptor parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubsResponse parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.SubsDescriptor parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubsResponse parseFrom( + public static monitoring.Monitoring.SubsDescriptor parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.SubsResponse parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.SubsDescriptor parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubsResponse parseDelimitedFrom( + public static monitoring.Monitoring.SubsDescriptor parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.SubsResponse parseFrom( + public static monitoring.Monitoring.SubsDescriptor parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubsResponse parseFrom( + public static monitoring.Monitoring.SubsDescriptor parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -12549,7 +13134,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.SubsResponse prototype) { + public static Builder newBuilder(monitoring.Monitoring.SubsDescriptor prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -12565,26 +13150,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.SubsResponse} + * Protobuf type {@code monitoring.SubsDescriptor} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.SubsResponse) - monitoring.Monitoring.SubsResponseOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.SubsDescriptor) + monitoring.Monitoring.SubsDescriptorOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_SubsResponse_descriptor; + return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_SubsResponse_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.SubsResponse.class, monitoring.Monitoring.SubsResponse.Builder.class); + monitoring.Monitoring.SubsDescriptor.class, monitoring.Monitoring.SubsDescriptor.Builder.class); } - // Construct using monitoring.Monitoring.SubsResponse.newBuilder() + // Construct using monitoring.Monitoring.SubsDescriptor.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -12597,65 +13182,60 @@ public final class Monitoring { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getKpiListFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); - if (subsIdBuilder_ == null) { - subsId_ = null; - } else { - subsId_ = null; - subsIdBuilder_ = null; - } - if (kpiListBuilder_ == null) { - kpiList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + if (kpiIdBuilder_ == null) { + kpiId_ = null; } else { - kpiListBuilder_.clear(); + kpiId_ = null; + kpiIdBuilder_ = null; } + samplingDurationS_ = 0F; + + samplingIntervalS_ = 0F; + + startDate_ = ""; + + endDate_ = ""; + return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_SubsResponse_descriptor; - } - - @java.lang.Override - public monitoring.Monitoring.SubsResponse getDefaultInstanceForType() { - return monitoring.Monitoring.SubsResponse.getDefaultInstance(); + return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_descriptor; } @java.lang.Override - public monitoring.Monitoring.SubsResponse build() { - monitoring.Monitoring.SubsResponse result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; + public monitoring.Monitoring.SubsDescriptor getDefaultInstanceForType() { + return monitoring.Monitoring.SubsDescriptor.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.SubsResponse buildPartial() { - monitoring.Monitoring.SubsResponse result = new monitoring.Monitoring.SubsResponse(this); - int from_bitField0_ = bitField0_; - if (subsIdBuilder_ == null) { - result.subsId_ = subsId_; - } else { - result.subsId_ = subsIdBuilder_.build(); + public monitoring.Monitoring.SubsDescriptor build() { + monitoring.Monitoring.SubsDescriptor result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); } - if (kpiListBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { - kpiList_ = java.util.Collections.unmodifiableList(kpiList_); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.kpiList_ = kpiList_; + return result; + } + + @java.lang.Override + public monitoring.Monitoring.SubsDescriptor buildPartial() { + monitoring.Monitoring.SubsDescriptor result = new monitoring.Monitoring.SubsDescriptor(this); + if (kpiIdBuilder_ == null) { + result.kpiId_ = kpiId_; } else { - result.kpiList_ = kpiListBuilder_.build(); + result.kpiId_ = kpiIdBuilder_.build(); } + result.samplingDurationS_ = samplingDurationS_; + result.samplingIntervalS_ = samplingIntervalS_; + result.startDate_ = startDate_; + result.endDate_ = endDate_; onBuilt(); return result; } @@ -12694,44 +13274,32 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.SubsResponse) { - return mergeFrom((monitoring.Monitoring.SubsResponse)other); + if (other instanceof monitoring.Monitoring.SubsDescriptor) { + return mergeFrom((monitoring.Monitoring.SubsDescriptor)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.SubsResponse other) { - if (other == monitoring.Monitoring.SubsResponse.getDefaultInstance()) return this; - if (other.hasSubsId()) { - mergeSubsId(other.getSubsId()); + public Builder mergeFrom(monitoring.Monitoring.SubsDescriptor other) { + if (other == monitoring.Monitoring.SubsDescriptor.getDefaultInstance()) return this; + if (other.hasKpiId()) { + mergeKpiId(other.getKpiId()); } - if (kpiListBuilder_ == null) { - if (!other.kpiList_.isEmpty()) { - if (kpiList_.isEmpty()) { - kpiList_ = other.kpiList_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureKpiListIsMutable(); - kpiList_.addAll(other.kpiList_); - } - onChanged(); - } - } else { - if (!other.kpiList_.isEmpty()) { - if (kpiListBuilder_.isEmpty()) { - kpiListBuilder_.dispose(); - kpiListBuilder_ = null; - kpiList_ = other.kpiList_; - bitField0_ = (bitField0_ & ~0x00000001); - kpiListBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getKpiListFieldBuilder() : null; - } else { - kpiListBuilder_.addAllMessages(other.kpiList_); - } - } + if (other.getSamplingDurationS() != 0F) { + setSamplingDurationS(other.getSamplingDurationS()); + } + if (other.getSamplingIntervalS() != 0F) { + setSamplingIntervalS(other.getSamplingIntervalS()); + } + if (!other.getStartDate().isEmpty()) { + startDate_ = other.startDate_; + onChanged(); + } + if (!other.getEndDate().isEmpty()) { + endDate_ = other.endDate_; + onChanged(); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -12748,11 +13316,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.SubsResponse parsedMessage = null; + monitoring.Monitoring.SubsDescriptor parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.SubsResponse) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.SubsDescriptor) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -12761,365 +13329,378 @@ public final class Monitoring { } return this; } - private int bitField0_; - private monitoring.Monitoring.SubscriptionID subsId_; + private monitoring.Monitoring.KpiId kpiId_; private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> subsIdBuilder_; + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; /** - * .monitoring.SubscriptionID subs_id = 1; - * @return Whether the subsId field is set. + * .monitoring.KpiId kpi_id = 1; + * @return Whether the kpiId field is set. */ - public boolean hasSubsId() { - return subsIdBuilder_ != null || subsId_ != null; + public boolean hasKpiId() { + return kpiIdBuilder_ != null || kpiId_ != null; } /** - * .monitoring.SubscriptionID subs_id = 1; - * @return The subsId. + * .monitoring.KpiId kpi_id = 1; + * @return The kpiId. */ - public monitoring.Monitoring.SubscriptionID getSubsId() { - if (subsIdBuilder_ == null) { - return subsId_ == null ? monitoring.Monitoring.SubscriptionID.getDefaultInstance() : subsId_; + public monitoring.Monitoring.KpiId getKpiId() { + if (kpiIdBuilder_ == null) { + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } else { - return subsIdBuilder_.getMessage(); + return kpiIdBuilder_.getMessage(); } } /** - * .monitoring.SubscriptionID subs_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public Builder setSubsId(monitoring.Monitoring.SubscriptionID value) { - if (subsIdBuilder_ == null) { + public Builder setKpiId(monitoring.Monitoring.KpiId value) { + if (kpiIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - subsId_ = value; + kpiId_ = value; onChanged(); } else { - subsIdBuilder_.setMessage(value); + kpiIdBuilder_.setMessage(value); } return this; } /** - * .monitoring.SubscriptionID subs_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public Builder setSubsId( - monitoring.Monitoring.SubscriptionID.Builder builderForValue) { - if (subsIdBuilder_ == null) { - subsId_ = builderForValue.build(); + public Builder setKpiId( + monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdBuilder_ == null) { + kpiId_ = builderForValue.build(); onChanged(); } else { - subsIdBuilder_.setMessage(builderForValue.build()); + kpiIdBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .monitoring.SubscriptionID subs_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public Builder mergeSubsId(monitoring.Monitoring.SubscriptionID value) { - if (subsIdBuilder_ == null) { - if (subsId_ != null) { - subsId_ = - monitoring.Monitoring.SubscriptionID.newBuilder(subsId_).mergeFrom(value).buildPartial(); + public Builder mergeKpiId(monitoring.Monitoring.KpiId value) { + if (kpiIdBuilder_ == null) { + if (kpiId_ != null) { + kpiId_ = + monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial(); } else { - subsId_ = value; + kpiId_ = value; } onChanged(); } else { - subsIdBuilder_.mergeFrom(value); + kpiIdBuilder_.mergeFrom(value); } return this; } /** - * .monitoring.SubscriptionID subs_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public Builder clearSubsId() { - if (subsIdBuilder_ == null) { - subsId_ = null; + public Builder clearKpiId() { + if (kpiIdBuilder_ == null) { + kpiId_ = null; onChanged(); } else { - subsId_ = null; - subsIdBuilder_ = null; + kpiId_ = null; + kpiIdBuilder_ = null; } return this; } /** - * .monitoring.SubscriptionID subs_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public monitoring.Monitoring.SubscriptionID.Builder getSubsIdBuilder() { + public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() { onChanged(); - return getSubsIdFieldBuilder().getBuilder(); + return getKpiIdFieldBuilder().getBuilder(); } /** - * .monitoring.SubscriptionID subs_id = 1; + * .monitoring.KpiId kpi_id = 1; */ - public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsIdOrBuilder() { - if (subsIdBuilder_ != null) { - return subsIdBuilder_.getMessageOrBuilder(); + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { + if (kpiIdBuilder_ != null) { + return kpiIdBuilder_.getMessageOrBuilder(); } else { - return subsId_ == null ? - monitoring.Monitoring.SubscriptionID.getDefaultInstance() : subsId_; + return kpiId_ == null ? + monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } } /** - * .monitoring.SubscriptionID subs_id = 1; + * .monitoring.KpiId kpi_id = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> - getSubsIdFieldBuilder() { - if (subsIdBuilder_ == null) { - subsIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder>( - getSubsId(), + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> + getKpiIdFieldBuilder() { + if (kpiIdBuilder_ == null) { + kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( + getKpiId(), getParentForChildren(), isClean()); - subsId_ = null; + kpiId_ = null; } - return subsIdBuilder_; - } - - private java.util.List kpiList_ = - java.util.Collections.emptyList(); - private void ensureKpiListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - kpiList_ = new java.util.ArrayList(kpiList_); - bitField0_ |= 0x00000001; - } + return kpiIdBuilder_; } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiList, monitoring.Monitoring.KpiList.Builder, monitoring.Monitoring.KpiListOrBuilder> kpiListBuilder_; - - /** - * repeated .monitoring.KpiList kpi_list = 2; - */ - public java.util.List getKpiListList() { - if (kpiListBuilder_ == null) { - return java.util.Collections.unmodifiableList(kpiList_); - } else { - return kpiListBuilder_.getMessageList(); - } - } - /** - * repeated .monitoring.KpiList kpi_list = 2; - */ - public int getKpiListCount() { - if (kpiListBuilder_ == null) { - return kpiList_.size(); - } else { - return kpiListBuilder_.getCount(); - } - } - /** - * repeated .monitoring.KpiList kpi_list = 2; - */ - public monitoring.Monitoring.KpiList getKpiList(int index) { - if (kpiListBuilder_ == null) { - return kpiList_.get(index); - } else { - return kpiListBuilder_.getMessage(index); - } - } + private float samplingDurationS_ ; /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_duration_s = 2; + * @return The samplingDurationS. */ - public Builder setKpiList( - int index, monitoring.Monitoring.KpiList value) { - if (kpiListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiListIsMutable(); - kpiList_.set(index, value); - onChanged(); - } else { - kpiListBuilder_.setMessage(index, value); - } - return this; + @java.lang.Override + public float getSamplingDurationS() { + return samplingDurationS_; } /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_duration_s = 2; + * @param value The samplingDurationS to set. + * @return This builder for chaining. */ - public Builder setKpiList( - int index, monitoring.Monitoring.KpiList.Builder builderForValue) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - kpiList_.set(index, builderForValue.build()); - onChanged(); - } else { - kpiListBuilder_.setMessage(index, builderForValue.build()); - } + public Builder setSamplingDurationS(float value) { + + samplingDurationS_ = value; + onChanged(); return this; } /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_duration_s = 2; + * @return This builder for chaining. */ - public Builder addKpiList(monitoring.Monitoring.KpiList value) { - if (kpiListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiListIsMutable(); - kpiList_.add(value); - onChanged(); - } else { - kpiListBuilder_.addMessage(value); - } + public Builder clearSamplingDurationS() { + + samplingDurationS_ = 0F; + onChanged(); return this; } + + private float samplingIntervalS_ ; /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_interval_s = 3; + * @return The samplingIntervalS. */ - public Builder addKpiList( - int index, monitoring.Monitoring.KpiList value) { - if (kpiListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiListIsMutable(); - kpiList_.add(index, value); - onChanged(); - } else { - kpiListBuilder_.addMessage(index, value); - } - return this; + @java.lang.Override + public float getSamplingIntervalS() { + return samplingIntervalS_; } /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_interval_s = 3; + * @param value The samplingIntervalS to set. + * @return This builder for chaining. */ - public Builder addKpiList( - monitoring.Monitoring.KpiList.Builder builderForValue) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - kpiList_.add(builderForValue.build()); - onChanged(); - } else { - kpiListBuilder_.addMessage(builderForValue.build()); - } + public Builder setSamplingIntervalS(float value) { + + samplingIntervalS_ = value; + onChanged(); return this; } /** - * repeated .monitoring.KpiList kpi_list = 2; + * float sampling_interval_s = 3; + * @return This builder for chaining. */ - public Builder addKpiList( - int index, monitoring.Monitoring.KpiList.Builder builderForValue) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - kpiList_.add(index, builderForValue.build()); - onChanged(); - } else { - kpiListBuilder_.addMessage(index, builderForValue.build()); - } + public Builder clearSamplingIntervalS() { + + samplingIntervalS_ = 0F; + onChanged(); return this; } + + private java.lang.Object startDate_ = ""; /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 4; + * @return The startDate. */ - public Builder addAllKpiList( - java.lang.Iterable values) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, kpiList_); - onChanged(); + public java.lang.String getStartDate() { + java.lang.Object ref = startDate_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + startDate_ = s; + return s; } else { - kpiListBuilder_.addAllMessages(values); + return (java.lang.String) ref; } - return this; } /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 4; + * @return The bytes for startDate. */ - public Builder clearKpiList() { - if (kpiListBuilder_ == null) { - kpiList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); + public com.google.protobuf.ByteString + getStartDateBytes() { + java.lang.Object ref = startDate_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + startDate_ = b; + return b; } else { - kpiListBuilder_.clear(); + return (com.google.protobuf.ByteString) ref; } + } + /** + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 4; + * @param value The startDate to set. + * @return This builder for chaining. + */ + public Builder setStartDate( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + startDate_ = value; + onChanged(); return this; } /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 4; + * @return This builder for chaining. */ - public Builder removeKpiList(int index) { - if (kpiListBuilder_ == null) { - ensureKpiListIsMutable(); - kpiList_.remove(index); - onChanged(); - } else { - kpiListBuilder_.remove(index); - } + public Builder clearStartDate() { + + startDate_ = getDefaultInstance().getStartDate(); + onChanged(); return this; } /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+       * used when you want something like "get the samples since X date/time"
+       *
+ * + * string start_date = 4; + * @param value The bytes for startDate to set. + * @return This builder for chaining. */ - public monitoring.Monitoring.KpiList.Builder getKpiListBuilder( - int index) { - return getKpiListFieldBuilder().getBuilder(index); + public Builder setStartDateBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + startDate_ = value; + onChanged(); + return this; } + + private java.lang.Object endDate_ = ""; /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 5; + * @return The endDate. */ - public monitoring.Monitoring.KpiListOrBuilder getKpiListOrBuilder( - int index) { - if (kpiListBuilder_ == null) { - return kpiList_.get(index); } else { - return kpiListBuilder_.getMessageOrBuilder(index); + public java.lang.String getEndDate() { + java.lang.Object ref = endDate_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + endDate_ = s; + return s; + } else { + return (java.lang.String) ref; } } /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 5; + * @return The bytes for endDate. */ - public java.util.List - getKpiListOrBuilderList() { - if (kpiListBuilder_ != null) { - return kpiListBuilder_.getMessageOrBuilderList(); + public com.google.protobuf.ByteString + getEndDateBytes() { + java.lang.Object ref = endDate_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + endDate_ = b; + return b; } else { - return java.util.Collections.unmodifiableList(kpiList_); + return (com.google.protobuf.ByteString) ref; } } /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 5; + * @param value The endDate to set. + * @return This builder for chaining. */ - public monitoring.Monitoring.KpiList.Builder addKpiListBuilder() { - return getKpiListFieldBuilder().addBuilder( - monitoring.Monitoring.KpiList.getDefaultInstance()); + public Builder setEndDate( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + endDate_ = value; + onChanged(); + return this; } /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 5; + * @return This builder for chaining. */ - public monitoring.Monitoring.KpiList.Builder addKpiListBuilder( - int index) { - return getKpiListFieldBuilder().addBuilder( - index, monitoring.Monitoring.KpiList.getDefaultInstance()); + public Builder clearEndDate() { + + endDate_ = getDefaultInstance().getEndDate(); + onChanged(); + return this; } /** - * repeated .monitoring.KpiList kpi_list = 2; + * 
+       * used when you want something like "get the samples until X date/time"
+       *
+ * + * string end_date = 5; + * @param value The bytes for endDate to set. + * @return This builder for chaining. */ - public java.util.List - getKpiListBuilderList() { - return getKpiListFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiList, monitoring.Monitoring.KpiList.Builder, monitoring.Monitoring.KpiListOrBuilder> - getKpiListFieldBuilder() { - if (kpiListBuilder_ == null) { - kpiListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiList, monitoring.Monitoring.KpiList.Builder, monitoring.Monitoring.KpiListOrBuilder>( - kpiList_, - ((bitField0_ & 0x00000001) != 0), - getParentForChildren(), - isClean()); - kpiList_ = null; - } - return kpiListBuilder_; + public Builder setEndDateBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + endDate_ = value; + onChanged(); + return this; } @java.lang.Override public final Builder setUnknownFields( @@ -13134,95 +13715,85 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.SubsResponse) + // @@protoc_insertion_point(builder_scope:monitoring.SubsDescriptor) } - - // @@protoc_insertion_point(class_scope:monitoring.SubsResponse) - private static final monitoring.Monitoring.SubsResponse DEFAULT_INSTANCE; + + // @@protoc_insertion_point(class_scope:monitoring.SubsDescriptor) + private static final monitoring.Monitoring.SubsDescriptor DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.SubsResponse(); + DEFAULT_INSTANCE = new monitoring.Monitoring.SubsDescriptor(); } - public static monitoring.Monitoring.SubsResponse getDefaultInstance() { + public static monitoring.Monitoring.SubsDescriptor getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public SubsResponse parsePartialFrom( + public SubsDescriptor parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SubsResponse(input, extensionRegistry); + return new SubsDescriptor(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.SubsResponse getDefaultInstanceForType() { + public monitoring.Monitoring.SubsDescriptor getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface SubsIDListOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.SubsIDList) + public interface SubscriptionIDOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.SubscriptionID) com.google.protobuf.MessageOrBuilder { /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - java.util.List - getSubsListList(); - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - monitoring.Monitoring.SubscriptionID getSubsList(int index); - /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; + * @return Whether the subsId field is set. */ - int getSubsListCount(); + boolean hasSubsId(); /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; + * @return The subsId. */ - java.util.List - getSubsListOrBuilderList(); + context.ContextOuterClass.Uuid getSubsId(); /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; */ - monitoring.Monitoring.SubscriptionIDOrBuilder getSubsListOrBuilder( - int index); + context.ContextOuterClass.UuidOrBuilder getSubsIdOrBuilder(); } /** - * Protobuf type {@code monitoring.SubsIDList} + * Protobuf type {@code monitoring.SubscriptionID} */ - public static final class SubsIDList extends + public static final class SubscriptionID extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.SubsIDList) - SubsIDListOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.SubscriptionID) + SubscriptionIDOrBuilder { private static final long serialVersionUID = 0L; - // Use SubsIDList.newBuilder() to construct. - private SubsIDList(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use SubscriptionID.newBuilder() to construct. + private SubscriptionID(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private SubsIDList() { - subsList_ = java.util.Collections.emptyList(); + private SubscriptionID() { } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new SubsIDList(); + return new SubscriptionID(); } @java.lang.Override @@ -13230,7 +13801,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private SubsIDList( + private SubscriptionID( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -13238,7 +13809,6 @@ public final class Monitoring { if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -13250,12 +13820,16 @@ public final class Monitoring { done = true; break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - subsList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; + context.ContextOuterClass.Uuid.Builder subBuilder = null; + if (subsId_ != null) { + subBuilder = subsId_.toBuilder(); } - subsList_.add( - input.readMessage(monitoring.Monitoring.SubscriptionID.parser(), extensionRegistry)); + subsId_ = input.readMessage(context.ContextOuterClass.Uuid.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(subsId_); + subsId_ = subBuilder.buildPartial(); + } + break; } default: { @@ -13273,64 +13847,47 @@ public final class Monitoring { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - subsList_ = java.util.Collections.unmodifiableList(subsList_); - } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_SubsIDList_descriptor; + return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_SubsIDList_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.SubsIDList.class, monitoring.Monitoring.SubsIDList.Builder.class); + monitoring.Monitoring.SubscriptionID.class, monitoring.Monitoring.SubscriptionID.Builder.class); } - public static final int SUBS_LIST_FIELD_NUMBER = 1; - private java.util.List subsList_; - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - @java.lang.Override - public java.util.List getSubsListList() { - return subsList_; - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - @java.lang.Override - public java.util.List - getSubsListOrBuilderList() { - return subsList_; - } + public static final int SUBS_ID_FIELD_NUMBER = 1; + private context.ContextOuterClass.Uuid subsId_; /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; + * @return Whether the subsId field is set. */ @java.lang.Override - public int getSubsListCount() { - return subsList_.size(); + public boolean hasSubsId() { + return subsId_ != null; } /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; + * @return The subsId. */ @java.lang.Override - public monitoring.Monitoring.SubscriptionID getSubsList(int index) { - return subsList_.get(index); + public context.ContextOuterClass.Uuid getSubsId() { + return subsId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : subsId_; } /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; */ @java.lang.Override - public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsListOrBuilder( - int index) { - return subsList_.get(index); + public context.ContextOuterClass.UuidOrBuilder getSubsIdOrBuilder() { + return getSubsId(); } private byte memoizedIsInitialized = -1; @@ -13347,8 +13904,8 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - for (int i = 0; i < subsList_.size(); i++) { - output.writeMessage(1, subsList_.get(i)); + if (subsId_ != null) { + output.writeMessage(1, getSubsId()); } unknownFields.writeTo(output); } @@ -13359,9 +13916,9 @@ public final class Monitoring { if (size != -1) return size; size = 0; - for (int i = 0; i < subsList_.size(); i++) { + if (subsId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, subsList_.get(i)); + .computeMessageSize(1, getSubsId()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -13373,13 +13930,16 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.SubsIDList)) { + if (!(obj instanceof monitoring.Monitoring.SubscriptionID)) { return super.equals(obj); } - monitoring.Monitoring.SubsIDList other = (monitoring.Monitoring.SubsIDList) obj; + monitoring.Monitoring.SubscriptionID other = (monitoring.Monitoring.SubscriptionID) obj; - if (!getSubsListList() - .equals(other.getSubsListList())) return false; + if (hasSubsId() != other.hasSubsId()) return false; + if (hasSubsId()) { + if (!getSubsId() + .equals(other.getSubsId())) return false; + } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -13391,78 +13951,78 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getSubsListCount() > 0) { - hash = (37 * hash) + SUBS_LIST_FIELD_NUMBER; - hash = (53 * hash) + getSubsListList().hashCode(); + if (hasSubsId()) { + hash = (37 * hash) + SUBS_ID_FIELD_NUMBER; + hash = (53 * hash) + getSubsId().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.SubsIDList parseFrom( + public static monitoring.Monitoring.SubscriptionID parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubsIDList parseFrom( + public static monitoring.Monitoring.SubscriptionID parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubsIDList parseFrom( + public static monitoring.Monitoring.SubscriptionID parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubsIDList parseFrom( + public static monitoring.Monitoring.SubscriptionID parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubsIDList parseFrom(byte[] data) + public static monitoring.Monitoring.SubscriptionID parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.SubsIDList parseFrom( + public static monitoring.Monitoring.SubscriptionID parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.SubsIDList parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.SubscriptionID parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubsIDList parseFrom( + public static monitoring.Monitoring.SubscriptionID parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.SubsIDList parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.SubscriptionID parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubsIDList parseDelimitedFrom( + public static monitoring.Monitoring.SubscriptionID parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.SubsIDList parseFrom( + public static monitoring.Monitoring.SubscriptionID parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.SubsIDList parseFrom( + public static monitoring.Monitoring.SubscriptionID parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -13475,7 +14035,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.SubsIDList prototype) { + public static Builder newBuilder(monitoring.Monitoring.SubscriptionID prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -13491,26 +14051,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.SubsIDList} + * Protobuf type {@code monitoring.SubscriptionID} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.SubsIDList) - monitoring.Monitoring.SubsIDListOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.SubscriptionID) + monitoring.Monitoring.SubscriptionIDOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_SubsIDList_descriptor; + return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_SubsIDList_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.SubsIDList.class, monitoring.Monitoring.SubsIDList.Builder.class); + monitoring.Monitoring.SubscriptionID.class, monitoring.Monitoring.SubscriptionID.Builder.class); } - // Construct using monitoring.Monitoring.SubsIDList.newBuilder() + // Construct using monitoring.Monitoring.SubscriptionID.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -13523,17 +14083,16 @@ public final class Monitoring { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getSubsListFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); - if (subsListBuilder_ == null) { - subsList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + if (subsIdBuilder_ == null) { + subsId_ = null; } else { - subsListBuilder_.clear(); + subsId_ = null; + subsIdBuilder_ = null; } return this; } @@ -13541,17 +14100,17 @@ public final class Monitoring { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_SubsIDList_descriptor; + return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_descriptor; } @java.lang.Override - public monitoring.Monitoring.SubsIDList getDefaultInstanceForType() { - return monitoring.Monitoring.SubsIDList.getDefaultInstance(); + public monitoring.Monitoring.SubscriptionID getDefaultInstanceForType() { + return monitoring.Monitoring.SubscriptionID.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.SubsIDList build() { - monitoring.Monitoring.SubsIDList result = buildPartial(); + public monitoring.Monitoring.SubscriptionID build() { + monitoring.Monitoring.SubscriptionID result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -13559,17 +14118,12 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.SubsIDList buildPartial() { - monitoring.Monitoring.SubsIDList result = new monitoring.Monitoring.SubsIDList(this); - int from_bitField0_ = bitField0_; - if (subsListBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { - subsList_ = java.util.Collections.unmodifiableList(subsList_); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.subsList_ = subsList_; + public monitoring.Monitoring.SubscriptionID buildPartial() { + monitoring.Monitoring.SubscriptionID result = new monitoring.Monitoring.SubscriptionID(this); + if (subsIdBuilder_ == null) { + result.subsId_ = subsId_; } else { - result.subsList_ = subsListBuilder_.build(); + result.subsId_ = subsIdBuilder_.build(); } onBuilt(); return result; @@ -13606,44 +14160,21 @@ public final class Monitoring { com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return super.addRepeatedField(field, value); - } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.SubsIDList) { - return mergeFrom((monitoring.Monitoring.SubsIDList)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(monitoring.Monitoring.SubsIDList other) { - if (other == monitoring.Monitoring.SubsIDList.getDefaultInstance()) return this; - if (subsListBuilder_ == null) { - if (!other.subsList_.isEmpty()) { - if (subsList_.isEmpty()) { - subsList_ = other.subsList_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureSubsListIsMutable(); - subsList_.addAll(other.subsList_); - } - onChanged(); - } + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof monitoring.Monitoring.SubscriptionID) { + return mergeFrom((monitoring.Monitoring.SubscriptionID)other); } else { - if (!other.subsList_.isEmpty()) { - if (subsListBuilder_.isEmpty()) { - subsListBuilder_.dispose(); - subsListBuilder_ = null; - subsList_ = other.subsList_; - bitField0_ = (bitField0_ & ~0x00000001); - subsListBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getSubsListFieldBuilder() : null; - } else { - subsListBuilder_.addAllMessages(other.subsList_); - } - } + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(monitoring.Monitoring.SubscriptionID other) { + if (other == monitoring.Monitoring.SubscriptionID.getDefaultInstance()) return this; + if (other.hasSubsId()) { + mergeSubsId(other.getSubsId()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -13660,11 +14191,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.SubsIDList parsedMessage = null; + monitoring.Monitoring.SubscriptionID parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.SubsIDList) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.SubscriptionID) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -13673,246 +14204,124 @@ public final class Monitoring { } return this; } - private int bitField0_; - - private java.util.List subsList_ = - java.util.Collections.emptyList(); - private void ensureSubsListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - subsList_ = new java.util.ArrayList(subsList_); - bitField0_ |= 0x00000001; - } - } - - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> subsListBuilder_; + private context.ContextOuterClass.Uuid subsId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> subsIdBuilder_; /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - public java.util.List getSubsListList() { - if (subsListBuilder_ == null) { - return java.util.Collections.unmodifiableList(subsList_); - } else { - return subsListBuilder_.getMessageList(); - } - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; + * @return Whether the subsId field is set. */ - public int getSubsListCount() { - if (subsListBuilder_ == null) { - return subsList_.size(); - } else { - return subsListBuilder_.getCount(); - } + public boolean hasSubsId() { + return subsIdBuilder_ != null || subsId_ != null; } /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; + * @return The subsId. */ - public monitoring.Monitoring.SubscriptionID getSubsList(int index) { - if (subsListBuilder_ == null) { - return subsList_.get(index); + public context.ContextOuterClass.Uuid getSubsId() { + if (subsIdBuilder_ == null) { + return subsId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : subsId_; } else { - return subsListBuilder_.getMessage(index); + return subsIdBuilder_.getMessage(); } } /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; */ - public Builder setSubsList( - int index, monitoring.Monitoring.SubscriptionID value) { - if (subsListBuilder_ == null) { + public Builder setSubsId(context.ContextOuterClass.Uuid value) { + if (subsIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureSubsListIsMutable(); - subsList_.set(index, value); - onChanged(); - } else { - subsListBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - public Builder setSubsList( - int index, monitoring.Monitoring.SubscriptionID.Builder builderForValue) { - if (subsListBuilder_ == null) { - ensureSubsListIsMutable(); - subsList_.set(index, builderForValue.build()); + subsId_ = value; onChanged(); } else { - subsListBuilder_.setMessage(index, builderForValue.build()); + subsIdBuilder_.setMessage(value); } + return this; } /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; */ - public Builder addSubsList(monitoring.Monitoring.SubscriptionID value) { - if (subsListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureSubsListIsMutable(); - subsList_.add(value); + public Builder setSubsId( + context.ContextOuterClass.Uuid.Builder builderForValue) { + if (subsIdBuilder_ == null) { + subsId_ = builderForValue.build(); onChanged(); } else { - subsListBuilder_.addMessage(value); + subsIdBuilder_.setMessage(builderForValue.build()); } + return this; } /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; */ - public Builder addSubsList( - int index, monitoring.Monitoring.SubscriptionID value) { - if (subsListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); + public Builder mergeSubsId(context.ContextOuterClass.Uuid value) { + if (subsIdBuilder_ == null) { + if (subsId_ != null) { + subsId_ = + context.ContextOuterClass.Uuid.newBuilder(subsId_).mergeFrom(value).buildPartial(); + } else { + subsId_ = value; } - ensureSubsListIsMutable(); - subsList_.add(index, value); - onChanged(); - } else { - subsListBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - public Builder addSubsList( - monitoring.Monitoring.SubscriptionID.Builder builderForValue) { - if (subsListBuilder_ == null) { - ensureSubsListIsMutable(); - subsList_.add(builderForValue.build()); - onChanged(); - } else { - subsListBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - public Builder addSubsList( - int index, monitoring.Monitoring.SubscriptionID.Builder builderForValue) { - if (subsListBuilder_ == null) { - ensureSubsListIsMutable(); - subsList_.add(index, builderForValue.build()); - onChanged(); - } else { - subsListBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - public Builder addAllSubsList( - java.lang.Iterable values) { - if (subsListBuilder_ == null) { - ensureSubsListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, subsList_); - onChanged(); - } else { - subsListBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - public Builder clearSubsList() { - if (subsListBuilder_ == null) { - subsList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { - subsListBuilder_.clear(); + subsIdBuilder_.mergeFrom(value); } + return this; } /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; */ - public Builder removeSubsList(int index) { - if (subsListBuilder_ == null) { - ensureSubsListIsMutable(); - subsList_.remove(index); + public Builder clearSubsId() { + if (subsIdBuilder_ == null) { + subsId_ = null; onChanged(); } else { - subsListBuilder_.remove(index); + subsId_ = null; + subsIdBuilder_ = null; } + return this; } /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - public monitoring.Monitoring.SubscriptionID.Builder getSubsListBuilder( - int index) { - return getSubsListFieldBuilder().getBuilder(index); - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsListOrBuilder( - int index) { - if (subsListBuilder_ == null) { - return subsList_.get(index); } else { - return subsListBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; - */ - public java.util.List - getSubsListOrBuilderList() { - if (subsListBuilder_ != null) { - return subsListBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(subsList_); - } - } - /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; */ - public monitoring.Monitoring.SubscriptionID.Builder addSubsListBuilder() { - return getSubsListFieldBuilder().addBuilder( - monitoring.Monitoring.SubscriptionID.getDefaultInstance()); + public context.ContextOuterClass.Uuid.Builder getSubsIdBuilder() { + + onChanged(); + return getSubsIdFieldBuilder().getBuilder(); } /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; */ - public monitoring.Monitoring.SubscriptionID.Builder addSubsListBuilder( - int index) { - return getSubsListFieldBuilder().addBuilder( - index, monitoring.Monitoring.SubscriptionID.getDefaultInstance()); + public context.ContextOuterClass.UuidOrBuilder getSubsIdOrBuilder() { + if (subsIdBuilder_ != null) { + return subsIdBuilder_.getMessageOrBuilder(); + } else { + return subsId_ == null ? + context.ContextOuterClass.Uuid.getDefaultInstance() : subsId_; + } } /** - * repeated .monitoring.SubscriptionID subs_list = 1; + * .context.Uuid subs_id = 1; */ - public java.util.List - getSubsListBuilderList() { - return getSubsListFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> - getSubsListFieldBuilder() { - if (subsListBuilder_ == null) { - subsListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder>( - subsList_, - ((bitField0_ & 0x00000001) != 0), + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> + getSubsIdFieldBuilder() { + if (subsIdBuilder_ == null) { + subsIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder>( + getSubsId(), getParentForChildren(), isClean()); - subsList_ = null; + subsId_ = null; } - return subsListBuilder_; + return subsIdBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -13927,176 +14336,110 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.SubsIDList) + // @@protoc_insertion_point(builder_scope:monitoring.SubscriptionID) } - // @@protoc_insertion_point(class_scope:monitoring.SubsIDList) - private static final monitoring.Monitoring.SubsIDList DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.SubscriptionID) + private static final monitoring.Monitoring.SubscriptionID DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.SubsIDList(); + DEFAULT_INSTANCE = new monitoring.Monitoring.SubscriptionID(); } - public static monitoring.Monitoring.SubsIDList getDefaultInstance() { + public static monitoring.Monitoring.SubscriptionID getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public SubsIDList parsePartialFrom( + public SubscriptionID parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SubsIDList(input, extensionRegistry); + return new SubscriptionID(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.SubsIDList getDefaultInstanceForType() { + public monitoring.Monitoring.SubscriptionID getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface AlarmDescriptorOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.AlarmDescriptor) + public interface SubsResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.SubsResponse) com.google.protobuf.MessageOrBuilder { /** - * .monitoring.AlarmID alarm_id = 1; - * @return Whether the alarmId field is set. - */ - boolean hasAlarmId(); - /** - * .monitoring.AlarmID alarm_id = 1; - * @return The alarmId. - */ - monitoring.Monitoring.AlarmID getAlarmId(); - /** - * .monitoring.AlarmID alarm_id = 1; - */ - monitoring.Monitoring.AlarmIDOrBuilder getAlarmIdOrBuilder(); - - /** - * string alarm_description = 2; - * @return The alarmDescription. - */ - java.lang.String getAlarmDescription(); - /** - * string alarm_description = 2; - * @return The bytes for alarmDescription. - */ - com.google.protobuf.ByteString - getAlarmDescriptionBytes(); - - /** - * string name = 3; - * @return The name. - */ - java.lang.String getName(); - /** - * string name = 3; - * @return The bytes for name. - */ - com.google.protobuf.ByteString - getNameBytes(); - - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - java.util.List - getKpiIdList(); - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - monitoring.Monitoring.KpiId getKpiId(int index); - /** - * repeated .monitoring.KpiId kpi_id = 4; + * .monitoring.SubscriptionID subs_id = 1; + * @return Whether the subsId field is set. */ - int getKpiIdCount(); + boolean hasSubsId(); /** - * repeated .monitoring.KpiId kpi_id = 4; + * .monitoring.SubscriptionID subs_id = 1; + * @return The subsId. */ - java.util.List - getKpiIdOrBuilderList(); + monitoring.Monitoring.SubscriptionID getSubsId(); /** - * repeated .monitoring.KpiId kpi_id = 4; + * .monitoring.SubscriptionID subs_id = 1; */ - monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder( - int index); + monitoring.Monitoring.SubscriptionIDOrBuilder getSubsIdOrBuilder(); /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ - java.util.List - getKpiValueRangeList(); + java.util.List + getKpiListList(); /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ - monitoring.Monitoring.KpiValueRange getKpiValueRange(int index); + monitoring.Monitoring.KpiList getKpiList(int index); /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ - int getKpiValueRangeCount(); + int getKpiListCount(); /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ - java.util.List - getKpiValueRangeOrBuilderList(); + java.util.List + getKpiListOrBuilderList(); /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ - monitoring.Monitoring.KpiValueRangeOrBuilder getKpiValueRangeOrBuilder( + monitoring.Monitoring.KpiListOrBuilder getKpiListOrBuilder( int index); - - /** - * .context.Timestamp timestamp = 6; - * @return Whether the timestamp field is set. - */ - boolean hasTimestamp(); - /** - * .context.Timestamp timestamp = 6; - * @return The timestamp. - */ - context.ContextOuterClass.Timestamp getTimestamp(); - /** - * .context.Timestamp timestamp = 6; - */ - context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder(); } /** - * Protobuf type {@code monitoring.AlarmDescriptor} + * Protobuf type {@code monitoring.SubsResponse} */ - public static final class AlarmDescriptor extends + public static final class SubsResponse extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.AlarmDescriptor) - AlarmDescriptorOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.SubsResponse) + SubsResponseOrBuilder { private static final long serialVersionUID = 0L; - // Use AlarmDescriptor.newBuilder() to construct. - private AlarmDescriptor(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use SubsResponse.newBuilder() to construct. + private SubsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private AlarmDescriptor() { - alarmDescription_ = ""; - name_ = ""; - kpiId_ = java.util.Collections.emptyList(); - kpiValueRange_ = java.util.Collections.emptyList(); + private SubsResponse() { + kpiList_ = java.util.Collections.emptyList(); } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new AlarmDescriptor(); + return new SubsResponse(); } @java.lang.Override @@ -14104,7 +14447,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private AlarmDescriptor( + private SubsResponse( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -14124,59 +14467,25 @@ public final class Monitoring { done = true; break; case 10: { - monitoring.Monitoring.AlarmID.Builder subBuilder = null; - if (alarmId_ != null) { - subBuilder = alarmId_.toBuilder(); + monitoring.Monitoring.SubscriptionID.Builder subBuilder = null; + if (subsId_ != null) { + subBuilder = subsId_.toBuilder(); } - alarmId_ = input.readMessage(monitoring.Monitoring.AlarmID.parser(), extensionRegistry); + subsId_ = input.readMessage(monitoring.Monitoring.SubscriptionID.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(alarmId_); - alarmId_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(subsId_); + subsId_ = subBuilder.buildPartial(); } break; } case 18: { - java.lang.String s = input.readStringRequireUtf8(); - - alarmDescription_ = s; - break; - } - case 26: { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - case 34: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - kpiId_ = new java.util.ArrayList(); + kpiList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - kpiId_.add( - input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry)); - break; - } - case 42: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - kpiValueRange_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - kpiValueRange_.add( - input.readMessage(monitoring.Monitoring.KpiValueRange.parser(), extensionRegistry)); - break; - } - case 50: { - context.ContextOuterClass.Timestamp.Builder subBuilder = null; - if (timestamp_ != null) { - subBuilder = timestamp_.toBuilder(); - } - timestamp_ = input.readMessage(context.ContextOuterClass.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(timestamp_); - timestamp_ = subBuilder.buildPartial(); - } - + kpiList_.add( + input.readMessage(monitoring.Monitoring.KpiList.parser(), extensionRegistry)); break; } default: { @@ -14195,234 +14504,89 @@ public final class Monitoring { e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { - kpiId_ = java.util.Collections.unmodifiableList(kpiId_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - kpiValueRange_ = java.util.Collections.unmodifiableList(kpiValueRange_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_fieldAccessorTable - .ensureFieldAccessorsInitialized( - monitoring.Monitoring.AlarmDescriptor.class, monitoring.Monitoring.AlarmDescriptor.Builder.class); - } - - public static final int ALARM_ID_FIELD_NUMBER = 1; - private monitoring.Monitoring.AlarmID alarmId_; - /** - * .monitoring.AlarmID alarm_id = 1; - * @return Whether the alarmId field is set. - */ - @java.lang.Override - public boolean hasAlarmId() { - return alarmId_ != null; - } - /** - * .monitoring.AlarmID alarm_id = 1; - * @return The alarmId. - */ - @java.lang.Override - public monitoring.Monitoring.AlarmID getAlarmId() { - return alarmId_ == null ? monitoring.Monitoring.AlarmID.getDefaultInstance() : alarmId_; - } - /** - * .monitoring.AlarmID alarm_id = 1; - */ - @java.lang.Override - public monitoring.Monitoring.AlarmIDOrBuilder getAlarmIdOrBuilder() { - return getAlarmId(); - } - - public static final int ALARM_DESCRIPTION_FIELD_NUMBER = 2; - private volatile java.lang.Object alarmDescription_; - /** - * string alarm_description = 2; - * @return The alarmDescription. - */ - @java.lang.Override - public java.lang.String getAlarmDescription() { - java.lang.Object ref = alarmDescription_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - alarmDescription_ = s; - return s; + kpiList_ = java.util.Collections.unmodifiableList(kpiList_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); } } - /** - * string alarm_description = 2; - * @return The bytes for alarmDescription. - */ - @java.lang.Override - public com.google.protobuf.ByteString - getAlarmDescriptionBytes() { - java.lang.Object ref = alarmDescription_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - alarmDescription_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return monitoring.Monitoring.internal_static_monitoring_SubsResponse_descriptor; } - public static final int NAME_FIELD_NUMBER = 3; - private volatile java.lang.Object name_; - /** - * string name = 3; - * @return The name. - */ - @java.lang.Override - public java.lang.String getName() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - name_ = s; - return s; - } - } - /** - * string name = 3; - * @return The bytes for name. - */ @java.lang.Override - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return monitoring.Monitoring.internal_static_monitoring_SubsResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + monitoring.Monitoring.SubsResponse.class, monitoring.Monitoring.SubsResponse.Builder.class); } - public static final int KPI_ID_FIELD_NUMBER = 4; - private java.util.List kpiId_; - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - @java.lang.Override - public java.util.List getKpiIdList() { - return kpiId_; - } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - @java.lang.Override - public java.util.List - getKpiIdOrBuilderList() { - return kpiId_; - } + public static final int SUBS_ID_FIELD_NUMBER = 1; + private monitoring.Monitoring.SubscriptionID subsId_; /** - * repeated .monitoring.KpiId kpi_id = 4; + * .monitoring.SubscriptionID subs_id = 1; + * @return Whether the subsId field is set. */ @java.lang.Override - public int getKpiIdCount() { - return kpiId_.size(); + public boolean hasSubsId() { + return subsId_ != null; } /** - * repeated .monitoring.KpiId kpi_id = 4; + * .monitoring.SubscriptionID subs_id = 1; + * @return The subsId. */ @java.lang.Override - public monitoring.Monitoring.KpiId getKpiId(int index) { - return kpiId_.get(index); + public monitoring.Monitoring.SubscriptionID getSubsId() { + return subsId_ == null ? monitoring.Monitoring.SubscriptionID.getDefaultInstance() : subsId_; } /** - * repeated .monitoring.KpiId kpi_id = 4; + * .monitoring.SubscriptionID subs_id = 1; */ @java.lang.Override - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder( - int index) { - return kpiId_.get(index); + public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsIdOrBuilder() { + return getSubsId(); } - public static final int KPI_VALUE_RANGE_FIELD_NUMBER = 5; - private java.util.List kpiValueRange_; + public static final int KPI_LIST_FIELD_NUMBER = 2; + private java.util.List kpiList_; /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ @java.lang.Override - public java.util.List getKpiValueRangeList() { - return kpiValueRange_; + public java.util.List getKpiListList() { + return kpiList_; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ @java.lang.Override - public java.util.List - getKpiValueRangeOrBuilderList() { - return kpiValueRange_; + public java.util.List + getKpiListOrBuilderList() { + return kpiList_; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ @java.lang.Override - public int getKpiValueRangeCount() { - return kpiValueRange_.size(); + public int getKpiListCount() { + return kpiList_.size(); } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ @java.lang.Override - public monitoring.Monitoring.KpiValueRange getKpiValueRange(int index) { - return kpiValueRange_.get(index); + public monitoring.Monitoring.KpiList getKpiList(int index) { + return kpiList_.get(index); } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.KpiList kpi_list = 2; */ @java.lang.Override - public monitoring.Monitoring.KpiValueRangeOrBuilder getKpiValueRangeOrBuilder( + public monitoring.Monitoring.KpiListOrBuilder getKpiListOrBuilder( int index) { - return kpiValueRange_.get(index); - } - - public static final int TIMESTAMP_FIELD_NUMBER = 6; - private context.ContextOuterClass.Timestamp timestamp_; - /** - * .context.Timestamp timestamp = 6; - * @return Whether the timestamp field is set. - */ - @java.lang.Override - public boolean hasTimestamp() { - return timestamp_ != null; - } - /** - * .context.Timestamp timestamp = 6; - * @return The timestamp. - */ - @java.lang.Override - public context.ContextOuterClass.Timestamp getTimestamp() { - return timestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_; - } - /** - * .context.Timestamp timestamp = 6; - */ - @java.lang.Override - public context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder() { - return getTimestamp(); + return kpiList_.get(index); } private byte memoizedIsInitialized = -1; @@ -14439,23 +14603,11 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (alarmId_ != null) { - output.writeMessage(1, getAlarmId()); - } - if (!getAlarmDescriptionBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, alarmDescription_); - } - if (!getNameBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 3, name_); - } - for (int i = 0; i < kpiId_.size(); i++) { - output.writeMessage(4, kpiId_.get(i)); - } - for (int i = 0; i < kpiValueRange_.size(); i++) { - output.writeMessage(5, kpiValueRange_.get(i)); + if (subsId_ != null) { + output.writeMessage(1, getSubsId()); } - if (timestamp_ != null) { - output.writeMessage(6, getTimestamp()); + for (int i = 0; i < kpiList_.size(); i++) { + output.writeMessage(2, kpiList_.get(i)); } unknownFields.writeTo(output); } @@ -14466,27 +14618,13 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (alarmId_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getAlarmId()); - } - if (!getAlarmDescriptionBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, alarmDescription_); - } - if (!getNameBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, name_); - } - for (int i = 0; i < kpiId_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, kpiId_.get(i)); - } - for (int i = 0; i < kpiValueRange_.size(); i++) { + if (subsId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, kpiValueRange_.get(i)); + .computeMessageSize(1, getSubsId()); } - if (timestamp_ != null) { + for (int i = 0; i < kpiList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, getTimestamp()); + .computeMessageSize(2, kpiList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -14498,29 +14636,18 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.AlarmDescriptor)) { + if (!(obj instanceof monitoring.Monitoring.SubsResponse)) { return super.equals(obj); } - monitoring.Monitoring.AlarmDescriptor other = (monitoring.Monitoring.AlarmDescriptor) obj; + monitoring.Monitoring.SubsResponse other = (monitoring.Monitoring.SubsResponse) obj; - if (hasAlarmId() != other.hasAlarmId()) return false; - if (hasAlarmId()) { - if (!getAlarmId() - .equals(other.getAlarmId())) return false; - } - if (!getAlarmDescription() - .equals(other.getAlarmDescription())) return false; - if (!getName() - .equals(other.getName())) return false; - if (!getKpiIdList() - .equals(other.getKpiIdList())) return false; - if (!getKpiValueRangeList() - .equals(other.getKpiValueRangeList())) return false; - if (hasTimestamp() != other.hasTimestamp()) return false; - if (hasTimestamp()) { - if (!getTimestamp() - .equals(other.getTimestamp())) return false; + if (hasSubsId() != other.hasSubsId()) return false; + if (hasSubsId()) { + if (!getSubsId() + .equals(other.getSubsId())) return false; } + if (!getKpiListList() + .equals(other.getKpiListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -14532,94 +14659,82 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasAlarmId()) { - hash = (37 * hash) + ALARM_ID_FIELD_NUMBER; - hash = (53 * hash) + getAlarmId().hashCode(); - } - hash = (37 * hash) + ALARM_DESCRIPTION_FIELD_NUMBER; - hash = (53 * hash) + getAlarmDescription().hashCode(); - hash = (37 * hash) + NAME_FIELD_NUMBER; - hash = (53 * hash) + getName().hashCode(); - if (getKpiIdCount() > 0) { - hash = (37 * hash) + KPI_ID_FIELD_NUMBER; - hash = (53 * hash) + getKpiIdList().hashCode(); - } - if (getKpiValueRangeCount() > 0) { - hash = (37 * hash) + KPI_VALUE_RANGE_FIELD_NUMBER; - hash = (53 * hash) + getKpiValueRangeList().hashCode(); + if (hasSubsId()) { + hash = (37 * hash) + SUBS_ID_FIELD_NUMBER; + hash = (53 * hash) + getSubsId().hashCode(); } - if (hasTimestamp()) { - hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER; - hash = (53 * hash) + getTimestamp().hashCode(); + if (getKpiListCount() > 0) { + hash = (37 * hash) + KPI_LIST_FIELD_NUMBER; + hash = (53 * hash) + getKpiListList().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.AlarmDescriptor parseFrom( + public static monitoring.Monitoring.SubsResponse parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.AlarmDescriptor parseFrom( + public static monitoring.Monitoring.SubsResponse parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.AlarmDescriptor parseFrom( + public static monitoring.Monitoring.SubsResponse parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.AlarmDescriptor parseFrom( + public static monitoring.Monitoring.SubsResponse parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.AlarmDescriptor parseFrom(byte[] data) + public static monitoring.Monitoring.SubsResponse parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.AlarmDescriptor parseFrom( + public static monitoring.Monitoring.SubsResponse parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.AlarmDescriptor parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.SubsResponse parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.AlarmDescriptor parseFrom( + public static monitoring.Monitoring.SubsResponse parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.AlarmDescriptor parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.SubsResponse parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.AlarmDescriptor parseDelimitedFrom( + public static monitoring.Monitoring.SubsResponse parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.AlarmDescriptor parseFrom( + public static monitoring.Monitoring.SubsResponse parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.AlarmDescriptor parseFrom( + public static monitoring.Monitoring.SubsResponse parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -14632,7 +14747,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.AlarmDescriptor prototype) { + public static Builder newBuilder(monitoring.Monitoring.SubsResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -14648,26 +14763,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.AlarmDescriptor} + * Protobuf type {@code monitoring.SubsResponse} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.AlarmDescriptor) - monitoring.Monitoring.AlarmDescriptorOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.SubsResponse) + monitoring.Monitoring.SubsResponseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_descriptor; + return monitoring.Monitoring.internal_static_monitoring_SubsResponse_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_SubsResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.AlarmDescriptor.class, monitoring.Monitoring.AlarmDescriptor.Builder.class); + monitoring.Monitoring.SubsResponse.class, monitoring.Monitoring.SubsResponse.Builder.class); } - // Construct using monitoring.Monitoring.AlarmDescriptor.newBuilder() + // Construct using monitoring.Monitoring.SubsResponse.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -14680,40 +14795,23 @@ public final class Monitoring { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getKpiIdFieldBuilder(); - getKpiValueRangeFieldBuilder(); + getKpiListFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); - if (alarmIdBuilder_ == null) { - alarmId_ = null; - } else { - alarmId_ = null; - alarmIdBuilder_ = null; - } - alarmDescription_ = ""; - - name_ = ""; - - if (kpiIdBuilder_ == null) { - kpiId_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - } else { - kpiIdBuilder_.clear(); - } - if (kpiValueRangeBuilder_ == null) { - kpiValueRange_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + if (subsIdBuilder_ == null) { + subsId_ = null; } else { - kpiValueRangeBuilder_.clear(); + subsId_ = null; + subsIdBuilder_ = null; } - if (timestampBuilder_ == null) { - timestamp_ = null; + if (kpiListBuilder_ == null) { + kpiList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); } else { - timestamp_ = null; - timestampBuilder_ = null; + kpiListBuilder_.clear(); } return this; } @@ -14721,17 +14819,17 @@ public final class Monitoring { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_descriptor; + return monitoring.Monitoring.internal_static_monitoring_SubsResponse_descriptor; } @java.lang.Override - public monitoring.Monitoring.AlarmDescriptor getDefaultInstanceForType() { - return monitoring.Monitoring.AlarmDescriptor.getDefaultInstance(); + public monitoring.Monitoring.SubsResponse getDefaultInstanceForType() { + return monitoring.Monitoring.SubsResponse.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.AlarmDescriptor build() { - monitoring.Monitoring.AlarmDescriptor result = buildPartial(); + public monitoring.Monitoring.SubsResponse build() { + monitoring.Monitoring.SubsResponse result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -14739,38 +14837,22 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.AlarmDescriptor buildPartial() { - monitoring.Monitoring.AlarmDescriptor result = new monitoring.Monitoring.AlarmDescriptor(this); + public monitoring.Monitoring.SubsResponse buildPartial() { + monitoring.Monitoring.SubsResponse result = new monitoring.Monitoring.SubsResponse(this); int from_bitField0_ = bitField0_; - if (alarmIdBuilder_ == null) { - result.alarmId_ = alarmId_; + if (subsIdBuilder_ == null) { + result.subsId_ = subsId_; } else { - result.alarmId_ = alarmIdBuilder_.build(); + result.subsId_ = subsIdBuilder_.build(); } - result.alarmDescription_ = alarmDescription_; - result.name_ = name_; - if (kpiIdBuilder_ == null) { + if (kpiListBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { - kpiId_ = java.util.Collections.unmodifiableList(kpiId_); + kpiList_ = java.util.Collections.unmodifiableList(kpiList_); bitField0_ = (bitField0_ & ~0x00000001); } - result.kpiId_ = kpiId_; - } else { - result.kpiId_ = kpiIdBuilder_.build(); - } - if (kpiValueRangeBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { - kpiValueRange_ = java.util.Collections.unmodifiableList(kpiValueRange_); - bitField0_ = (bitField0_ & ~0x00000002); - } - result.kpiValueRange_ = kpiValueRange_; - } else { - result.kpiValueRange_ = kpiValueRangeBuilder_.build(); - } - if (timestampBuilder_ == null) { - result.timestamp_ = timestamp_; + result.kpiList_ = kpiList_; } else { - result.timestamp_ = timestampBuilder_.build(); + result.kpiList_ = kpiListBuilder_.build(); } onBuilt(); return result; @@ -14810,82 +14892,45 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.AlarmDescriptor) { - return mergeFrom((monitoring.Monitoring.AlarmDescriptor)other); + if (other instanceof monitoring.Monitoring.SubsResponse) { + return mergeFrom((monitoring.Monitoring.SubsResponse)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.AlarmDescriptor other) { - if (other == monitoring.Monitoring.AlarmDescriptor.getDefaultInstance()) return this; - if (other.hasAlarmId()) { - mergeAlarmId(other.getAlarmId()); - } - if (!other.getAlarmDescription().isEmpty()) { - alarmDescription_ = other.alarmDescription_; - onChanged(); - } - if (!other.getName().isEmpty()) { - name_ = other.name_; - onChanged(); + public Builder mergeFrom(monitoring.Monitoring.SubsResponse other) { + if (other == monitoring.Monitoring.SubsResponse.getDefaultInstance()) return this; + if (other.hasSubsId()) { + mergeSubsId(other.getSubsId()); } - if (kpiIdBuilder_ == null) { - if (!other.kpiId_.isEmpty()) { - if (kpiId_.isEmpty()) { - kpiId_ = other.kpiId_; + if (kpiListBuilder_ == null) { + if (!other.kpiList_.isEmpty()) { + if (kpiList_.isEmpty()) { + kpiList_ = other.kpiList_; bitField0_ = (bitField0_ & ~0x00000001); } else { - ensureKpiIdIsMutable(); - kpiId_.addAll(other.kpiId_); + ensureKpiListIsMutable(); + kpiList_.addAll(other.kpiList_); } onChanged(); } } else { - if (!other.kpiId_.isEmpty()) { - if (kpiIdBuilder_.isEmpty()) { - kpiIdBuilder_.dispose(); - kpiIdBuilder_ = null; - kpiId_ = other.kpiId_; + if (!other.kpiList_.isEmpty()) { + if (kpiListBuilder_.isEmpty()) { + kpiListBuilder_.dispose(); + kpiListBuilder_ = null; + kpiList_ = other.kpiList_; bitField0_ = (bitField0_ & ~0x00000001); - kpiIdBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getKpiIdFieldBuilder() : null; - } else { - kpiIdBuilder_.addAllMessages(other.kpiId_); - } - } - } - if (kpiValueRangeBuilder_ == null) { - if (!other.kpiValueRange_.isEmpty()) { - if (kpiValueRange_.isEmpty()) { - kpiValueRange_ = other.kpiValueRange_; - bitField0_ = (bitField0_ & ~0x00000002); - } else { - ensureKpiValueRangeIsMutable(); - kpiValueRange_.addAll(other.kpiValueRange_); - } - onChanged(); - } - } else { - if (!other.kpiValueRange_.isEmpty()) { - if (kpiValueRangeBuilder_.isEmpty()) { - kpiValueRangeBuilder_.dispose(); - kpiValueRangeBuilder_ = null; - kpiValueRange_ = other.kpiValueRange_; - bitField0_ = (bitField0_ & ~0x00000002); - kpiValueRangeBuilder_ = + kpiListBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getKpiValueRangeFieldBuilder() : null; + getKpiListFieldBuilder() : null; } else { - kpiValueRangeBuilder_.addAllMessages(other.kpiValueRange_); + kpiListBuilder_.addAllMessages(other.kpiList_); } } } - if (other.hasTimestamp()) { - mergeTimestamp(other.getTimestamp()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -14901,11 +14946,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.AlarmDescriptor parsedMessage = null; + monitoring.Monitoring.SubsResponse parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.AlarmDescriptor) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.SubsResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -14916,1495 +14961,2430 @@ public final class Monitoring { } private int bitField0_; - private monitoring.Monitoring.AlarmID alarmId_; + private monitoring.Monitoring.SubscriptionID subsId_; private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.AlarmID, monitoring.Monitoring.AlarmID.Builder, monitoring.Monitoring.AlarmIDOrBuilder> alarmIdBuilder_; + monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> subsIdBuilder_; /** - * .monitoring.AlarmID alarm_id = 1; - * @return Whether the alarmId field is set. + * .monitoring.SubscriptionID subs_id = 1; + * @return Whether the subsId field is set. */ - public boolean hasAlarmId() { - return alarmIdBuilder_ != null || alarmId_ != null; + public boolean hasSubsId() { + return subsIdBuilder_ != null || subsId_ != null; + } + /** + * .monitoring.SubscriptionID subs_id = 1; + * @return The subsId. + */ + public monitoring.Monitoring.SubscriptionID getSubsId() { + if (subsIdBuilder_ == null) { + return subsId_ == null ? monitoring.Monitoring.SubscriptionID.getDefaultInstance() : subsId_; + } else { + return subsIdBuilder_.getMessage(); + } + } + /** + * .monitoring.SubscriptionID subs_id = 1; + */ + public Builder setSubsId(monitoring.Monitoring.SubscriptionID value) { + if (subsIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + subsId_ = value; + onChanged(); + } else { + subsIdBuilder_.setMessage(value); + } + + return this; + } + /** + * .monitoring.SubscriptionID subs_id = 1; + */ + public Builder setSubsId( + monitoring.Monitoring.SubscriptionID.Builder builderForValue) { + if (subsIdBuilder_ == null) { + subsId_ = builderForValue.build(); + onChanged(); + } else { + subsIdBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .monitoring.SubscriptionID subs_id = 1; + */ + public Builder mergeSubsId(monitoring.Monitoring.SubscriptionID value) { + if (subsIdBuilder_ == null) { + if (subsId_ != null) { + subsId_ = + monitoring.Monitoring.SubscriptionID.newBuilder(subsId_).mergeFrom(value).buildPartial(); + } else { + subsId_ = value; + } + onChanged(); + } else { + subsIdBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .monitoring.SubscriptionID subs_id = 1; + */ + public Builder clearSubsId() { + if (subsIdBuilder_ == null) { + subsId_ = null; + onChanged(); + } else { + subsId_ = null; + subsIdBuilder_ = null; + } + + return this; + } + /** + * .monitoring.SubscriptionID subs_id = 1; + */ + public monitoring.Monitoring.SubscriptionID.Builder getSubsIdBuilder() { + + onChanged(); + return getSubsIdFieldBuilder().getBuilder(); + } + /** + * .monitoring.SubscriptionID subs_id = 1; + */ + public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsIdOrBuilder() { + if (subsIdBuilder_ != null) { + return subsIdBuilder_.getMessageOrBuilder(); + } else { + return subsId_ == null ? + monitoring.Monitoring.SubscriptionID.getDefaultInstance() : subsId_; + } + } + /** + * .monitoring.SubscriptionID subs_id = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> + getSubsIdFieldBuilder() { + if (subsIdBuilder_ == null) { + subsIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder>( + getSubsId(), + getParentForChildren(), + isClean()); + subsId_ = null; + } + return subsIdBuilder_; + } + + private java.util.List kpiList_ = + java.util.Collections.emptyList(); + private void ensureKpiListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + kpiList_ = new java.util.ArrayList(kpiList_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiList, monitoring.Monitoring.KpiList.Builder, monitoring.Monitoring.KpiListOrBuilder> kpiListBuilder_; + + /** + * repeated .monitoring.KpiList kpi_list = 2; + */ + public java.util.List getKpiListList() { + if (kpiListBuilder_ == null) { + return java.util.Collections.unmodifiableList(kpiList_); + } else { + return kpiListBuilder_.getMessageList(); + } + } + /** + * repeated .monitoring.KpiList kpi_list = 2; + */ + public int getKpiListCount() { + if (kpiListBuilder_ == null) { + return kpiList_.size(); + } else { + return kpiListBuilder_.getCount(); + } } /** - * .monitoring.AlarmID alarm_id = 1; - * @return The alarmId. + * repeated .monitoring.KpiList kpi_list = 2; */ - public monitoring.Monitoring.AlarmID getAlarmId() { - if (alarmIdBuilder_ == null) { - return alarmId_ == null ? monitoring.Monitoring.AlarmID.getDefaultInstance() : alarmId_; + public monitoring.Monitoring.KpiList getKpiList(int index) { + if (kpiListBuilder_ == null) { + return kpiList_.get(index); } else { - return alarmIdBuilder_.getMessage(); + return kpiListBuilder_.getMessage(index); } } /** - * .monitoring.AlarmID alarm_id = 1; + * repeated .monitoring.KpiList kpi_list = 2; */ - public Builder setAlarmId(monitoring.Monitoring.AlarmID value) { - if (alarmIdBuilder_ == null) { + public Builder setKpiList( + int index, monitoring.Monitoring.KpiList value) { + if (kpiListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - alarmId_ = value; + ensureKpiListIsMutable(); + kpiList_.set(index, value); onChanged(); } else { - alarmIdBuilder_.setMessage(value); + kpiListBuilder_.setMessage(index, value); } - return this; } /** - * .monitoring.AlarmID alarm_id = 1; + * repeated .monitoring.KpiList kpi_list = 2; */ - public Builder setAlarmId( - monitoring.Monitoring.AlarmID.Builder builderForValue) { - if (alarmIdBuilder_ == null) { - alarmId_ = builderForValue.build(); + public Builder setKpiList( + int index, monitoring.Monitoring.KpiList.Builder builderForValue) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + kpiList_.set(index, builderForValue.build()); onChanged(); } else { - alarmIdBuilder_.setMessage(builderForValue.build()); + kpiListBuilder_.setMessage(index, builderForValue.build()); } - return this; } /** - * .monitoring.AlarmID alarm_id = 1; + * repeated .monitoring.KpiList kpi_list = 2; */ - public Builder mergeAlarmId(monitoring.Monitoring.AlarmID value) { - if (alarmIdBuilder_ == null) { - if (alarmId_ != null) { - alarmId_ = - monitoring.Monitoring.AlarmID.newBuilder(alarmId_).mergeFrom(value).buildPartial(); - } else { - alarmId_ = value; + public Builder addKpiList(monitoring.Monitoring.KpiList value) { + if (kpiListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); } + ensureKpiListIsMutable(); + kpiList_.add(value); onChanged(); } else { - alarmIdBuilder_.mergeFrom(value); + kpiListBuilder_.addMessage(value); } - return this; } /** - * .monitoring.AlarmID alarm_id = 1; + * repeated .monitoring.KpiList kpi_list = 2; */ - public Builder clearAlarmId() { - if (alarmIdBuilder_ == null) { - alarmId_ = null; + public Builder addKpiList( + int index, monitoring.Monitoring.KpiList value) { + if (kpiListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureKpiListIsMutable(); + kpiList_.add(index, value); onChanged(); } else { - alarmId_ = null; - alarmIdBuilder_ = null; + kpiListBuilder_.addMessage(index, value); } - return this; } /** - * .monitoring.AlarmID alarm_id = 1; - */ - public monitoring.Monitoring.AlarmID.Builder getAlarmIdBuilder() { - - onChanged(); - return getAlarmIdFieldBuilder().getBuilder(); - } - /** - * .monitoring.AlarmID alarm_id = 1; + * repeated .monitoring.KpiList kpi_list = 2; */ - public monitoring.Monitoring.AlarmIDOrBuilder getAlarmIdOrBuilder() { - if (alarmIdBuilder_ != null) { - return alarmIdBuilder_.getMessageOrBuilder(); + public Builder addKpiList( + monitoring.Monitoring.KpiList.Builder builderForValue) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + kpiList_.add(builderForValue.build()); + onChanged(); } else { - return alarmId_ == null ? - monitoring.Monitoring.AlarmID.getDefaultInstance() : alarmId_; + kpiListBuilder_.addMessage(builderForValue.build()); } + return this; } /** - * .monitoring.AlarmID alarm_id = 1; + * repeated .monitoring.KpiList kpi_list = 2; */ - private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.AlarmID, monitoring.Monitoring.AlarmID.Builder, monitoring.Monitoring.AlarmIDOrBuilder> - getAlarmIdFieldBuilder() { - if (alarmIdBuilder_ == null) { - alarmIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.AlarmID, monitoring.Monitoring.AlarmID.Builder, monitoring.Monitoring.AlarmIDOrBuilder>( - getAlarmId(), - getParentForChildren(), - isClean()); - alarmId_ = null; + public Builder addKpiList( + int index, monitoring.Monitoring.KpiList.Builder builderForValue) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + kpiList_.add(index, builderForValue.build()); + onChanged(); + } else { + kpiListBuilder_.addMessage(index, builderForValue.build()); } - return alarmIdBuilder_; + return this; } - - private java.lang.Object alarmDescription_ = ""; /** - * string alarm_description = 2; - * @return The alarmDescription. + * repeated .monitoring.KpiList kpi_list = 2; */ - public java.lang.String getAlarmDescription() { - java.lang.Object ref = alarmDescription_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - alarmDescription_ = s; - return s; + public Builder addAllKpiList( + java.lang.Iterable values) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, kpiList_); + onChanged(); } else { - return (java.lang.String) ref; + kpiListBuilder_.addAllMessages(values); } + return this; } /** - * string alarm_description = 2; - * @return The bytes for alarmDescription. + * repeated .monitoring.KpiList kpi_list = 2; */ - public com.google.protobuf.ByteString - getAlarmDescriptionBytes() { - java.lang.Object ref = alarmDescription_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - alarmDescription_ = b; - return b; + public Builder clearKpiList() { + if (kpiListBuilder_ == null) { + kpiList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); } else { - return (com.google.protobuf.ByteString) ref; + kpiListBuilder_.clear(); } - } - /** - * string alarm_description = 2; - * @param value The alarmDescription to set. - * @return This builder for chaining. - */ - public Builder setAlarmDescription( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - alarmDescription_ = value; - onChanged(); return this; } /** - * string alarm_description = 2; - * @return This builder for chaining. + * repeated .monitoring.KpiList kpi_list = 2; */ - public Builder clearAlarmDescription() { - - alarmDescription_ = getDefaultInstance().getAlarmDescription(); - onChanged(); + public Builder removeKpiList(int index) { + if (kpiListBuilder_ == null) { + ensureKpiListIsMutable(); + kpiList_.remove(index); + onChanged(); + } else { + kpiListBuilder_.remove(index); + } return this; } /** - * string alarm_description = 2; - * @param value The bytes for alarmDescription to set. - * @return This builder for chaining. + * repeated .monitoring.KpiList kpi_list = 2; */ - public Builder setAlarmDescriptionBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - alarmDescription_ = value; - onChanged(); - return this; + public monitoring.Monitoring.KpiList.Builder getKpiListBuilder( + int index) { + return getKpiListFieldBuilder().getBuilder(index); } - - private java.lang.Object name_ = ""; /** - * string name = 3; - * @return The name. + * repeated .monitoring.KpiList kpi_list = 2; */ - public java.lang.String getName() { - java.lang.Object ref = name_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - name_ = s; - return s; - } else { - return (java.lang.String) ref; + public monitoring.Monitoring.KpiListOrBuilder getKpiListOrBuilder( + int index) { + if (kpiListBuilder_ == null) { + return kpiList_.get(index); } else { + return kpiListBuilder_.getMessageOrBuilder(index); } } /** - * string name = 3; - * @return The bytes for name. + * repeated .monitoring.KpiList kpi_list = 2; */ - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; + public java.util.List + getKpiListOrBuilderList() { + if (kpiListBuilder_ != null) { + return kpiListBuilder_.getMessageOrBuilderList(); } else { - return (com.google.protobuf.ByteString) ref; + return java.util.Collections.unmodifiableList(kpiList_); } } /** - * string name = 3; - * @param value The name to set. - * @return This builder for chaining. + * repeated .monitoring.KpiList kpi_list = 2; */ - public Builder setName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - name_ = value; - onChanged(); - return this; + public monitoring.Monitoring.KpiList.Builder addKpiListBuilder() { + return getKpiListFieldBuilder().addBuilder( + monitoring.Monitoring.KpiList.getDefaultInstance()); } /** - * string name = 3; - * @return This builder for chaining. + * repeated .monitoring.KpiList kpi_list = 2; */ - public Builder clearName() { - - name_ = getDefaultInstance().getName(); - onChanged(); - return this; + public monitoring.Monitoring.KpiList.Builder addKpiListBuilder( + int index) { + return getKpiListFieldBuilder().addBuilder( + index, monitoring.Monitoring.KpiList.getDefaultInstance()); } /** - * string name = 3; - * @param value The bytes for name to set. - * @return This builder for chaining. + * repeated .monitoring.KpiList kpi_list = 2; */ - public Builder setNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); + public java.util.List + getKpiListBuilderList() { + return getKpiListFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiList, monitoring.Monitoring.KpiList.Builder, monitoring.Monitoring.KpiListOrBuilder> + getKpiListFieldBuilder() { + if (kpiListBuilder_ == null) { + kpiListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.KpiList, monitoring.Monitoring.KpiList.Builder, monitoring.Monitoring.KpiListOrBuilder>( + kpiList_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + kpiList_ = null; + } + return kpiListBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:monitoring.SubsResponse) + } + + // @@protoc_insertion_point(class_scope:monitoring.SubsResponse) + private static final monitoring.Monitoring.SubsResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new monitoring.Monitoring.SubsResponse(); + } + + public static monitoring.Monitoring.SubsResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public SubsResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new SubsResponse(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public monitoring.Monitoring.SubsResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + } - checkByteStringIsUtf8(value); - - name_ = value; - onChanged(); - return this; + + public interface SubsIDListOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.SubsIDList) + com.google.protobuf.MessageOrBuilder { + + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + java.util.List + getSubsListList(); + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + monitoring.Monitoring.SubscriptionID getSubsList(int index); + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + int getSubsListCount(); + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + java.util.List + getSubsListOrBuilderList(); + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + monitoring.Monitoring.SubscriptionIDOrBuilder getSubsListOrBuilder( + int index); + } + /** + * Protobuf type {@code monitoring.SubsIDList} + */ + public static final class SubsIDList extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:monitoring.SubsIDList) + SubsIDListOrBuilder { + private static final long serialVersionUID = 0L; + // Use SubsIDList.newBuilder() to construct. + private SubsIDList(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private SubsIDList() { + subsList_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new SubsIDList(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private SubsIDList( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + subsList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + subsList_.add( + input.readMessage(monitoring.Monitoring.SubscriptionID.parser(), extensionRegistry)); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + subsList_ = java.util.Collections.unmodifiableList(subsList_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return monitoring.Monitoring.internal_static_monitoring_SubsIDList_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return monitoring.Monitoring.internal_static_monitoring_SubsIDList_fieldAccessorTable + .ensureFieldAccessorsInitialized( + monitoring.Monitoring.SubsIDList.class, monitoring.Monitoring.SubsIDList.Builder.class); + } + + public static final int SUBS_LIST_FIELD_NUMBER = 1; + private java.util.List subsList_; + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + @java.lang.Override + public java.util.List getSubsListList() { + return subsList_; + } + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + @java.lang.Override + public java.util.List + getSubsListOrBuilderList() { + return subsList_; + } + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + @java.lang.Override + public int getSubsListCount() { + return subsList_.size(); + } + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + @java.lang.Override + public monitoring.Monitoring.SubscriptionID getSubsList(int index) { + return subsList_.get(index); + } + /** + * repeated .monitoring.SubscriptionID subs_list = 1; + */ + @java.lang.Override + public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsListOrBuilder( + int index) { + return subsList_.get(index); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; - private java.util.List kpiId_ = - java.util.Collections.emptyList(); - private void ensureKpiIdIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - kpiId_ = new java.util.ArrayList(kpiId_); - bitField0_ |= 0x00000001; - } + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + for (int i = 0; i < subsList_.size(); i++) { + output.writeMessage(1, subsList_.get(i)); } + unknownFields.writeTo(output); + } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public java.util.List getKpiIdList() { - if (kpiIdBuilder_ == null) { - return java.util.Collections.unmodifiableList(kpiId_); - } else { - return kpiIdBuilder_.getMessageList(); - } + size = 0; + for (int i = 0; i < subsList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, subsList_.get(i)); } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public int getKpiIdCount() { - if (kpiIdBuilder_ == null) { - return kpiId_.size(); - } else { - return kpiIdBuilder_.getCount(); - } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public monitoring.Monitoring.KpiId getKpiId(int index) { - if (kpiIdBuilder_ == null) { - return kpiId_.get(index); - } else { - return kpiIdBuilder_.getMessage(index); - } + if (!(obj instanceof monitoring.Monitoring.SubsIDList)) { + return super.equals(obj); } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public Builder setKpiId( - int index, monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiIdIsMutable(); - kpiId_.set(index, value); - onChanged(); - } else { - kpiIdBuilder_.setMessage(index, value); - } - return this; + monitoring.Monitoring.SubsIDList other = (monitoring.Monitoring.SubsIDList) obj; + + if (!getSubsListList() + .equals(other.getSubsListList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public Builder setKpiId( - int index, monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - kpiId_.set(index, builderForValue.build()); - onChanged(); - } else { - kpiIdBuilder_.setMessage(index, builderForValue.build()); - } - return this; + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getSubsListCount() > 0) { + hash = (37 * hash) + SUBS_LIST_FIELD_NUMBER; + hash = (53 * hash) + getSubsListList().hashCode(); } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public Builder addKpiId(monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiIdIsMutable(); - kpiId_.add(value); - onChanged(); - } else { - kpiIdBuilder_.addMessage(value); - } - return this; + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static monitoring.Monitoring.SubsIDList parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static monitoring.Monitoring.SubsIDList parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static monitoring.Monitoring.SubsIDList parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static monitoring.Monitoring.SubsIDList parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static monitoring.Monitoring.SubsIDList parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static monitoring.Monitoring.SubsIDList parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static monitoring.Monitoring.SubsIDList parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static monitoring.Monitoring.SubsIDList parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static monitoring.Monitoring.SubsIDList parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static monitoring.Monitoring.SubsIDList parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static monitoring.Monitoring.SubsIDList parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static monitoring.Monitoring.SubsIDList parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(monitoring.Monitoring.SubsIDList prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code monitoring.SubsIDList} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:monitoring.SubsIDList) + monitoring.Monitoring.SubsIDListOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return monitoring.Monitoring.internal_static_monitoring_SubsIDList_descriptor; } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public Builder addKpiId( - int index, monitoring.Monitoring.KpiId value) { - if (kpiIdBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureKpiIdIsMutable(); - kpiId_.add(index, value); - onChanged(); - } else { - kpiIdBuilder_.addMessage(index, value); - } - return this; + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return monitoring.Monitoring.internal_static_monitoring_SubsIDList_fieldAccessorTable + .ensureFieldAccessorsInitialized( + monitoring.Monitoring.SubsIDList.class, monitoring.Monitoring.SubsIDList.Builder.class); + } + + // Construct using monitoring.Monitoring.SubsIDList.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public Builder addKpiId( - monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - kpiId_.add(builderForValue.build()); - onChanged(); - } else { - kpiIdBuilder_.addMessage(builderForValue.build()); + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getSubsListFieldBuilder(); } - return this; } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public Builder addKpiId( - int index, monitoring.Monitoring.KpiId.Builder builderForValue) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - kpiId_.add(index, builderForValue.build()); - onChanged(); + @java.lang.Override + public Builder clear() { + super.clear(); + if (subsListBuilder_ == null) { + subsList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); } else { - kpiIdBuilder_.addMessage(index, builderForValue.build()); + subsListBuilder_.clear(); } return this; } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public Builder addAllKpiId( - java.lang.Iterable values) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, kpiId_); - onChanged(); - } else { - kpiIdBuilder_.addAllMessages(values); - } - return this; + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return monitoring.Monitoring.internal_static_monitoring_SubsIDList_descriptor; } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public Builder clearKpiId() { - if (kpiIdBuilder_ == null) { - kpiId_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - } else { - kpiIdBuilder_.clear(); + + @java.lang.Override + public monitoring.Monitoring.SubsIDList getDefaultInstanceForType() { + return monitoring.Monitoring.SubsIDList.getDefaultInstance(); + } + + @java.lang.Override + public monitoring.Monitoring.SubsIDList build() { + monitoring.Monitoring.SubsIDList result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); } - return this; + return result; } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public Builder removeKpiId(int index) { - if (kpiIdBuilder_ == null) { - ensureKpiIdIsMutable(); - kpiId_.remove(index); - onChanged(); + + @java.lang.Override + public monitoring.Monitoring.SubsIDList buildPartial() { + monitoring.Monitoring.SubsIDList result = new monitoring.Monitoring.SubsIDList(this); + int from_bitField0_ = bitField0_; + if (subsListBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + subsList_ = java.util.Collections.unmodifiableList(subsList_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.subsList_ = subsList_; } else { - kpiIdBuilder_.remove(index); + result.subsList_ = subsListBuilder_.build(); } - return this; + onBuilt(); + return result; } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder( - int index) { - return getKpiIdFieldBuilder().getBuilder(index); + + @java.lang.Override + public Builder clone() { + return super.clone(); } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder( - int index) { - if (kpiIdBuilder_ == null) { - return kpiId_.get(index); } else { - return kpiIdBuilder_.getMessageOrBuilder(index); - } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public java.util.List - getKpiIdOrBuilderList() { - if (kpiIdBuilder_ != null) { - return kpiIdBuilder_.getMessageOrBuilderList(); + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof monitoring.Monitoring.SubsIDList) { + return mergeFrom((monitoring.Monitoring.SubsIDList)other); } else { - return java.util.Collections.unmodifiableList(kpiId_); + super.mergeFrom(other); + return this; } } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public monitoring.Monitoring.KpiId.Builder addKpiIdBuilder() { - return getKpiIdFieldBuilder().addBuilder( - monitoring.Monitoring.KpiId.getDefaultInstance()); - } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public monitoring.Monitoring.KpiId.Builder addKpiIdBuilder( - int index) { - return getKpiIdFieldBuilder().addBuilder( - index, monitoring.Monitoring.KpiId.getDefaultInstance()); + + public Builder mergeFrom(monitoring.Monitoring.SubsIDList other) { + if (other == monitoring.Monitoring.SubsIDList.getDefaultInstance()) return this; + if (subsListBuilder_ == null) { + if (!other.subsList_.isEmpty()) { + if (subsList_.isEmpty()) { + subsList_ = other.subsList_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureSubsListIsMutable(); + subsList_.addAll(other.subsList_); + } + onChanged(); + } + } else { + if (!other.subsList_.isEmpty()) { + if (subsListBuilder_.isEmpty()) { + subsListBuilder_.dispose(); + subsListBuilder_ = null; + subsList_ = other.subsList_; + bitField0_ = (bitField0_ & ~0x00000001); + subsListBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getSubsListFieldBuilder() : null; + } else { + subsListBuilder_.addAllMessages(other.subsList_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; } - /** - * repeated .monitoring.KpiId kpi_id = 4; - */ - public java.util.List - getKpiIdBuilderList() { - return getKpiIdFieldBuilder().getBuilderList(); + + @java.lang.Override + public final boolean isInitialized() { + return true; } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> - getKpiIdFieldBuilder() { - if (kpiIdBuilder_ == null) { - kpiIdBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( - kpiId_, - ((bitField0_ & 0x00000001) != 0), - getParentForChildren(), - isClean()); - kpiId_ = null; + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + monitoring.Monitoring.SubsIDList parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (monitoring.Monitoring.SubsIDList) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } } - return kpiIdBuilder_; + return this; } + private int bitField0_; - private java.util.List kpiValueRange_ = + private java.util.List subsList_ = java.util.Collections.emptyList(); - private void ensureKpiValueRangeIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { - kpiValueRange_ = new java.util.ArrayList(kpiValueRange_); - bitField0_ |= 0x00000002; + private void ensureSubsListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + subsList_ = new java.util.ArrayList(subsList_); + bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiValueRange, monitoring.Monitoring.KpiValueRange.Builder, monitoring.Monitoring.KpiValueRangeOrBuilder> kpiValueRangeBuilder_; + monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> subsListBuilder_; /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public java.util.List getKpiValueRangeList() { - if (kpiValueRangeBuilder_ == null) { - return java.util.Collections.unmodifiableList(kpiValueRange_); + public java.util.List getSubsListList() { + if (subsListBuilder_ == null) { + return java.util.Collections.unmodifiableList(subsList_); } else { - return kpiValueRangeBuilder_.getMessageList(); + return subsListBuilder_.getMessageList(); } } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public int getKpiValueRangeCount() { - if (kpiValueRangeBuilder_ == null) { - return kpiValueRange_.size(); + public int getSubsListCount() { + if (subsListBuilder_ == null) { + return subsList_.size(); } else { - return kpiValueRangeBuilder_.getCount(); + return subsListBuilder_.getCount(); } } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public monitoring.Monitoring.KpiValueRange getKpiValueRange(int index) { - if (kpiValueRangeBuilder_ == null) { - return kpiValueRange_.get(index); + public monitoring.Monitoring.SubscriptionID getSubsList(int index) { + if (subsListBuilder_ == null) { + return subsList_.get(index); } else { - return kpiValueRangeBuilder_.getMessage(index); + return subsListBuilder_.getMessage(index); } } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public Builder setKpiValueRange( - int index, monitoring.Monitoring.KpiValueRange value) { - if (kpiValueRangeBuilder_ == null) { + public Builder setSubsList( + int index, monitoring.Monitoring.SubscriptionID value) { + if (subsListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureKpiValueRangeIsMutable(); - kpiValueRange_.set(index, value); + ensureSubsListIsMutable(); + subsList_.set(index, value); onChanged(); } else { - kpiValueRangeBuilder_.setMessage(index, value); + subsListBuilder_.setMessage(index, value); } return this; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public Builder setKpiValueRange( - int index, monitoring.Monitoring.KpiValueRange.Builder builderForValue) { - if (kpiValueRangeBuilder_ == null) { - ensureKpiValueRangeIsMutable(); - kpiValueRange_.set(index, builderForValue.build()); + public Builder setSubsList( + int index, monitoring.Monitoring.SubscriptionID.Builder builderForValue) { + if (subsListBuilder_ == null) { + ensureSubsListIsMutable(); + subsList_.set(index, builderForValue.build()); onChanged(); } else { - kpiValueRangeBuilder_.setMessage(index, builderForValue.build()); + subsListBuilder_.setMessage(index, builderForValue.build()); } return this; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public Builder addKpiValueRange(monitoring.Monitoring.KpiValueRange value) { - if (kpiValueRangeBuilder_ == null) { + public Builder addSubsList(monitoring.Monitoring.SubscriptionID value) { + if (subsListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureKpiValueRangeIsMutable(); - kpiValueRange_.add(value); + ensureSubsListIsMutable(); + subsList_.add(value); onChanged(); } else { - kpiValueRangeBuilder_.addMessage(value); + subsListBuilder_.addMessage(value); } return this; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public Builder addKpiValueRange( - int index, monitoring.Monitoring.KpiValueRange value) { - if (kpiValueRangeBuilder_ == null) { + public Builder addSubsList( + int index, monitoring.Monitoring.SubscriptionID value) { + if (subsListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureKpiValueRangeIsMutable(); - kpiValueRange_.add(index, value); + ensureSubsListIsMutable(); + subsList_.add(index, value); onChanged(); } else { - kpiValueRangeBuilder_.addMessage(index, value); + subsListBuilder_.addMessage(index, value); } return this; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public Builder addKpiValueRange( - monitoring.Monitoring.KpiValueRange.Builder builderForValue) { - if (kpiValueRangeBuilder_ == null) { - ensureKpiValueRangeIsMutable(); - kpiValueRange_.add(builderForValue.build()); + public Builder addSubsList( + monitoring.Monitoring.SubscriptionID.Builder builderForValue) { + if (subsListBuilder_ == null) { + ensureSubsListIsMutable(); + subsList_.add(builderForValue.build()); onChanged(); } else { - kpiValueRangeBuilder_.addMessage(builderForValue.build()); + subsListBuilder_.addMessage(builderForValue.build()); } return this; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public Builder addKpiValueRange( - int index, monitoring.Monitoring.KpiValueRange.Builder builderForValue) { - if (kpiValueRangeBuilder_ == null) { - ensureKpiValueRangeIsMutable(); - kpiValueRange_.add(index, builderForValue.build()); + public Builder addSubsList( + int index, monitoring.Monitoring.SubscriptionID.Builder builderForValue) { + if (subsListBuilder_ == null) { + ensureSubsListIsMutable(); + subsList_.add(index, builderForValue.build()); onChanged(); } else { - kpiValueRangeBuilder_.addMessage(index, builderForValue.build()); + subsListBuilder_.addMessage(index, builderForValue.build()); } return this; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public Builder addAllKpiValueRange( - java.lang.Iterable values) { - if (kpiValueRangeBuilder_ == null) { - ensureKpiValueRangeIsMutable(); + public Builder addAllSubsList( + java.lang.Iterable values) { + if (subsListBuilder_ == null) { + ensureSubsListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, kpiValueRange_); + values, subsList_); onChanged(); } else { - kpiValueRangeBuilder_.addAllMessages(values); + subsListBuilder_.addAllMessages(values); } return this; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public Builder clearKpiValueRange() { - if (kpiValueRangeBuilder_ == null) { - kpiValueRange_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + public Builder clearSubsList() { + if (subsListBuilder_ == null) { + subsList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { - kpiValueRangeBuilder_.clear(); + subsListBuilder_.clear(); } return this; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public Builder removeKpiValueRange(int index) { - if (kpiValueRangeBuilder_ == null) { - ensureKpiValueRangeIsMutable(); - kpiValueRange_.remove(index); + public Builder removeSubsList(int index) { + if (subsListBuilder_ == null) { + ensureSubsListIsMutable(); + subsList_.remove(index); onChanged(); } else { - kpiValueRangeBuilder_.remove(index); + subsListBuilder_.remove(index); } return this; } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public monitoring.Monitoring.KpiValueRange.Builder getKpiValueRangeBuilder( + public monitoring.Monitoring.SubscriptionID.Builder getSubsListBuilder( int index) { - return getKpiValueRangeFieldBuilder().getBuilder(index); + return getSubsListFieldBuilder().getBuilder(index); } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public monitoring.Monitoring.KpiValueRangeOrBuilder getKpiValueRangeOrBuilder( + public monitoring.Monitoring.SubscriptionIDOrBuilder getSubsListOrBuilder( int index) { - if (kpiValueRangeBuilder_ == null) { - return kpiValueRange_.get(index); } else { - return kpiValueRangeBuilder_.getMessageOrBuilder(index); + if (subsListBuilder_ == null) { + return subsList_.get(index); } else { + return subsListBuilder_.getMessageOrBuilder(index); } } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public java.util.List - getKpiValueRangeOrBuilderList() { - if (kpiValueRangeBuilder_ != null) { - return kpiValueRangeBuilder_.getMessageOrBuilderList(); + public java.util.List + getSubsListOrBuilderList() { + if (subsListBuilder_ != null) { + return subsListBuilder_.getMessageOrBuilderList(); } else { - return java.util.Collections.unmodifiableList(kpiValueRange_); + return java.util.Collections.unmodifiableList(subsList_); } } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public monitoring.Monitoring.KpiValueRange.Builder addKpiValueRangeBuilder() { - return getKpiValueRangeFieldBuilder().addBuilder( - monitoring.Monitoring.KpiValueRange.getDefaultInstance()); + public monitoring.Monitoring.SubscriptionID.Builder addSubsListBuilder() { + return getSubsListFieldBuilder().addBuilder( + monitoring.Monitoring.SubscriptionID.getDefaultInstance()); } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public monitoring.Monitoring.KpiValueRange.Builder addKpiValueRangeBuilder( + public monitoring.Monitoring.SubscriptionID.Builder addSubsListBuilder( int index) { - return getKpiValueRangeFieldBuilder().addBuilder( - index, monitoring.Monitoring.KpiValueRange.getDefaultInstance()); + return getSubsListFieldBuilder().addBuilder( + index, monitoring.Monitoring.SubscriptionID.getDefaultInstance()); } /** - * repeated .monitoring.KpiValueRange kpi_value_range = 5; + * repeated .monitoring.SubscriptionID subs_list = 1; */ - public java.util.List - getKpiValueRangeBuilderList() { - return getKpiValueRangeFieldBuilder().getBuilderList(); + public java.util.List + getSubsListBuilderList() { + return getSubsListFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder> + getSubsListFieldBuilder() { + if (subsListBuilder_ == null) { + subsListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + monitoring.Monitoring.SubscriptionID, monitoring.Monitoring.SubscriptionID.Builder, monitoring.Monitoring.SubscriptionIDOrBuilder>( + subsList_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + subsList_ = null; + } + return subsListBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:monitoring.SubsIDList) + } + + // @@protoc_insertion_point(class_scope:monitoring.SubsIDList) + private static final monitoring.Monitoring.SubsIDList DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new monitoring.Monitoring.SubsIDList(); + } + + public static monitoring.Monitoring.SubsIDList getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public SubsIDList parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new SubsIDList(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public monitoring.Monitoring.SubsIDList getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface AlarmDescriptorOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.AlarmDescriptor) + com.google.protobuf.MessageOrBuilder { + + /** + * string alarm_description = 1; + * @return The alarmDescription. + */ + java.lang.String getAlarmDescription(); + /** + * string alarm_description = 1; + * @return The bytes for alarmDescription. + */ + com.google.protobuf.ByteString + getAlarmDescriptionBytes(); + + /** + * string name = 2; + * @return The name. + */ + java.lang.String getName(); + /** + * string name = 2; + * @return The bytes for name. + */ + com.google.protobuf.ByteString + getNameBytes(); + + /** + * .monitoring.KpiId kpi_id = 3; + * @return Whether the kpiId field is set. + */ + boolean hasKpiId(); + /** + * .monitoring.KpiId kpi_id = 3; + * @return The kpiId. + */ + monitoring.Monitoring.KpiId getKpiId(); + /** + * .monitoring.KpiId kpi_id = 3; + */ + monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder(); + + /** + * .monitoring.KpiValueRange kpi_value_range = 4; + * @return Whether the kpiValueRange field is set. + */ + boolean hasKpiValueRange(); + /** + * .monitoring.KpiValueRange kpi_value_range = 4; + * @return The kpiValueRange. + */ + monitoring.Monitoring.KpiValueRange getKpiValueRange(); + /** + * .monitoring.KpiValueRange kpi_value_range = 4; + */ + monitoring.Monitoring.KpiValueRangeOrBuilder getKpiValueRangeOrBuilder(); + + /** + * string timestamp = 5; + * @return The timestamp. + */ + java.lang.String getTimestamp(); + /** + * string timestamp = 5; + * @return The bytes for timestamp. + */ + com.google.protobuf.ByteString + getTimestampBytes(); + } + /** + * Protobuf type {@code monitoring.AlarmDescriptor} + */ + public static final class AlarmDescriptor extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:monitoring.AlarmDescriptor) + AlarmDescriptorOrBuilder { + private static final long serialVersionUID = 0L; + // Use AlarmDescriptor.newBuilder() to construct. + private AlarmDescriptor(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private AlarmDescriptor() { + alarmDescription_ = ""; + name_ = ""; + timestamp_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new AlarmDescriptor(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private AlarmDescriptor( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); } - private com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiValueRange, monitoring.Monitoring.KpiValueRange.Builder, monitoring.Monitoring.KpiValueRangeOrBuilder> - getKpiValueRangeFieldBuilder() { - if (kpiValueRangeBuilder_ == null) { - kpiValueRangeBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - monitoring.Monitoring.KpiValueRange, monitoring.Monitoring.KpiValueRange.Builder, monitoring.Monitoring.KpiValueRangeOrBuilder>( - kpiValueRange_, - ((bitField0_ & 0x00000002) != 0), - getParentForChildren(), - isClean()); - kpiValueRange_ = null; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + java.lang.String s = input.readStringRequireUtf8(); + + alarmDescription_ = s; + break; + } + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + + name_ = s; + break; + } + case 26: { + monitoring.Monitoring.KpiId.Builder subBuilder = null; + if (kpiId_ != null) { + subBuilder = kpiId_.toBuilder(); + } + kpiId_ = input.readMessage(monitoring.Monitoring.KpiId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(kpiId_); + kpiId_ = subBuilder.buildPartial(); + } + + break; + } + case 34: { + monitoring.Monitoring.KpiValueRange.Builder subBuilder = null; + if (kpiValueRange_ != null) { + subBuilder = kpiValueRange_.toBuilder(); + } + kpiValueRange_ = input.readMessage(monitoring.Monitoring.KpiValueRange.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(kpiValueRange_); + kpiValueRange_ = subBuilder.buildPartial(); + } + + break; + } + case 42: { + java.lang.String s = input.readStringRequireUtf8(); + + timestamp_ = s; + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } } - return kpiValueRangeBuilder_; + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_descriptor; + } - private context.ContextOuterClass.Timestamp timestamp_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> timestampBuilder_; - /** - * .context.Timestamp timestamp = 6; - * @return Whether the timestamp field is set. - */ - public boolean hasTimestamp() { - return timestampBuilder_ != null || timestamp_ != null; + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_fieldAccessorTable + .ensureFieldAccessorsInitialized( + monitoring.Monitoring.AlarmDescriptor.class, monitoring.Monitoring.AlarmDescriptor.Builder.class); + } + + public static final int ALARM_DESCRIPTION_FIELD_NUMBER = 1; + private volatile java.lang.Object alarmDescription_; + /** + * string alarm_description = 1; + * @return The alarmDescription. + */ + @java.lang.Override + public java.lang.String getAlarmDescription() { + java.lang.Object ref = alarmDescription_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + alarmDescription_ = s; + return s; } - /** - * .context.Timestamp timestamp = 6; - * @return The timestamp. - */ - public context.ContextOuterClass.Timestamp getTimestamp() { - if (timestampBuilder_ == null) { - return timestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_; - } else { - return timestampBuilder_.getMessage(); - } + } + /** + * string alarm_description = 1; + * @return The bytes for alarmDescription. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getAlarmDescriptionBytes() { + java.lang.Object ref = alarmDescription_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + alarmDescription_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; } - /** - * .context.Timestamp timestamp = 6; - */ - public Builder setTimestamp(context.ContextOuterClass.Timestamp value) { - if (timestampBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - timestamp_ = value; - onChanged(); - } else { - timestampBuilder_.setMessage(value); - } + } - return this; + public static final int NAME_FIELD_NUMBER = 2; + private volatile java.lang.Object name_; + /** + * string name = 2; + * @return The name. + */ + @java.lang.Override + public java.lang.String getName() { + java.lang.Object ref = name_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + name_ = s; + return s; } - /** - * .context.Timestamp timestamp = 6; - */ - public Builder setTimestamp( - context.ContextOuterClass.Timestamp.Builder builderForValue) { - if (timestampBuilder_ == null) { - timestamp_ = builderForValue.build(); - onChanged(); - } else { - timestampBuilder_.setMessage(builderForValue.build()); - } - - return this; + } + /** + * string name = 2; + * @return The bytes for name. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; } - /** - * .context.Timestamp timestamp = 6; - */ - public Builder mergeTimestamp(context.ContextOuterClass.Timestamp value) { - if (timestampBuilder_ == null) { - if (timestamp_ != null) { - timestamp_ = - context.ContextOuterClass.Timestamp.newBuilder(timestamp_).mergeFrom(value).buildPartial(); - } else { - timestamp_ = value; - } - onChanged(); - } else { - timestampBuilder_.mergeFrom(value); - } + } - return this; + public static final int KPI_ID_FIELD_NUMBER = 3; + private monitoring.Monitoring.KpiId kpiId_; + /** + * .monitoring.KpiId kpi_id = 3; + * @return Whether the kpiId field is set. + */ + @java.lang.Override + public boolean hasKpiId() { + return kpiId_ != null; + } + /** + * .monitoring.KpiId kpi_id = 3; + * @return The kpiId. + */ + @java.lang.Override + public monitoring.Monitoring.KpiId getKpiId() { + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + } + /** + * .monitoring.KpiId kpi_id = 3; + */ + @java.lang.Override + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { + return getKpiId(); + } + + public static final int KPI_VALUE_RANGE_FIELD_NUMBER = 4; + private monitoring.Monitoring.KpiValueRange kpiValueRange_; + /** + * .monitoring.KpiValueRange kpi_value_range = 4; + * @return Whether the kpiValueRange field is set. + */ + @java.lang.Override + public boolean hasKpiValueRange() { + return kpiValueRange_ != null; + } + /** + * .monitoring.KpiValueRange kpi_value_range = 4; + * @return The kpiValueRange. + */ + @java.lang.Override + public monitoring.Monitoring.KpiValueRange getKpiValueRange() { + return kpiValueRange_ == null ? monitoring.Monitoring.KpiValueRange.getDefaultInstance() : kpiValueRange_; + } + /** + * .monitoring.KpiValueRange kpi_value_range = 4; + */ + @java.lang.Override + public monitoring.Monitoring.KpiValueRangeOrBuilder getKpiValueRangeOrBuilder() { + return getKpiValueRange(); + } + + public static final int TIMESTAMP_FIELD_NUMBER = 5; + private volatile java.lang.Object timestamp_; + /** + * string timestamp = 5; + * @return The timestamp. + */ + @java.lang.Override + public java.lang.String getTimestamp() { + java.lang.Object ref = timestamp_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + timestamp_ = s; + return s; } - /** - * .context.Timestamp timestamp = 6; - */ - public Builder clearTimestamp() { - if (timestampBuilder_ == null) { - timestamp_ = null; - onChanged(); - } else { - timestamp_ = null; - timestampBuilder_ = null; - } + } + /** + * string timestamp = 5; + * @return The bytes for timestamp. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getTimestampBytes() { + java.lang.Object ref = timestamp_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + timestamp_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; - return this; - } - /** - * .context.Timestamp timestamp = 6; - */ - public context.ContextOuterClass.Timestamp.Builder getTimestampBuilder() { - - onChanged(); - return getTimestampFieldBuilder().getBuilder(); + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!getAlarmDescriptionBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, alarmDescription_); } - /** - * .context.Timestamp timestamp = 6; - */ - public context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder() { - if (timestampBuilder_ != null) { - return timestampBuilder_.getMessageOrBuilder(); - } else { - return timestamp_ == null ? - context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_; - } + if (!getNameBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_); } - /** - * .context.Timestamp timestamp = 6; - */ - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> - getTimestampFieldBuilder() { - if (timestampBuilder_ == null) { - timestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>( - getTimestamp(), - getParentForChildren(), - isClean()); - timestamp_ = null; - } - return timestampBuilder_; + if (kpiId_ != null) { + output.writeMessage(3, getKpiId()); } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); + if (kpiValueRange_ != null) { + output.writeMessage(4, getKpiValueRange()); } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); + if (!getTimestampBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, timestamp_); } - - - // @@protoc_insertion_point(builder_scope:monitoring.AlarmDescriptor) + unknownFields.writeTo(output); } - // @@protoc_insertion_point(class_scope:monitoring.AlarmDescriptor) - private static final monitoring.Monitoring.AlarmDescriptor DEFAULT_INSTANCE; - static { - DEFAULT_INSTANCE = new monitoring.Monitoring.AlarmDescriptor(); - } + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; - public static monitoring.Monitoring.AlarmDescriptor getDefaultInstance() { - return DEFAULT_INSTANCE; + size = 0; + if (!getAlarmDescriptionBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, alarmDescription_); + } + if (!getNameBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_); + } + if (kpiId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, getKpiId()); + } + if (kpiValueRange_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, getKpiValueRange()); + } + if (!getTimestampBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, timestamp_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public AlarmDescriptor parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new AlarmDescriptor(input, extensionRegistry); + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; } - }; + if (!(obj instanceof monitoring.Monitoring.AlarmDescriptor)) { + return super.equals(obj); + } + monitoring.Monitoring.AlarmDescriptor other = (monitoring.Monitoring.AlarmDescriptor) obj; - public static com.google.protobuf.Parser parser() { - return PARSER; + if (!getAlarmDescription() + .equals(other.getAlarmDescription())) return false; + if (!getName() + .equals(other.getName())) return false; + if (hasKpiId() != other.hasKpiId()) return false; + if (hasKpiId()) { + if (!getKpiId() + .equals(other.getKpiId())) return false; + } + if (hasKpiValueRange() != other.hasKpiValueRange()) return false; + if (hasKpiValueRange()) { + if (!getKpiValueRange() + .equals(other.getKpiValueRange())) return false; + } + if (!getTimestamp() + .equals(other.getTimestamp())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + ALARM_DESCRIPTION_FIELD_NUMBER; + hash = (53 * hash) + getAlarmDescription().hashCode(); + hash = (37 * hash) + NAME_FIELD_NUMBER; + hash = (53 * hash) + getName().hashCode(); + if (hasKpiId()) { + hash = (37 * hash) + KPI_ID_FIELD_NUMBER; + hash = (53 * hash) + getKpiId().hashCode(); + } + if (hasKpiValueRange()) { + hash = (37 * hash) + KPI_VALUE_RANGE_FIELD_NUMBER; + hash = (53 * hash) + getKpiValueRange().hashCode(); + } + hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER; + hash = (53 * hash) + getTimestamp().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; } - @java.lang.Override - public monitoring.Monitoring.AlarmDescriptor getDefaultInstanceForType() { - return DEFAULT_INSTANCE; + public static monitoring.Monitoring.AlarmDescriptor parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); } - - } - - public interface AlarmIDOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.AlarmID) - com.google.protobuf.MessageOrBuilder { - - /** - * .context.Uuid alarm_id = 1; - * @return Whether the alarmId field is set. - */ - boolean hasAlarmId(); - /** - * .context.Uuid alarm_id = 1; - * @return The alarmId. - */ - context.ContextOuterClass.Uuid getAlarmId(); - /** - * .context.Uuid alarm_id = 1; - */ - context.ContextOuterClass.UuidOrBuilder getAlarmIdOrBuilder(); - } - /** - * Protobuf type {@code monitoring.AlarmID} - */ - public static final class AlarmID extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.AlarmID) - AlarmIDOrBuilder { - private static final long serialVersionUID = 0L; - // Use AlarmID.newBuilder() to construct. - private AlarmID(com.google.protobuf.GeneratedMessageV3.Builder builder) { - super(builder); + public static monitoring.Monitoring.AlarmDescriptor parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); } - private AlarmID() { + public static monitoring.Monitoring.AlarmDescriptor parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); } - - @java.lang.Override - @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { - return new AlarmID(); + public static monitoring.Monitoring.AlarmDescriptor parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; + public static monitoring.Monitoring.AlarmDescriptor parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); } - private AlarmID( - com.google.protobuf.CodedInputStream input, + public static monitoring.Monitoring.AlarmDescriptor parseFrom( + byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - context.ContextOuterClass.Uuid.Builder subBuilder = null; - if (alarmId_ != null) { - subBuilder = alarmId_.toBuilder(); - } - alarmId_ = input.readMessage(context.ContextOuterClass.Uuid.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(alarmId_); - alarmId_ = subBuilder.buildPartial(); - } - - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } + return PARSER.parseFrom(data, extensionRegistry); + } + public static monitoring.Monitoring.AlarmDescriptor parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static monitoring.Monitoring.AlarmDescriptor parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static monitoring.Monitoring.AlarmDescriptor parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_AlarmID_descriptor; + public static monitoring.Monitoring.AlarmDescriptor parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static monitoring.Monitoring.AlarmDescriptor parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static monitoring.Monitoring.AlarmDescriptor parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_AlarmID_fieldAccessorTable - .ensureFieldAccessorsInitialized( - monitoring.Monitoring.AlarmID.class, monitoring.Monitoring.AlarmID.Builder.class); + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(monitoring.Monitoring.AlarmDescriptor prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - - public static final int ALARM_ID_FIELD_NUMBER = 1; - private context.ContextOuterClass.Uuid alarmId_; - /** - * .context.Uuid alarm_id = 1; - * @return Whether the alarmId field is set. - */ @java.lang.Override - public boolean hasAlarmId() { - return alarmId_ != null; + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } - /** - * .context.Uuid alarm_id = 1; - * @return The alarmId. - */ + @java.lang.Override - public context.ContextOuterClass.Uuid getAlarmId() { - return alarmId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : alarmId_; + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; } /** - * .context.Uuid alarm_id = 1; + * Protobuf type {@code monitoring.AlarmDescriptor} */ - @java.lang.Override - public context.ContextOuterClass.UuidOrBuilder getAlarmIdOrBuilder() { - return getAlarmId(); - } + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:monitoring.AlarmDescriptor) + monitoring.Monitoring.AlarmDescriptorOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_descriptor; + } - private byte memoizedIsInitialized = -1; - @java.lang.Override - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_fieldAccessorTable + .ensureFieldAccessorsInitialized( + monitoring.Monitoring.AlarmDescriptor.class, monitoring.Monitoring.AlarmDescriptor.Builder.class); + } - memoizedIsInitialized = 1; - return true; - } + // Construct using monitoring.Monitoring.AlarmDescriptor.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } - @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - if (alarmId_ != null) { - output.writeMessage(1, getAlarmId()); + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); } - unknownFields.writeTo(output); - } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + alarmDescription_ = ""; - @java.lang.Override - public int getSerializedSize() { - int size = memoizedSize; - if (size != -1) return size; + name_ = ""; - size = 0; - if (alarmId_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getAlarmId()); + if (kpiIdBuilder_ == null) { + kpiId_ = null; + } else { + kpiId_ = null; + kpiIdBuilder_ = null; + } + if (kpiValueRangeBuilder_ == null) { + kpiValueRange_ = null; + } else { + kpiValueRange_ = null; + kpiValueRangeBuilder_ = null; + } + timestamp_ = ""; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_descriptor; + } + + @java.lang.Override + public monitoring.Monitoring.AlarmDescriptor getDefaultInstanceForType() { + return monitoring.Monitoring.AlarmDescriptor.getDefaultInstance(); + } + + @java.lang.Override + public monitoring.Monitoring.AlarmDescriptor build() { + monitoring.Monitoring.AlarmDescriptor result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public monitoring.Monitoring.AlarmDescriptor buildPartial() { + monitoring.Monitoring.AlarmDescriptor result = new monitoring.Monitoring.AlarmDescriptor(this); + result.alarmDescription_ = alarmDescription_; + result.name_ = name_; + if (kpiIdBuilder_ == null) { + result.kpiId_ = kpiId_; + } else { + result.kpiId_ = kpiIdBuilder_.build(); + } + if (kpiValueRangeBuilder_ == null) { + result.kpiValueRange_ = kpiValueRange_; + } else { + result.kpiValueRange_ = kpiValueRangeBuilder_.build(); + } + result.timestamp_ = timestamp_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof monitoring.Monitoring.AlarmDescriptor) { + return mergeFrom((monitoring.Monitoring.AlarmDescriptor)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(monitoring.Monitoring.AlarmDescriptor other) { + if (other == monitoring.Monitoring.AlarmDescriptor.getDefaultInstance()) return this; + if (!other.getAlarmDescription().isEmpty()) { + alarmDescription_ = other.alarmDescription_; + onChanged(); + } + if (!other.getName().isEmpty()) { + name_ = other.name_; + onChanged(); + } + if (other.hasKpiId()) { + mergeKpiId(other.getKpiId()); + } + if (other.hasKpiValueRange()) { + mergeKpiValueRange(other.getKpiValueRange()); + } + if (!other.getTimestamp().isEmpty()) { + timestamp_ = other.timestamp_; + onChanged(); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + monitoring.Monitoring.AlarmDescriptor parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (monitoring.Monitoring.AlarmDescriptor) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; } - size += unknownFields.getSerializedSize(); - memoizedSize = size; - return size; - } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { - if (obj == this) { - return true; + private java.lang.Object alarmDescription_ = ""; + /** + * string alarm_description = 1; + * @return The alarmDescription. + */ + public java.lang.String getAlarmDescription() { + java.lang.Object ref = alarmDescription_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + alarmDescription_ = s; + return s; + } else { + return (java.lang.String) ref; + } } - if (!(obj instanceof monitoring.Monitoring.AlarmID)) { - return super.equals(obj); + /** + * string alarm_description = 1; + * @return The bytes for alarmDescription. + */ + public com.google.protobuf.ByteString + getAlarmDescriptionBytes() { + java.lang.Object ref = alarmDescription_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + alarmDescription_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } } - monitoring.Monitoring.AlarmID other = (monitoring.Monitoring.AlarmID) obj; - - if (hasAlarmId() != other.hasAlarmId()) return false; - if (hasAlarmId()) { - if (!getAlarmId() - .equals(other.getAlarmId())) return false; + /** + * string alarm_description = 1; + * @param value The alarmDescription to set. + * @return This builder for chaining. + */ + public Builder setAlarmDescription( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + alarmDescription_ = value; + onChanged(); + return this; } - if (!unknownFields.equals(other.unknownFields)) return false; - return true; - } - - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; + /** + * string alarm_description = 1; + * @return This builder for chaining. + */ + public Builder clearAlarmDescription() { + + alarmDescription_ = getDefaultInstance().getAlarmDescription(); + onChanged(); + return this; } - int hash = 41; - hash = (19 * hash) + getDescriptor().hashCode(); - if (hasAlarmId()) { - hash = (37 * hash) + ALARM_ID_FIELD_NUMBER; - hash = (53 * hash) + getAlarmId().hashCode(); + /** + * string alarm_description = 1; + * @param value The bytes for alarmDescription to set. + * @return This builder for chaining. + */ + public Builder setAlarmDescriptionBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + alarmDescription_ = value; + onChanged(); + return this; } - hash = (29 * hash) + unknownFields.hashCode(); - memoizedHashCode = hash; - return hash; - } - - public static monitoring.Monitoring.AlarmID parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static monitoring.Monitoring.AlarmID parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static monitoring.Monitoring.AlarmID parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static monitoring.Monitoring.AlarmID parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static monitoring.Monitoring.AlarmID parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static monitoring.Monitoring.AlarmID parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static monitoring.Monitoring.AlarmID parseFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static monitoring.Monitoring.AlarmID parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - public static monitoring.Monitoring.AlarmID parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); - } - public static monitoring.Monitoring.AlarmID parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); - } - public static monitoring.Monitoring.AlarmID parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static monitoring.Monitoring.AlarmID parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - - @java.lang.Override - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder() { - return DEFAULT_INSTANCE.toBuilder(); - } - public static Builder newBuilder(monitoring.Monitoring.AlarmID prototype) { - return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); - } - @java.lang.Override - public Builder toBuilder() { - return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); - } - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code monitoring.AlarmID} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.AlarmID) - monitoring.Monitoring.AlarmIDOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_AlarmID_descriptor; + private java.lang.Object name_ = ""; + /** + * string name = 2; + * @return The name. + */ + public java.lang.String getName() { + java.lang.Object ref = name_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + name_ = s; + return s; + } else { + return (java.lang.String) ref; + } } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_AlarmID_fieldAccessorTable - .ensureFieldAccessorsInitialized( - monitoring.Monitoring.AlarmID.class, monitoring.Monitoring.AlarmID.Builder.class); + /** + * string name = 2; + * @return The bytes for name. + */ + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string name = 2; + * @param value The name to set. + * @return This builder for chaining. + */ + public Builder setName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + name_ = value; + onChanged(); + return this; + } + /** + * string name = 2; + * @return This builder for chaining. + */ + public Builder clearName() { + + name_ = getDefaultInstance().getName(); + onChanged(); + return this; } - - // Construct using monitoring.Monitoring.AlarmID.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); + /** + * string name = 2; + * @param value The bytes for name to set. + * @return This builder for chaining. + */ + public Builder setNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + name_ = value; + onChanged(); + return this; } - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); + private monitoring.Monitoring.KpiId kpiId_; + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> kpiIdBuilder_; + /** + * .monitoring.KpiId kpi_id = 3; + * @return Whether the kpiId field is set. + */ + public boolean hasKpiId() { + return kpiIdBuilder_ != null || kpiId_ != null; } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { + /** + * .monitoring.KpiId kpi_id = 3; + * @return The kpiId. + */ + public monitoring.Monitoring.KpiId getKpiId() { + if (kpiIdBuilder_ == null) { + return kpiId_ == null ? monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; + } else { + return kpiIdBuilder_.getMessage(); } } - @java.lang.Override - public Builder clear() { - super.clear(); - if (alarmIdBuilder_ == null) { - alarmId_ = null; + /** + * .monitoring.KpiId kpi_id = 3; + */ + public Builder setKpiId(monitoring.Monitoring.KpiId value) { + if (kpiIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + kpiId_ = value; + onChanged(); } else { - alarmId_ = null; - alarmIdBuilder_ = null; + kpiIdBuilder_.setMessage(value); } - return this; - } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_AlarmID_descriptor; - } - @java.lang.Override - public monitoring.Monitoring.AlarmID getDefaultInstanceForType() { - return monitoring.Monitoring.AlarmID.getDefaultInstance(); + return this; } - - @java.lang.Override - public monitoring.Monitoring.AlarmID build() { - monitoring.Monitoring.AlarmID result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); + /** + * .monitoring.KpiId kpi_id = 3; + */ + public Builder setKpiId( + monitoring.Monitoring.KpiId.Builder builderForValue) { + if (kpiIdBuilder_ == null) { + kpiId_ = builderForValue.build(); + onChanged(); + } else { + kpiIdBuilder_.setMessage(builderForValue.build()); } - return result; - } - @java.lang.Override - public monitoring.Monitoring.AlarmID buildPartial() { - monitoring.Monitoring.AlarmID result = new monitoring.Monitoring.AlarmID(this); - if (alarmIdBuilder_ == null) { - result.alarmId_ = alarmId_; + return this; + } + /** + * .monitoring.KpiId kpi_id = 3; + */ + public Builder mergeKpiId(monitoring.Monitoring.KpiId value) { + if (kpiIdBuilder_ == null) { + if (kpiId_ != null) { + kpiId_ = + monitoring.Monitoring.KpiId.newBuilder(kpiId_).mergeFrom(value).buildPartial(); + } else { + kpiId_ = value; + } + onChanged(); } else { - result.alarmId_ = alarmIdBuilder_.build(); + kpiIdBuilder_.mergeFrom(value); } - onBuilt(); - return result; - } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); + return this; } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.AlarmID) { - return mergeFrom((monitoring.Monitoring.AlarmID)other); + /** + * .monitoring.KpiId kpi_id = 3; + */ + public Builder clearKpiId() { + if (kpiIdBuilder_ == null) { + kpiId_ = null; + onChanged(); } else { - super.mergeFrom(other); - return this; + kpiId_ = null; + kpiIdBuilder_ = null; } - } - public Builder mergeFrom(monitoring.Monitoring.AlarmID other) { - if (other == monitoring.Monitoring.AlarmID.getDefaultInstance()) return this; - if (other.hasAlarmId()) { - mergeAlarmId(other.getAlarmId()); - } - this.mergeUnknownFields(other.unknownFields); - onChanged(); return this; } - - @java.lang.Override - public final boolean isInitialized() { - return true; + /** + * .monitoring.KpiId kpi_id = 3; + */ + public monitoring.Monitoring.KpiId.Builder getKpiIdBuilder() { + + onChanged(); + return getKpiIdFieldBuilder().getBuilder(); } - - @java.lang.Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - monitoring.Monitoring.AlarmID parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.AlarmID) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } + /** + * .monitoring.KpiId kpi_id = 3; + */ + public monitoring.Monitoring.KpiIdOrBuilder getKpiIdOrBuilder() { + if (kpiIdBuilder_ != null) { + return kpiIdBuilder_.getMessageOrBuilder(); + } else { + return kpiId_ == null ? + monitoring.Monitoring.KpiId.getDefaultInstance() : kpiId_; } - return this; + } + /** + * .monitoring.KpiId kpi_id = 3; + */ + private com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder> + getKpiIdFieldBuilder() { + if (kpiIdBuilder_ == null) { + kpiIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiId, monitoring.Monitoring.KpiId.Builder, monitoring.Monitoring.KpiIdOrBuilder>( + getKpiId(), + getParentForChildren(), + isClean()); + kpiId_ = null; + } + return kpiIdBuilder_; } - private context.ContextOuterClass.Uuid alarmId_; + private monitoring.Monitoring.KpiValueRange kpiValueRange_; private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> alarmIdBuilder_; + monitoring.Monitoring.KpiValueRange, monitoring.Monitoring.KpiValueRange.Builder, monitoring.Monitoring.KpiValueRangeOrBuilder> kpiValueRangeBuilder_; /** - * .context.Uuid alarm_id = 1; - * @return Whether the alarmId field is set. + * .monitoring.KpiValueRange kpi_value_range = 4; + * @return Whether the kpiValueRange field is set. */ - public boolean hasAlarmId() { - return alarmIdBuilder_ != null || alarmId_ != null; + public boolean hasKpiValueRange() { + return kpiValueRangeBuilder_ != null || kpiValueRange_ != null; } /** - * .context.Uuid alarm_id = 1; - * @return The alarmId. + * .monitoring.KpiValueRange kpi_value_range = 4; + * @return The kpiValueRange. */ - public context.ContextOuterClass.Uuid getAlarmId() { - if (alarmIdBuilder_ == null) { - return alarmId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : alarmId_; + public monitoring.Monitoring.KpiValueRange getKpiValueRange() { + if (kpiValueRangeBuilder_ == null) { + return kpiValueRange_ == null ? monitoring.Monitoring.KpiValueRange.getDefaultInstance() : kpiValueRange_; } else { - return alarmIdBuilder_.getMessage(); + return kpiValueRangeBuilder_.getMessage(); } } /** - * .context.Uuid alarm_id = 1; + * .monitoring.KpiValueRange kpi_value_range = 4; */ - public Builder setAlarmId(context.ContextOuterClass.Uuid value) { - if (alarmIdBuilder_ == null) { + public Builder setKpiValueRange(monitoring.Monitoring.KpiValueRange value) { + if (kpiValueRangeBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - alarmId_ = value; + kpiValueRange_ = value; onChanged(); } else { - alarmIdBuilder_.setMessage(value); + kpiValueRangeBuilder_.setMessage(value); } return this; } /** - * .context.Uuid alarm_id = 1; + * .monitoring.KpiValueRange kpi_value_range = 4; */ - public Builder setAlarmId( - context.ContextOuterClass.Uuid.Builder builderForValue) { - if (alarmIdBuilder_ == null) { - alarmId_ = builderForValue.build(); + public Builder setKpiValueRange( + monitoring.Monitoring.KpiValueRange.Builder builderForValue) { + if (kpiValueRangeBuilder_ == null) { + kpiValueRange_ = builderForValue.build(); onChanged(); } else { - alarmIdBuilder_.setMessage(builderForValue.build()); + kpiValueRangeBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .context.Uuid alarm_id = 1; + * .monitoring.KpiValueRange kpi_value_range = 4; */ - public Builder mergeAlarmId(context.ContextOuterClass.Uuid value) { - if (alarmIdBuilder_ == null) { - if (alarmId_ != null) { - alarmId_ = - context.ContextOuterClass.Uuid.newBuilder(alarmId_).mergeFrom(value).buildPartial(); + public Builder mergeKpiValueRange(monitoring.Monitoring.KpiValueRange value) { + if (kpiValueRangeBuilder_ == null) { + if (kpiValueRange_ != null) { + kpiValueRange_ = + monitoring.Monitoring.KpiValueRange.newBuilder(kpiValueRange_).mergeFrom(value).buildPartial(); } else { - alarmId_ = value; + kpiValueRange_ = value; } onChanged(); } else { - alarmIdBuilder_.mergeFrom(value); + kpiValueRangeBuilder_.mergeFrom(value); } return this; } /** - * .context.Uuid alarm_id = 1; + * .monitoring.KpiValueRange kpi_value_range = 4; */ - public Builder clearAlarmId() { - if (alarmIdBuilder_ == null) { - alarmId_ = null; + public Builder clearKpiValueRange() { + if (kpiValueRangeBuilder_ == null) { + kpiValueRange_ = null; onChanged(); } else { - alarmId_ = null; - alarmIdBuilder_ = null; + kpiValueRange_ = null; + kpiValueRangeBuilder_ = null; } return this; } /** - * .context.Uuid alarm_id = 1; + * .monitoring.KpiValueRange kpi_value_range = 4; */ - public context.ContextOuterClass.Uuid.Builder getAlarmIdBuilder() { + public monitoring.Monitoring.KpiValueRange.Builder getKpiValueRangeBuilder() { onChanged(); - return getAlarmIdFieldBuilder().getBuilder(); + return getKpiValueRangeFieldBuilder().getBuilder(); } /** - * .context.Uuid alarm_id = 1; + * .monitoring.KpiValueRange kpi_value_range = 4; */ - public context.ContextOuterClass.UuidOrBuilder getAlarmIdOrBuilder() { - if (alarmIdBuilder_ != null) { - return alarmIdBuilder_.getMessageOrBuilder(); + public monitoring.Monitoring.KpiValueRangeOrBuilder getKpiValueRangeOrBuilder() { + if (kpiValueRangeBuilder_ != null) { + return kpiValueRangeBuilder_.getMessageOrBuilder(); } else { - return alarmId_ == null ? - context.ContextOuterClass.Uuid.getDefaultInstance() : alarmId_; + return kpiValueRange_ == null ? + monitoring.Monitoring.KpiValueRange.getDefaultInstance() : kpiValueRange_; } } /** - * .context.Uuid alarm_id = 1; + * .monitoring.KpiValueRange kpi_value_range = 4; */ private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> - getAlarmIdFieldBuilder() { - if (alarmIdBuilder_ == null) { - alarmIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder>( - getAlarmId(), + monitoring.Monitoring.KpiValueRange, monitoring.Monitoring.KpiValueRange.Builder, monitoring.Monitoring.KpiValueRangeOrBuilder> + getKpiValueRangeFieldBuilder() { + if (kpiValueRangeBuilder_ == null) { + kpiValueRangeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + monitoring.Monitoring.KpiValueRange, monitoring.Monitoring.KpiValueRange.Builder, monitoring.Monitoring.KpiValueRangeOrBuilder>( + getKpiValueRange(), getParentForChildren(), isClean()); - alarmId_ = null; + kpiValueRange_ = null; } - return alarmIdBuilder_; + return kpiValueRangeBuilder_; + } + + private java.lang.Object timestamp_ = ""; + /** + * string timestamp = 5; + * @return The timestamp. + */ + public java.lang.String getTimestamp() { + java.lang.Object ref = timestamp_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + timestamp_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string timestamp = 5; + * @return The bytes for timestamp. + */ + public com.google.protobuf.ByteString + getTimestampBytes() { + java.lang.Object ref = timestamp_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + timestamp_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string timestamp = 5; + * @param value The timestamp to set. + * @return This builder for chaining. + */ + public Builder setTimestamp( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + timestamp_ = value; + onChanged(); + return this; + } + /** + * string timestamp = 5; + * @return This builder for chaining. + */ + public Builder clearTimestamp() { + + timestamp_ = getDefaultInstance().getTimestamp(); + onChanged(); + return this; + } + /** + * string timestamp = 5; + * @param value The bytes for timestamp to set. + * @return This builder for chaining. + */ + public Builder setTimestampBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + timestamp_ = value; + onChanged(); + return this; } @java.lang.Override public final Builder setUnknownFields( @@ -16419,97 +17399,85 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.AlarmID) + // @@protoc_insertion_point(builder_scope:monitoring.AlarmDescriptor) } - // @@protoc_insertion_point(class_scope:monitoring.AlarmID) - private static final monitoring.Monitoring.AlarmID DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.AlarmDescriptor) + private static final monitoring.Monitoring.AlarmDescriptor DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.AlarmID(); + DEFAULT_INSTANCE = new monitoring.Monitoring.AlarmDescriptor(); } - public static monitoring.Monitoring.AlarmID getDefaultInstance() { + public static monitoring.Monitoring.AlarmDescriptor getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public AlarmID parsePartialFrom( + public AlarmDescriptor parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AlarmID(input, extensionRegistry); + return new AlarmDescriptor(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.AlarmID getDefaultInstanceForType() { + public monitoring.Monitoring.AlarmDescriptor getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface AlarmSubscriptionOrBuilder extends - // @@protoc_insertion_point(interface_extends:monitoring.AlarmSubscription) + public interface AlarmIDOrBuilder extends + // @@protoc_insertion_point(interface_extends:monitoring.AlarmID) com.google.protobuf.MessageOrBuilder { /** - * .monitoring.AlarmID alarmID = 1; - * @return Whether the alarmID field is set. - */ - boolean hasAlarmID(); - /** - * .monitoring.AlarmID alarmID = 1; - * @return The alarmID. - */ - monitoring.Monitoring.AlarmID getAlarmID(); - /** - * .monitoring.AlarmID alarmID = 1; + * .context.Uuid alarm_id = 1; + * @return Whether the alarmId field is set. */ - monitoring.Monitoring.AlarmIDOrBuilder getAlarmIDOrBuilder(); - + boolean hasAlarmId(); /** - * float subscription_timeout_s = 2; - * @return The subscriptionTimeoutS. + * .context.Uuid alarm_id = 1; + * @return The alarmId. */ - float getSubscriptionTimeoutS(); - + context.ContextOuterClass.Uuid getAlarmId(); /** - * float subscription_frequency_ms = 3; - * @return The subscriptionFrequencyMs. + * .context.Uuid alarm_id = 1; */ - float getSubscriptionFrequencyMs(); + context.ContextOuterClass.UuidOrBuilder getAlarmIdOrBuilder(); } /** - * Protobuf type {@code monitoring.AlarmSubscription} + * Protobuf type {@code monitoring.AlarmID} */ - public static final class AlarmSubscription extends + public static final class AlarmID extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:monitoring.AlarmSubscription) - AlarmSubscriptionOrBuilder { + // @@protoc_insertion_point(message_implements:monitoring.AlarmID) + AlarmIDOrBuilder { private static final long serialVersionUID = 0L; - // Use AlarmSubscription.newBuilder() to construct. - private AlarmSubscription(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use AlarmID.newBuilder() to construct. + private AlarmID(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private AlarmSubscription() { + private AlarmID() { } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new AlarmSubscription(); + return new AlarmID(); } @java.lang.Override @@ -16517,7 +17485,7 @@ public final class Monitoring { getUnknownFields() { return this.unknownFields; } - private AlarmSubscription( + private AlarmID( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -16536,28 +17504,18 @@ public final class Monitoring { done = true; break; case 10: { - monitoring.Monitoring.AlarmID.Builder subBuilder = null; - if (alarmID_ != null) { - subBuilder = alarmID_.toBuilder(); + context.ContextOuterClass.Uuid.Builder subBuilder = null; + if (alarmId_ != null) { + subBuilder = alarmId_.toBuilder(); } - alarmID_ = input.readMessage(monitoring.Monitoring.AlarmID.parser(), extensionRegistry); + alarmId_ = input.readMessage(context.ContextOuterClass.Uuid.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(alarmID_); - alarmID_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(alarmId_); + alarmId_ = subBuilder.buildPartial(); } break; } - case 21: { - - subscriptionTimeoutS_ = input.readFloat(); - break; - } - case 29: { - - subscriptionFrequencyMs_ = input.readFloat(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -16579,63 +17537,41 @@ public final class Monitoring { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_AlarmSubscription_descriptor; + return monitoring.Monitoring.internal_static_monitoring_AlarmID_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_AlarmSubscription_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_AlarmID_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.AlarmSubscription.class, monitoring.Monitoring.AlarmSubscription.Builder.class); + monitoring.Monitoring.AlarmID.class, monitoring.Monitoring.AlarmID.Builder.class); } - public static final int ALARMID_FIELD_NUMBER = 1; - private monitoring.Monitoring.AlarmID alarmID_; - /** - * .monitoring.AlarmID alarmID = 1; - * @return Whether the alarmID field is set. - */ - @java.lang.Override - public boolean hasAlarmID() { - return alarmID_ != null; - } - /** - * .monitoring.AlarmID alarmID = 1; - * @return The alarmID. - */ - @java.lang.Override - public monitoring.Monitoring.AlarmID getAlarmID() { - return alarmID_ == null ? monitoring.Monitoring.AlarmID.getDefaultInstance() : alarmID_; - } + public static final int ALARM_ID_FIELD_NUMBER = 1; + private context.ContextOuterClass.Uuid alarmId_; /** - * .monitoring.AlarmID alarmID = 1; + * .context.Uuid alarm_id = 1; + * @return Whether the alarmId field is set. */ @java.lang.Override - public monitoring.Monitoring.AlarmIDOrBuilder getAlarmIDOrBuilder() { - return getAlarmID(); + public boolean hasAlarmId() { + return alarmId_ != null; } - - public static final int SUBSCRIPTION_TIMEOUT_S_FIELD_NUMBER = 2; - private float subscriptionTimeoutS_; /** - * float subscription_timeout_s = 2; - * @return The subscriptionTimeoutS. + * .context.Uuid alarm_id = 1; + * @return The alarmId. */ @java.lang.Override - public float getSubscriptionTimeoutS() { - return subscriptionTimeoutS_; + public context.ContextOuterClass.Uuid getAlarmId() { + return alarmId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : alarmId_; } - - public static final int SUBSCRIPTION_FREQUENCY_MS_FIELD_NUMBER = 3; - private float subscriptionFrequencyMs_; /** - * float subscription_frequency_ms = 3; - * @return The subscriptionFrequencyMs. + * .context.Uuid alarm_id = 1; */ @java.lang.Override - public float getSubscriptionFrequencyMs() { - return subscriptionFrequencyMs_; + public context.ContextOuterClass.UuidOrBuilder getAlarmIdOrBuilder() { + return getAlarmId(); } private byte memoizedIsInitialized = -1; @@ -16652,14 +17588,8 @@ public final class Monitoring { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (alarmID_ != null) { - output.writeMessage(1, getAlarmID()); - } - if (subscriptionTimeoutS_ != 0F) { - output.writeFloat(2, subscriptionTimeoutS_); - } - if (subscriptionFrequencyMs_ != 0F) { - output.writeFloat(3, subscriptionFrequencyMs_); + if (alarmId_ != null) { + output.writeMessage(1, getAlarmId()); } unknownFields.writeTo(output); } @@ -16670,17 +17600,9 @@ public final class Monitoring { if (size != -1) return size; size = 0; - if (alarmID_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getAlarmID()); - } - if (subscriptionTimeoutS_ != 0F) { - size += com.google.protobuf.CodedOutputStream - .computeFloatSize(2, subscriptionTimeoutS_); - } - if (subscriptionFrequencyMs_ != 0F) { + if (alarmId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(3, subscriptionFrequencyMs_); + .computeMessageSize(1, getAlarmId()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -16692,22 +17614,16 @@ public final class Monitoring { if (obj == this) { return true; } - if (!(obj instanceof monitoring.Monitoring.AlarmSubscription)) { + if (!(obj instanceof monitoring.Monitoring.AlarmID)) { return super.equals(obj); } - monitoring.Monitoring.AlarmSubscription other = (monitoring.Monitoring.AlarmSubscription) obj; + monitoring.Monitoring.AlarmID other = (monitoring.Monitoring.AlarmID) obj; - if (hasAlarmID() != other.hasAlarmID()) return false; - if (hasAlarmID()) { - if (!getAlarmID() - .equals(other.getAlarmID())) return false; + if (hasAlarmId() != other.hasAlarmId()) return false; + if (hasAlarmId()) { + if (!getAlarmId() + .equals(other.getAlarmId())) return false; } - if (java.lang.Float.floatToIntBits(getSubscriptionTimeoutS()) - != java.lang.Float.floatToIntBits( - other.getSubscriptionTimeoutS())) return false; - if (java.lang.Float.floatToIntBits(getSubscriptionFrequencyMs()) - != java.lang.Float.floatToIntBits( - other.getSubscriptionFrequencyMs())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -16719,84 +17635,78 @@ public final class Monitoring { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasAlarmID()) { - hash = (37 * hash) + ALARMID_FIELD_NUMBER; - hash = (53 * hash) + getAlarmID().hashCode(); + if (hasAlarmId()) { + hash = (37 * hash) + ALARM_ID_FIELD_NUMBER; + hash = (53 * hash) + getAlarmId().hashCode(); } - hash = (37 * hash) + SUBSCRIPTION_TIMEOUT_S_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getSubscriptionTimeoutS()); - hash = (37 * hash) + SUBSCRIPTION_FREQUENCY_MS_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getSubscriptionFrequencyMs()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static monitoring.Monitoring.AlarmSubscription parseFrom( + public static monitoring.Monitoring.AlarmID parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.AlarmSubscription parseFrom( + public static monitoring.Monitoring.AlarmID parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.AlarmSubscription parseFrom( + public static monitoring.Monitoring.AlarmID parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.AlarmSubscription parseFrom( + public static monitoring.Monitoring.AlarmID parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.AlarmSubscription parseFrom(byte[] data) + public static monitoring.Monitoring.AlarmID parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static monitoring.Monitoring.AlarmSubscription parseFrom( + public static monitoring.Monitoring.AlarmID parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static monitoring.Monitoring.AlarmSubscription parseFrom(java.io.InputStream input) + public static monitoring.Monitoring.AlarmID parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.AlarmSubscription parseFrom( + public static monitoring.Monitoring.AlarmID parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.AlarmSubscription parseDelimitedFrom(java.io.InputStream input) + public static monitoring.Monitoring.AlarmID parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static monitoring.Monitoring.AlarmSubscription parseDelimitedFrom( + public static monitoring.Monitoring.AlarmID parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static monitoring.Monitoring.AlarmSubscription parseFrom( + public static monitoring.Monitoring.AlarmID parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static monitoring.Monitoring.AlarmSubscription parseFrom( + public static monitoring.Monitoring.AlarmID parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -16809,7 +17719,7 @@ public final class Monitoring { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(monitoring.Monitoring.AlarmSubscription prototype) { + public static Builder newBuilder(monitoring.Monitoring.AlarmID prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -16825,26 +17735,26 @@ public final class Monitoring { return builder; } /** - * Protobuf type {@code monitoring.AlarmSubscription} + * Protobuf type {@code monitoring.AlarmID} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:monitoring.AlarmSubscription) - monitoring.Monitoring.AlarmSubscriptionOrBuilder { + // @@protoc_insertion_point(builder_implements:monitoring.AlarmID) + monitoring.Monitoring.AlarmIDOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return monitoring.Monitoring.internal_static_monitoring_AlarmSubscription_descriptor; + return monitoring.Monitoring.internal_static_monitoring_AlarmID_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return monitoring.Monitoring.internal_static_monitoring_AlarmSubscription_fieldAccessorTable + return monitoring.Monitoring.internal_static_monitoring_AlarmID_fieldAccessorTable .ensureFieldAccessorsInitialized( - monitoring.Monitoring.AlarmSubscription.class, monitoring.Monitoring.AlarmSubscription.Builder.class); + monitoring.Monitoring.AlarmID.class, monitoring.Monitoring.AlarmID.Builder.class); } - // Construct using monitoring.Monitoring.AlarmSubscription.newBuilder() + // Construct using monitoring.Monitoring.AlarmID.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -16862,33 +17772,29 @@ public final class Monitoring { @java.lang.Override public Builder clear() { super.clear(); - if (alarmIDBuilder_ == null) { - alarmID_ = null; + if (alarmIdBuilder_ == null) { + alarmId_ = null; } else { - alarmID_ = null; - alarmIDBuilder_ = null; + alarmId_ = null; + alarmIdBuilder_ = null; } - subscriptionTimeoutS_ = 0F; - - subscriptionFrequencyMs_ = 0F; - return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return monitoring.Monitoring.internal_static_monitoring_AlarmSubscription_descriptor; + return monitoring.Monitoring.internal_static_monitoring_AlarmID_descriptor; } @java.lang.Override - public monitoring.Monitoring.AlarmSubscription getDefaultInstanceForType() { - return monitoring.Monitoring.AlarmSubscription.getDefaultInstance(); + public monitoring.Monitoring.AlarmID getDefaultInstanceForType() { + return monitoring.Monitoring.AlarmID.getDefaultInstance(); } @java.lang.Override - public monitoring.Monitoring.AlarmSubscription build() { - monitoring.Monitoring.AlarmSubscription result = buildPartial(); + public monitoring.Monitoring.AlarmID build() { + monitoring.Monitoring.AlarmID result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -16896,15 +17802,13 @@ public final class Monitoring { } @java.lang.Override - public monitoring.Monitoring.AlarmSubscription buildPartial() { - monitoring.Monitoring.AlarmSubscription result = new monitoring.Monitoring.AlarmSubscription(this); - if (alarmIDBuilder_ == null) { - result.alarmID_ = alarmID_; + public monitoring.Monitoring.AlarmID buildPartial() { + monitoring.Monitoring.AlarmID result = new monitoring.Monitoring.AlarmID(this); + if (alarmIdBuilder_ == null) { + result.alarmId_ = alarmId_; } else { - result.alarmID_ = alarmIDBuilder_.build(); + result.alarmId_ = alarmIdBuilder_.build(); } - result.subscriptionTimeoutS_ = subscriptionTimeoutS_; - result.subscriptionFrequencyMs_ = subscriptionFrequencyMs_; onBuilt(); return result; } @@ -16943,24 +17847,18 @@ public final class Monitoring { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof monitoring.Monitoring.AlarmSubscription) { - return mergeFrom((monitoring.Monitoring.AlarmSubscription)other); + if (other instanceof monitoring.Monitoring.AlarmID) { + return mergeFrom((monitoring.Monitoring.AlarmID)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(monitoring.Monitoring.AlarmSubscription other) { - if (other == monitoring.Monitoring.AlarmSubscription.getDefaultInstance()) return this; - if (other.hasAlarmID()) { - mergeAlarmID(other.getAlarmID()); - } - if (other.getSubscriptionTimeoutS() != 0F) { - setSubscriptionTimeoutS(other.getSubscriptionTimeoutS()); - } - if (other.getSubscriptionFrequencyMs() != 0F) { - setSubscriptionFrequencyMs(other.getSubscriptionFrequencyMs()); + public Builder mergeFrom(monitoring.Monitoring.AlarmID other) { + if (other == monitoring.Monitoring.AlarmID.getDefaultInstance()) return this; + if (other.hasAlarmId()) { + mergeAlarmId(other.getAlarmId()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -16977,11 +17875,11 @@ public final class Monitoring { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - monitoring.Monitoring.AlarmSubscription parsedMessage = null; + monitoring.Monitoring.AlarmID parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (monitoring.Monitoring.AlarmSubscription) e.getUnfinishedMessage(); + parsedMessage = (monitoring.Monitoring.AlarmID) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -16991,185 +17889,123 @@ public final class Monitoring { return this; } - private monitoring.Monitoring.AlarmID alarmID_; + private context.ContextOuterClass.Uuid alarmId_; private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.AlarmID, monitoring.Monitoring.AlarmID.Builder, monitoring.Monitoring.AlarmIDOrBuilder> alarmIDBuilder_; + context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> alarmIdBuilder_; /** - * .monitoring.AlarmID alarmID = 1; - * @return Whether the alarmID field is set. + * .context.Uuid alarm_id = 1; + * @return Whether the alarmId field is set. */ - public boolean hasAlarmID() { - return alarmIDBuilder_ != null || alarmID_ != null; + public boolean hasAlarmId() { + return alarmIdBuilder_ != null || alarmId_ != null; } /** - * .monitoring.AlarmID alarmID = 1; - * @return The alarmID. + * .context.Uuid alarm_id = 1; + * @return The alarmId. */ - public monitoring.Monitoring.AlarmID getAlarmID() { - if (alarmIDBuilder_ == null) { - return alarmID_ == null ? monitoring.Monitoring.AlarmID.getDefaultInstance() : alarmID_; + public context.ContextOuterClass.Uuid getAlarmId() { + if (alarmIdBuilder_ == null) { + return alarmId_ == null ? context.ContextOuterClass.Uuid.getDefaultInstance() : alarmId_; } else { - return alarmIDBuilder_.getMessage(); + return alarmIdBuilder_.getMessage(); } } /** - * .monitoring.AlarmID alarmID = 1; + * .context.Uuid alarm_id = 1; */ - public Builder setAlarmID(monitoring.Monitoring.AlarmID value) { - if (alarmIDBuilder_ == null) { + public Builder setAlarmId(context.ContextOuterClass.Uuid value) { + if (alarmIdBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - alarmID_ = value; + alarmId_ = value; onChanged(); } else { - alarmIDBuilder_.setMessage(value); + alarmIdBuilder_.setMessage(value); } return this; } /** - * .monitoring.AlarmID alarmID = 1; + * .context.Uuid alarm_id = 1; */ - public Builder setAlarmID( - monitoring.Monitoring.AlarmID.Builder builderForValue) { - if (alarmIDBuilder_ == null) { - alarmID_ = builderForValue.build(); + public Builder setAlarmId( + context.ContextOuterClass.Uuid.Builder builderForValue) { + if (alarmIdBuilder_ == null) { + alarmId_ = builderForValue.build(); onChanged(); } else { - alarmIDBuilder_.setMessage(builderForValue.build()); + alarmIdBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .monitoring.AlarmID alarmID = 1; + * .context.Uuid alarm_id = 1; */ - public Builder mergeAlarmID(monitoring.Monitoring.AlarmID value) { - if (alarmIDBuilder_ == null) { - if (alarmID_ != null) { - alarmID_ = - monitoring.Monitoring.AlarmID.newBuilder(alarmID_).mergeFrom(value).buildPartial(); + public Builder mergeAlarmId(context.ContextOuterClass.Uuid value) { + if (alarmIdBuilder_ == null) { + if (alarmId_ != null) { + alarmId_ = + context.ContextOuterClass.Uuid.newBuilder(alarmId_).mergeFrom(value).buildPartial(); } else { - alarmID_ = value; + alarmId_ = value; } onChanged(); } else { - alarmIDBuilder_.mergeFrom(value); + alarmIdBuilder_.mergeFrom(value); } return this; } /** - * .monitoring.AlarmID alarmID = 1; + * .context.Uuid alarm_id = 1; */ - public Builder clearAlarmID() { - if (alarmIDBuilder_ == null) { - alarmID_ = null; + public Builder clearAlarmId() { + if (alarmIdBuilder_ == null) { + alarmId_ = null; onChanged(); } else { - alarmID_ = null; - alarmIDBuilder_ = null; + alarmId_ = null; + alarmIdBuilder_ = null; } return this; } /** - * .monitoring.AlarmID alarmID = 1; + * .context.Uuid alarm_id = 1; */ - public monitoring.Monitoring.AlarmID.Builder getAlarmIDBuilder() { + public context.ContextOuterClass.Uuid.Builder getAlarmIdBuilder() { onChanged(); - return getAlarmIDFieldBuilder().getBuilder(); + return getAlarmIdFieldBuilder().getBuilder(); } /** - * .monitoring.AlarmID alarmID = 1; + * .context.Uuid alarm_id = 1; */ - public monitoring.Monitoring.AlarmIDOrBuilder getAlarmIDOrBuilder() { - if (alarmIDBuilder_ != null) { - return alarmIDBuilder_.getMessageOrBuilder(); + public context.ContextOuterClass.UuidOrBuilder getAlarmIdOrBuilder() { + if (alarmIdBuilder_ != null) { + return alarmIdBuilder_.getMessageOrBuilder(); } else { - return alarmID_ == null ? - monitoring.Monitoring.AlarmID.getDefaultInstance() : alarmID_; + return alarmId_ == null ? + context.ContextOuterClass.Uuid.getDefaultInstance() : alarmId_; } } /** - * .monitoring.AlarmID alarmID = 1; + * .context.Uuid alarm_id = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.AlarmID, monitoring.Monitoring.AlarmID.Builder, monitoring.Monitoring.AlarmIDOrBuilder> - getAlarmIDFieldBuilder() { - if (alarmIDBuilder_ == null) { - alarmIDBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - monitoring.Monitoring.AlarmID, monitoring.Monitoring.AlarmID.Builder, monitoring.Monitoring.AlarmIDOrBuilder>( - getAlarmID(), + context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder> + getAlarmIdFieldBuilder() { + if (alarmIdBuilder_ == null) { + alarmIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.Uuid, context.ContextOuterClass.Uuid.Builder, context.ContextOuterClass.UuidOrBuilder>( + getAlarmId(), getParentForChildren(), isClean()); - alarmID_ = null; + alarmId_ = null; } - return alarmIDBuilder_; - } - - private float subscriptionTimeoutS_ ; - /** - * float subscription_timeout_s = 2; - * @return The subscriptionTimeoutS. - */ - @java.lang.Override - public float getSubscriptionTimeoutS() { - return subscriptionTimeoutS_; - } - /** - * float subscription_timeout_s = 2; - * @param value The subscriptionTimeoutS to set. - * @return This builder for chaining. - */ - public Builder setSubscriptionTimeoutS(float value) { - - subscriptionTimeoutS_ = value; - onChanged(); - return this; - } - /** - * float subscription_timeout_s = 2; - * @return This builder for chaining. - */ - public Builder clearSubscriptionTimeoutS() { - - subscriptionTimeoutS_ = 0F; - onChanged(); - return this; - } - - private float subscriptionFrequencyMs_ ; - /** - * float subscription_frequency_ms = 3; - * @return The subscriptionFrequencyMs. - */ - @java.lang.Override - public float getSubscriptionFrequencyMs() { - return subscriptionFrequencyMs_; - } - /** - * float subscription_frequency_ms = 3; - * @param value The subscriptionFrequencyMs to set. - * @return This builder for chaining. - */ - public Builder setSubscriptionFrequencyMs(float value) { - - subscriptionFrequencyMs_ = value; - onChanged(); - return this; - } - /** - * float subscription_frequency_ms = 3; - * @return This builder for chaining. - */ - public Builder clearSubscriptionFrequencyMs() { - - subscriptionFrequencyMs_ = 0F; - onChanged(); - return this; + return alarmIdBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -17184,41 +18020,41 @@ public final class Monitoring { } - // @@protoc_insertion_point(builder_scope:monitoring.AlarmSubscription) + // @@protoc_insertion_point(builder_scope:monitoring.AlarmID) } - // @@protoc_insertion_point(class_scope:monitoring.AlarmSubscription) - private static final monitoring.Monitoring.AlarmSubscription DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:monitoring.AlarmID) + private static final monitoring.Monitoring.AlarmID DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new monitoring.Monitoring.AlarmSubscription(); + DEFAULT_INSTANCE = new monitoring.Monitoring.AlarmID(); } - public static monitoring.Monitoring.AlarmSubscription getDefaultInstance() { + public static monitoring.Monitoring.AlarmID getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public AlarmSubscription parsePartialFrom( + public AlarmID parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AlarmSubscription(input, extensionRegistry); + return new AlarmID(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public monitoring.Monitoring.AlarmSubscription getDefaultInstanceForType() { + public monitoring.Monitoring.AlarmID getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -17269,21 +18105,6 @@ public final class Monitoring { * .monitoring.KpiValue kpi_value = 3; */ monitoring.Monitoring.KpiValueOrBuilder getKpiValueOrBuilder(); - - /** - * .context.Timestamp timestamp = 4; - * @return Whether the timestamp field is set. - */ - boolean hasTimestamp(); - /** - * .context.Timestamp timestamp = 4; - * @return The timestamp. - */ - context.ContextOuterClass.Timestamp getTimestamp(); - /** - * .context.Timestamp timestamp = 4; - */ - context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder(); } /** * Protobuf type {@code monitoring.AlarmResponse} @@ -17363,19 +18184,6 @@ public final class Monitoring { break; } - case 34: { - context.ContextOuterClass.Timestamp.Builder subBuilder = null; - if (timestamp_ != null) { - subBuilder = timestamp_.toBuilder(); - } - timestamp_ = input.readMessage(context.ContextOuterClass.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(timestamp_); - timestamp_ = subBuilder.buildPartial(); - } - - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -17498,32 +18306,6 @@ public final class Monitoring { return getKpiValue(); } - public static final int TIMESTAMP_FIELD_NUMBER = 4; - private context.ContextOuterClass.Timestamp timestamp_; - /** - * .context.Timestamp timestamp = 4; - * @return Whether the timestamp field is set. - */ - @java.lang.Override - public boolean hasTimestamp() { - return timestamp_ != null; - } - /** - * .context.Timestamp timestamp = 4; - * @return The timestamp. - */ - @java.lang.Override - public context.ContextOuterClass.Timestamp getTimestamp() { - return timestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_; - } - /** - * .context.Timestamp timestamp = 4; - */ - @java.lang.Override - public context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder() { - return getTimestamp(); - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -17547,9 +18329,6 @@ public final class Monitoring { if (kpiValue_ != null) { output.writeMessage(3, getKpiValue()); } - if (timestamp_ != null) { - output.writeMessage(4, getTimestamp()); - } unknownFields.writeTo(output); } @@ -17570,10 +18349,6 @@ public final class Monitoring { size += com.google.protobuf.CodedOutputStream .computeMessageSize(3, getKpiValue()); } - if (timestamp_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, getTimestamp()); - } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -17601,11 +18376,6 @@ public final class Monitoring { if (!getKpiValue() .equals(other.getKpiValue())) return false; } - if (hasTimestamp() != other.hasTimestamp()) return false; - if (hasTimestamp()) { - if (!getTimestamp() - .equals(other.getTimestamp())) return false; - } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -17627,10 +18397,6 @@ public final class Monitoring { hash = (37 * hash) + KPI_VALUE_FIELD_NUMBER; hash = (53 * hash) + getKpiValue().hashCode(); } - if (hasTimestamp()) { - hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER; - hash = (53 * hash) + getTimestamp().hashCode(); - } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -17778,12 +18544,6 @@ public final class Monitoring { kpiValue_ = null; kpiValueBuilder_ = null; } - if (timestampBuilder_ == null) { - timestamp_ = null; - } else { - timestamp_ = null; - timestampBuilder_ = null; - } return this; } @@ -17821,11 +18581,6 @@ public final class Monitoring { } else { result.kpiValue_ = kpiValueBuilder_.build(); } - if (timestampBuilder_ == null) { - result.timestamp_ = timestamp_; - } else { - result.timestamp_ = timestampBuilder_.build(); - } onBuilt(); return result; } @@ -17884,9 +18639,6 @@ public final class Monitoring { if (other.hasKpiValue()) { mergeKpiValue(other.getKpiValue()); } - if (other.hasTimestamp()) { - mergeTimestamp(other.getTimestamp()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -18229,125 +18981,6 @@ public final class Monitoring { } return kpiValueBuilder_; } - - private context.ContextOuterClass.Timestamp timestamp_; - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> timestampBuilder_; - /** - * .context.Timestamp timestamp = 4; - * @return Whether the timestamp field is set. - */ - public boolean hasTimestamp() { - return timestampBuilder_ != null || timestamp_ != null; - } - /** - * .context.Timestamp timestamp = 4; - * @return The timestamp. - */ - public context.ContextOuterClass.Timestamp getTimestamp() { - if (timestampBuilder_ == null) { - return timestamp_ == null ? context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_; - } else { - return timestampBuilder_.getMessage(); - } - } - /** - * .context.Timestamp timestamp = 4; - */ - public Builder setTimestamp(context.ContextOuterClass.Timestamp value) { - if (timestampBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - timestamp_ = value; - onChanged(); - } else { - timestampBuilder_.setMessage(value); - } - - return this; - } - /** - * .context.Timestamp timestamp = 4; - */ - public Builder setTimestamp( - context.ContextOuterClass.Timestamp.Builder builderForValue) { - if (timestampBuilder_ == null) { - timestamp_ = builderForValue.build(); - onChanged(); - } else { - timestampBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .context.Timestamp timestamp = 4; - */ - public Builder mergeTimestamp(context.ContextOuterClass.Timestamp value) { - if (timestampBuilder_ == null) { - if (timestamp_ != null) { - timestamp_ = - context.ContextOuterClass.Timestamp.newBuilder(timestamp_).mergeFrom(value).buildPartial(); - } else { - timestamp_ = value; - } - onChanged(); - } else { - timestampBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .context.Timestamp timestamp = 4; - */ - public Builder clearTimestamp() { - if (timestampBuilder_ == null) { - timestamp_ = null; - onChanged(); - } else { - timestamp_ = null; - timestampBuilder_ = null; - } - - return this; - } - /** - * .context.Timestamp timestamp = 4; - */ - public context.ContextOuterClass.Timestamp.Builder getTimestampBuilder() { - - onChanged(); - return getTimestampFieldBuilder().getBuilder(); - } - /** - * .context.Timestamp timestamp = 4; - */ - public context.ContextOuterClass.TimestampOrBuilder getTimestampOrBuilder() { - if (timestampBuilder_ != null) { - return timestampBuilder_.getMessageOrBuilder(); - } else { - return timestamp_ == null ? - context.ContextOuterClass.Timestamp.getDefaultInstance() : timestamp_; - } - } - /** - * .context.Timestamp timestamp = 4; - */ - private com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder> - getTimestampFieldBuilder() { - if (timestampBuilder_ == null) { - timestampBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - context.ContextOuterClass.Timestamp, context.ContextOuterClass.Timestamp.Builder, context.ContextOuterClass.TimestampOrBuilder>( - getTimestamp(), - getParentForChildren(), - isClean()); - timestamp_ = null; - } - return timestampBuilder_; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -19199,6 +19832,16 @@ public final class Monitoring { private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_monitoring_KpiDescriptor_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_monitoring_BundleKpiDescriptor_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_monitoring_BundleKpiDescriptor_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_monitoring_EditedKpiDescriptor_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_monitoring_EditedKpiDescriptor_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_monitoring_MonitorKpiRequest_descriptor; private static final @@ -19269,11 +19912,6 @@ public final class Monitoring { private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_monitoring_AlarmID_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_monitoring_AlarmSubscription_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_monitoring_AlarmSubscription_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_monitoring_AlarmResponse_descriptor; private static final @@ -19294,95 +19932,97 @@ public final class Monitoring { static { java.lang.String[] descriptorData = { "\n\020monitoring.proto\022\nmonitoring\032\rcontext." + - "proto\032\026kpi_sample_types.proto\"\311\002\n\rKpiDes" + + "proto\032\026kpi_sample_types.proto\"\376\001\n\rKpiDes" + + "criptor\022\027\n\017kpi_description\030\001 \001(\t\0228\n\017kpi_" + + "sample_type\030\002 \001(\0162\037.kpi_sample_types.Kpi" + + "SampleType\022$\n\tdevice_id\030\003 \001(\0132\021.context." + + "DeviceId\022(\n\013endpoint_id\030\004 \001(\0132\023.context." + + "EndPointId\022&\n\nservice_id\030\005 \001(\0132\022.context" + + ".ServiceId\022\"\n\010slice_id\030\006 \001(\0132\020.context.S" + + "liceId\"\254\002\n\023BundleKpiDescriptor\022\027\n\017kpi_de" + + "scription\030\001 \001(\t\022&\n\013kpi_id_list\030\002 \003(\0132\021.m" + + "onitoring.KpiId\0228\n\017kpi_sample_type\030\003 \001(\016" + + "2\037.kpi_sample_types.KpiSampleType\022$\n\tdev" + + "ice_id\030\004 \001(\0132\021.context.DeviceId\022(\n\013endpo" + + "int_id\030\005 \001(\0132\023.context.EndPointId\022&\n\nser" + + "vice_id\030\006 \001(\0132\022.context.ServiceId\022\"\n\010sli" + + "ce_id\030\007 \001(\0132\020.context.SliceId\"\317\002\n\023Edited" + + "KpiDescriptor\022!\n\006kpi_id\030\001 \001(\0132\021.monitori" + + "ng.KpiId\022\027\n\017kpi_description\030\002 \001(\t\022&\n\013kpi" + + "_id_list\030\003 \003(\0132\021.monitoring.KpiId\0228\n\017kpi" + + "_sample_type\030\004 \001(\0162\037.kpi_sample_types.Kp" + + "iSampleType\022$\n\tdevice_id\030\005 \001(\0132\021.context" + + ".DeviceId\022(\n\013endpoint_id\030\006 \001(\0132\023.context" + + ".EndPointId\022&\n\nservice_id\030\007 \001(\0132\022.contex" + + "t.ServiceId\022\"\n\010slice_id\030\010 \001(\0132\020.context." + + "SliceId\"l\n\021MonitorKpiRequest\022!\n\006kpi_id\030\001" + + " \001(\0132\021.monitoring.KpiId\022\033\n\023monitoring_wi" + + "ndow_s\030\002 \001(\002\022\027\n\017sampling_rate_s\030\003 \001(\002\"\241\001" + + "\n\010KpiQuery\022!\n\006kpi_id\030\001 \003(\0132\021.monitoring." + + "KpiId\022\033\n\023monitoring_window_s\030\002 \001(\002\022\027\n\017sa" + + "mpling_rate_s\030\003 \001(\002\022\026\n\016last_n_samples\030\004 " + + "\001(\r\022\022\n\nstart_date\030\005 \001(\t\022\020\n\010end_date\030\006 \001(" + + "\t\"&\n\005KpiId\022\035\n\006kpi_id\030\001 \001(\0132\r.context.Uui" + + "d\"d\n\003Kpi\022!\n\006kpi_id\030\001 \001(\0132\021.monitoring.Kp" + + "iId\022\021\n\ttimestamp\030\002 \001(\t\022\'\n\tkpi_value\030\003 \001(" + + "\0132\024.monitoring.KpiValue\"e\n\rKpiValueRange" + + "\022)\n\013kpiMinValue\030\001 \001(\0132\024.monitoring.KpiVa" + + "lue\022)\n\013kpiMaxValue\030\002 \001(\0132\024.monitoring.Kp" + + "iValue\"a\n\010KpiValue\022\020\n\006intVal\030\001 \001(\rH\000\022\022\n\010" + + "floatVal\030\002 \001(\002H\000\022\023\n\tstringVal\030\003 \001(\tH\000\022\021\n" + + "\007boolVal\030\004 \001(\010H\000B\007\n\005value\",\n\007KpiList\022!\n\010" + + "kpi_list\030\001 \003(\0132\017.monitoring.Kpi\"K\n\021KpiDe" + + "scriptorList\0226\n\023kpi_descriptor_list\030\001 \003(" + + "\0132\031.monitoring.KpiDescriptor\"\223\001\n\016SubsDes" + "criptor\022!\n\006kpi_id\030\001 \001(\0132\021.monitoring.Kpi" + - "Id\022\027\n\017kpi_description\030\002 \001(\t\022&\n\013kpi_id_li" + - "st\030\003 \003(\0132\021.monitoring.KpiId\0228\n\017kpi_sampl" + - "e_type\030\004 \001(\0162\037.kpi_sample_types.KpiSampl" + - "eType\022$\n\tdevice_id\030\005 \001(\0132\021.context.Devic" + - "eId\022(\n\013endpoint_id\030\006 \001(\0132\023.context.EndPo" + - "intId\022&\n\nservice_id\030\007 \001(\0132\022.context.Serv" + - "iceId\022\"\n\010slice_id\030\010 \001(\0132\020.context.SliceI" + - "d\"l\n\021MonitorKpiRequest\022!\n\006kpi_id\030\001 \001(\0132\021" + - ".monitoring.KpiId\022\033\n\023monitoring_window_s" + - "\030\002 \001(\002\022\027\n\017sampling_rate_s\030\003 \001(\002\"\323\001\n\010KpiQ" + - "uery\022!\n\006kpi_id\030\001 \003(\0132\021.monitoring.KpiId\022" + - "\033\n\023monitoring_window_s\030\002 \001(\002\022\027\n\017sampling" + - "_rate_s\030\003 \001(\002\022\026\n\016last_n_samples\030\004 \001(\r\022+\n" + - "\017start_timestamp\030\005 \001(\0132\022.context.Timesta" + - "mp\022)\n\rend_timestamp\030\006 \001(\0132\022.context.Time" + - "stamp\"&\n\005KpiId\022\035\n\006kpi_id\030\001 \001(\0132\r.context" + - ".Uuid\"x\n\003Kpi\022!\n\006kpi_id\030\001 \001(\0132\021.monitorin" + - "g.KpiId\022%\n\ttimestamp\030\002 \001(\0132\022.context.Tim" + - "estamp\022\'\n\tkpi_value\030\003 \001(\0132\024.monitoring.K" + - "piValue\"\250\001\n\rKpiValueRange\022)\n\013kpiMinValue" + - "\030\001 \001(\0132\024.monitoring.KpiValue\022)\n\013kpiMaxVa" + - "lue\030\002 \001(\0132\024.monitoring.KpiValue\022\017\n\007inRan" + - "ge\030\003 \001(\010\022\027\n\017includeMinValue\030\004 \001(\010\022\027\n\017inc" + - "ludeMaxValue\030\005 \001(\010\"\241\001\n\010KpiValue\022\022\n\010int32" + - "Val\030\001 \001(\005H\000\022\023\n\tuint32Val\030\002 \001(\rH\000\022\022\n\010int6" + - "4Val\030\003 \001(\003H\000\022\023\n\tuint64Val\030\004 \001(\004H\000\022\022\n\010flo" + - "atVal\030\005 \001(\002H\000\022\023\n\tstringVal\030\006 \001(\tH\000\022\021\n\007bo" + - "olVal\030\007 \001(\010H\000B\007\n\005value\",\n\007KpiList\022!\n\010kpi" + - "_list\030\001 \003(\0132\017.monitoring.Kpi\"K\n\021KpiDescr" + - "iptorList\0226\n\023kpi_descriptor_list\030\001 \003(\0132\031" + - ".monitoring.KpiDescriptor\"\362\001\n\016SubsDescri" + - "ptor\022+\n\007subs_id\030\001 \001(\0132\032.monitoring.Subsc" + - "riptionID\022!\n\006kpi_id\030\002 \001(\0132\021.monitoring.K" + - "piId\022\033\n\023sampling_duration_s\030\003 \001(\002\022\033\n\023sam" + - "pling_interval_s\030\004 \001(\002\022+\n\017start_timestam" + - "p\030\005 \001(\0132\022.context.Timestamp\022)\n\rend_times" + - "tamp\030\006 \001(\0132\022.context.Timestamp\"0\n\016Subscr" + - "iptionID\022\036\n\007subs_id\030\001 \001(\0132\r.context.Uuid" + - "\"b\n\014SubsResponse\022+\n\007subs_id\030\001 \001(\0132\032.moni" + - "toring.SubscriptionID\022%\n\010kpi_list\030\002 \003(\0132" + - "\023.monitoring.KpiList\";\n\nSubsIDList\022-\n\tsu" + - "bs_list\030\001 \003(\0132\032.monitoring.SubscriptionI" + - "D\"\337\001\n\017AlarmDescriptor\022%\n\010alarm_id\030\001 \001(\0132" + - "\023.monitoring.AlarmID\022\031\n\021alarm_descriptio" + - "n\030\002 \001(\t\022\014\n\004name\030\003 \001(\t\022!\n\006kpi_id\030\004 \003(\0132\021." + - "monitoring.KpiId\0222\n\017kpi_value_range\030\005 \003(" + - "\0132\031.monitoring.KpiValueRange\022%\n\ttimestam" + - "p\030\006 \001(\0132\022.context.Timestamp\"*\n\007AlarmID\022\037" + - "\n\010alarm_id\030\001 \001(\0132\r.context.Uuid\"|\n\021Alarm" + - "Subscription\022$\n\007alarmID\030\001 \001(\0132\023.monitori" + - "ng.AlarmID\022\036\n\026subscription_timeout_s\030\002 \001" + - "(\002\022!\n\031subscription_frequency_ms\030\003 \001(\002\"\224\001" + - "\n\rAlarmResponse\022%\n\010alarm_id\030\001 \001(\0132\023.moni" + - "toring.AlarmID\022\014\n\004text\030\002 \001(\t\022\'\n\tkpi_valu" + - "e\030\003 \001(\0132\024.monitoring.KpiValue\022%\n\ttimesta" + - "mp\030\004 \001(\0132\022.context.Timestamp\"6\n\013AlarmIDL" + - "ist\022\'\n\nalarm_list\030\001 \003(\0132\023.monitoring.Ala" + - "rmID2\233\t\n\021MonitoringService\0228\n\006SetKpi\022\031.m" + - "onitoring.KpiDescriptor\032\021.monitoring.Kpi" + - "Id\"\000\0220\n\tDeleteKpi\022\021.monitoring.KpiId\032\016.c" + - "ontext.Empty\"\000\022B\n\020GetKpiDescriptor\022\021.mon" + - "itoring.KpiId\032\031.monitoring.KpiDescriptor" + - "\"\000\022G\n\024GetKpiDescriptorList\022\016.context.Emp" + - "ty\032\035.monitoring.KpiDescriptorList\"\000\022/\n\nI" + - "ncludeKpi\022\017.monitoring.Kpi\032\016.context.Emp" + - "ty\"\000\022=\n\nMonitorKpi\022\035.monitoring.MonitorK" + - "piRequest\032\016.context.Empty\"\000\022;\n\014QueryKpiD" + - "ata\022\024.monitoring.KpiQuery\032\023.monitoring.K" + - "piList\"\000\022I\n\022SetKpiSubscription\022\032.monitor" + - "ing.SubsDescriptor\032\023.monitoring.KpiList\"" + - "\0000\001\022M\n\021GetSubsDescriptor\022\032.monitoring.Su" + - "bscriptionID\032\032.monitoring.SubsDescriptor" + - "\"\000\022<\n\020GetSubscriptions\022\016.context.Empty\032\026" + - ".monitoring.SubsIDList\"\000\022B\n\022DeleteSubscr" + - "iption\022\032.monitoring.SubscriptionID\032\016.con" + - "text.Empty\"\000\022A\n\013SetKpiAlarm\022\033.monitoring" + - ".AlarmDescriptor\032\023.monitoring.AlarmID\"\000\022" + - "6\n\tGetAlarms\022\016.context.Empty\032\027.monitorin" + - "g.AlarmIDList\"\000\022H\n\022GetAlarmDescriptor\022\023." + - "monitoring.AlarmID\032\033.monitoring.AlarmDes" + - "criptor\"\000\022V\n\026GetAlarmResponseStream\022\035.mo" + - "nitoring.AlarmSubscription\032\031.monitoring." + - "AlarmResponse\"\0000\001\0224\n\013DeleteAlarm\022\023.monit" + - "oring.AlarmID\032\016.context.Empty\"\000\0226\n\014GetSt" + - "reamKpi\022\021.monitoring.KpiId\032\017.monitoring." + - "Kpi\"\0000\001\0229\n\rGetInstantKpi\022\021.monitoring.Kp" + - "iId\032\023.monitoring.KpiList\"\000b\006proto3" + "Id\022\033\n\023sampling_duration_s\030\002 \001(\002\022\033\n\023sampl" + + "ing_interval_s\030\003 \001(\002\022\022\n\nstart_date\030\004 \001(\t" + + "\022\020\n\010end_date\030\005 \001(\t\"0\n\016SubscriptionID\022\036\n\007" + + "subs_id\030\001 \001(\0132\r.context.Uuid\"b\n\014SubsResp" + + "onse\022+\n\007subs_id\030\001 \001(\0132\032.monitoring.Subsc" + + "riptionID\022%\n\010kpi_list\030\002 \003(\0132\023.monitoring" + + ".KpiList\";\n\nSubsIDList\022-\n\tsubs_list\030\001 \003(" + + "\0132\032.monitoring.SubscriptionID\"\244\001\n\017AlarmD" + + "escriptor\022\031\n\021alarm_description\030\001 \001(\t\022\014\n\004" + + "name\030\002 \001(\t\022!\n\006kpi_id\030\003 \001(\0132\021.monitoring." + + "KpiId\0222\n\017kpi_value_range\030\004 \001(\0132\031.monitor" + + "ing.KpiValueRange\022\021\n\ttimestamp\030\005 \001(\t\"*\n\007" + + "AlarmID\022\037\n\010alarm_id\030\001 \001(\0132\r.context.Uuid" + + "\"m\n\rAlarmResponse\022%\n\010alarm_id\030\001 \001(\0132\023.mo" + + "nitoring.AlarmID\022\014\n\004text\030\002 \001(\t\022\'\n\tkpi_va" + + "lue\030\003 \001(\0132\024.monitoring.KpiValue\"6\n\013Alarm" + + "IDList\022\'\n\nalarm_list\030\001 \003(\0132\023.monitoring." + + "AlarmID2\271\t\n\021MonitoringService\022;\n\tCreateK" + + "pi\022\031.monitoring.KpiDescriptor\032\021.monitori" + + "ng.KpiId\"\000\022F\n\021EditKpiDescriptor\022\037.monito" + + "ring.EditedKpiDescriptor\032\016.context.Empty" + + "\"\000\0220\n\tDeleteKpi\022\021.monitoring.KpiId\032\016.con" + + "text.Empty\"\000\022G\n\024GetKpiDescriptorList\022\016.c" + + "ontext.Empty\032\035.monitoring.KpiDescriptorL" + + "ist\"\000\022G\n\017CreateBundleKpi\022\037.monitoring.Bu" + + "ndleKpiDescriptor\032\021.monitoring.KpiId\"\000\022B" + + "\n\020GetKpiDescriptor\022\021.monitoring.KpiId\032\031." + + "monitoring.KpiDescriptor\"\000\022/\n\nIncludeKpi" + + "\022\017.monitoring.Kpi\032\016.context.Empty\"\000\022=\n\nM" + + "onitorKpi\022\035.monitoring.MonitorKpiRequest" + + "\032\016.context.Empty\"\000\022;\n\014QueryKpiData\022\024.mon" + + "itoring.KpiQuery\032\023.monitoring.KpiList\"\000\022" + + "C\n\014SubscribeKpi\022\032.monitoring.SubsDescrip" + + "tor\032\023.monitoring.KpiList\"\0000\001\022M\n\021GetSubsD" + + "escriptor\022\032.monitoring.SubscriptionID\032\032." + + "monitoring.SubsDescriptor\"\000\022<\n\020GetSubscr" + + "iptions\022\016.context.Empty\032\026.monitoring.Sub" + + "sIDList\"\000\022C\n\023EditKpiSubscription\022\032.monit" + + "oring.SubsDescriptor\032\016.context.Empty\"\000\022D" + + "\n\016CreateKpiAlarm\022\033.monitoring.AlarmDescr" + + "iptor\032\023.monitoring.AlarmID\"\000\022=\n\014EditKpiA" + + "larm\022\033.monitoring.AlarmDescriptor\032\016.cont" + + "ext.Empty\"\000\0226\n\tGetAlarms\022\016.context.Empty" + + "\032\027.monitoring.AlarmIDList\"\000\022H\n\022GetAlarmD" + + "escriptor\022\023.monitoring.AlarmID\032\033.monitor" + + "ing.AlarmDescriptor\"\000\022L\n\026GetAlarmRespons" + + "eStream\022\023.monitoring.AlarmID\032\031.monitorin" + + "g.AlarmResponse\"\0000\001b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -19395,105 +20035,111 @@ public final class Monitoring { internal_static_monitoring_KpiDescriptor_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_KpiDescriptor_descriptor, + new java.lang.String[] { "KpiDescription", "KpiSampleType", "DeviceId", "EndpointId", "ServiceId", "SliceId", }); + internal_static_monitoring_BundleKpiDescriptor_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_monitoring_BundleKpiDescriptor_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_monitoring_BundleKpiDescriptor_descriptor, + new java.lang.String[] { "KpiDescription", "KpiIdList", "KpiSampleType", "DeviceId", "EndpointId", "ServiceId", "SliceId", }); + internal_static_monitoring_EditedKpiDescriptor_descriptor = + getDescriptor().getMessageTypes().get(2); + internal_static_monitoring_EditedKpiDescriptor_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_monitoring_EditedKpiDescriptor_descriptor, new java.lang.String[] { "KpiId", "KpiDescription", "KpiIdList", "KpiSampleType", "DeviceId", "EndpointId", "ServiceId", "SliceId", }); internal_static_monitoring_MonitorKpiRequest_descriptor = - getDescriptor().getMessageTypes().get(1); + getDescriptor().getMessageTypes().get(3); internal_static_monitoring_MonitorKpiRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_MonitorKpiRequest_descriptor, new java.lang.String[] { "KpiId", "MonitoringWindowS", "SamplingRateS", }); internal_static_monitoring_KpiQuery_descriptor = - getDescriptor().getMessageTypes().get(2); + getDescriptor().getMessageTypes().get(4); internal_static_monitoring_KpiQuery_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_KpiQuery_descriptor, - new java.lang.String[] { "KpiId", "MonitoringWindowS", "SamplingRateS", "LastNSamples", "StartTimestamp", "EndTimestamp", }); + new java.lang.String[] { "KpiId", "MonitoringWindowS", "SamplingRateS", "LastNSamples", "StartDate", "EndDate", }); internal_static_monitoring_KpiId_descriptor = - getDescriptor().getMessageTypes().get(3); + getDescriptor().getMessageTypes().get(5); internal_static_monitoring_KpiId_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_KpiId_descriptor, new java.lang.String[] { "KpiId", }); internal_static_monitoring_Kpi_descriptor = - getDescriptor().getMessageTypes().get(4); + getDescriptor().getMessageTypes().get(6); internal_static_monitoring_Kpi_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_Kpi_descriptor, new java.lang.String[] { "KpiId", "Timestamp", "KpiValue", }); internal_static_monitoring_KpiValueRange_descriptor = - getDescriptor().getMessageTypes().get(5); + getDescriptor().getMessageTypes().get(7); internal_static_monitoring_KpiValueRange_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_KpiValueRange_descriptor, - new java.lang.String[] { "KpiMinValue", "KpiMaxValue", "InRange", "IncludeMinValue", "IncludeMaxValue", }); + new java.lang.String[] { "KpiMinValue", "KpiMaxValue", }); internal_static_monitoring_KpiValue_descriptor = - getDescriptor().getMessageTypes().get(6); + getDescriptor().getMessageTypes().get(8); internal_static_monitoring_KpiValue_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_KpiValue_descriptor, - new java.lang.String[] { "Int32Val", "Uint32Val", "Int64Val", "Uint64Val", "FloatVal", "StringVal", "BoolVal", "Value", }); + new java.lang.String[] { "IntVal", "FloatVal", "StringVal", "BoolVal", "Value", }); internal_static_monitoring_KpiList_descriptor = - getDescriptor().getMessageTypes().get(7); + getDescriptor().getMessageTypes().get(9); internal_static_monitoring_KpiList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_KpiList_descriptor, new java.lang.String[] { "KpiList", }); internal_static_monitoring_KpiDescriptorList_descriptor = - getDescriptor().getMessageTypes().get(8); + getDescriptor().getMessageTypes().get(10); internal_static_monitoring_KpiDescriptorList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_KpiDescriptorList_descriptor, new java.lang.String[] { "KpiDescriptorList", }); internal_static_monitoring_SubsDescriptor_descriptor = - getDescriptor().getMessageTypes().get(9); + getDescriptor().getMessageTypes().get(11); internal_static_monitoring_SubsDescriptor_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_SubsDescriptor_descriptor, - new java.lang.String[] { "SubsId", "KpiId", "SamplingDurationS", "SamplingIntervalS", "StartTimestamp", "EndTimestamp", }); + new java.lang.String[] { "KpiId", "SamplingDurationS", "SamplingIntervalS", "StartDate", "EndDate", }); internal_static_monitoring_SubscriptionID_descriptor = - getDescriptor().getMessageTypes().get(10); + getDescriptor().getMessageTypes().get(12); internal_static_monitoring_SubscriptionID_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_SubscriptionID_descriptor, new java.lang.String[] { "SubsId", }); internal_static_monitoring_SubsResponse_descriptor = - getDescriptor().getMessageTypes().get(11); + getDescriptor().getMessageTypes().get(13); internal_static_monitoring_SubsResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_SubsResponse_descriptor, new java.lang.String[] { "SubsId", "KpiList", }); internal_static_monitoring_SubsIDList_descriptor = - getDescriptor().getMessageTypes().get(12); + getDescriptor().getMessageTypes().get(14); internal_static_monitoring_SubsIDList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_SubsIDList_descriptor, new java.lang.String[] { "SubsList", }); internal_static_monitoring_AlarmDescriptor_descriptor = - getDescriptor().getMessageTypes().get(13); + getDescriptor().getMessageTypes().get(15); internal_static_monitoring_AlarmDescriptor_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_AlarmDescriptor_descriptor, - new java.lang.String[] { "AlarmId", "AlarmDescription", "Name", "KpiId", "KpiValueRange", "Timestamp", }); + new java.lang.String[] { "AlarmDescription", "Name", "KpiId", "KpiValueRange", "Timestamp", }); internal_static_monitoring_AlarmID_descriptor = - getDescriptor().getMessageTypes().get(14); + getDescriptor().getMessageTypes().get(16); internal_static_monitoring_AlarmID_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_AlarmID_descriptor, new java.lang.String[] { "AlarmId", }); - internal_static_monitoring_AlarmSubscription_descriptor = - getDescriptor().getMessageTypes().get(15); - internal_static_monitoring_AlarmSubscription_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_monitoring_AlarmSubscription_descriptor, - new java.lang.String[] { "AlarmID", "SubscriptionTimeoutS", "SubscriptionFrequencyMs", }); internal_static_monitoring_AlarmResponse_descriptor = - getDescriptor().getMessageTypes().get(16); + getDescriptor().getMessageTypes().get(17); internal_static_monitoring_AlarmResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_AlarmResponse_descriptor, - new java.lang.String[] { "AlarmId", "Text", "KpiValue", "Timestamp", }); + new java.lang.String[] { "AlarmId", "Text", "KpiValue", }); internal_static_monitoring_AlarmIDList_descriptor = - getDescriptor().getMessageTypes().get(17); + getDescriptor().getMessageTypes().get(18); internal_static_monitoring_AlarmIDList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_AlarmIDList_descriptor, diff --git a/src/policy/target/generated-sources/grpc/monitoring/MonitoringService.java b/src/policy/target/generated-sources/grpc/monitoring/MonitoringService.java index 637260068..f826e1167 100644 --- a/src/policy/target/generated-sources/grpc/monitoring/MonitoringService.java +++ b/src/policy/target/generated-sources/grpc/monitoring/MonitoringService.java @@ -8,14 +8,18 @@ comments = "Source: monitoring.proto") public interface MonitoringService extends MutinyService { - io.smallrye.mutiny.Uni setKpi(monitoring.Monitoring.KpiDescriptor request); + io.smallrye.mutiny.Uni createKpi(monitoring.Monitoring.KpiDescriptor request); - io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request); + io.smallrye.mutiny.Uni editKpiDescriptor(monitoring.Monitoring.EditedKpiDescriptor request); - io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request); + io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request); io.smallrye.mutiny.Uni getKpiDescriptorList(context.ContextOuterClass.Empty request); + io.smallrye.mutiny.Uni createBundleKpi(monitoring.Monitoring.BundleKpiDescriptor request); + + io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request); + io.smallrye.mutiny.Uni includeKpi(monitoring.Monitoring.Kpi request); io.smallrye.mutiny.Uni monitorKpi(monitoring.Monitoring.MonitorKpiRequest request); @@ -26,24 +30,20 @@ public interface MonitoringService extends MutinyService { io.smallrye.mutiny.Uni getSubscriptions(context.ContextOuterClass.Empty request); - io.smallrye.mutiny.Uni deleteSubscription(monitoring.Monitoring.SubscriptionID request); + io.smallrye.mutiny.Uni editKpiSubscription(monitoring.Monitoring.SubsDescriptor request); + + io.smallrye.mutiny.Uni createKpiAlarm(monitoring.Monitoring.AlarmDescriptor request); - io.smallrye.mutiny.Uni setKpiAlarm(monitoring.Monitoring.AlarmDescriptor request); + io.smallrye.mutiny.Uni editKpiAlarm(monitoring.Monitoring.AlarmDescriptor request); io.smallrye.mutiny.Uni getAlarms(context.ContextOuterClass.Empty request); io.smallrye.mutiny.Uni getAlarmDescriptor(monitoring.Monitoring.AlarmID request); - io.smallrye.mutiny.Uni deleteAlarm(monitoring.Monitoring.AlarmID request); - - io.smallrye.mutiny.Uni getInstantKpi(monitoring.Monitoring.KpiId request); - - - io.smallrye.mutiny.Multi setKpiSubscription(monitoring.Monitoring.SubsDescriptor request); - io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmSubscription request); + io.smallrye.mutiny.Multi subscribeKpi(monitoring.Monitoring.SubsDescriptor request); - io.smallrye.mutiny.Multi getStreamKpi(monitoring.Monitoring.KpiId request); + io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmID request); diff --git a/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceBean.java b/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceBean.java index 21f7f48ac..c7f776e7b 100644 --- a/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceBean.java +++ b/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceBean.java @@ -16,25 +16,25 @@ public class MonitoringServiceBean extends MutinyMonitoringServiceGrpc.Monitorin } @Override - public io.smallrye.mutiny.Uni setKpi(monitoring.Monitoring.KpiDescriptor request) { + public io.smallrye.mutiny.Uni createKpi(monitoring.Monitoring.KpiDescriptor request) { try { - return delegate.setKpi(request); + return delegate.createKpi(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request) { + public io.smallrye.mutiny.Uni editKpiDescriptor(monitoring.Monitoring.EditedKpiDescriptor request) { try { - return delegate.deleteKpi(request); + return delegate.editKpiDescriptor(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request) { + public io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request) { try { - return delegate.getKpiDescriptor(request); + return delegate.deleteKpi(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } @@ -48,116 +48,115 @@ public class MonitoringServiceBean extends MutinyMonitoringServiceGrpc.Monitorin } } @Override - public io.smallrye.mutiny.Uni includeKpi(monitoring.Monitoring.Kpi request) { + public io.smallrye.mutiny.Uni createBundleKpi(monitoring.Monitoring.BundleKpiDescriptor request) { try { - return delegate.includeKpi(request); + return delegate.createBundleKpi(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni monitorKpi(monitoring.Monitoring.MonitorKpiRequest request) { + public io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request) { try { - return delegate.monitorKpi(request); + return delegate.getKpiDescriptor(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni queryKpiData(monitoring.Monitoring.KpiQuery request) { + public io.smallrye.mutiny.Uni includeKpi(monitoring.Monitoring.Kpi request) { try { - return delegate.queryKpiData(request); + return delegate.includeKpi(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni getSubsDescriptor(monitoring.Monitoring.SubscriptionID request) { + public io.smallrye.mutiny.Uni monitorKpi(monitoring.Monitoring.MonitorKpiRequest request) { try { - return delegate.getSubsDescriptor(request); + return delegate.monitorKpi(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni getSubscriptions(context.ContextOuterClass.Empty request) { + public io.smallrye.mutiny.Uni queryKpiData(monitoring.Monitoring.KpiQuery request) { try { - return delegate.getSubscriptions(request); + return delegate.queryKpiData(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni deleteSubscription(monitoring.Monitoring.SubscriptionID request) { + public io.smallrye.mutiny.Uni getSubsDescriptor(monitoring.Monitoring.SubscriptionID request) { try { - return delegate.deleteSubscription(request); + return delegate.getSubsDescriptor(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni setKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { + public io.smallrye.mutiny.Uni getSubscriptions(context.ContextOuterClass.Empty request) { try { - return delegate.setKpiAlarm(request); + return delegate.getSubscriptions(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni getAlarms(context.ContextOuterClass.Empty request) { + public io.smallrye.mutiny.Uni editKpiSubscription(monitoring.Monitoring.SubsDescriptor request) { try { - return delegate.getAlarms(request); + return delegate.editKpiSubscription(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni getAlarmDescriptor(monitoring.Monitoring.AlarmID request) { + public io.smallrye.mutiny.Uni createKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { try { - return delegate.getAlarmDescriptor(request); + return delegate.createKpiAlarm(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni deleteAlarm(monitoring.Monitoring.AlarmID request) { + public io.smallrye.mutiny.Uni editKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { try { - return delegate.deleteAlarm(request); + return delegate.editKpiAlarm(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Uni getInstantKpi(monitoring.Monitoring.KpiId request) { + public io.smallrye.mutiny.Uni getAlarms(context.ContextOuterClass.Empty request) { try { - return delegate.getInstantKpi(request); + return delegate.getAlarms(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } - @Override - public io.smallrye.mutiny.Multi setKpiSubscription(monitoring.Monitoring.SubsDescriptor request) { + public io.smallrye.mutiny.Uni getAlarmDescriptor(monitoring.Monitoring.AlarmID request) { try { - return delegate.setKpiSubscription(request); + return delegate.getAlarmDescriptor(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmSubscription request) { + public io.smallrye.mutiny.Multi subscribeKpi(monitoring.Monitoring.SubsDescriptor request) { try { - return delegate.getAlarmResponseStream(request); + return delegate.subscribeKpi(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } } @Override - public io.smallrye.mutiny.Multi getStreamKpi(monitoring.Monitoring.KpiId request) { + public io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmID request) { try { - return delegate.getStreamKpi(request); + return delegate.getAlarmResponseStream(request); } catch (UnsupportedOperationException e) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } diff --git a/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceClient.java b/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceClient.java index 6b6dc3864..35c98e8ff 100644 --- a/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceClient.java +++ b/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceClient.java @@ -21,22 +21,30 @@ public class MonitoringServiceClient implements MonitoringService, MutinyClient< } @Override - public io.smallrye.mutiny.Uni setKpi(monitoring.Monitoring.KpiDescriptor request) { - return stub.setKpi(request); + public io.smallrye.mutiny.Uni createKpi(monitoring.Monitoring.KpiDescriptor request) { + return stub.createKpi(request); } @Override - public io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request) { - return stub.deleteKpi(request); + public io.smallrye.mutiny.Uni editKpiDescriptor(monitoring.Monitoring.EditedKpiDescriptor request) { + return stub.editKpiDescriptor(request); } @Override - public io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request) { - return stub.getKpiDescriptor(request); + public io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request) { + return stub.deleteKpi(request); } @Override public io.smallrye.mutiny.Uni getKpiDescriptorList(context.ContextOuterClass.Empty request) { return stub.getKpiDescriptorList(request); } @Override + public io.smallrye.mutiny.Uni createBundleKpi(monitoring.Monitoring.BundleKpiDescriptor request) { + return stub.createBundleKpi(request); + } + @Override + public io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request) { + return stub.getKpiDescriptor(request); + } + @Override public io.smallrye.mutiny.Uni includeKpi(monitoring.Monitoring.Kpi request) { return stub.includeKpi(request); } @@ -57,12 +65,16 @@ public class MonitoringServiceClient implements MonitoringService, MutinyClient< return stub.getSubscriptions(request); } @Override - public io.smallrye.mutiny.Uni deleteSubscription(monitoring.Monitoring.SubscriptionID request) { - return stub.deleteSubscription(request); + public io.smallrye.mutiny.Uni editKpiSubscription(monitoring.Monitoring.SubsDescriptor request) { + return stub.editKpiSubscription(request); + } + @Override + public io.smallrye.mutiny.Uni createKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { + return stub.createKpiAlarm(request); } @Override - public io.smallrye.mutiny.Uni setKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { - return stub.setKpiAlarm(request); + public io.smallrye.mutiny.Uni editKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { + return stub.editKpiAlarm(request); } @Override public io.smallrye.mutiny.Uni getAlarms(context.ContextOuterClass.Empty request) { @@ -72,28 +84,15 @@ public class MonitoringServiceClient implements MonitoringService, MutinyClient< public io.smallrye.mutiny.Uni getAlarmDescriptor(monitoring.Monitoring.AlarmID request) { return stub.getAlarmDescriptor(request); } - @Override - public io.smallrye.mutiny.Uni deleteAlarm(monitoring.Monitoring.AlarmID request) { - return stub.deleteAlarm(request); - } - @Override - public io.smallrye.mutiny.Uni getInstantKpi(monitoring.Monitoring.KpiId request) { - return stub.getInstantKpi(request); - } @Override - public io.smallrye.mutiny.Multi setKpiSubscription(monitoring.Monitoring.SubsDescriptor request) { - return stub.setKpiSubscription(request); + public io.smallrye.mutiny.Multi subscribeKpi(monitoring.Monitoring.SubsDescriptor request) { + return stub.subscribeKpi(request); } @Override - public io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmSubscription request) { + public io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmID request) { return stub.getAlarmResponseStream(request); } - @Override - public io.smallrye.mutiny.Multi getStreamKpi(monitoring.Monitoring.KpiId request) { - return stub.getStreamKpi(request); - } - } \ No newline at end of file diff --git a/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceGrpc.java b/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceGrpc.java index fe92a7814..d4ae3510a 100644 --- a/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceGrpc.java +++ b/src/policy/target/generated-sources/grpc/monitoring/MonitoringServiceGrpc.java @@ -15,96 +15,96 @@ public final class MonitoringServiceGrpc { // Static method descriptors that strictly reflect the proto. private static volatile io.grpc.MethodDescriptor getSetKpiMethod; + monitoring.Monitoring.KpiId> getCreateKpiMethod; @io.grpc.stub.annotations.RpcMethod( - fullMethodName = SERVICE_NAME + '/' + "SetKpi", + fullMethodName = SERVICE_NAME + '/' + "CreateKpi", requestType = monitoring.Monitoring.KpiDescriptor.class, responseType = monitoring.Monitoring.KpiId.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor getSetKpiMethod() { - io.grpc.MethodDescriptor getSetKpiMethod; - if ((getSetKpiMethod = MonitoringServiceGrpc.getSetKpiMethod) == null) { + monitoring.Monitoring.KpiId> getCreateKpiMethod() { + io.grpc.MethodDescriptor getCreateKpiMethod; + if ((getCreateKpiMethod = MonitoringServiceGrpc.getCreateKpiMethod) == null) { synchronized (MonitoringServiceGrpc.class) { - if ((getSetKpiMethod = MonitoringServiceGrpc.getSetKpiMethod) == null) { - MonitoringServiceGrpc.getSetKpiMethod = getSetKpiMethod = + if ((getCreateKpiMethod = MonitoringServiceGrpc.getCreateKpiMethod) == null) { + MonitoringServiceGrpc.getCreateKpiMethod = getCreateKpiMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName(SERVICE_NAME, "SetKpi")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CreateKpi")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( monitoring.Monitoring.KpiDescriptor.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( monitoring.Monitoring.KpiId.getDefaultInstance())) - .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("SetKpi")) + .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("CreateKpi")) .build(); } } } - return getSetKpiMethod; + return getCreateKpiMethod; } - private static volatile io.grpc.MethodDescriptor getDeleteKpiMethod; + private static volatile io.grpc.MethodDescriptor getEditKpiDescriptorMethod; @io.grpc.stub.annotations.RpcMethod( - fullMethodName = SERVICE_NAME + '/' + "DeleteKpi", - requestType = monitoring.Monitoring.KpiId.class, + fullMethodName = SERVICE_NAME + '/' + "EditKpiDescriptor", + requestType = monitoring.Monitoring.EditedKpiDescriptor.class, responseType = context.ContextOuterClass.Empty.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getDeleteKpiMethod() { - io.grpc.MethodDescriptor getDeleteKpiMethod; - if ((getDeleteKpiMethod = MonitoringServiceGrpc.getDeleteKpiMethod) == null) { + public static io.grpc.MethodDescriptor getEditKpiDescriptorMethod() { + io.grpc.MethodDescriptor getEditKpiDescriptorMethod; + if ((getEditKpiDescriptorMethod = MonitoringServiceGrpc.getEditKpiDescriptorMethod) == null) { synchronized (MonitoringServiceGrpc.class) { - if ((getDeleteKpiMethod = MonitoringServiceGrpc.getDeleteKpiMethod) == null) { - MonitoringServiceGrpc.getDeleteKpiMethod = getDeleteKpiMethod = - io.grpc.MethodDescriptor.newBuilder() + if ((getEditKpiDescriptorMethod = MonitoringServiceGrpc.getEditKpiDescriptorMethod) == null) { + MonitoringServiceGrpc.getEditKpiDescriptorMethod = getEditKpiDescriptorMethod = + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName(SERVICE_NAME, "DeleteKpi")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "EditKpiDescriptor")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - monitoring.Monitoring.KpiId.getDefaultInstance())) + monitoring.Monitoring.EditedKpiDescriptor.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( context.ContextOuterClass.Empty.getDefaultInstance())) - .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("DeleteKpi")) + .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("EditKpiDescriptor")) .build(); } } } - return getDeleteKpiMethod; + return getEditKpiDescriptorMethod; } private static volatile io.grpc.MethodDescriptor getGetKpiDescriptorMethod; + context.ContextOuterClass.Empty> getDeleteKpiMethod; @io.grpc.stub.annotations.RpcMethod( - fullMethodName = SERVICE_NAME + '/' + "GetKpiDescriptor", + fullMethodName = SERVICE_NAME + '/' + "DeleteKpi", requestType = monitoring.Monitoring.KpiId.class, - responseType = monitoring.Monitoring.KpiDescriptor.class, + responseType = context.ContextOuterClass.Empty.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor getGetKpiDescriptorMethod() { - io.grpc.MethodDescriptor getGetKpiDescriptorMethod; - if ((getGetKpiDescriptorMethod = MonitoringServiceGrpc.getGetKpiDescriptorMethod) == null) { + context.ContextOuterClass.Empty> getDeleteKpiMethod() { + io.grpc.MethodDescriptor getDeleteKpiMethod; + if ((getDeleteKpiMethod = MonitoringServiceGrpc.getDeleteKpiMethod) == null) { synchronized (MonitoringServiceGrpc.class) { - if ((getGetKpiDescriptorMethod = MonitoringServiceGrpc.getGetKpiDescriptorMethod) == null) { - MonitoringServiceGrpc.getGetKpiDescriptorMethod = getGetKpiDescriptorMethod = - io.grpc.MethodDescriptor.newBuilder() + if ((getDeleteKpiMethod = MonitoringServiceGrpc.getDeleteKpiMethod) == null) { + MonitoringServiceGrpc.getDeleteKpiMethod = getDeleteKpiMethod = + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetKpiDescriptor")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "DeleteKpi")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( monitoring.Monitoring.KpiId.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - monitoring.Monitoring.KpiDescriptor.getDefaultInstance())) - .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("GetKpiDescriptor")) + context.ContextOuterClass.Empty.getDefaultInstance())) + .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("DeleteKpi")) .build(); } } } - return getGetKpiDescriptorMethod; + return getDeleteKpiMethod; } private static volatile io.grpc.MethodDescriptor getCreateBundleKpiMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "CreateBundleKpi", + requestType = monitoring.Monitoring.BundleKpiDescriptor.class, + responseType = monitoring.Monitoring.KpiId.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor getCreateBundleKpiMethod() { + io.grpc.MethodDescriptor getCreateBundleKpiMethod; + if ((getCreateBundleKpiMethod = MonitoringServiceGrpc.getCreateBundleKpiMethod) == null) { + synchronized (MonitoringServiceGrpc.class) { + if ((getCreateBundleKpiMethod = MonitoringServiceGrpc.getCreateBundleKpiMethod) == null) { + MonitoringServiceGrpc.getCreateBundleKpiMethod = getCreateBundleKpiMethod = + io.grpc.MethodDescriptor.newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CreateBundleKpi")) + .setSampledToLocalTracing(true) + .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + monitoring.Monitoring.BundleKpiDescriptor.getDefaultInstance())) + .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + monitoring.Monitoring.KpiId.getDefaultInstance())) + .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("CreateBundleKpi")) + .build(); + } + } + } + return getCreateBundleKpiMethod; + } + + private static volatile io.grpc.MethodDescriptor getGetKpiDescriptorMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "GetKpiDescriptor", + requestType = monitoring.Monitoring.KpiId.class, + responseType = monitoring.Monitoring.KpiDescriptor.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor getGetKpiDescriptorMethod() { + io.grpc.MethodDescriptor getGetKpiDescriptorMethod; + if ((getGetKpiDescriptorMethod = MonitoringServiceGrpc.getGetKpiDescriptorMethod) == null) { + synchronized (MonitoringServiceGrpc.class) { + if ((getGetKpiDescriptorMethod = MonitoringServiceGrpc.getGetKpiDescriptorMethod) == null) { + MonitoringServiceGrpc.getGetKpiDescriptorMethod = getGetKpiDescriptorMethod = + io.grpc.MethodDescriptor.newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetKpiDescriptor")) + .setSampledToLocalTracing(true) + .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + monitoring.Monitoring.KpiId.getDefaultInstance())) + .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + monitoring.Monitoring.KpiDescriptor.getDefaultInstance())) + .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("GetKpiDescriptor")) + .build(); + } + } + } + return getGetKpiDescriptorMethod; + } + private static volatile io.grpc.MethodDescriptor getIncludeKpiMethod; @@ -232,34 +294,34 @@ public final class MonitoringServiceGrpc { } private static volatile io.grpc.MethodDescriptor getSetKpiSubscriptionMethod; + monitoring.Monitoring.KpiList> getSubscribeKpiMethod; @io.grpc.stub.annotations.RpcMethod( - fullMethodName = SERVICE_NAME + '/' + "SetKpiSubscription", + fullMethodName = SERVICE_NAME + '/' + "SubscribeKpi", requestType = monitoring.Monitoring.SubsDescriptor.class, responseType = monitoring.Monitoring.KpiList.class, methodType = io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) public static io.grpc.MethodDescriptor getSetKpiSubscriptionMethod() { - io.grpc.MethodDescriptor getSetKpiSubscriptionMethod; - if ((getSetKpiSubscriptionMethod = MonitoringServiceGrpc.getSetKpiSubscriptionMethod) == null) { + monitoring.Monitoring.KpiList> getSubscribeKpiMethod() { + io.grpc.MethodDescriptor getSubscribeKpiMethod; + if ((getSubscribeKpiMethod = MonitoringServiceGrpc.getSubscribeKpiMethod) == null) { synchronized (MonitoringServiceGrpc.class) { - if ((getSetKpiSubscriptionMethod = MonitoringServiceGrpc.getSetKpiSubscriptionMethod) == null) { - MonitoringServiceGrpc.getSetKpiSubscriptionMethod = getSetKpiSubscriptionMethod = + if ((getSubscribeKpiMethod = MonitoringServiceGrpc.getSubscribeKpiMethod) == null) { + MonitoringServiceGrpc.getSubscribeKpiMethod = getSubscribeKpiMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) - .setFullMethodName(generateFullMethodName(SERVICE_NAME, "SetKpiSubscription")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "SubscribeKpi")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( monitoring.Monitoring.SubsDescriptor.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( monitoring.Monitoring.KpiList.getDefaultInstance())) - .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("SetKpiSubscription")) + .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("SubscribeKpi")) .build(); } } } - return getSetKpiSubscriptionMethod; + return getSubscribeKpiMethod; } private static volatile io.grpc.MethodDescriptor getDeleteSubscriptionMethod; + private static volatile io.grpc.MethodDescriptor getEditKpiSubscriptionMethod; @io.grpc.stub.annotations.RpcMethod( - fullMethodName = SERVICE_NAME + '/' + "DeleteSubscription", - requestType = monitoring.Monitoring.SubscriptionID.class, + fullMethodName = SERVICE_NAME + '/' + "EditKpiSubscription", + requestType = monitoring.Monitoring.SubsDescriptor.class, responseType = context.ContextOuterClass.Empty.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getDeleteSubscriptionMethod() { - io.grpc.MethodDescriptor getDeleteSubscriptionMethod; - if ((getDeleteSubscriptionMethod = MonitoringServiceGrpc.getDeleteSubscriptionMethod) == null) { + public static io.grpc.MethodDescriptor getEditKpiSubscriptionMethod() { + io.grpc.MethodDescriptor getEditKpiSubscriptionMethod; + if ((getEditKpiSubscriptionMethod = MonitoringServiceGrpc.getEditKpiSubscriptionMethod) == null) { synchronized (MonitoringServiceGrpc.class) { - if ((getDeleteSubscriptionMethod = MonitoringServiceGrpc.getDeleteSubscriptionMethod) == null) { - MonitoringServiceGrpc.getDeleteSubscriptionMethod = getDeleteSubscriptionMethod = - io.grpc.MethodDescriptor.newBuilder() + if ((getEditKpiSubscriptionMethod = MonitoringServiceGrpc.getEditKpiSubscriptionMethod) == null) { + MonitoringServiceGrpc.getEditKpiSubscriptionMethod = getEditKpiSubscriptionMethod = + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName(SERVICE_NAME, "DeleteSubscription")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "EditKpiSubscription")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - monitoring.Monitoring.SubscriptionID.getDefaultInstance())) + monitoring.Monitoring.SubsDescriptor.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( context.ContextOuterClass.Empty.getDefaultInstance())) - .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("DeleteSubscription")) + .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("EditKpiSubscription")) .build(); } } } - return getDeleteSubscriptionMethod; + return getEditKpiSubscriptionMethod; } private static volatile io.grpc.MethodDescriptor getSetKpiAlarmMethod; + monitoring.Monitoring.AlarmID> getCreateKpiAlarmMethod; @io.grpc.stub.annotations.RpcMethod( - fullMethodName = SERVICE_NAME + '/' + "SetKpiAlarm", + fullMethodName = SERVICE_NAME + '/' + "CreateKpiAlarm", requestType = monitoring.Monitoring.AlarmDescriptor.class, responseType = monitoring.Monitoring.AlarmID.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor getSetKpiAlarmMethod() { - io.grpc.MethodDescriptor getSetKpiAlarmMethod; - if ((getSetKpiAlarmMethod = MonitoringServiceGrpc.getSetKpiAlarmMethod) == null) { + monitoring.Monitoring.AlarmID> getCreateKpiAlarmMethod() { + io.grpc.MethodDescriptor getCreateKpiAlarmMethod; + if ((getCreateKpiAlarmMethod = MonitoringServiceGrpc.getCreateKpiAlarmMethod) == null) { synchronized (MonitoringServiceGrpc.class) { - if ((getSetKpiAlarmMethod = MonitoringServiceGrpc.getSetKpiAlarmMethod) == null) { - MonitoringServiceGrpc.getSetKpiAlarmMethod = getSetKpiAlarmMethod = + if ((getCreateKpiAlarmMethod = MonitoringServiceGrpc.getCreateKpiAlarmMethod) == null) { + MonitoringServiceGrpc.getCreateKpiAlarmMethod = getCreateKpiAlarmMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName(SERVICE_NAME, "SetKpiAlarm")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CreateKpiAlarm")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( monitoring.Monitoring.AlarmDescriptor.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( monitoring.Monitoring.AlarmID.getDefaultInstance())) - .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("SetKpiAlarm")) + .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("CreateKpiAlarm")) .build(); } } } - return getSetKpiAlarmMethod; + return getCreateKpiAlarmMethod; + } + + private static volatile io.grpc.MethodDescriptor getEditKpiAlarmMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "EditKpiAlarm", + requestType = monitoring.Monitoring.AlarmDescriptor.class, + responseType = context.ContextOuterClass.Empty.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor getEditKpiAlarmMethod() { + io.grpc.MethodDescriptor getEditKpiAlarmMethod; + if ((getEditKpiAlarmMethod = MonitoringServiceGrpc.getEditKpiAlarmMethod) == null) { + synchronized (MonitoringServiceGrpc.class) { + if ((getEditKpiAlarmMethod = MonitoringServiceGrpc.getEditKpiAlarmMethod) == null) { + MonitoringServiceGrpc.getEditKpiAlarmMethod = getEditKpiAlarmMethod = + io.grpc.MethodDescriptor.newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "EditKpiAlarm")) + .setSampledToLocalTracing(true) + .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + monitoring.Monitoring.AlarmDescriptor.getDefaultInstance())) + .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + context.ContextOuterClass.Empty.getDefaultInstance())) + .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("EditKpiAlarm")) + .build(); + } + } + } + return getEditKpiAlarmMethod; } private static volatile io.grpc.MethodDescriptor getGetAlarmResponseStreamMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "GetAlarmResponseStream", - requestType = monitoring.Monitoring.AlarmSubscription.class, + requestType = monitoring.Monitoring.AlarmID.class, responseType = monitoring.Monitoring.AlarmResponse.class, methodType = io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) - public static io.grpc.MethodDescriptor getGetAlarmResponseStreamMethod() { - io.grpc.MethodDescriptor getGetAlarmResponseStreamMethod; + io.grpc.MethodDescriptor getGetAlarmResponseStreamMethod; if ((getGetAlarmResponseStreamMethod = MonitoringServiceGrpc.getGetAlarmResponseStreamMethod) == null) { synchronized (MonitoringServiceGrpc.class) { if ((getGetAlarmResponseStreamMethod = MonitoringServiceGrpc.getGetAlarmResponseStreamMethod) == null) { MonitoringServiceGrpc.getGetAlarmResponseStreamMethod = getGetAlarmResponseStreamMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetAlarmResponseStream")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - monitoring.Monitoring.AlarmSubscription.getDefaultInstance())) + monitoring.Monitoring.AlarmID.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( monitoring.Monitoring.AlarmResponse.getDefaultInstance())) .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("GetAlarmResponseStream")) @@ -479,99 +572,6 @@ public final class MonitoringServiceGrpc { return getGetAlarmResponseStreamMethod; } - private static volatile io.grpc.MethodDescriptor getDeleteAlarmMethod; - - @io.grpc.stub.annotations.RpcMethod( - fullMethodName = SERVICE_NAME + '/' + "DeleteAlarm", - requestType = monitoring.Monitoring.AlarmID.class, - responseType = context.ContextOuterClass.Empty.class, - methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getDeleteAlarmMethod() { - io.grpc.MethodDescriptor getDeleteAlarmMethod; - if ((getDeleteAlarmMethod = MonitoringServiceGrpc.getDeleteAlarmMethod) == null) { - synchronized (MonitoringServiceGrpc.class) { - if ((getDeleteAlarmMethod = MonitoringServiceGrpc.getDeleteAlarmMethod) == null) { - MonitoringServiceGrpc.getDeleteAlarmMethod = getDeleteAlarmMethod = - io.grpc.MethodDescriptor.newBuilder() - .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName(SERVICE_NAME, "DeleteAlarm")) - .setSampledToLocalTracing(true) - .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - monitoring.Monitoring.AlarmID.getDefaultInstance())) - .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - context.ContextOuterClass.Empty.getDefaultInstance())) - .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("DeleteAlarm")) - .build(); - } - } - } - return getDeleteAlarmMethod; - } - - private static volatile io.grpc.MethodDescriptor getGetStreamKpiMethod; - - @io.grpc.stub.annotations.RpcMethod( - fullMethodName = SERVICE_NAME + '/' + "GetStreamKpi", - requestType = monitoring.Monitoring.KpiId.class, - responseType = monitoring.Monitoring.Kpi.class, - methodType = io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) - public static io.grpc.MethodDescriptor getGetStreamKpiMethod() { - io.grpc.MethodDescriptor getGetStreamKpiMethod; - if ((getGetStreamKpiMethod = MonitoringServiceGrpc.getGetStreamKpiMethod) == null) { - synchronized (MonitoringServiceGrpc.class) { - if ((getGetStreamKpiMethod = MonitoringServiceGrpc.getGetStreamKpiMethod) == null) { - MonitoringServiceGrpc.getGetStreamKpiMethod = getGetStreamKpiMethod = - io.grpc.MethodDescriptor.newBuilder() - .setType(io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING) - .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetStreamKpi")) - .setSampledToLocalTracing(true) - .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - monitoring.Monitoring.KpiId.getDefaultInstance())) - .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - monitoring.Monitoring.Kpi.getDefaultInstance())) - .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("GetStreamKpi")) - .build(); - } - } - } - return getGetStreamKpiMethod; - } - - private static volatile io.grpc.MethodDescriptor getGetInstantKpiMethod; - - @io.grpc.stub.annotations.RpcMethod( - fullMethodName = SERVICE_NAME + '/' + "GetInstantKpi", - requestType = monitoring.Monitoring.KpiId.class, - responseType = monitoring.Monitoring.KpiList.class, - methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getGetInstantKpiMethod() { - io.grpc.MethodDescriptor getGetInstantKpiMethod; - if ((getGetInstantKpiMethod = MonitoringServiceGrpc.getGetInstantKpiMethod) == null) { - synchronized (MonitoringServiceGrpc.class) { - if ((getGetInstantKpiMethod = MonitoringServiceGrpc.getGetInstantKpiMethod) == null) { - MonitoringServiceGrpc.getGetInstantKpiMethod = getGetInstantKpiMethod = - io.grpc.MethodDescriptor.newBuilder() - .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetInstantKpi")) - .setSampledToLocalTracing(true) - .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - monitoring.Monitoring.KpiId.getDefaultInstance())) - .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - monitoring.Monitoring.KpiList.getDefaultInstance())) - .setSchemaDescriptor(new MonitoringServiceMethodDescriptorSupplier("GetInstantKpi")) - .build(); - } - } - } - return getGetInstantKpiMethod; - } - /** * Creates a new async stub that supports all call types for the service */ @@ -622,23 +622,23 @@ public final class MonitoringServiceGrpc { /** */ - public void setKpi(monitoring.Monitoring.KpiDescriptor request, + public void createKpi(monitoring.Monitoring.KpiDescriptor request, io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSetKpiMethod(), responseObserver); + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCreateKpiMethod(), responseObserver); } /** */ - public void deleteKpi(monitoring.Monitoring.KpiId request, + public void editKpiDescriptor(monitoring.Monitoring.EditedKpiDescriptor request, io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getDeleteKpiMethod(), responseObserver); + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getEditKpiDescriptorMethod(), responseObserver); } /** */ - public void getKpiDescriptor(monitoring.Monitoring.KpiId request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetKpiDescriptorMethod(), responseObserver); + public void deleteKpi(monitoring.Monitoring.KpiId request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getDeleteKpiMethod(), responseObserver); } /** @@ -648,6 +648,20 @@ public final class MonitoringServiceGrpc { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetKpiDescriptorListMethod(), responseObserver); } + /** + */ + public void createBundleKpi(monitoring.Monitoring.BundleKpiDescriptor request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCreateBundleKpiMethod(), responseObserver); + } + + /** + */ + public void getKpiDescriptor(monitoring.Monitoring.KpiId request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetKpiDescriptorMethod(), responseObserver); + } + /** */ public void includeKpi(monitoring.Monitoring.Kpi request, @@ -671,9 +685,9 @@ public final class MonitoringServiceGrpc { /** */ - public void setKpiSubscription(monitoring.Monitoring.SubsDescriptor request, + public void subscribeKpi(monitoring.Monitoring.SubsDescriptor request, io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSetKpiSubscriptionMethod(), responseObserver); + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSubscribeKpiMethod(), responseObserver); } /** @@ -692,16 +706,23 @@ public final class MonitoringServiceGrpc { /** */ - public void deleteSubscription(monitoring.Monitoring.SubscriptionID request, + public void editKpiSubscription(monitoring.Monitoring.SubsDescriptor request, io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getDeleteSubscriptionMethod(), responseObserver); + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getEditKpiSubscriptionMethod(), responseObserver); } /** */ - public void setKpiAlarm(monitoring.Monitoring.AlarmDescriptor request, + public void createKpiAlarm(monitoring.Monitoring.AlarmDescriptor request, io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSetKpiAlarmMethod(), responseObserver); + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCreateKpiAlarmMethod(), responseObserver); + } + + /** + */ + public void editKpiAlarm(monitoring.Monitoring.AlarmDescriptor request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getEditKpiAlarmMethod(), responseObserver); } /** @@ -720,55 +741,34 @@ public final class MonitoringServiceGrpc { /** */ - public void getAlarmResponseStream(monitoring.Monitoring.AlarmSubscription request, + public void getAlarmResponseStream(monitoring.Monitoring.AlarmID request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetAlarmResponseStreamMethod(), responseObserver); } - /** - */ - public void deleteAlarm(monitoring.Monitoring.AlarmID request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getDeleteAlarmMethod(), responseObserver); - } - - /** - */ - public void getStreamKpi(monitoring.Monitoring.KpiId request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetStreamKpiMethod(), responseObserver); - } - - /** - */ - public void getInstantKpi(monitoring.Monitoring.KpiId request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetInstantKpiMethod(), responseObserver); - } - @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( - getSetKpiMethod(), + getCreateKpiMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< monitoring.Monitoring.KpiDescriptor, monitoring.Monitoring.KpiId>( - this, METHODID_SET_KPI))) + this, METHODID_CREATE_KPI))) .addMethod( - getDeleteKpiMethod(), + getEditKpiDescriptorMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - monitoring.Monitoring.KpiId, + monitoring.Monitoring.EditedKpiDescriptor, context.ContextOuterClass.Empty>( - this, METHODID_DELETE_KPI))) + this, METHODID_EDIT_KPI_DESCRIPTOR))) .addMethod( - getGetKpiDescriptorMethod(), + getDeleteKpiMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< monitoring.Monitoring.KpiId, - monitoring.Monitoring.KpiDescriptor>( - this, METHODID_GET_KPI_DESCRIPTOR))) + context.ContextOuterClass.Empty>( + this, METHODID_DELETE_KPI))) .addMethod( getGetKpiDescriptorListMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( @@ -776,6 +776,20 @@ public final class MonitoringServiceGrpc { context.ContextOuterClass.Empty, monitoring.Monitoring.KpiDescriptorList>( this, METHODID_GET_KPI_DESCRIPTOR_LIST))) + .addMethod( + getCreateBundleKpiMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + monitoring.Monitoring.BundleKpiDescriptor, + monitoring.Monitoring.KpiId>( + this, METHODID_CREATE_BUNDLE_KPI))) + .addMethod( + getGetKpiDescriptorMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + monitoring.Monitoring.KpiId, + monitoring.Monitoring.KpiDescriptor>( + this, METHODID_GET_KPI_DESCRIPTOR))) .addMethod( getIncludeKpiMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( @@ -798,12 +812,12 @@ public final class MonitoringServiceGrpc { monitoring.Monitoring.KpiList>( this, METHODID_QUERY_KPI_DATA))) .addMethod( - getSetKpiSubscriptionMethod(), + getSubscribeKpiMethod(), io.grpc.stub.ServerCalls.asyncServerStreamingCall( new MethodHandlers< monitoring.Monitoring.SubsDescriptor, monitoring.Monitoring.KpiList>( - this, METHODID_SET_KPI_SUBSCRIPTION))) + this, METHODID_SUBSCRIBE_KPI))) .addMethod( getGetSubsDescriptorMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( @@ -819,19 +833,26 @@ public final class MonitoringServiceGrpc { monitoring.Monitoring.SubsIDList>( this, METHODID_GET_SUBSCRIPTIONS))) .addMethod( - getDeleteSubscriptionMethod(), + getEditKpiSubscriptionMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - monitoring.Monitoring.SubscriptionID, + monitoring.Monitoring.SubsDescriptor, context.ContextOuterClass.Empty>( - this, METHODID_DELETE_SUBSCRIPTION))) + this, METHODID_EDIT_KPI_SUBSCRIPTION))) .addMethod( - getSetKpiAlarmMethod(), + getCreateKpiAlarmMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< monitoring.Monitoring.AlarmDescriptor, monitoring.Monitoring.AlarmID>( - this, METHODID_SET_KPI_ALARM))) + this, METHODID_CREATE_KPI_ALARM))) + .addMethod( + getEditKpiAlarmMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + monitoring.Monitoring.AlarmDescriptor, + context.ContextOuterClass.Empty>( + this, METHODID_EDIT_KPI_ALARM))) .addMethod( getGetAlarmsMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( @@ -850,30 +871,9 @@ public final class MonitoringServiceGrpc { getGetAlarmResponseStreamMethod(), io.grpc.stub.ServerCalls.asyncServerStreamingCall( new MethodHandlers< - monitoring.Monitoring.AlarmSubscription, + monitoring.Monitoring.AlarmID, monitoring.Monitoring.AlarmResponse>( this, METHODID_GET_ALARM_RESPONSE_STREAM))) - .addMethod( - getDeleteAlarmMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - monitoring.Monitoring.AlarmID, - context.ContextOuterClass.Empty>( - this, METHODID_DELETE_ALARM))) - .addMethod( - getGetStreamKpiMethod(), - io.grpc.stub.ServerCalls.asyncServerStreamingCall( - new MethodHandlers< - monitoring.Monitoring.KpiId, - monitoring.Monitoring.Kpi>( - this, METHODID_GET_STREAM_KPI))) - .addMethod( - getGetInstantKpiMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - monitoring.Monitoring.KpiId, - monitoring.Monitoring.KpiList>( - this, METHODID_GET_INSTANT_KPI))) .build(); } } @@ -894,26 +894,26 @@ public final class MonitoringServiceGrpc { /** */ - public void setKpi(monitoring.Monitoring.KpiDescriptor request, + public void createKpi(monitoring.Monitoring.KpiDescriptor request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( - getChannel().newCall(getSetKpiMethod(), getCallOptions()), request, responseObserver); + getChannel().newCall(getCreateKpiMethod(), getCallOptions()), request, responseObserver); } /** */ - public void deleteKpi(monitoring.Monitoring.KpiId request, + public void editKpiDescriptor(monitoring.Monitoring.EditedKpiDescriptor request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( - getChannel().newCall(getDeleteKpiMethod(), getCallOptions()), request, responseObserver); + getChannel().newCall(getEditKpiDescriptorMethod(), getCallOptions()), request, responseObserver); } /** */ - public void getKpiDescriptor(monitoring.Monitoring.KpiId request, - io.grpc.stub.StreamObserver responseObserver) { + public void deleteKpi(monitoring.Monitoring.KpiId request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( - getChannel().newCall(getGetKpiDescriptorMethod(), getCallOptions()), request, responseObserver); + getChannel().newCall(getDeleteKpiMethod(), getCallOptions()), request, responseObserver); } /** @@ -924,6 +924,22 @@ public final class MonitoringServiceGrpc { getChannel().newCall(getGetKpiDescriptorListMethod(), getCallOptions()), request, responseObserver); } + /** + */ + public void createBundleKpi(monitoring.Monitoring.BundleKpiDescriptor request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getCreateBundleKpiMethod(), getCallOptions()), request, responseObserver); + } + + /** + */ + public void getKpiDescriptor(monitoring.Monitoring.KpiId request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getGetKpiDescriptorMethod(), getCallOptions()), request, responseObserver); + } + /** */ public void includeKpi(monitoring.Monitoring.Kpi request, @@ -950,10 +966,10 @@ public final class MonitoringServiceGrpc { /** */ - public void setKpiSubscription(monitoring.Monitoring.SubsDescriptor request, + public void subscribeKpi(monitoring.Monitoring.SubsDescriptor request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( - getChannel().newCall(getSetKpiSubscriptionMethod(), getCallOptions()), request, responseObserver); + getChannel().newCall(getSubscribeKpiMethod(), getCallOptions()), request, responseObserver); } /** @@ -974,18 +990,26 @@ public final class MonitoringServiceGrpc { /** */ - public void deleteSubscription(monitoring.Monitoring.SubscriptionID request, + public void editKpiSubscription(monitoring.Monitoring.SubsDescriptor request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( - getChannel().newCall(getDeleteSubscriptionMethod(), getCallOptions()), request, responseObserver); + getChannel().newCall(getEditKpiSubscriptionMethod(), getCallOptions()), request, responseObserver); } /** */ - public void setKpiAlarm(monitoring.Monitoring.AlarmDescriptor request, + public void createKpiAlarm(monitoring.Monitoring.AlarmDescriptor request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( - getChannel().newCall(getSetKpiAlarmMethod(), getCallOptions()), request, responseObserver); + getChannel().newCall(getCreateKpiAlarmMethod(), getCallOptions()), request, responseObserver); + } + + /** + */ + public void editKpiAlarm(monitoring.Monitoring.AlarmDescriptor request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getEditKpiAlarmMethod(), getCallOptions()), request, responseObserver); } /** @@ -1006,35 +1030,11 @@ public final class MonitoringServiceGrpc { /** */ - public void getAlarmResponseStream(monitoring.Monitoring.AlarmSubscription request, + public void getAlarmResponseStream(monitoring.Monitoring.AlarmID request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncServerStreamingCall( getChannel().newCall(getGetAlarmResponseStreamMethod(), getCallOptions()), request, responseObserver); } - - /** - */ - public void deleteAlarm(monitoring.Monitoring.AlarmID request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ClientCalls.asyncUnaryCall( - getChannel().newCall(getDeleteAlarmMethod(), getCallOptions()), request, responseObserver); - } - - /** - */ - public void getStreamKpi(monitoring.Monitoring.KpiId request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ClientCalls.asyncServerStreamingCall( - getChannel().newCall(getGetStreamKpiMethod(), getCallOptions()), request, responseObserver); - } - - /** - */ - public void getInstantKpi(monitoring.Monitoring.KpiId request, - io.grpc.stub.StreamObserver responseObserver) { - io.grpc.stub.ClientCalls.asyncUnaryCall( - getChannel().newCall(getGetInstantKpiMethod(), getCallOptions()), request, responseObserver); - } } /** @@ -1053,23 +1053,23 @@ public final class MonitoringServiceGrpc { /** */ - public monitoring.Monitoring.KpiId setKpi(monitoring.Monitoring.KpiDescriptor request) { + public monitoring.Monitoring.KpiId createKpi(monitoring.Monitoring.KpiDescriptor request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( - getChannel(), getSetKpiMethod(), getCallOptions(), request); + getChannel(), getCreateKpiMethod(), getCallOptions(), request); } /** */ - public context.ContextOuterClass.Empty deleteKpi(monitoring.Monitoring.KpiId request) { + public context.ContextOuterClass.Empty editKpiDescriptor(monitoring.Monitoring.EditedKpiDescriptor request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( - getChannel(), getDeleteKpiMethod(), getCallOptions(), request); + getChannel(), getEditKpiDescriptorMethod(), getCallOptions(), request); } /** */ - public monitoring.Monitoring.KpiDescriptor getKpiDescriptor(monitoring.Monitoring.KpiId request) { + public context.ContextOuterClass.Empty deleteKpi(monitoring.Monitoring.KpiId request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( - getChannel(), getGetKpiDescriptorMethod(), getCallOptions(), request); + getChannel(), getDeleteKpiMethod(), getCallOptions(), request); } /** @@ -1079,6 +1079,20 @@ public final class MonitoringServiceGrpc { getChannel(), getGetKpiDescriptorListMethod(), getCallOptions(), request); } + /** + */ + public monitoring.Monitoring.KpiId createBundleKpi(monitoring.Monitoring.BundleKpiDescriptor request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getCreateBundleKpiMethod(), getCallOptions(), request); + } + + /** + */ + public monitoring.Monitoring.KpiDescriptor getKpiDescriptor(monitoring.Monitoring.KpiId request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getGetKpiDescriptorMethod(), getCallOptions(), request); + } + /** */ public context.ContextOuterClass.Empty includeKpi(monitoring.Monitoring.Kpi request) { @@ -1102,10 +1116,10 @@ public final class MonitoringServiceGrpc { /** */ - public java.util.Iterator setKpiSubscription( + public java.util.Iterator subscribeKpi( monitoring.Monitoring.SubsDescriptor request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( - getChannel(), getSetKpiSubscriptionMethod(), getCallOptions(), request); + getChannel(), getSubscribeKpiMethod(), getCallOptions(), request); } /** @@ -1124,16 +1138,23 @@ public final class MonitoringServiceGrpc { /** */ - public context.ContextOuterClass.Empty deleteSubscription(monitoring.Monitoring.SubscriptionID request) { + public context.ContextOuterClass.Empty editKpiSubscription(monitoring.Monitoring.SubsDescriptor request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( - getChannel(), getDeleteSubscriptionMethod(), getCallOptions(), request); + getChannel(), getEditKpiSubscriptionMethod(), getCallOptions(), request); } /** */ - public monitoring.Monitoring.AlarmID setKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { + public monitoring.Monitoring.AlarmID createKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( - getChannel(), getSetKpiAlarmMethod(), getCallOptions(), request); + getChannel(), getCreateKpiAlarmMethod(), getCallOptions(), request); + } + + /** + */ + public context.ContextOuterClass.Empty editKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getEditKpiAlarmMethod(), getCallOptions(), request); } /** @@ -1153,32 +1174,10 @@ public final class MonitoringServiceGrpc { /** */ public java.util.Iterator getAlarmResponseStream( - monitoring.Monitoring.AlarmSubscription request) { + monitoring.Monitoring.AlarmID request) { return io.grpc.stub.ClientCalls.blockingServerStreamingCall( getChannel(), getGetAlarmResponseStreamMethod(), getCallOptions(), request); } - - /** - */ - public context.ContextOuterClass.Empty deleteAlarm(monitoring.Monitoring.AlarmID request) { - return io.grpc.stub.ClientCalls.blockingUnaryCall( - getChannel(), getDeleteAlarmMethod(), getCallOptions(), request); - } - - /** - */ - public java.util.Iterator getStreamKpi( - monitoring.Monitoring.KpiId request) { - return io.grpc.stub.ClientCalls.blockingServerStreamingCall( - getChannel(), getGetStreamKpiMethod(), getCallOptions(), request); - } - - /** - */ - public monitoring.Monitoring.KpiList getInstantKpi(monitoring.Monitoring.KpiId request) { - return io.grpc.stub.ClientCalls.blockingUnaryCall( - getChannel(), getGetInstantKpiMethod(), getCallOptions(), request); - } } /** @@ -1197,26 +1196,26 @@ public final class MonitoringServiceGrpc { /** */ - public com.google.common.util.concurrent.ListenableFuture setKpi( + public com.google.common.util.concurrent.ListenableFuture createKpi( monitoring.Monitoring.KpiDescriptor request) { return io.grpc.stub.ClientCalls.futureUnaryCall( - getChannel().newCall(getSetKpiMethod(), getCallOptions()), request); + getChannel().newCall(getCreateKpiMethod(), getCallOptions()), request); } /** */ - public com.google.common.util.concurrent.ListenableFuture deleteKpi( - monitoring.Monitoring.KpiId request) { + public com.google.common.util.concurrent.ListenableFuture editKpiDescriptor( + monitoring.Monitoring.EditedKpiDescriptor request) { return io.grpc.stub.ClientCalls.futureUnaryCall( - getChannel().newCall(getDeleteKpiMethod(), getCallOptions()), request); + getChannel().newCall(getEditKpiDescriptorMethod(), getCallOptions()), request); } /** */ - public com.google.common.util.concurrent.ListenableFuture getKpiDescriptor( + public com.google.common.util.concurrent.ListenableFuture deleteKpi( monitoring.Monitoring.KpiId request) { return io.grpc.stub.ClientCalls.futureUnaryCall( - getChannel().newCall(getGetKpiDescriptorMethod(), getCallOptions()), request); + getChannel().newCall(getDeleteKpiMethod(), getCallOptions()), request); } /** @@ -1227,6 +1226,22 @@ public final class MonitoringServiceGrpc { getChannel().newCall(getGetKpiDescriptorListMethod(), getCallOptions()), request); } + /** + */ + public com.google.common.util.concurrent.ListenableFuture createBundleKpi( + monitoring.Monitoring.BundleKpiDescriptor request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getCreateBundleKpiMethod(), getCallOptions()), request); + } + + /** + */ + public com.google.common.util.concurrent.ListenableFuture getKpiDescriptor( + monitoring.Monitoring.KpiId request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getGetKpiDescriptorMethod(), getCallOptions()), request); + } + /** */ public com.google.common.util.concurrent.ListenableFuture includeKpi( @@ -1269,71 +1284,63 @@ public final class MonitoringServiceGrpc { /** */ - public com.google.common.util.concurrent.ListenableFuture deleteSubscription( - monitoring.Monitoring.SubscriptionID request) { + public com.google.common.util.concurrent.ListenableFuture editKpiSubscription( + monitoring.Monitoring.SubsDescriptor request) { return io.grpc.stub.ClientCalls.futureUnaryCall( - getChannel().newCall(getDeleteSubscriptionMethod(), getCallOptions()), request); + getChannel().newCall(getEditKpiSubscriptionMethod(), getCallOptions()), request); } /** */ - public com.google.common.util.concurrent.ListenableFuture setKpiAlarm( + public com.google.common.util.concurrent.ListenableFuture createKpiAlarm( monitoring.Monitoring.AlarmDescriptor request) { return io.grpc.stub.ClientCalls.futureUnaryCall( - getChannel().newCall(getSetKpiAlarmMethod(), getCallOptions()), request); + getChannel().newCall(getCreateKpiAlarmMethod(), getCallOptions()), request); } /** */ - public com.google.common.util.concurrent.ListenableFuture getAlarms( - context.ContextOuterClass.Empty request) { + public com.google.common.util.concurrent.ListenableFuture editKpiAlarm( + monitoring.Monitoring.AlarmDescriptor request) { return io.grpc.stub.ClientCalls.futureUnaryCall( - getChannel().newCall(getGetAlarmsMethod(), getCallOptions()), request); + getChannel().newCall(getEditKpiAlarmMethod(), getCallOptions()), request); } /** */ - public com.google.common.util.concurrent.ListenableFuture getAlarmDescriptor( - monitoring.Monitoring.AlarmID request) { + public com.google.common.util.concurrent.ListenableFuture getAlarms( + context.ContextOuterClass.Empty request) { return io.grpc.stub.ClientCalls.futureUnaryCall( - getChannel().newCall(getGetAlarmDescriptorMethod(), getCallOptions()), request); + getChannel().newCall(getGetAlarmsMethod(), getCallOptions()), request); } /** */ - public com.google.common.util.concurrent.ListenableFuture deleteAlarm( + public com.google.common.util.concurrent.ListenableFuture getAlarmDescriptor( monitoring.Monitoring.AlarmID request) { return io.grpc.stub.ClientCalls.futureUnaryCall( - getChannel().newCall(getDeleteAlarmMethod(), getCallOptions()), request); - } - - /** - */ - public com.google.common.util.concurrent.ListenableFuture getInstantKpi( - monitoring.Monitoring.KpiId request) { - return io.grpc.stub.ClientCalls.futureUnaryCall( - getChannel().newCall(getGetInstantKpiMethod(), getCallOptions()), request); + getChannel().newCall(getGetAlarmDescriptorMethod(), getCallOptions()), request); } } - private static final int METHODID_SET_KPI = 0; - private static final int METHODID_DELETE_KPI = 1; - private static final int METHODID_GET_KPI_DESCRIPTOR = 2; + private static final int METHODID_CREATE_KPI = 0; + private static final int METHODID_EDIT_KPI_DESCRIPTOR = 1; + private static final int METHODID_DELETE_KPI = 2; private static final int METHODID_GET_KPI_DESCRIPTOR_LIST = 3; - private static final int METHODID_INCLUDE_KPI = 4; - private static final int METHODID_MONITOR_KPI = 5; - private static final int METHODID_QUERY_KPI_DATA = 6; - private static final int METHODID_SET_KPI_SUBSCRIPTION = 7; - private static final int METHODID_GET_SUBS_DESCRIPTOR = 8; - private static final int METHODID_GET_SUBSCRIPTIONS = 9; - private static final int METHODID_DELETE_SUBSCRIPTION = 10; - private static final int METHODID_SET_KPI_ALARM = 11; - private static final int METHODID_GET_ALARMS = 12; - private static final int METHODID_GET_ALARM_DESCRIPTOR = 13; - private static final int METHODID_GET_ALARM_RESPONSE_STREAM = 14; - private static final int METHODID_DELETE_ALARM = 15; - private static final int METHODID_GET_STREAM_KPI = 16; - private static final int METHODID_GET_INSTANT_KPI = 17; + private static final int METHODID_CREATE_BUNDLE_KPI = 4; + private static final int METHODID_GET_KPI_DESCRIPTOR = 5; + private static final int METHODID_INCLUDE_KPI = 6; + private static final int METHODID_MONITOR_KPI = 7; + private static final int METHODID_QUERY_KPI_DATA = 8; + private static final int METHODID_SUBSCRIBE_KPI = 9; + private static final int METHODID_GET_SUBS_DESCRIPTOR = 10; + private static final int METHODID_GET_SUBSCRIPTIONS = 11; + private static final int METHODID_EDIT_KPI_SUBSCRIPTION = 12; + private static final int METHODID_CREATE_KPI_ALARM = 13; + private static final int METHODID_EDIT_KPI_ALARM = 14; + private static final int METHODID_GET_ALARMS = 15; + private static final int METHODID_GET_ALARM_DESCRIPTOR = 16; + private static final int METHODID_GET_ALARM_RESPONSE_STREAM = 17; private static final class MethodHandlers implements io.grpc.stub.ServerCalls.UnaryMethod, @@ -1352,22 +1359,30 @@ public final class MonitoringServiceGrpc { @java.lang.SuppressWarnings("unchecked") public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) { switch (methodId) { - case METHODID_SET_KPI: - serviceImpl.setKpi((monitoring.Monitoring.KpiDescriptor) request, + case METHODID_CREATE_KPI: + serviceImpl.createKpi((monitoring.Monitoring.KpiDescriptor) request, (io.grpc.stub.StreamObserver) responseObserver); break; + case METHODID_EDIT_KPI_DESCRIPTOR: + serviceImpl.editKpiDescriptor((monitoring.Monitoring.EditedKpiDescriptor) request, + (io.grpc.stub.StreamObserver) responseObserver); + break; case METHODID_DELETE_KPI: serviceImpl.deleteKpi((monitoring.Monitoring.KpiId) request, (io.grpc.stub.StreamObserver) responseObserver); break; - case METHODID_GET_KPI_DESCRIPTOR: - serviceImpl.getKpiDescriptor((monitoring.Monitoring.KpiId) request, - (io.grpc.stub.StreamObserver) responseObserver); - break; case METHODID_GET_KPI_DESCRIPTOR_LIST: serviceImpl.getKpiDescriptorList((context.ContextOuterClass.Empty) request, (io.grpc.stub.StreamObserver) responseObserver); break; + case METHODID_CREATE_BUNDLE_KPI: + serviceImpl.createBundleKpi((monitoring.Monitoring.BundleKpiDescriptor) request, + (io.grpc.stub.StreamObserver) responseObserver); + break; + case METHODID_GET_KPI_DESCRIPTOR: + serviceImpl.getKpiDescriptor((monitoring.Monitoring.KpiId) request, + (io.grpc.stub.StreamObserver) responseObserver); + break; case METHODID_INCLUDE_KPI: serviceImpl.includeKpi((monitoring.Monitoring.Kpi) request, (io.grpc.stub.StreamObserver) responseObserver); @@ -1380,8 +1395,8 @@ public final class MonitoringServiceGrpc { serviceImpl.queryKpiData((monitoring.Monitoring.KpiQuery) request, (io.grpc.stub.StreamObserver) responseObserver); break; - case METHODID_SET_KPI_SUBSCRIPTION: - serviceImpl.setKpiSubscription((monitoring.Monitoring.SubsDescriptor) request, + case METHODID_SUBSCRIBE_KPI: + serviceImpl.subscribeKpi((monitoring.Monitoring.SubsDescriptor) request, (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_GET_SUBS_DESCRIPTOR: @@ -1392,14 +1407,18 @@ public final class MonitoringServiceGrpc { serviceImpl.getSubscriptions((context.ContextOuterClass.Empty) request, (io.grpc.stub.StreamObserver) responseObserver); break; - case METHODID_DELETE_SUBSCRIPTION: - serviceImpl.deleteSubscription((monitoring.Monitoring.SubscriptionID) request, + case METHODID_EDIT_KPI_SUBSCRIPTION: + serviceImpl.editKpiSubscription((monitoring.Monitoring.SubsDescriptor) request, (io.grpc.stub.StreamObserver) responseObserver); break; - case METHODID_SET_KPI_ALARM: - serviceImpl.setKpiAlarm((monitoring.Monitoring.AlarmDescriptor) request, + case METHODID_CREATE_KPI_ALARM: + serviceImpl.createKpiAlarm((monitoring.Monitoring.AlarmDescriptor) request, (io.grpc.stub.StreamObserver) responseObserver); break; + case METHODID_EDIT_KPI_ALARM: + serviceImpl.editKpiAlarm((monitoring.Monitoring.AlarmDescriptor) request, + (io.grpc.stub.StreamObserver) responseObserver); + break; case METHODID_GET_ALARMS: serviceImpl.getAlarms((context.ContextOuterClass.Empty) request, (io.grpc.stub.StreamObserver) responseObserver); @@ -1409,21 +1428,9 @@ public final class MonitoringServiceGrpc { (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_GET_ALARM_RESPONSE_STREAM: - serviceImpl.getAlarmResponseStream((monitoring.Monitoring.AlarmSubscription) request, + serviceImpl.getAlarmResponseStream((monitoring.Monitoring.AlarmID) request, (io.grpc.stub.StreamObserver) responseObserver); break; - case METHODID_DELETE_ALARM: - serviceImpl.deleteAlarm((monitoring.Monitoring.AlarmID) request, - (io.grpc.stub.StreamObserver) responseObserver); - break; - case METHODID_GET_STREAM_KPI: - serviceImpl.getStreamKpi((monitoring.Monitoring.KpiId) request, - (io.grpc.stub.StreamObserver) responseObserver); - break; - case METHODID_GET_INSTANT_KPI: - serviceImpl.getInstantKpi((monitoring.Monitoring.KpiId) request, - (io.grpc.stub.StreamObserver) responseObserver); - break; default: throw new AssertionError(); } @@ -1485,24 +1492,24 @@ public final class MonitoringServiceGrpc { if (result == null) { serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME) .setSchemaDescriptor(new MonitoringServiceFileDescriptorSupplier()) - .addMethod(getSetKpiMethod()) + .addMethod(getCreateKpiMethod()) + .addMethod(getEditKpiDescriptorMethod()) .addMethod(getDeleteKpiMethod()) - .addMethod(getGetKpiDescriptorMethod()) .addMethod(getGetKpiDescriptorListMethod()) + .addMethod(getCreateBundleKpiMethod()) + .addMethod(getGetKpiDescriptorMethod()) .addMethod(getIncludeKpiMethod()) .addMethod(getMonitorKpiMethod()) .addMethod(getQueryKpiDataMethod()) - .addMethod(getSetKpiSubscriptionMethod()) + .addMethod(getSubscribeKpiMethod()) .addMethod(getGetSubsDescriptorMethod()) .addMethod(getGetSubscriptionsMethod()) - .addMethod(getDeleteSubscriptionMethod()) - .addMethod(getSetKpiAlarmMethod()) + .addMethod(getEditKpiSubscriptionMethod()) + .addMethod(getCreateKpiAlarmMethod()) + .addMethod(getEditKpiAlarmMethod()) .addMethod(getGetAlarmsMethod()) .addMethod(getGetAlarmDescriptorMethod()) .addMethod(getGetAlarmResponseStreamMethod()) - .addMethod(getDeleteAlarmMethod()) - .addMethod(getGetStreamKpiMethod()) - .addMethod(getGetInstantKpiMethod()) .build(); } } diff --git a/src/policy/target/generated-sources/grpc/monitoring/MutinyMonitoringServiceGrpc.java b/src/policy/target/generated-sources/grpc/monitoring/MutinyMonitoringServiceGrpc.java index d663b38c9..46f442b74 100644 --- a/src/policy/target/generated-sources/grpc/monitoring/MutinyMonitoringServiceGrpc.java +++ b/src/policy/target/generated-sources/grpc/monitoring/MutinyMonitoringServiceGrpc.java @@ -36,18 +36,18 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim } - public io.smallrye.mutiny.Uni setKpi(monitoring.Monitoring.KpiDescriptor request) { - return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::setKpi); + public io.smallrye.mutiny.Uni createKpi(monitoring.Monitoring.KpiDescriptor request) { + return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::createKpi); } - public io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request) { - return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::deleteKpi); + public io.smallrye.mutiny.Uni editKpiDescriptor(monitoring.Monitoring.EditedKpiDescriptor request) { + return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::editKpiDescriptor); } - public io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request) { - return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::getKpiDescriptor); + public io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request) { + return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::deleteKpi); } @@ -56,6 +56,16 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim } + public io.smallrye.mutiny.Uni createBundleKpi(monitoring.Monitoring.BundleKpiDescriptor request) { + return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::createBundleKpi); + } + + + public io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request) { + return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::getKpiDescriptor); + } + + public io.smallrye.mutiny.Uni includeKpi(monitoring.Monitoring.Kpi request) { return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::includeKpi); } @@ -81,13 +91,18 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim } - public io.smallrye.mutiny.Uni deleteSubscription(monitoring.Monitoring.SubscriptionID request) { - return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::deleteSubscription); + public io.smallrye.mutiny.Uni editKpiSubscription(monitoring.Monitoring.SubsDescriptor request) { + return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::editKpiSubscription); + } + + + public io.smallrye.mutiny.Uni createKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { + return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::createKpiAlarm); } - public io.smallrye.mutiny.Uni setKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { - return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::setKpiAlarm); + public io.smallrye.mutiny.Uni editKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { + return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::editKpiAlarm); } @@ -101,30 +116,15 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim } - public io.smallrye.mutiny.Uni deleteAlarm(monitoring.Monitoring.AlarmID request) { - return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::deleteAlarm); - } - - - public io.smallrye.mutiny.Uni getInstantKpi(monitoring.Monitoring.KpiId request) { - return io.quarkus.grpc.runtime.ClientCalls.oneToOne(request, delegateStub::getInstantKpi); - } - - - public io.smallrye.mutiny.Multi setKpiSubscription(monitoring.Monitoring.SubsDescriptor request) { - return io.quarkus.grpc.runtime.ClientCalls.oneToMany(request, delegateStub::setKpiSubscription); + public io.smallrye.mutiny.Multi subscribeKpi(monitoring.Monitoring.SubsDescriptor request) { + return io.quarkus.grpc.runtime.ClientCalls.oneToMany(request, delegateStub::subscribeKpi); } - public io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmSubscription request) { + public io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmID request) { return io.quarkus.grpc.runtime.ClientCalls.oneToMany(request, delegateStub::getAlarmResponseStream); } - - public io.smallrye.mutiny.Multi getStreamKpi(monitoring.Monitoring.KpiId request) { - return io.quarkus.grpc.runtime.ClientCalls.oneToMany(request, delegateStub::getStreamKpi); - } - } @@ -143,17 +143,17 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim - public io.smallrye.mutiny.Uni setKpi(monitoring.Monitoring.KpiDescriptor request) { + public io.smallrye.mutiny.Uni createKpi(monitoring.Monitoring.KpiDescriptor request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request) { + public io.smallrye.mutiny.Uni editKpiDescriptor(monitoring.Monitoring.EditedKpiDescriptor request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request) { + public io.smallrye.mutiny.Uni deleteKpi(monitoring.Monitoring.KpiId request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } @@ -163,98 +163,98 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim } - public io.smallrye.mutiny.Uni includeKpi(monitoring.Monitoring.Kpi request) { + public io.smallrye.mutiny.Uni createBundleKpi(monitoring.Monitoring.BundleKpiDescriptor request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni monitorKpi(monitoring.Monitoring.MonitorKpiRequest request) { + public io.smallrye.mutiny.Uni getKpiDescriptor(monitoring.Monitoring.KpiId request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni queryKpiData(monitoring.Monitoring.KpiQuery request) { + public io.smallrye.mutiny.Uni includeKpi(monitoring.Monitoring.Kpi request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni getSubsDescriptor(monitoring.Monitoring.SubscriptionID request) { + public io.smallrye.mutiny.Uni monitorKpi(monitoring.Monitoring.MonitorKpiRequest request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni getSubscriptions(context.ContextOuterClass.Empty request) { + public io.smallrye.mutiny.Uni queryKpiData(monitoring.Monitoring.KpiQuery request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni deleteSubscription(monitoring.Monitoring.SubscriptionID request) { + public io.smallrye.mutiny.Uni getSubsDescriptor(monitoring.Monitoring.SubscriptionID request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni setKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { + public io.smallrye.mutiny.Uni getSubscriptions(context.ContextOuterClass.Empty request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni getAlarms(context.ContextOuterClass.Empty request) { + public io.smallrye.mutiny.Uni editKpiSubscription(monitoring.Monitoring.SubsDescriptor request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni getAlarmDescriptor(monitoring.Monitoring.AlarmID request) { + public io.smallrye.mutiny.Uni createKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni deleteAlarm(monitoring.Monitoring.AlarmID request) { + public io.smallrye.mutiny.Uni editKpiAlarm(monitoring.Monitoring.AlarmDescriptor request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Uni getInstantKpi(monitoring.Monitoring.KpiId request) { + public io.smallrye.mutiny.Uni getAlarms(context.ContextOuterClass.Empty request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Multi setKpiSubscription(monitoring.Monitoring.SubsDescriptor request) { + public io.smallrye.mutiny.Uni getAlarmDescriptor(monitoring.Monitoring.AlarmID request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmSubscription request) { + public io.smallrye.mutiny.Multi subscribeKpi(monitoring.Monitoring.SubsDescriptor request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } - public io.smallrye.mutiny.Multi getStreamKpi(monitoring.Monitoring.KpiId request) { + public io.smallrye.mutiny.Multi getAlarmResponseStream(monitoring.Monitoring.AlarmID request) { throw new io.grpc.StatusRuntimeException(io.grpc.Status.UNIMPLEMENTED); } @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( - monitoring.MonitoringServiceGrpc.getSetKpiMethod(), + monitoring.MonitoringServiceGrpc.getCreateKpiMethod(), asyncUnaryCall( new MethodHandlers< monitoring.Monitoring.KpiDescriptor, monitoring.Monitoring.KpiId>( - this, METHODID_SET_KPI, compression))) + this, METHODID_CREATE_KPI, compression))) .addMethod( - monitoring.MonitoringServiceGrpc.getDeleteKpiMethod(), + monitoring.MonitoringServiceGrpc.getEditKpiDescriptorMethod(), asyncUnaryCall( new MethodHandlers< - monitoring.Monitoring.KpiId, + monitoring.Monitoring.EditedKpiDescriptor, context.ContextOuterClass.Empty>( - this, METHODID_DELETE_KPI, compression))) + this, METHODID_EDIT_KPI_DESCRIPTOR, compression))) .addMethod( - monitoring.MonitoringServiceGrpc.getGetKpiDescriptorMethod(), + monitoring.MonitoringServiceGrpc.getDeleteKpiMethod(), asyncUnaryCall( new MethodHandlers< monitoring.Monitoring.KpiId, - monitoring.Monitoring.KpiDescriptor>( - this, METHODID_GET_KPI_DESCRIPTOR, compression))) + context.ContextOuterClass.Empty>( + this, METHODID_DELETE_KPI, compression))) .addMethod( monitoring.MonitoringServiceGrpc.getGetKpiDescriptorListMethod(), asyncUnaryCall( @@ -262,6 +262,20 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim context.ContextOuterClass.Empty, monitoring.Monitoring.KpiDescriptorList>( this, METHODID_GET_KPI_DESCRIPTOR_LIST, compression))) + .addMethod( + monitoring.MonitoringServiceGrpc.getCreateBundleKpiMethod(), + asyncUnaryCall( + new MethodHandlers< + monitoring.Monitoring.BundleKpiDescriptor, + monitoring.Monitoring.KpiId>( + this, METHODID_CREATE_BUNDLE_KPI, compression))) + .addMethod( + monitoring.MonitoringServiceGrpc.getGetKpiDescriptorMethod(), + asyncUnaryCall( + new MethodHandlers< + monitoring.Monitoring.KpiId, + monitoring.Monitoring.KpiDescriptor>( + this, METHODID_GET_KPI_DESCRIPTOR, compression))) .addMethod( monitoring.MonitoringServiceGrpc.getIncludeKpiMethod(), asyncUnaryCall( @@ -284,12 +298,12 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim monitoring.Monitoring.KpiList>( this, METHODID_QUERY_KPI_DATA, compression))) .addMethod( - monitoring.MonitoringServiceGrpc.getSetKpiSubscriptionMethod(), + monitoring.MonitoringServiceGrpc.getSubscribeKpiMethod(), asyncServerStreamingCall( new MethodHandlers< monitoring.Monitoring.SubsDescriptor, monitoring.Monitoring.KpiList>( - this, METHODID_SET_KPI_SUBSCRIPTION, compression))) + this, METHODID_SUBSCRIBE_KPI, compression))) .addMethod( monitoring.MonitoringServiceGrpc.getGetSubsDescriptorMethod(), asyncUnaryCall( @@ -305,19 +319,26 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim monitoring.Monitoring.SubsIDList>( this, METHODID_GET_SUBSCRIPTIONS, compression))) .addMethod( - monitoring.MonitoringServiceGrpc.getDeleteSubscriptionMethod(), + monitoring.MonitoringServiceGrpc.getEditKpiSubscriptionMethod(), asyncUnaryCall( new MethodHandlers< - monitoring.Monitoring.SubscriptionID, + monitoring.Monitoring.SubsDescriptor, context.ContextOuterClass.Empty>( - this, METHODID_DELETE_SUBSCRIPTION, compression))) + this, METHODID_EDIT_KPI_SUBSCRIPTION, compression))) .addMethod( - monitoring.MonitoringServiceGrpc.getSetKpiAlarmMethod(), + monitoring.MonitoringServiceGrpc.getCreateKpiAlarmMethod(), asyncUnaryCall( new MethodHandlers< monitoring.Monitoring.AlarmDescriptor, monitoring.Monitoring.AlarmID>( - this, METHODID_SET_KPI_ALARM, compression))) + this, METHODID_CREATE_KPI_ALARM, compression))) + .addMethod( + monitoring.MonitoringServiceGrpc.getEditKpiAlarmMethod(), + asyncUnaryCall( + new MethodHandlers< + monitoring.Monitoring.AlarmDescriptor, + context.ContextOuterClass.Empty>( + this, METHODID_EDIT_KPI_ALARM, compression))) .addMethod( monitoring.MonitoringServiceGrpc.getGetAlarmsMethod(), asyncUnaryCall( @@ -336,52 +357,31 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim monitoring.MonitoringServiceGrpc.getGetAlarmResponseStreamMethod(), asyncServerStreamingCall( new MethodHandlers< - monitoring.Monitoring.AlarmSubscription, + monitoring.Monitoring.AlarmID, monitoring.Monitoring.AlarmResponse>( this, METHODID_GET_ALARM_RESPONSE_STREAM, compression))) - .addMethod( - monitoring.MonitoringServiceGrpc.getDeleteAlarmMethod(), - asyncUnaryCall( - new MethodHandlers< - monitoring.Monitoring.AlarmID, - context.ContextOuterClass.Empty>( - this, METHODID_DELETE_ALARM, compression))) - .addMethod( - monitoring.MonitoringServiceGrpc.getGetStreamKpiMethod(), - asyncServerStreamingCall( - new MethodHandlers< - monitoring.Monitoring.KpiId, - monitoring.Monitoring.Kpi>( - this, METHODID_GET_STREAM_KPI, compression))) - .addMethod( - monitoring.MonitoringServiceGrpc.getGetInstantKpiMethod(), - asyncUnaryCall( - new MethodHandlers< - monitoring.Monitoring.KpiId, - monitoring.Monitoring.KpiList>( - this, METHODID_GET_INSTANT_KPI, compression))) .build(); } } - private static final int METHODID_SET_KPI = 0; - private static final int METHODID_DELETE_KPI = 1; - private static final int METHODID_GET_KPI_DESCRIPTOR = 2; + private static final int METHODID_CREATE_KPI = 0; + private static final int METHODID_EDIT_KPI_DESCRIPTOR = 1; + private static final int METHODID_DELETE_KPI = 2; private static final int METHODID_GET_KPI_DESCRIPTOR_LIST = 3; - private static final int METHODID_INCLUDE_KPI = 4; - private static final int METHODID_MONITOR_KPI = 5; - private static final int METHODID_QUERY_KPI_DATA = 6; - private static final int METHODID_SET_KPI_SUBSCRIPTION = 7; - private static final int METHODID_GET_SUBS_DESCRIPTOR = 8; - private static final int METHODID_GET_SUBSCRIPTIONS = 9; - private static final int METHODID_DELETE_SUBSCRIPTION = 10; - private static final int METHODID_SET_KPI_ALARM = 11; - private static final int METHODID_GET_ALARMS = 12; - private static final int METHODID_GET_ALARM_DESCRIPTOR = 13; - private static final int METHODID_GET_ALARM_RESPONSE_STREAM = 14; - private static final int METHODID_DELETE_ALARM = 15; - private static final int METHODID_GET_STREAM_KPI = 16; - private static final int METHODID_GET_INSTANT_KPI = 17; + private static final int METHODID_CREATE_BUNDLE_KPI = 4; + private static final int METHODID_GET_KPI_DESCRIPTOR = 5; + private static final int METHODID_INCLUDE_KPI = 6; + private static final int METHODID_MONITOR_KPI = 7; + private static final int METHODID_QUERY_KPI_DATA = 8; + private static final int METHODID_SUBSCRIBE_KPI = 9; + private static final int METHODID_GET_SUBS_DESCRIPTOR = 10; + private static final int METHODID_GET_SUBSCRIPTIONS = 11; + private static final int METHODID_EDIT_KPI_SUBSCRIPTION = 12; + private static final int METHODID_CREATE_KPI_ALARM = 13; + private static final int METHODID_EDIT_KPI_ALARM = 14; + private static final int METHODID_GET_ALARMS = 15; + private static final int METHODID_GET_ALARM_DESCRIPTOR = 16; + private static final int METHODID_GET_ALARM_RESPONSE_STREAM = 17; private static final class MethodHandlers implements io.grpc.stub.ServerCalls.UnaryMethod, @@ -402,23 +402,23 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim @java.lang.SuppressWarnings("unchecked") public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) { switch (methodId) { - case METHODID_SET_KPI: + case METHODID_CREATE_KPI: io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.KpiDescriptor) request, (io.grpc.stub.StreamObserver) responseObserver, compression, - serviceImpl::setKpi); + serviceImpl::createKpi); break; - case METHODID_DELETE_KPI: - io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.KpiId) request, + case METHODID_EDIT_KPI_DESCRIPTOR: + io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.EditedKpiDescriptor) request, (io.grpc.stub.StreamObserver) responseObserver, compression, - serviceImpl::deleteKpi); + serviceImpl::editKpiDescriptor); break; - case METHODID_GET_KPI_DESCRIPTOR: + case METHODID_DELETE_KPI: io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.KpiId) request, - (io.grpc.stub.StreamObserver) responseObserver, + (io.grpc.stub.StreamObserver) responseObserver, compression, - serviceImpl::getKpiDescriptor); + serviceImpl::deleteKpi); break; case METHODID_GET_KPI_DESCRIPTOR_LIST: io.quarkus.grpc.runtime.ServerCalls.oneToOne((context.ContextOuterClass.Empty) request, @@ -426,6 +426,18 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim compression, serviceImpl::getKpiDescriptorList); break; + case METHODID_CREATE_BUNDLE_KPI: + io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.BundleKpiDescriptor) request, + (io.grpc.stub.StreamObserver) responseObserver, + compression, + serviceImpl::createBundleKpi); + break; + case METHODID_GET_KPI_DESCRIPTOR: + io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.KpiId) request, + (io.grpc.stub.StreamObserver) responseObserver, + compression, + serviceImpl::getKpiDescriptor); + break; case METHODID_INCLUDE_KPI: io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.Kpi) request, (io.grpc.stub.StreamObserver) responseObserver, @@ -444,11 +456,11 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim compression, serviceImpl::queryKpiData); break; - case METHODID_SET_KPI_SUBSCRIPTION: + case METHODID_SUBSCRIBE_KPI: io.quarkus.grpc.runtime.ServerCalls.oneToMany((monitoring.Monitoring.SubsDescriptor) request, (io.grpc.stub.StreamObserver) responseObserver, compression, - serviceImpl::setKpiSubscription); + serviceImpl::subscribeKpi); break; case METHODID_GET_SUBS_DESCRIPTOR: io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.SubscriptionID) request, @@ -462,17 +474,23 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim compression, serviceImpl::getSubscriptions); break; - case METHODID_DELETE_SUBSCRIPTION: - io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.SubscriptionID) request, + case METHODID_EDIT_KPI_SUBSCRIPTION: + io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.SubsDescriptor) request, (io.grpc.stub.StreamObserver) responseObserver, compression, - serviceImpl::deleteSubscription); + serviceImpl::editKpiSubscription); break; - case METHODID_SET_KPI_ALARM: + case METHODID_CREATE_KPI_ALARM: io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.AlarmDescriptor) request, (io.grpc.stub.StreamObserver) responseObserver, compression, - serviceImpl::setKpiAlarm); + serviceImpl::createKpiAlarm); + break; + case METHODID_EDIT_KPI_ALARM: + io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.AlarmDescriptor) request, + (io.grpc.stub.StreamObserver) responseObserver, + compression, + serviceImpl::editKpiAlarm); break; case METHODID_GET_ALARMS: io.quarkus.grpc.runtime.ServerCalls.oneToOne((context.ContextOuterClass.Empty) request, @@ -487,29 +505,11 @@ public final class MutinyMonitoringServiceGrpc implements io.quarkus.grpc.runtim serviceImpl::getAlarmDescriptor); break; case METHODID_GET_ALARM_RESPONSE_STREAM: - io.quarkus.grpc.runtime.ServerCalls.oneToMany((monitoring.Monitoring.AlarmSubscription) request, + io.quarkus.grpc.runtime.ServerCalls.oneToMany((monitoring.Monitoring.AlarmID) request, (io.grpc.stub.StreamObserver) responseObserver, compression, serviceImpl::getAlarmResponseStream); break; - case METHODID_DELETE_ALARM: - io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.AlarmID) request, - (io.grpc.stub.StreamObserver) responseObserver, - compression, - serviceImpl::deleteAlarm); - break; - case METHODID_GET_STREAM_KPI: - io.quarkus.grpc.runtime.ServerCalls.oneToMany((monitoring.Monitoring.KpiId) request, - (io.grpc.stub.StreamObserver) responseObserver, - compression, - serviceImpl::getStreamKpi); - break; - case METHODID_GET_INSTANT_KPI: - io.quarkus.grpc.runtime.ServerCalls.oneToOne((monitoring.Monitoring.KpiId) request, - (io.grpc.stub.StreamObserver) responseObserver, - compression, - serviceImpl::getInstantKpi); - break; default: throw new java.lang.AssertionError(); } diff --git a/src/policy/target/kubernetes/kubernetes.yml b/src/policy/target/kubernetes/kubernetes.yml new file mode 100644 index 000000000..680929bc0 --- /dev/null +++ b/src/policy/target/kubernetes/kubernetes.yml @@ -0,0 +1,89 @@ +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + app.quarkus.io/commit-id: 7d24cfdf286fcca1ff04620ee026933bedd8960e + app.quarkus.io/build-timestamp: 2022-08-04 - 22:13:18 +0000 + labels: + app.kubernetes.io/name: policyservice + app: policyservice + name: policyservice +spec: + ports: + - name: http + port: 8080 + targetPort: 8080 + - name: grpc + port: 6060 + targetPort: 6060 + selector: + app.kubernetes.io/name: policyservice + type: ClusterIP +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + app.quarkus.io/commit-id: 7d24cfdf286fcca1ff04620ee026933bedd8960e + app.quarkus.io/build-timestamp: 2022-08-04 - 22:13:18 +0000 + labels: + app: policyservice + app.kubernetes.io/name: policyservice + name: policyservice +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/name: policyservice + template: + metadata: + annotations: + app.quarkus.io/commit-id: 7d24cfdf286fcca1ff04620ee026933bedd8960e + app.quarkus.io/build-timestamp: 2022-08-04 - 22:13:18 +0000 + labels: + app: policyservice + app.kubernetes.io/name: policyservice + spec: + containers: + - env: + - name: KUBERNETES_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: CONTEXT_SERVICE_HOST + value: contextservice + - name: SERVICE_SERVICE_HOST + value: serviceservice + - name: MONITORING_SERVICE_HOST + value: monitoringservice + image: registry.gitlab.com/teraflow-h2020/controller/policy:0.1.0 + imagePullPolicy: Always + livenessProbe: + failureThreshold: 3 + httpGet: + path: /q/health/live + port: 8080 + scheme: HTTP + initialDelaySeconds: 2 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 10 + name: policyservice + ports: + - containerPort: 8080 + name: http + protocol: TCP + - containerPort: 6060 + name: grpc + protocol: TCP + readinessProbe: + failureThreshold: 3 + httpGet: + path: /q/health/ready + port: 8080 + scheme: HTTP + initialDelaySeconds: 2 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 10 diff --git a/src/service/service/path_computation_element/PathComputationElement.py b/src/service/service/path_computation_element/PathComputationElement.py index 80316ac89..41a4c5d57 100644 --- a/src/service/service/path_computation_element/PathComputationElement.py +++ b/src/service/service/path_computation_element/PathComputationElement.py @@ -31,10 +31,10 @@ LOGGER = logging.getLogger(__name__) LOGGER.setLevel(logging.INFO) SUB_SERVICE_TYPES = { - DeviceTypeEnum.EMULATED_PACKET_ROUTER.value : ServiceTypeEnum.SERVICETYPE_L3NM, - DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM.value: ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE, - DeviceTypeEnum.PACKET_ROUTER.value : ServiceTypeEnum.SERVICETYPE_L3NM, - DeviceTypeEnum.OPEN_LINE_SYSTEM.value : ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE, + DeviceTypeEnum.EMULATED_PACKET_ROUTER.value : ServiceTypeEnum.SERVICETYPE_L3NM, + DeviceTypeEnum.EMULATED_OPTICAL_LINE_SYSTEM.value: ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE, + DeviceTypeEnum.PACKET_ROUTER.value : ServiceTypeEnum.SERVICETYPE_L3NM, + DeviceTypeEnum.OPTICAL_LINE_SYSTEM.value : ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE, } DEFAULT_SUB_SERVICE_TYPE = ServiceTypeEnum.SERVICETYPE_UNKNOWN diff --git a/src/service/tests/ServiceHandler_L3NM_EMU.py b/src/service/tests/ServiceHandler_L3NM_EMU.py index 45df80e42..0ac5fbf24 100644 --- a/src/service/tests/ServiceHandler_L3NM_EMU.py +++ b/src/service/tests/ServiceHandler_L3NM_EMU.py @@ -14,7 +14,7 @@ from typing import Dict, List, Tuple from common.tools.object_factory.ConfigRule import json_config_rule_set -from common.tools.object_factory.Constraint import json_constraint_custom +from common.tools.object_factory.Constraint import json_constraint from common.tools.object_factory.Device import ( json_device_emulated_packet_router_disabled, json_device_emulated_tapi_disabled, json_device_id) from common.tools.object_factory.EndPoint import json_endpoint, json_endpoint_id @@ -101,8 +101,8 @@ SERVICE_R1_R3_UUID = 'SVC:{:s}/{:s}-{:s}/{:s}'.format( DEVICE_R3_UUID, ENDPOINT_ID_R3_EP100['endpoint_uuid']['uuid']) SERVICE_R1_R3_ENDPOINT_IDS = [ENDPOINT_ID_R1_EP100, ENDPOINT_ID_R3_EP100] SERVICE_R1_R3_CONSTRAINTS = [ - json_constraint_custom('latency_ms', 15.2), - json_constraint_custom('jitter_us', 1.2), + json_constraint('latency_ms', 15.2), + json_constraint('jitter_us', 1.2), ] SERVICE_R1_R3_CONFIG_RULES = [ json_config_rule_set( diff --git a/src/service/tests/ServiceHandler_L3NM_OC.py b/src/service/tests/ServiceHandler_L3NM_OC.py index 717536f6d..0797a4af5 100644 --- a/src/service/tests/ServiceHandler_L3NM_OC.py +++ b/src/service/tests/ServiceHandler_L3NM_OC.py @@ -15,7 +15,7 @@ import uuid from typing import Dict, List, Tuple from common.tools.object_factory.ConfigRule import json_config_rule_set -from common.tools.object_factory.Constraint import json_constraint_custom +from common.tools.object_factory.Constraint import json_constraint from common.tools.object_factory.Device import ( json_device_connect_rules, json_device_emulated_packet_router_disabled, json_device_emulated_tapi_disabled, json_device_id) @@ -115,8 +115,8 @@ SERVICE_R1_R2_UUID = 'SVC:{:s}/{:s}-{:s}/{:s}'.format( DEVICE_R2_UUID, ENDPOINT_ID_R2_EP100['endpoint_uuid']['uuid']) SERVICE_R1_R2_ENDPOINT_IDS = [ENDPOINT_ID_R1_EP100, ENDPOINT_ID_R2_EP100] SERVICE_R1_R2_CONSTRAINTS = [ - json_constraint_custom('latency_ms', 15.2), - json_constraint_custom('jitter_us', 1.2), + json_constraint('latency_ms', 15.2), + json_constraint('jitter_us', 1.2), ] SERVICE_R1_R2_CONFIG_RULES = [ json_config_rule_set( diff --git a/src/slice/requirements.in b/src/slice/requirements.in index 0a2c39895..e69de29bb 100644 --- a/src/slice/requirements.in +++ b/src/slice/requirements.in @@ -1 +0,0 @@ -#deepdiff==5.8.* diff --git a/src/slice/service/SliceServiceServicerImpl.py b/src/slice/service/SliceServiceServicerImpl.py index 30c2310b0..275a20114 100644 --- a/src/slice/service/SliceServiceServicerImpl.py +++ b/src/slice/service/SliceServiceServicerImpl.py @@ -12,16 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import grpc, logging #, deepdiff +import grpc, json, logging from common.proto.context_pb2 import ( - Empty, Service, ServiceId, ServiceStatusEnum, ServiceTypeEnum, Slice, SliceId, SliceStatusEnum) + ConfigActionEnum, Empty, Service, ServiceStatusEnum, ServiceTypeEnum, Slice, SliceId, SliceStatusEnum) from common.proto.slice_pb2_grpc import SliceServiceServicer from common.rpc_method_wrapper.Decorator import create_metrics, safe_and_metered_rpc_method -from common.tools.grpc.ConfigRules import copy_config_rules -from common.tools.grpc.Constraints import copy_constraints -from common.tools.grpc.EndPointIds import copy_endpoint_ids -from common.tools.grpc.ServiceIds import update_service_ids -from common.tools.grpc.Tools import grpc_message_to_json from context.client.ContextClient import ContextClient from interdomain.client.InterdomainClient import InterdomainClient from service.client.ServiceClient import ServiceClient @@ -39,73 +34,66 @@ class SliceServiceServicerImpl(SliceServiceServicer): def create_update(self, request : Slice) -> SliceId: context_client = ContextClient() - try: - _slice = context_client.GetSlice(request.slice_id) - json_current_slice = grpc_message_to_json(_slice) - except: - json_current_slice = {} - slice_request = Slice() - slice_request.slice_id.CopyFrom(request.slice_id) - slice_request.slice_status.slice_status = SliceStatusEnum.SLICESTATUS_PLANNED - context_client.SetSlice(slice_request) - _slice = context_client.GetSlice(request.slice_id) - slice_request = Slice() - slice_request.CopyFrom(_slice) - - #LOGGER.info('json_current_slice = {:s}'.format(str(json_current_slice))) - #json_updated_slice = grpc_message_to_json(request) - #LOGGER.info('json_updated_slice = {:s}'.format(str(json_updated_slice))) - #changes = deepdiff.DeepDiff(json_current_slice, json_updated_slice) - #LOGGER.info('changes = {:s}'.format(str(changes))) + + slice_id = context_client.SetSlice(request) + if len(request.slice_endpoint_ids) != 2: return slice_id domains = set() for slice_endpoint_id in request.slice_endpoint_ids: device_uuid = slice_endpoint_id.device_id.device_uuid.uuid - device_parts = device_uuid.split('@') - domain_uuid = '' if len(device_parts) == 1 else device_parts[1] - domains.add(domain_uuid) - LOGGER.info('domains = {:s}'.format(str(domains))) - is_multi_domain = len(domains) > 1 - LOGGER.info('is_multi_domain = {:s}'.format(str(is_multi_domain))) + domains.add(device_uuid.split('@')[1]) + is_multi_domain = len(domains) == 2 if is_multi_domain: interdomain_client = InterdomainClient() slice_id = interdomain_client.RequestSlice(request) else: - service_id = ServiceId() - context_uuid = service_id.context_id.context_uuid.uuid = request.slice_id.context_id.context_uuid.uuid - slice_uuid = service_uuid = service_id.service_uuid.uuid = request.slice_id.slice_uuid.uuid - - service_client = ServiceClient() - try: - _service = context_client.GetService(service_id) - except: - service_request = Service() - service_request.service_id.CopyFrom(service_id) - service_request.service_type = ServiceTypeEnum.SERVICETYPE_L2NM - service_request.service_status.service_status = ServiceStatusEnum.SERVICESTATUS_PLANNED - service_reply = service_client.CreateService(service_request) - if service_reply != service_request.service_id: # pylint: disable=no-member - raise Exception('Service creation failed. Wrong Service Id was returned') - _service = context_client.GetService(service_id) + # pylint: disable=no-member service_request = Service() - service_request.CopyFrom(_service) + service_request.service_id.context_id.context_uuid.uuid = request.slice_id.context_id.context_uuid.uuid + service_request.service_id.service_uuid.uuid = request.slice_id.slice_uuid.uuid + service_request.service_type = ServiceTypeEnum.SERVICETYPE_L3NM + service_request.service_status.service_status = ServiceStatusEnum.SERVICESTATUS_PLANNED - copy_endpoint_ids(request.slice_endpoint_ids, service_request.service_endpoint_ids) - copy_constraints(request.slice_constraints, service_request.service_constraints) - copy_config_rules(request.slice_config.config_rules, service_request.service_config.config_rules) + service_client = ServiceClient() + service_reply = service_client.CreateService(service_request) + if service_reply != service_request.service_id: # pylint: disable=no-member + raise Exception('Service creation failed. Wrong Service Id was returned') + + config_rule = service_request.service_config.config_rules.add() + config_rule.action = ConfigActionEnum.CONFIGACTION_SET + config_rule.custom.resource_key = '/settings' + config_rule.custom.resource_value = json.dumps( + {'mtu': 1512, 'address_families': ['IPV4'], 'bgp_as': 65000, 'bgp_route_target': '65000:333'}, + sort_keys=True) + + for slice_endpoint_id in request.slice_endpoint_ids: + device_uuid = slice_endpoint_id.device_id.device_uuid.uuid + endpoint_uuid = slice_endpoint_id.endpoint_uuid.uuid + + endpoint_id = service_request.service_endpoint_ids.add() + endpoint_id.device_id.device_uuid.uuid = device_uuid + endpoint_id.endpoint_uuid.uuid = endpoint_uuid + + config_rule = service_request.service_config.config_rules.add() + config_rule.action = ConfigActionEnum.CONFIGACTION_SET + config_rule.custom.resource_key = '/device[{:s}]/endpoint[{:s}]/settings'.format( + device_uuid, endpoint_uuid) + config_rule.custom.resource_value = json.dumps( + {'router_id': '0.0.0.0', 'route_distinguisher': '0:0', 'sub_interface_index': 0, 'vlan_id': 0, + 'address_ip': '0.0.0.0', 'address_prefix': 0}, + sort_keys=True) service_reply = service_client.UpdateService(service_request) if service_reply != service_request.service_id: # pylint: disable=no-member raise Exception('Service update failed. Wrong Service Id was returned') - copy_endpoint_ids(request.slice_endpoint_ids, slice_request.slice_endpoint_ids) - copy_constraints(request.slice_constraints, slice_request.slice_constraints) - copy_config_rules(request.slice_config.config_rules, slice_request.slice_config.config_rules) - - update_service_ids(slice_request.slice_service_ids, context_uuid, service_uuid) - context_client.SetSlice(slice_request) - slice_id = slice_request.slice_id + reply = Slice() + reply.CopyFrom(request) + slice_service_id = reply.slice_service_ids.add() + slice_service_id.CopyFrom(service_reply) + context_client.SetSlice(reply) + slice_id = reply.slice_id slice_ = context_client.GetSlice(slice_id) slice_active = Slice() @@ -144,41 +132,4 @@ class SliceServiceServicerImpl(SliceServiceServicer): @safe_and_metered_rpc_method(METRICS, LOGGER) def DeleteSlice(self, request : SliceId, context : grpc.ServicerContext) -> Empty: - context_client = ContextClient() - try: - _slice = context_client.GetSlice(request) - except: - return Empty() - - domains = set() - for slice_endpoint_id in _slice.slice_endpoint_ids: - device_uuid = slice_endpoint_id.device_id.device_uuid.uuid - device_parts = device_uuid.split('@') - domain_uuid = '' if len(device_parts) == 1 else device_parts[1] - domains.add(domain_uuid) - LOGGER.info('domains = {:s}'.format(str(domains))) - is_multi_domain = len(domains) > 1 - LOGGER.info('is_multi_domain = {:s}'.format(str(is_multi_domain))) - - if is_multi_domain: - interdomain_client = InterdomainClient() - #slice_id = interdomain_client.DeleteSlice(request) - raise NotImplementedError('Delete inter-domain slice') - else: - current_slice = Slice() - current_slice.CopyFrom(_slice) - current_slice.slice_status.slice_status = SliceStatusEnum.SLICESTATUS_DEINIT - context_client.SetSlice(current_slice) - - service_client = ServiceClient() - for service_id in _slice.slice_service_ids: - current_slice = Slice() - current_slice.slice_id.CopyFrom(_slice.slice_id) - slice_service_id = current_slice.slice_service_ids.add() - slice_service_id.CopyFrom(service_id) - context_client.UnsetSlice(current_slice) - - service_client.DeleteService(service_id) - - context_client.RemoveSlice(request) return Empty() diff --git a/src/slice/service/__main__.py b/src/slice/service/__main__.py index a59c54b4b..f77d86bff 100644 --- a/src/slice/service/__main__.py +++ b/src/slice/service/__main__.py @@ -29,7 +29,7 @@ def main(): global LOGGER # pylint: disable=global-statement log_level = get_log_level() - logging.basicConfig(level=log_level, format="[%(asctime)s] %(levelname)s:%(name)s:%(message)s") + logging.basicConfig(level=log_level) LOGGER = logging.getLogger(__name__) wait_for_environment_variables([ diff --git a/src/tests/oeccpsc22/tests/test_functional_create_interdomain_slice.py b/src/tests/oeccpsc22/tests/test_functional_create_interdomain_slice.py index b31e86874..e6f6ccbc9 100644 --- a/src/tests/oeccpsc22/tests/test_functional_create_interdomain_slice.py +++ b/src/tests/oeccpsc22/tests/test_functional_create_interdomain_slice.py @@ -27,7 +27,7 @@ LOGGER = logging.getLogger(__name__) LOGGER.setLevel(logging.DEBUG) DEVTYPE_EMU_PR = DeviceTypeEnum.EMULATED_PACKET_ROUTER.value -DEVTYPE_EMU_OLS = DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM.value +DEVTYPE_EMU_OLS = DeviceTypeEnum.EMULATED_OPTICAL_LINE_SYSTEM.value @pytest.fixture(scope='session') diff --git a/src/tests/oeccpsc22/tests/test_functional_delete_interdomain_slice.py b/src/tests/oeccpsc22/tests/test_functional_delete_interdomain_slice.py index 45296d107..40a954868 100644 --- a/src/tests/oeccpsc22/tests/test_functional_delete_interdomain_slice.py +++ b/src/tests/oeccpsc22/tests/test_functional_delete_interdomain_slice.py @@ -27,7 +27,7 @@ LOGGER = logging.getLogger(__name__) LOGGER.setLevel(logging.DEBUG) DEVTYPE_EMU_PR = DeviceTypeEnum.EMULATED_PACKET_ROUTER.value -DEVTYPE_EMU_OLS = DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM.value +DEVTYPE_EMU_OLS = DeviceTypeEnum.EMULATED_OPTICAL_LINE_SYSTEM.value @pytest.fixture(scope='session') diff --git a/src/tests/ofc22/descriptors_emulated.json b/src/tests/ofc22/descriptors_emulated.json index 0f6f75e16..eb2250623 100644 --- a/src/tests/ofc22/descriptors_emulated.json +++ b/src/tests/ofc22/descriptors_emulated.json @@ -18,9 +18,9 @@ "device_id": {"device_uuid": {"uuid": "R1-EMU"}}, "device_type": "emu-packet-router", "device_config": {"config_rules": [ - {"action": 1, "resource_key": "_connect/address", "resource_value": "127.0.0.1"}, - {"action": 1, "resource_key": "_connect/port", "resource_value": "0"}, - {"action": 1, "resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"} + {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}}, + {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}}, + {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"}} ]}, "device_operational_status": 1, "device_drivers": [0], @@ -30,9 +30,9 @@ "device_id": {"device_uuid": {"uuid": "R2-EMU"}}, "device_type": "emu-packet-router", "device_config": {"config_rules": [ - {"action": 1, "resource_key": "_connect/address", "resource_value": "127.0.0.1"}, - {"action": 1, "resource_key": "_connect/port", "resource_value": "0"}, - {"action": 1, "resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"} + {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}}, + {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}}, + {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"}} ]}, "device_operational_status": 1, "device_drivers": [0], @@ -42,9 +42,9 @@ "device_id": {"device_uuid": {"uuid": "R3-EMU"}}, "device_type": "emu-packet-router", "device_config": {"config_rules": [ - {"action": 1, "resource_key": "_connect/address", "resource_value": "127.0.0.1"}, - {"action": 1, "resource_key": "_connect/port", "resource_value": "0"}, - {"action": 1, "resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"} + {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}}, + {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}}, + {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"}} ]}, "device_operational_status": 1, "device_drivers": [0], @@ -54,9 +54,9 @@ "device_id": {"device_uuid": {"uuid": "R4-EMU"}}, "device_type": "emu-packet-router", "device_config": {"config_rules": [ - {"action": 1, "resource_key": "_connect/address", "resource_value": "127.0.0.1"}, - {"action": 1, "resource_key": "_connect/port", "resource_value": "0"}, - {"action": 1, "resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"} + {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}}, + {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}}, + {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"}} ]}, "device_operational_status": 1, "device_drivers": [0], @@ -64,11 +64,11 @@ }, { "device_id": {"device_uuid": {"uuid": "O1-OLS"}}, - "device_type": "emu-open-line-system", + "device_type": "emu-optical-line-system", "device_config": {"config_rules": [ - {"action": 1, "resource_key": "_connect/address", "resource_value": "127.0.0.1"}, - {"action": 1, "resource_key": "_connect/port", "resource_value": "0"}, - {"action": 1, "resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"aade6001-f00b-5e2f-a357-6a0a9d3de870\"}, {\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"eb287d83-f05e-53ec-ab5a-adf6bd2b5418\"}, {\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"0ef74f99-1acc-57bd-ab9d-4b958b06c513\"}, {\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"50296d99-58cc-5ce7-82f5-fc8ee4eec2ec\"}]}"} + {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}}, + {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}}, + {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"aade6001-f00b-5e2f-a357-6a0a9d3de870\"}, {\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"eb287d83-f05e-53ec-ab5a-adf6bd2b5418\"}, {\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"0ef74f99-1acc-57bd-ab9d-4b958b06c513\"}, {\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"50296d99-58cc-5ce7-82f5-fc8ee4eec2ec\"}]}"}} ]}, "device_operational_status": 1, "device_drivers": [0], @@ -105,4 +105,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/tests/ofc22/run_test_01_bootstrap.sh b/src/tests/ofc22/run_test_01_bootstrap.sh index ef23c28eb..be30b1518 100755 --- a/src/tests/ofc22/run_test_01_bootstrap.sh +++ b/src/tests/ofc22/run_test_01_bootstrap.sh @@ -13,8 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -# make sure to source the following scripts: -# - my_deploy.sh -# - tfs_runtime_env_vars.sh - pytest --verbose src/tests/ofc22/tests/test_functional_bootstrap.py diff --git a/src/tests/ofc22/tests/LoadDescriptors.py b/src/tests/ofc22/tests/LoadDescriptors.py index 33bc699af..4d3af78f5 100644 --- a/src/tests/ofc22/tests/LoadDescriptors.py +++ b/src/tests/ofc22/tests/LoadDescriptors.py @@ -15,7 +15,7 @@ import json, logging, sys from common.Settings import get_setting from context.client.ContextClient import ContextClient -from common.proto.context_pb2 import Context, Device, Link, Topology +from context.proto.context_pb2 import Context, Device, Link, Topology from device.client.DeviceClient import DeviceClient LOGGER = logging.getLogger(__name__) diff --git a/src/tests/ofc22/tests/Objects.py b/src/tests/ofc22/tests/Objects.py index d2fb32ebb..bda08d776 100644 --- a/src/tests/ofc22/tests/Objects.py +++ b/src/tests/ofc22/tests/Objects.py @@ -21,7 +21,7 @@ from common.tools.object_factory.Device import ( from common.tools.object_factory.EndPoint import json_endpoint, json_endpoint_id from common.tools.object_factory.Link import json_link, json_link_id from common.tools.object_factory.Topology import json_topology, json_topology_id -from common.proto.kpi_sample_types_pb2 import KpiSampleType +from context.proto.kpi_sample_types_pb2 import KpiSampleType # ----- Context -------------------------------------------------------------------------------------------------------- CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_UUID) @@ -228,4 +228,4 @@ DEVICES = [ (DEVICE_O1, DEVICE_O1_CONNECT_RULES), ] -LINKS = [LINK_R1_O1, LINK_R2_O1, LINK_R3_O1, LINK_R4_O1] \ No newline at end of file +LINKS = [LINK_R1_O1, LINK_R2_O1, LINK_R3_O1, LINK_R4_O1] diff --git a/src/tests/ofc22/tests/test_functional_bootstrap.py b/src/tests/ofc22/tests/test_functional_bootstrap.py index 56231512d..334d7894b 100644 --- a/src/tests/ofc22/tests/test_functional_bootstrap.py +++ b/src/tests/ofc22/tests/test_functional_bootstrap.py @@ -21,7 +21,7 @@ from common.tools.object_factory.Link import json_link_id from common.tools.object_factory.Topology import json_topology_id from context.client.ContextClient import ContextClient from context.client.EventsCollector import EventsCollector -from common.proto.context_pb2 import Context, ContextId, Device, Empty, Link, Topology +from context.proto.context_pb2 import Context, ContextId, Device, Empty, Link, Topology from device.client.DeviceClient import DeviceClient from .Objects import CONTEXT_ID, CONTEXTS, DEVICES, LINKS, TOPOLOGIES diff --git a/src/tests/ofc22/tests/test_functional_cleanup.py b/src/tests/ofc22/tests/test_functional_cleanup.py index 6c3a79dfd..eb78a5850 100644 --- a/src/tests/ofc22/tests/test_functional_cleanup.py +++ b/src/tests/ofc22/tests/test_functional_cleanup.py @@ -21,7 +21,7 @@ from common.tools.object_factory.Link import json_link_id from common.tools.object_factory.Topology import json_topology_id from context.client.ContextClient import ContextClient from context.client.EventsCollector import EventsCollector -from common.proto.context_pb2 import ContextId, DeviceId, Empty, LinkId, TopologyId +from context.proto.context_pb2 import ContextId, DeviceId, Empty, LinkId, TopologyId from device.client.DeviceClient import DeviceClient from .Objects import CONTEXT_ID, CONTEXTS, DEVICES, LINKS, TOPOLOGIES diff --git a/src/tests/ofc22/tests/test_functional_create_service.py b/src/tests/ofc22/tests/test_functional_create_service.py index a76cc444e..f3389fdbf 100644 --- a/src/tests/ofc22/tests/test_functional_create_service.py +++ b/src/tests/ofc22/tests/test_functional_create_service.py @@ -23,7 +23,7 @@ from common.tools.grpc.Tools import grpc_message_to_json_string from compute.tests.mock_osm.MockOSM import MockOSM from context.client.ContextClient import ContextClient from context.client.EventsCollector import EventsCollector -from common.proto.context_pb2 import ContextId, Empty +from context.proto.context_pb2 import ContextId, Empty from .Objects import ( CONTEXT_ID, CONTEXTS, DEVICE_O1_UUID, DEVICE_R1_UUID, DEVICE_R3_UUID, DEVICES, LINKS, TOPOLOGIES, WIM_MAPPING, WIM_PASSWORD, WIM_SERVICE_CONNECTION_POINTS, WIM_SERVICE_TYPE, WIM_USERNAME) @@ -32,7 +32,7 @@ LOGGER = logging.getLogger(__name__) LOGGER.setLevel(logging.DEBUG) DEVTYPE_EMU_PR = DeviceTypeEnum.EMULATED_PACKET_ROUTER.value -DEVTYPE_EMU_OLS = DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM.value +DEVTYPE_EMU_OLS = DeviceTypeEnum.EMULATED_OPTICAL_LINE_SYSTEM.value @pytest.fixture(scope='session') diff --git a/src/tests/ofc22/tests/test_functional_delete_service.py b/src/tests/ofc22/tests/test_functional_delete_service.py index fed2300c6..51e91a596 100644 --- a/src/tests/ofc22/tests/test_functional_delete_service.py +++ b/src/tests/ofc22/tests/test_functional_delete_service.py @@ -23,7 +23,7 @@ from common.tools.grpc.Tools import grpc_message_to_json_string from compute.tests.mock_osm.MockOSM import MockOSM from context.client.ContextClient import ContextClient from context.client.EventsCollector import EventsCollector -from common.proto.context_pb2 import ContextId, Empty +from context.proto.context_pb2 import ContextId, Empty from .Objects import ( CONTEXT_ID, CONTEXTS, DEVICE_O1_UUID, DEVICE_R1_UUID, DEVICE_R3_UUID, DEVICES, LINKS, TOPOLOGIES, WIM_MAPPING, WIM_PASSWORD, WIM_USERNAME) @@ -33,7 +33,7 @@ LOGGER = logging.getLogger(__name__) LOGGER.setLevel(logging.DEBUG) DEVTYPE_EMU_PR = DeviceTypeEnum.EMULATED_PACKET_ROUTER.value -DEVTYPE_EMU_OLS = DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM.value +DEVTYPE_EMU_OLS = DeviceTypeEnum.EMULATED_OPTICAL_LINE_SYSTEM.value @pytest.fixture(scope='session') diff --git a/src/webui/service/static/topology_icons/Acknowledgements.txt b/src/webui/service/static/topology_icons/Acknowledgements.txt index 1ddf1e1d0..c646efdec 100644 --- a/src/webui/service/static/topology_icons/Acknowledgements.txt +++ b/src/webui/service/static/topology_icons/Acknowledgements.txt @@ -8,5 +8,5 @@ https://symbols.getvecta.com/stencil_241/45_atm-switch.6a7362c1df.png => emu-pac https://symbols.getvecta.com/stencil_240/204_router.7b208c1133.png => packet-router.png https://symbols.getvecta.com/stencil_241/224_router.be30fb87e7.png => emu-packet-router.png -https://symbols.getvecta.com/stencil_240/269_virtual-layer-switch.ed10fdede6.png => open-line-system.png -https://symbols.getvecta.com/stencil_241/281_virtual-layer-switch.29420aff2f.png => emu-open-line-system.png +https://symbols.getvecta.com/stencil_240/269_virtual-layer-switch.ed10fdede6.png => optical-line-system.png +https://symbols.getvecta.com/stencil_241/281_virtual-layer-switch.29420aff2f.png => emu-optical-line-system.png diff --git a/src/webui/service/static/topology_icons/emu-optical-line-system.png b/src/webui/service/static/topology_icons/emu-optical-line-system.png new file mode 100644 index 0000000000000000000000000000000000000000..a5c30d679170c6e080dee3cc5239bf7ecaefe743 GIT binary patch literal 12869 zcmc(GWmr_*7cUH5D&Wu|AfPitcZY_AqaWkD;WdR=?m-D*^Q*mXA4wkt*^WoFc00aO!jR zK~FmRx>*RfkmYmN+esU$K5e-#f$*HBLJadA^TXJbA)<;f2aN8?~dop*N2jQCuZff_2asIZ_m81_43W zcUx;O9#UuWaQ22NEWH?&6Mp#{`Mu6YJ$VT_tVW~^&JcBcYZiDqwJKStb8~mlGmXwz z8U#IfX*RRV!P%g?-f*4282HEh!)8(Zv+K)q)u4PBGq|Dx`y}Xy_Wb%!mn9j(Hwg=g zziO>*?~3_xpOco!PMazIdeY#@XCivDd;1;7y2e$#&-Fuj$S+UI6;k&D_XBjU*?*tE zd35XWrYi-QEaKVLrd4drPTLI+=j*t~5;wzh9|PO9GX$0PI*z|`c0Ecs@7gUfkfJ%~-|n>Go%vFq*Tpm*q@Ugn{u`bXe0^RYboGzZDAcwX6pNbb z3J#XK_}yT8=8_O3O8k;6-sws0&dWQ=(JCeBT?y?z`)SPX9p5hI8|i6vpcf>_~)17X@u)y$A^Ma`?`vd zk06Dc^U;l}>RPAzujCD(P9u;En)Zl)b9OX9EC`6fjQ;urN6k08rg*LmeD3_Sn5`j| zK?cUuD4HR^_10ghS(og$@h1&sJm5@GA!I|?V4oAcG8T9H!N8@eRtoBe-y=hlqQg2y zqc+HqX5$lSeX^^w%bt)?frVLNTJ=meeN*^VC! z*JmwVpZ$L2@>UzIolp`(o-&h{gn~m;i>ZJWsi~Aj^BHA`yJodSZ(H6#*8QGIRSlqr z(b#tn4W5l;2+a}vw({O62)ISJ+_v|S^9V}atrU>BQq!{dw(wE(&|7Y;=MTUQC7`pr zq~TLPKD@9UD^RM7k|Bi!>^tPYGoQICiMcdXQ6ox+%3l9n6SnRn{ody79K~&oFvNZY zrJ{)b{$6O8K;V<2k6pk1M3;W(4;S3-WqzmW=8;LSDC`$;&+LvlRxjnoZ z;AP%o(>tBTGYo#YJI6g^?vs1@+g>4lm&O#vpHc=IxQoGu`XdJ{Mn95$sFhJxDT^T$ z7m$eRy4(<0d>)x@;s4osPdkfzy*z{u*kiiI%AK~Em`_isyJHJaj$ zzuu28RE)mGx_+GRF02i8Y!AK8s?%~fkZZ4(`s_rld(rfyY9jB4yUB(chB2uFW}Uf+??v=+HtQ9 zLbLRjTi23O;MEAm8ro1>L*0FGW|m41!ngf_Ay@xSMREvIib4H`sDCG0!ms`w4D_%D zUmhL}DqMeau#$=b#)F12Ioh=<;ge8@NcA zrgLFEXNau;5z>X)P8MV^fH9SLp{l6wjRIvlL<#?|;ib^ThB2+C)LG3EsiGCrl5~KL>w8nh{LH&~KMM@r9 zTGEN1H1mWAVV^vvmlx{}$f*R;*s@eIIj_l5eg| zwR=pM24Qn+3;JC*xSk}l_r^Xy5K%nYM7=>_`8SND(yBK~14uIzdJjR+t{Fv?qk|OB5@HD17f`QOz0Aa2tZx2X!H4@IKxi)O^P+001YA=*+Ps6qfIu;x(;Mzbny42feq4U0W7-BthlBS2l}ZpWX9biKHJYSGd}W^A0-xBC+uz|H8~| ziW~DhCC>&aJ?^tR2S1n^l?ISPrru}Yf>Fpi!tB*yKb-j?|M!R)q7c{lX1<*wp0Bst ztgFA2rdvQd1OC)zBry&5O6lca{kGp2dvseT$9|5)GWg2-{9@@QPdu|~^jH?{;kRjJ zEGF|JRwilfOG2U5TK>gui>1SA2)HfopzZqdmqIo)WaXW-_xAl__1CrAI+dO>+R`w~ zk3T%f;&NGl$N(>gyU3;Hzmf{P3vhiP@yLg`m0-_(z?mo5hgey{e&CpyEM3CUofY8P?l>W+i9+Sb*$s;7!!!)biS1%f_% zX5X8fjnJ~ID$}QB7JeJx4;Opwa<8ocAo8rQ*lGpN9ejeg7DDp$WM^jdxD7bb26gkN zqruk(b|V=az_1i5W^slIHIkel_wAOhtD4qYXV{I2Mhun{TiHoaO-kg@gEX?9|NR(VuPJzZ+e$1w;XAyqAZEh zw)BHC!8LVv$OkYraHr=xm5015-ieGNJcqb?82aG zhRgkAQky;=SoFB@(?t2eF(nc|f&*l1lFnjk4+;CLdo`vlwSU`#Up(hy^GiA1;RPm) zcC8&dKi!@hJ}x7^#qxm9q>+@b+QckQ$ty>9tTVu8|8F{gikj7k8s&UF^~L4PrJL(N zk<$gABDsKHbI#lI*iM|5VH}yT-FjkH^FDah9FL-Wu@^%|ANA{gZx<;2wt-C~OJsH= z#ApLiS55jdLyOU?HIqiJ;XzxL3M%I4iyWWTyC$5w-cKBwMat9eEA|Zp^Ig1eh<$hd>dBN|^}{twtz+ zH4qd`+1;B`3V$to6f?!;K31{rRn6Bn>_kdJ>4kvDk9DRseFt>Q8^ZQQ3T$6M9-}92&*Lyx)v> z)9;y6`hl!EStzuWg9iBMN9p~C*>uT9p9qkH?7Gme~X$**rk z{bqyGu;Wi91yEMQLlaLFYV>;k#XbKj^~-Q!%+)ke7*ze@*Vo0oFPgkgq7G`PQX#e( zZ;7~1)Q<_$U#+UG$tqi5hl*=QL`*{K@pm$8l9E%QM&xdqMOG}@|#K(Gef4zpRn(9nvOL8>y03z?Z_o){rH7`)2dX62?R~_e>I&3vc;!E)GPek zEDqzQybck$wEvp3#rj$Y#n|}PpM)-fYGy!06pm+Fsw=he?#Hu-1Q?9Eh=a`R;$(~a z(txKPz>&zNWH7C0jvob*TFB1At7Q^}H|#fm2X#2{5v|VS3KNfUYzcf1LkcSm*{dg> zrKFqw*PAC7P@4PrFM57MnD*@_MEQ0+g?g`c92>&-QSY6e0;TY*%NVMYX!f91 zm$^pA{Al2~4_AOrFq>9e{>b5Ufpqs*Ys@-?^MLAF-ek*hqoyN;6@O`xWSgEcvdkU! zLypQGCyZoEjAE)bp4_6UnbT2hcFq{|L#DPxWZ?H*z3x8lZg%<331l)s|A*j>dl*Vn zO}(~=sOtXp3dItTbasAS>^ZQOXs_S1bsGNfJJ06iZ(g$@O4hfy?jX0so{?`D-Xli> zP<^UvhP_q{{yUL>eINO~mKK;|#a*sjq2Na_wVH=SRrot1`R55ft04aShtb?xX@o6v zhEow(VHaV-G%KY{Gsn9XgfQ3>Y@X%F_hT^p|;4UJVs1JMIqjce!qzJ?&#DncDG>ffs?~(UAp`UhZ4tC+hEMkx@&X zrmmT_D;*gu;0JA>fIoYw0>S6QM@Pc~%nu<+SvXF1>3E3OB|1cdbevpkXez>LvLt*hUWqfKCI&lKq4n{yh2EL++8)7bm#dP1VRMZ2vZk1)PXF1mjnRGOa z%9~<>hUtCF0+=GDHuKcv@)ybv0)i)oP-hM6Lo5@klMh z6Mid>+Vi+ZezgKn6xeq?S)EXe-moD0w2lUN7msY78)73s0DF0#z#tTcC6CcSWn%ct zl!z#yiYP#)%$5La!<7HW?;H5bwEz2_8X2V%_gN1=;6FJaw_`nIh{gOT2mU_|hZsKx zqB0d&hQRmUSDL1w^*h?YF`OH4gK{!a@1?Y_L@}?=bX_;qxNOTW>@BnhNaw#g`dsgS zx~;#h1dRN^R2v3nqLoDhME7l8TB$_6(-cHcIvs3+6FHTBD!e<;oqnd?{37fX7ba zi-c%r3achb{bYDAQvoV~rz!aYx73{Bq?FxltCc+-5gBjyaVMx0ighA~nKoNDNiibO_({cxHX#ay2dy*8Gem4p&>hEjVQA-U%0clg*O> zq8s|w6?_x8Ec)W7HqN&izbiChAMRZCZt$p&_DM-?^h1==Xr0ZVIOCYQl!VJH>U0gK zLroH?1w%sr5!jtAcb6;>IFKX%wiPQiJ5H2oNJZaf=NGXX8LP6V=2S8m$@$kiU1KU& zGvRMi7D6-kJ z99+qfPFzh)&x|%2uRL)p-~CzA#)Vvt75KRAU+VgpCuGB2aZ|o9VRN7;$Cjx}Uw|Nw zb33HISf;vBx83zKAtnqHR-X7AWYNqkfqNt~Qcx2Q&j!(bSR^{8NdXh3aZ%8-44A6W zQ@cbA1jagfOUu&))l9gRYEYo>p(g{P&oHkWX$AELa4@7Nu7CJPbSx~?W}15K-T{vV zpq(;B>~+`hjwExb53NMA?>W{sucKn) zbSnsix%fsdGG?7l zv*eyJ67zZOjQNg-4dpAyl8Zh-TNo`yRi2`xPhrX|HOEV}!IP`*FMPloJOPFPmAT-$ts@P(Qt8 z$7t1Yo2S%FDZA4D zCT`EKyUN^fzGA@5EG9R4_lLw=j2)+{gLamx4lC7K#Lmon_aAZZq`Mi&)~~F9z(zCt zG?9YP30Zr4=M|c_zx1x_=8 zg!Nqs&q-N@TS&6kT+fdFOHXrWkOf$d^hyTV z83T^JUax&=h+h@x*jtFggXzW{?5D?nR!j3R}o%_4WZM}6ws&wbCK_~+Po^{4dRJcnq*K;RWt>)|W3Vg#PHP=l@R zF{F;=a;x~QXna4bC@Lt#mJZQ?Ew9)*8lL`%tP0k9*S*@-4I()Q9Z zy&Yw)Ds%$m#wg!1Z~v%{sVk!3Zg z-<afFlwTBNtvR^2-V(vmeHQf4fnbWlDfBvm^e4R!D?(p!6< zI|Kh=5=aytbpLf7y0rnJ2F)=fP!cK%5)?O z%=G>}s|R=`?-EIDDp%;fo;dZ8do+B(UH^Pb0#1BiJK2;TPTSz`uwb+lpjT-<6)?0>&;hxYR>M_R3 zM9@o_TX-Wjfe1e3YCtVmNC*x!^fa>??0ggal(egb2fih%f|cnvcJx!ixfJ^N6!V&R zP|8o7Xyb+fg7l?=L*}--Lz^kjVu<2H*!kPWJ`fhB6%Zi{nSB9i22XYSv$v3^7EVm1 z>CHjfVH2Y1y?dwxYQzx+f#42PMXf(7bNBb#$3<|oVKxu1s8lOmJg*$w#H{f75P}Cr zMGq9;lk_`UZwp1RAn^_HC_wT|AxU8gU$uxU4rKEvvZ?w4o|c;}n->IB98G8}sj%Sk zd^49Kfm(H&KVJ0Q16KRQTZ$yUEBRJbw9te;G^>G%hFeo3#p#H_Ux_QBKJw zD|wggAjI>C_`1Nyqwt|T=@_H`qn(Oci-XIcCTb?fH3_k(N>@W6E*b#Ln?F|!%i#0h zFs^(0?30M}wGIOnG+s+U_cjfO#WYd!VaXSvdnRZ)JgBw{%%TISCF4E*D9e*ykxaZ` znM6P<(NZndsQL|@6UXDys8+P7Q0I^4Cb-}xcxijai0+Ts+t&gFN^9r1blZOL>|tnzm! zG9Xaw2uz!t;HRBq9Tc9*?G>3Sf-2;BRkFljH zO~V8=Mc(MrJ5&-K+1OL-)7wWeFziBv+u3?PFOqM3l*F{{e{}Gwe~(G;HcoVGaOmZM z-2&y;5=5*65M^>O?dA$0oh}{J*y2w~Ivh%Xpe~m~CF!>0NZUv{lvwcfE5~m|s#8Ar zNUJMaJG~TQ1M?oI^j~ucUOQn&aEg$QDj?*O;y7o?Zb(;=va zjrAZ$dv7bSY#Dc6oy{+bIXTKgC(M;)((dF!aE~*M-Cz(8fqOaNBO2^S(*WlH4yVU# zPgSR*OmT(jO$FpgrI;??G zb-oLY+G)eAavj{UOaFJeL%(z0!A0`k)F|8a>Vnu)Mr-n8v*hW6p4D+#6nK(}B1C9s zXUQb8$-pnC!$ZhCGP5Q9XsiYlmr`r8!uQHP8*18Y zV__vu6!wdMD^O%|*y`EdD$hSl65~O?&140B$lZ{`6bK<}6x?~)O+>E(AxJBS zSe`a@|MHt0VvgKh?3|zPLsL|9`rMwndd-{vsvZ!uus?tDO7L)#?sH3!TeDOPVSbh* zd-Qlm;fNu8m zkY%l=AuenR5bK>>i7EaFC8c;gz76y9VY`bpR4=f2&~TKwYFXt#%@{W&F*6kzrbp7a z{pD^|8WpDJi+DV}Koa^<4ym6q^mlK;kVW$$5Y*VXiM@or#JOwhx#1yZgrCpt-VP|7 zXTpS8=nVvy57S(k=XnEtjR=S-9WHNXEQ32;W-*1Iy=2;Ks*T?3nl}S)z_*-V#Sa10 z_>TD{#deK17UcTwwFf8Mxk>s=>{|y>v^Q8-niPO>;sejCceP30vdNtg8I|P%Dr`v! z%)B5}6{kv?djS~Rq&M-8Rq8*^Dk{$&knIePihlW6_ii$#}WrA{WklD<_ z15R~Cwj8m=_m*9k?}XnpIHGc2&N(jD4d~@f0orRlLFDVFkp|5dxf4-tOc*e^6E2}KSWvGW3L`4MxCC`yK60d z415s{XIpq=fCXjz`?J4~5AhYQ{&FY;Y}+`9PJG0g0Hfft&^9G9+t}d86GDXik|$>h zST=|z`4ISfi_T{YZQdrQUm^O4ytIcXeErAOK-ER(e!Y<2>Sze=OwK)d7_BNv_n0%}S}^!m-VWi{tv_xGs{y z$Q$CuRhS>vOOlB?jlMvrBBXm>a|JNH-vMezE$GY4e^5ERYW)2-8|cA7h{t2jGei$p zPl-kjS<14WA~_Oprn?yO^7u5Xg>HICs4Ch3uxI6TO3RUwFLt1#rtRqTCAMS;l@ zcQtvIiT^)9Wo-FG{r2VUZ|31&4}6Q7Wv$pbB4nk}ct$R-7bVb%&kcD@~Ls8_5D~^J8>>H(8N!6i|-%`BFtY z?eyeVs#v37N=)p#4gz3Sj15X7_iId=hLHYkWT~e^kcEHnxIX}S&;ptOCU}akI(A(p zq=^702*xV&EiU{$CU`h$`cV{T=>prc3WiK>gIyjL(@3m7i5WJ_9%q1YozXW-%{}hP zioIJXsh2e97GN)hg|Fs(ee~HO#3S0u!E@tQI*yOlhZyvKPrdIJx+kIaY zKeYr--gW2yjxepH>> zg%!@lQU5aA>u3+(KHbiH87t>G3yIj%$%&$0N~lr@jY_aF@wlY2GxB}}m<=Oz10M$O z&uP(wV;t3c^rLiotp=QKZ#8Om2m65|=+4vE17 zQl$-~?9q}Nk-C!dpCiVdS;`vj=CHrH_eq+R}^ZP35> zN$OWCTa^>kMJJ@tfJu?E;ArzcDfQuCn2rhHK6_Kbg6YQ^_0ompvdvY3=`jg&8L$^j z|M$wP^Re7sYQgTO1NVB1JQSQNv5g=E9KFf$E}Y@YT=lm#lOpO5sT& zcg!LxU%oT-DQ(ZX|MU%D--r8Ly!q0D19Q&{CRtyM?BC_^`lX-?#wVuStuKD*O07iDTJJhG zATn}jh%spbmiz#aG$24OW_f~E%C)qR>mi&l)w3B)m-IEoe5SmVV77548F;_y(kEsN zSS%oPLBm{MVs+~+>CJmk)v&Ld{)18k!mlyN9Mb)nm zzAoVwLfOU5I@7~I&U8PC7||W9?IEWGr9@n>IaRqj%mjX8VD7sJtL^q7SvYh%{-3?K ztWl{((2AuXpN|Wb#CyFL_ZKK=`%;mZCu4H2PKj$CAkQuDV~IKs`Mu=t9#j>UmZ7?2K%K&ANfjExh!`AxBC;N1aBp3)<1m8;i2-u)k+!Un>A9hQqg z;R0g-CtjwAoc{ZWX^iP6Vp`Lt)JN>XYp6S~ul~ah z4$-*#_AFLBkT25tnq&HkupX2rOD?q$RT%-LBMLlXRP*L_dnn^p0n3&dsE3FWP2O*qc#RniiV9TGuE|G=cyb#w%#TG#h^!3 zuolHM`3RrVq`dM86AI3x5HZcr8zDFQkueKL4zjotJc0h7i@qtj@G27?o)BTToJgsu*ds{D#WE@@(zZ4WFdOyUjy~`&;1batio_2k8A@Q($ zSFMB_HS&17jPW$1k~v)mznZ4eMIi9MT1?s9X7?|X*y@KUxJjc^JGCPj1DF0RS#4RG zTLuW>VWtBgji5*BRKY^PN1pQEJ#%b@EUbR&eee*yCpGXs%*e(Hap#^^d-&2_j9?O2 zJkhkyh^-lM5y=;G7uN2PZAgzmYEF-*4da)Pkm^v!1PcB4`TNCKzkcuTz}^{E#wb^MSJg%P@o zrh#u?#M_s}L%jj^Hk9&2{$c*V$@0tR*N;?my;y#^nkOE|sH2ENN^fm8913d_K#^*q zK?YQdYF7=g_l_u{;aeev7g=5dlA4yLSm~>iiB851f?JYU%ZRSH#{z?%i?I-+#V%ST z<462?><|VLIXWbcaiKsFAd%8XfSs?|VE5&+-;$e?p?%J&U6*H^7o%NKkx3j{`tV(- z10lkIT0M#7q0fSMIw9To>iCcd>)>}Q#Ut&v_b|fA=WE)4WbNa@TwCtox>JHqirIlcbEz=VE({Ig78st~_G>7u$unU>i2-eZYyrQ8 zq=3R=c&6FDJ%7u`_4c7xK?SN^))0;%Qy&8Z_92bMujS|RM|7zfHzmJ< z+T-lgr9)G5r!90DMwP>bn-+N2R?|6Ue2r)SWWH3e&Pz>Pvtsq0)LZ4TcDtLVLLyG5%6&3bJ9Rft(w~AYQ9&zi^0VDEq3^g7pYPNn_GgD z7n9ap9(3Y?fg1eOHULAKHHu=WT%hUw2xvhfmJmw+*%v7)5cOZ@N+~D}Xooop)gh9~FkYhLb{_sNP_iXVA0uGk?4Fh6)P26NnKtEXV@cunvBx$>Zk4Y@hEo z?AhusE3gipYh;qU6r)v1rhTa$ZHia5Q^@a{h3;{VTdJJJkS0ZC07>!=@JWW*jRKb;4+~Tk4>!1;KjBYZB`eOewZK&yqZ|J1joVAX-!l>5-Vw-J6<6OTmpU;Sc1#?JY-B44rO}~S zlwlEvWp00LduLxc%d~W?IGraePn5F_laiWi4`73ONP>6;u9OYN7ZimfV()VnuzmF$ znnT04VL^B-FJR&V<8os8vUo(-r7IMNwoMykmz@OPw1(~MNH-t)B(87gnY%-wibY80 z5VrHM*vva7hl+ztfz~sgcROt#wa9>DEAb(S@q&S%wH>mFktxztbw&M=DQ#ZAOBKJiBktES{(OB~F|~5xMWpNz22D?&mFrz0(~jIlZGvCj zE}Y5LH)t1nQ;E#3NpKj-EoF2F)esysQd$|T(BYTvBO-F8M@NjeX|$G4PKl)j9ZUMW zHf6!o8a&0v+fU+c(@@N~1Fze{3}qTLIIo10q|qvc;cwHc5LV>eyrJAn777I+ft-5Tkn>Js=X1sc#f`p@QCYADgMxLTln>_qZa%a`GD}b z&-QkMtS(SkV{Bx-fx%K_Zt@Zfp&c3TjY)?O>y=xVQT42DosJD5qM^vmZWBgwoye2e0T9Q=oQ410oY!pCFlm4uv zY3bV|?{BACPDeQkLbY;twI9%u`iIkp(Oc6Yk$qvAvWiVi@GsG0Q$rKOxh2(kqYi^n zPh>jD!C(Hi}mB}3}mT9{YyE=dm;2~}q$%R{j-`(Z~@rFIeN>uGCvjrkzr$P;` zzkQ=WPriA3d|!%5R`nebm;{2y3mq_TNno5*Et=tM#h&|eWWiz%L&Js=u){;L zMTPh8*}?BhF!W1mdUJhCWJR3awIg(Iqc|$dg`0ZKVq-0Kx&By~Su+3t(W4fgJh7cO zd;M@n&K{&Lf3U)0ct=Swl7l^lJx^AR>xs>P@4AFr)mV$SlYX|nv@S+T=zhL?0UC)E zr3SD|e^yoUZ4`camF%ox$!PrRi(<$D;^p{SVFae@5!f6IG4NreF<2BnmBReCd32Q* zlYwLt0CVMG=HI+gplWc~QDN-(bbb7gf3`&nsrG?ZEnUy#8$O!dCH~(+J}As?PV+r% znG6&E?T37`8jDUK6N5; zKD6|!rqz>>S^jXc&+^VFw1M&Hh`k`SRCR+U|GD=LC}Y>IT;*b9C=b<91nEw65*k{TwFowvO&P7NSG8KfQl&)BJ9`- zkF53W6vr5S*tcOaH4qf|4u6<5!c1OlD;)SEZk_Q&EBq$7E)nO-`UbV=r&?|^e@wWZ z71}#CVA7rluUT2esjyC@y~8#hVRQf#rqeKOi~}HthTBaonp+1&GWWZUa&EryVMAMs zXPFNnx+|4cPabcpn-F2%_N#7XO=jM;SQOz}#9;!X=JIhSY+kPQJd|yX7S6MiLh3IU zsOXboNUNDZe0W=hAU>O?opUF2?H&G)+UwXpCFS(dm&vt7phbLK>MGVc8Y$LFS`1%S z?Sdfw8u*sC9a$OB&v#_x8+gp*d*KWdUmDAHyl{%P2VvW|s!d2p0vtL1~Gkl8-b5 zQ9Atz+<^~xORgmJTc2h^YS@&@hJ21Ez}-QYE1w+q_us75))trbaTJH}8`k!8%6LX} zTGPZ4GB?D({M9tE1}-lhqrB%F?5GR)itw z2lsfHHe&nrY}mH5nasoBsmz7!kv*qIw{N-xfX)6rWHk58$lx!o+_}8|dP`p_j&rQq z_p*$C3u<2gl{SEO?fb>n#>>*dGam%()HXJ=pQ=a`7lAQbvr z#o;BKi*)a=O!OpwB2sUdZG!Mm)LCfN_mUd;b84;1h-*a@cg{Ji-j}$>WR++-Xykg6 zDU8UHNJ^7nU((m1PWon%wv%5)Xf-wbZoIP|^Iahx3(P6DjYbRB;Nt?WaWRsy zHAtjF^`z;wBFnm2x_eE~%}{AQuWVaVk9*BUma(3f=q6iZ)$a6vm~!0CP9eV=uHM*k zs{xt2i^K*P6l*=-p1_C%T@B*D`^)s$M8|hxtRq*8wpu;Wq#kb~4Gtp$fJvZ5WBujd z(Swkx*63}Q*|3>$)!-|;AuUeFt`QAkAQz2Qs#3hRk{Raq$}u0Dtv4|l%Wd{8tyr^L z=h;Tt18ZGEeJj#&?4Ui+zIb`q%5YTH)yu&$Y1&ls+q5>$_rCP<3u!jXVY7OwKSix& zx=z$pwlxJ~JLfK|e<>5o0}`>XUD{kXr0-r#2WB20J%{QwI*XBk$jBHFb@x-F^Cd*f zkSy|B)AjaUWRowAPSKn@eEZ7gxa{1mHJ(}mi8Iw*EWqRXx{+d4biie_m!q<>icZX7H8OqPY1g>nAk2Mc?H)C- z>=EQm2Co6z5UF#S#u9Ca#g2F$e`e=NFN2nVqkp`=1H9!>cJ`(G+0_P?-&;sDI73ut z3k=wZe!PRb!Iayq`xY&)29Dj z8EwAH{!PGm=X*h_`Bdy<5@45UwlaUim&P)!V_OuzoRr|4?&uivShbS-DnEXhZ1T)nBd%|<0Q`>of8LfJApI>aFfApl;zf$-}rp1Rp19D%Y|3y;sIH*uHqUudcRnGWUg|0 z-C3nUP%s0n!SH6f!mPtScRN^CWKJ3c9m$fZ|0v&hGf29vlz z@w;M<-th>^a*9Xg#A{jBRP)0$VoKpsnU7(83CRk(f5*`sV3^8LC%saD0H2xCJ`tKw zpOg#=QFyQ3ciS}qeXsJ)iimF$Kwn#Y)NK32bFi3!kPa;R^i&mu zg=3J&ZMFjEtgk2^iSm;vG4m8J7ExDArd&+s&DQ*rTew0gioUF((EW9_a(QlY)7Bp~{I6e_&$FidEK zUTDXkkeOd#VcV2Q-KzR@m=sv)BYh?spNRm9&xQwli0;^S z9-m-4DSX>}Ou@7h9LtOrszS=D-;9<1r1?1BN~K%poSq=$qX*{5%I5#_H6n`Rfj*Q0 zAv;XXPDr#si1KZy&eMvvV+c&VIO=7t&ptuLklk|$i&`p{`O>vtaDU;vSk^Rbyik=Q z^Vrgm$683;JhLu7=f`<`%kwILFKx1~QKHH%-V}PkC$MS493$s885^t1(FO_?>i5D# z&~|2lUfRk+TKV^3Z)nJ zOxmSxZgA;Tp9lox6hqm=dlS4N#>0i#&qzs1X>}yv6;dF?*k3h5GBRT2$`&vm-$wXz zm~2o>h0hiKjla3U+RTbfULpe(97m+|i7c(YbkR1T{hN~UY%fnKowG~li+4iBt+?64 zID9_8{MHp%JA2eq`Zn^K;mujN{hf(>5rZMj)GNHgVUCk84{YL7pLs4{t%+-)r%9!77GfsEw}$*1oJa~8)ddRW8k zX2}QfLD0cN`PDHU3?(!;E&v-V5qA~M)Y-1Ashud(`G}n`jDtPZ{{cwdl=tl`exejS zxS86Uz~iPUfv43M*VJaB*70a+5CW}ljfcngG@F{|2&_WL*U{5<9eU2VPu%$ABIx|c zg;k6eALGfM5n>6#nm>B0qCtcT^Wiz+<3Fo5Av3dv?O+Fl9T)Jw$%CLt9P0P+Fe!Xo zDey#mdrK*4JEp4!tqS>!58q&oIoG>8LuTV-7*7t91r-p&R_?v2EBFZk7Wrogc1WN2 zp}o&18^kv`Vx&xnW+#jPXI&V^g5J(<3wz8zzgaE~LU5juDnks8z%*t(H=e7fPR5-l z=zsU#-2=y#-~;fbY?$6TRqNiAl&$cLL-HSvh6foKq~->vX0fJ3;_E=dVidj^I{aKQ zIZ@?)9LAya)q)o9e^08AtyS-L;~g*7@yRsWeK=kfUl6?cy#2v~(wveIAL>CM-hONw zz71nlp-eDZ-&u^`92TwRCrD~DJO>YqWp*I4r&`k#6&<@TH7TtV3e{Xs;LfLOAnd{i zV)CJi8V|_QNYrJl^lfXb%EiaOjM9P0iHBs0++yz9-_jgo!@=QE;M=)vHwRtK6&jIrPf%a=jT|u5U2*_MdNb_V}!61O%O?gAW zVBji<;Uyk8HW5d6=syj{N66y=5Z=WVhF_zD8(=+Zq@&G+tDWu;X+OYC2ZFeY^OBO{ zqJpdtMB4KbHy~caK}im%zW^@>%Z5+=H=t$>#l?kt7GDBB7d10(055HJL-1OP_di=r z_P&(9sMyv)+;h)Q|H%ozfocW9CU`Py0)tkURLAjc^(%_jeg%vv*V~_bfkNnj#mH}c z7DovoAq9_0J7fJbnW$ZioPjR}uO}`)bHFIms@0aPtcapy< z;SPbqrKPQ+L&@DTlpb#xfK`gEpVs1=d{NVC-P!PZDw4(_OtYu&zGQLEp!PKBCqA&| zI0Xg1a$EEQ_=yO3R7W^Xn!cWtRn!p=h-Jsl42CNE-dg=a>*>qGWeRK&!2O4JxjWnb zv>yC?I^(hWpJ<0`{tuR&y3Y)SozUY_xU1EV>|IQS-)N>3vD5H!`%G@H3GCgi zC({^f*}eLek`~76ck=odKm1;AFr|aY>CGKl@{Xuxyp0$zwgm8tm#yN4|6B%E+A=#| z7#If(yv7F{Kz`ACJoTzx&i3+-r40kBP!(GjHKGDmVL-n;cF_PTP*T2Cubfmv+fk`h zhCm*hckc%rN`yC#^(pNtr~fwJuMHC^GmyGFQWNJ(J$}j}m9Cy1t+lHm0N9Oo-IP4? zAOZsu2i2 z%No00<4>VIcaR}pL- zfNP&_V8eW34?;C-qS{+$TKC>e4fou$fQRiOXoYLx$&CgM;MVT=N~9eBhLcMStjYop z8W)3PlZ;m&xpP=^t3AH$r?|}kBb&Jer`SjE4nc=xO8!iEP&V6Z$_5QnP!N*(Fr7_9GV+VDRt5~G>SGtP)!;P8ho>WACKlwOS8!4kE{E5%&PLZoFjV{P>5x?C3E2;h=6@^Y8@~w`QbIkBU;So$nVrEQ32O?^xL!r7Z9DRBr@Pwz8jmwH`6n5b7EE0m!9xUI2%v(v4Zwm1IVn5Qvq_G+tJ9Q52CII^Q7}sL_`=|pdBRG$-xMo=fT|mja+D8j@&m%BR`(5!qu8?E zouOT+m5u`Y%wIC$%IKFeBO@xuQ{nZmXxV!(*6zhv2cI9aJ1xq8V{o-w(Vdl2-rgvFEf6-ROe9!aIqY8O5SlMH0>%vqU6@^9N!&OHp?{_4*?nT*Gl`PhQQ?Yc{U z_7C|~LIn@QXF&(%AEltS<8PVp7R+CQLX(%j*7TfuQhc0$)VgdvC2I>RSsKAXd`TE3 z67W(-Jqb>Dh1DjMZ#3#e`zzVs;Cz#@Wc{g6%%)zPOG~?(JFhxF ztsXUtfOrSO?QW%?3mg z=c&2s)x&<(=776>ZpC(iRqiRFXZy>;Eq%WTM#8fGrKgc_GcY`7WU_SE*XQtHzH_Q0S9y-`{hO zsW<;c<-n+MsoMhY(dW~ruZHEoQBjsvgcAF$*HPS!1aVj_vDsB)*(Pa0BwR`}R-nZz zb6J#ZYybV#jwa(ARnlcUXGI?r2B17o5hxNaGb|FV_=chHK9}!WTu!&Au}o`l`?UnC zfqQKb!*L~k>9@PkH^Uvar5u3$r;ljzL#cwOJsuYR(U4W)OAha9%j{O7I^cMX%l0pV z1r%{tnG^>tRm)w!$GvqLj=oBHj&pBj*nGRYgQJ9H!Kj>5I)zyN`zvF*+y_+WWF`*4 z*p!KtZsXvU?2cu@S0440?3E)AIeH)r^W5a;FVsGa$|3IJT%5A`$wY0|wy|oZdu-g? zT#I!3)4UK%j@Yi*WL#u6bjR#rZ_XDe4!?IIR4SFn=y;74^G|jzM2_5i|Bi1w=y=jD zym~|c(22E>tA^RxpWR!`>RO^k5kN*7uNp7vHY|YB1fJx4B8Z}Q!QPFz!uj5q^mno^ zZ4d5!&7k~g4IS_=8mj%$ z;c35=RqY(jOl$Apa$g==+|QgN2e$u>bANgy#fM}}gSWdYB5J8*9vs`f0g-&?twl&) zp;=ffOdMvFHKeBG_!PBFz9v^$Ri0Acu5ZAh^!^|St9<8L`VGHETg4-hN@E>tMmD?e z{UaU6|45P+X2FF+kJv9i0hwO!eJah`-FM2{UuE!^eDmG>+MMloVuqcM_3wl}O|bjI zZBB}5>lLkhj(-Jg4Vvd}RP7x;h=n~g?VSHEqcVESFW=XvYRq;;eJ{j3mv{61L{(+h zB@P6{)&z;VgkqN|Ha_lXVYi=mFrV;1euJl~^;={sg4bx%jW0>C0fQcVxh>B zCRpWx)zUvg;Yc^fZ;yK>K8}Z3yTnT=@%?Vgc+5Z4$Y&ug3%5F2EBrWynjzW{8P4!p zzBhL^QF?|Jind97_G!GpoJmB4cPjX2S|~MiL&@aW*+t)XL(l%^>RiduZPcMfl=FE1 z?+P(M7`m?1C5+5k2orNUH7|}PWJ;S(2AFDF)2jVg@)!g)=mf}!UjddhZv+qA9Wf(; zw0|AUKbzmC8F9PbeYK_Bg=J21`5JusbXDln_!zA1vSa8rj*76%tv4`K|9*6o zzy#gwsT%#xmtT8_pqQ=x4umZFq#)3sZ`K&1Y1tdMhS?`&Xe?W%!t&YHhy}Fuc-SmD zYs&xl=UVsKi6;C7PS#-CdNBBZvIc%l8&S>7R_fAVFBw{QV1zbmd~ei2*iXCwk^cL< zHmrBes9kyOM1⁣ohp)AI+dseJX4}`V&ErvK4_*Lc&2RRR7t@r~j34&FfC>Stf!X zgoyD2H#dH};rRcEn}zD(3_4-sNsYRsuKl)0zFiYiE>=E{Z=8$gHrvoy8!z1g_AegC-+ze5!cgiEj_I;o+F#@QL$?CxO&tKv<2m#-93wXql!(?2$ z&H0$u^xaSECV@-Kw z0jS*5GwqFMsA)i5zD*BszGDbB%A zwttr1-{y}V2ReVQ7F9+aKDoZ{nb4jSzy4?QB1cE2pMkq2FJ}Z0bI(l3d5;}@*j8NQ zk!uzWINa&{O<$MR4s41@OQ^~0T>?lWEe8dz#Qq(q9pCFqz^?-x03?1d7hsn{O7Q?c zJ!$7uvJnrT_~^B=*4%F~%>&4E#E(3Oa+)aMpg8*fYHTVpBE@_Tw)>VG1u4)wfXC8q za68>myHzi3+HMx~4~$69qQq^oXP|C;$pR7Jkud4&UjZUY4 zG7$GY62Jj;KL-U>8xOO^`wD7Rs(pX>pQAk$2GxPTdag+gl>`G*F6=(A!rw z!?&>O_{P^K_`t*WJ2RAC5J!)fCfnn5%@l;Lfx&rqr;HW}uar>U(idBG$ zfb(#|_$-kE_O@@pw63s=ir+)%p24S3Sd9_aB9{U$d3KZ{9XZY_5oW!emQ3S3!);bl zYkS;S$B}*48zG^hezftEHpcM^-QN?np7<49CdTJB$ZTc1Vc=8?!LX6TqdDa#7j#kM(_Skg$z%XNH~-S9s|SP%_UMWCdSd!3?BKJ3I9-N_l5epk-C()4k}sOx1d=Yu zon2oAm}}bpx+y4lm>sp2pYBs^_{43)2xm>~pH~Pj6T@~P=Vju6mLRX0fYUn~&o`;} zLw86b}2sgIard^MZV9irqrlTo9#`&$s8TeFK0!`1Cz( z69pMy3Ac-+dVh!OryqdEhI;nPJ~Kjl=wAL$bwL5iEn$Wnt6r^d)l-cY#@Q(xU_^1R zU8am=>dbg^O1#Vqfp;x^gM`4|*q(5ITRX!;m38s(sjCk$VrqAC%$N;JQ8BGd1ipq~ zyT*|IU3sp*cCT~mkVrt{^O_KLnbTaC@=XdUB8hoNfkGG>PHf+rF@nfsf6wo)sUxUE z^=nW^7XyioiV&x&DnE?41sRC9b6Wo+Ftg@(UFVOb(xqbQBV_1~Zx={wF7wybV1kHt zB9z)-bjysw^_TbzTF(MRQ*L(8KUi?CJq7A(ZO1m)Nmurab>(&Cw3qfqnvsjI|8`bw z*myb2U?A7P)RO+|p*GN%SY)qr8VFWll6arHVT1EHLR8Z&pSDjI>(cg+RfGX_RN*5gQ-&|KFP%pxj|b+ObLSZj6CO@M zv(++uFr&QaEDUn-J5znYjZVHeF$-7hT0S7}JckhLUP(()0fv!ZOqr}{O!!txjer%JF@X&!5zTxv%{RC_DOphuXK$Q?&~kcdm@-t8Mmg7T5A~Hw;m9fLGoo zaIx*25O(UdA1Dy2c9IhHvI`#_?TVv)&un>BrDV3H1OP>iUBkw%2d5IL6v|>$p&BD3 zNb$=2y~fEaV-;5qsnK?^Bc_v@>KPo|ZBW`rGgy>1JM7CVuX!k2oMm*>`wl(4d;CS0 ze|vbeS+(>ddByEW@plF6G6EUxJF)ggy%Z4GD=H%gSc>b|8@Hko177DQQePJ7<<;}i ziYw#MpGlpPP9@!aI*~!-xNdAt%R46H;9udB4M|!3HLo&=2QdgAk(dz4M3rL?<7bea zJXC|kKHl*kjl_DVa1wz1obOF>YaNkE)S9Tncc}MkBKz$blkP(UdVg*_2M+ZZ*Pjsw zIw&>TwR#wvQWnnFKCz7Awp#cdo4QT;5=mdb{qfRB+V*od)!NUu{^C|Ezd3Xofm+k| zQst!4$~|>4a{lr9X#;!om23sBIS6{X|R6JlT4LrX0P>DR3PW5;&Z^+1nlKHAb@B@kx2oJk*P_DbCcl%c!d1&Y9*V+Ul zG$LBd$X>!edt%_ZTryr3B1SNu>glhwgAeVCs~J+yhjr%Nv*c1pfWd&~G8cMbqldWN zDoq(AUS=peHp^kcr6B%1KZrAwVFojb?PrWX^A-~ND`i_?(-Xc+lGUQNESXj+&&40z$W36HVs1-cmIXrS(4nK|WuO;WniDgE#g3}v zXx=(v3cd3}ixWiR1t_`7-s_by4wieI1jZmpCIR+T{Y_d#`=i*Ldk$3OS(;$!_bbJH z83H{J`z7DkP?K!p-!5_Vg&Gp z=Q8OG-?;Nrx%nowa%tBy_l8N1Uv1bj8Ylm!{2U@p!g-T0p0(;P-azeP*o)gdUMIEq z8FZkxK36}WRGdp9_;5c3CVfrcI|Ju9dfI{i(p?M>0%nM4rY(Sf2@HrNG!SxcCJNKz z)q?l~^2$`#zO?}p7RT+Pz?SZnzr9raTV;4w(280uUI77xnB?+YJ+9B(WHL>VLV5pB z_cW=J_KnLKD@cJfX5cPpQ>_zDU6Hd{+WwVxqUm7wDe~%HtCbzAV~5rKM}H?1t3s{R z@{Wkmn@hLQn<6~aY~(V~ulR36xF_>Xb0T5@iKg;d$=eUKfp;YXZKYXzPHwkLhy5ve zVs*3L%3U}4;ykj~!Ek~tZl!$>xt=xmk+J~IruWtFH19&p* zIJ_vo;#np7i!SBT?e+QqeP_;GVBL!&Hr-Y!k}q!dhgcCz-^ZTt2sW$G|CFW(iNf$XH6!UK&>JZIy6OI2N)9?_;5~|wqzHCddwln|*dv)h@B|s|{DelR0QlQx z&(Ku!S;EA#xlgU;lOvLzgT|_bD>n;ueX9!6*?D$EywRVp_ZkY{U%4F~KKf#qmGh}V ztu?EE>)g4M`C!)VFrwk^z3y{dh2k}D!}yuNWPEf))%#02v2k@mrf|KD-rp}hrIX5n z&{8p2UCVT?+t1p_^qPm$Gj=Y#&k9SlFFac{%&#j;nx;iF0v<)pF4mM|O#@7*d0wT+ z0{gSnLbV67&gcW!+EO=iw2W^y%3ZpA00Ej`S?ru0Z`L(QUa0gk=d|k7zif)tYxNFC z&_O>kr-@7)*@xATx#pN3%*-cse{1O6nkfA|P(sncaq}&jMG_}R{rOLhva;N(e(vYm z=-W>aYt@bRTwIKOa{zCNuHkWIbF8t$5NJ&Fnpowt6aK3``1WKEpVv$0kZzx?s%XHY z`5vG^4Z|!?pGipmTU#tznx=KmeQ_HAZrW|jU(;vn6xCL*SblMYa{jE?psvO&kbcNN zI!&`X1Y{$@&mvDzdnAU>|Ahs+gjpQ_of9*EHEHoz0 z*TM6j{=?G0DVFjmkVQ5tn%weZez74>m7u)I9DQ1T1G!~QW1K)MyycW;+q)zT=UHQZ zsI0@it_qJ8O|FMHoK!Dq=KUVk_0KtY~ug{b!25e&L|5*(SJ7P179$JLMuO)iTfC->gs z!ykoG<-m!^M5q5~as8`c6%ve4T%Wd;?4H2i0{)_e6Z{-(8)YOwN1+TvrYT z?Y2r678CVjNO!WF16Quz4-eVlsSCnkipAM5?*e(FeJ>WQB!}xopSN+1MpD#x+t(%G zAV|ps2Hin3j=V4mdM>kAd5^CE>K%4D8vLJJS3w3)amD>Y8}5&0pCZs>&h`3>{C;Ex$82`_Zla*x4&ukUM^#aZguKkUflE z_S3HH0x@rb;LGloeP#c;^j?ScQ`b!9ox9g*+I$90n3ghso%7YdZetz44VDw`>wuST zdOVZexInyljZdo`zWi?#eW?#`A)8xRuPEy>`IemMSlh1;X=;jo-0?!wti6#M^cYg@ zHz87F6X~4=8xY8^iOM$6My(LzaKyJjohzPPHL%C zrK&?K{7rX9o`4XHN7Rg@r$w@CmU|rbzqPf~@D)TM_Ziz%ZdnHCPHwV0teW~2i)chowg!l<1+eo3@g7B*da!O845TFnf3W@txA zbEE@~N`6w*OKe%J^sF$&Ll5I>Wt1k<2+Uhg6t<)!)e{9Aowp=Fsm2%lTGE?%ulf8r zCcZwN>mHayGu#k3J16;hvml)=jK1<%)+tX`i0B%{)pt`;rwD?GH%YJG=OlUw{8Y(1 zi*!@jsE`sBN~dEd!;>VOFWWMtwf~?6{cyqVxZVH#EyPZP@-6KL1*B!j zKw=t=??GG(qp=LncCGQC;p$1``C;wA@1l;`3%cVAcJ)k8_ra$(2X{hz#lQ1!13%RQ NsVZqIR>@mN{6A11CyD?7 literal 0 HcmV?d00001 diff --git a/tutorial/1-2-install-microk8s.md b/tutorial/1-2-install-microk8s.md index 327c6af9e..09e0b41a3 100644 --- a/tutorial/1-2-install-microk8s.md +++ b/tutorial/1-2-install-microk8s.md @@ -70,16 +70,7 @@ sudo ufw default allow routed ```bash sudo usermod -a -G docker $USER sudo usermod -a -G microk8s $USER -sudo chown -f -R $USER $HOME/.kube -sudo reboot -``` - -In case that the .kube file is not automatically provisioned into your home folder, you may follow the steps below: - -```bash -mkdir -p $HOME/.kube -sudo chown -f -R $USER $HOME/.kube -microk8s config > $HOME/.kube/config +sudo chown -f -R $USER ~/.kube sudo reboot ``` diff --git a/tutorial/2-1-python-environment.md b/tutorial/2-1-python-environment.md index e03e3daff..4a818e9e7 100644 --- a/tutorial/2-1-python-environment.md +++ b/tutorial/2-1-python-environment.md @@ -32,13 +32,6 @@ eval "$(pyenv init -)" eval "$(pyenv virtualenv-init -)" ``` -In case .bashrc is not linked properly to your profile, you may need to append the following line into your local .profile file: - -```bash -# Open ~/.profile and append this line: -+source "$HOME"/.bashrc -``` - ## 2.1.4. Restart the VM Restart the VM for all the changes to take effect. @@ -65,13 +58,6 @@ pyenv virtualenv 3.9.13 tfs pyenv local 3.9.13/envs/tfs ``` -In case that the correct pyenv does not get automatically activated when you change to the tfs-ctrl/ folder, then execute the following command: - -```bash -cd ~/tfs-ctrl -pyenv activate 3.9.13/envs/tfs -``` - After completing these commands, you should see in your prompt that now you're within the virtual environment `3.9.13/envs/tfs` on folder `~/tfs-ctrl`: ``` diff --git a/tutorial/2-2-ofc22.md b/tutorial/2-2-ofc22.md index 651b7777d..5a0547d64 100644 --- a/tutorial/2-2-ofc22.md +++ b/tutorial/2-2-ofc22.md @@ -49,18 +49,6 @@ Notes: ## 2.2.5. Test execution -Before executing the tests, the environment variables need to be prepared. First, make sure to load your deployment variables by: - -``` -source my_deploy.sh -``` - -Then, you also need to load the environment variables to support the execution of the tests by: - -``` -source tfs_runtime_env_vars.sh -``` - To execute this functional test, four main steps needs to be carried out: 1. Device bootstrapping 2. L3VPN Service creation -- GitLab From a94c5e0f5bc00179a869f825cb98b317cc9613d4 Mon Sep 17 00:00:00 2001 From: Javier Moreno Date: Tue, 20 Sep 2022 10:06:52 +0200 Subject: [PATCH 04/34] Changes in the DB' classes and files --- src/monitoring/service/AlarmManager.py | 0 .../{SqliteTools.py => ManagementDBTools.py} | 2 +- src/monitoring/service/MetricsDBTools.py | 2 +- .../service/MonitoringServiceServicerImpl.py | 8 ++-- src/monitoring/service/SubscriptionManager.py | 0 src/monitoring/tests/test_unitary.py | 48 +++++++++---------- 6 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 src/monitoring/service/AlarmManager.py rename src/monitoring/service/{SqliteTools.py => ManagementDBTools.py} (98%) create mode 100644 src/monitoring/service/SubscriptionManager.py diff --git a/src/monitoring/service/AlarmManager.py b/src/monitoring/service/AlarmManager.py new file mode 100644 index 000000000..e69de29bb diff --git a/src/monitoring/service/SqliteTools.py b/src/monitoring/service/ManagementDBTools.py similarity index 98% rename from src/monitoring/service/SqliteTools.py rename to src/monitoring/service/ManagementDBTools.py index 092d07e9b..28ce875c9 100644 --- a/src/monitoring/service/SqliteTools.py +++ b/src/monitoring/service/ManagementDBTools.py @@ -14,7 +14,7 @@ import sqlite3 as sl -class SQLite(): +class ManagementDB(): def __init__(self, database): self.client = sl.connect(database, check_same_thread=False) self.client.execute(""" diff --git a/src/monitoring/service/MetricsDBTools.py b/src/monitoring/service/MetricsDBTools.py index dc194c430..f04b2a7ba 100644 --- a/src/monitoring/service/MetricsDBTools.py +++ b/src/monitoring/service/MetricsDBTools.py @@ -50,7 +50,7 @@ class MetricsDB(): LOGGER.info(f"KPI written") except IngressError as ierr: # LOGGER.info(ierr) - # LOGGER.info(f"Ingress Retry number {counter}") + # LOGGER.info(f"Retry number {counter}") counter=counter+1 diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py index ae6e9570c..19b5e7e74 100644 --- a/src/monitoring/service/MonitoringServiceServicerImpl.py +++ b/src/monitoring/service/MonitoringServiceServicerImpl.py @@ -28,7 +28,7 @@ from common.proto.monitoring_pb2 import AlarmResponse, AlarmDescriptor, AlarmIDL MonitorKpiRequest, Kpi, AlarmSubscription from common.rpc_method_wrapper.ServiceExceptions import ServiceException -from monitoring.service import SqliteTools, MetricsDBTools +from monitoring.service import ManagementDBTools, MetricsDBTools from device.client.DeviceClient import DeviceClient from prometheus_client import Counter, Summary @@ -55,7 +55,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('Init monitoringService') # Init sqlite monitoring db - self.sql_db = SqliteTools.SQLite('monitoring.db') + self.management_db = ManagementDBTools.ManagementDB('monitoring.db') self.deviceClient = DeviceClient(host=DEVICESERVICE_SERVICE_HOST, port=DEVICESERVICE_SERVICE_PORT_GRPC) # instantiate the client self.metrics_db = MetricsDBTools.MetricsDB(METRICSDB_HOSTNAME,METRICSDB_ILP_PORT,METRICSDB_REST_PORT,METRICSDB_TABLE) @@ -77,7 +77,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): kpi_endpoint_id = request.endpoint_id.endpoint_uuid.uuid kpi_service_id = request.service_id.service_uuid.uuid - data = self.sql_db.insert_KPI( + data = self.management_db.insert_KPI( kpi_description, kpi_sample_type, kpi_device_id, kpi_endpoint_id, kpi_service_id) kpi_id.kpi_id.uuid = str(data) @@ -107,7 +107,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): def GetKpiDescriptor(self, request: KpiId, grpc_context: grpc.ServicerContext) -> KpiDescriptor: LOGGER.info('getting Kpi by KpiID') try: - kpi_db = self.sql_db.get_KPI(int(request.kpi_id.uuid)) + kpi_db = self.management_db.get_KPI(int(request.kpi_id.uuid)) # LOGGER.info('sql_db.get_KPIS={:s}'.format(str(self.sql_db.get_KPIS()))) # LOGGER.info('kpi_db={:s}'.format(str(kpi_db))) if kpi_db is None: return None diff --git a/src/monitoring/service/SubscriptionManager.py b/src/monitoring/service/SubscriptionManager.py new file mode 100644 index 000000000..e69de29bb diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py index 5dc94db31..1ea85a5a2 100644 --- a/src/monitoring/tests/test_unitary.py +++ b/src/monitoring/tests/test_unitary.py @@ -42,7 +42,7 @@ from device.service.drivers import DRIVERS from monitoring.client.MonitoringClient import MonitoringClient from common.proto.kpi_sample_types_pb2 import KpiSampleType -from monitoring.service import SqliteTools, MetricsDBTools +from monitoring.service import ManagementDBTools, MetricsDBTools from monitoring.service.MonitoringService import MonitoringService from monitoring.service.EventTools import EventsDeviceCollector from monitoring.tests.Messages import create_kpi_request, include_kpi_request, monitor_kpi_request, \ @@ -154,9 +154,9 @@ def monitoring_client(monitoring_service : MonitoringService): # pylint: disable _client.close() @pytest.fixture(scope='session') -def sql_db(): - _sql_db = SqliteTools.SQLite('monitoring.db') - return _sql_db +def management_db(): + _management_db = ManagementDBTools.ManagementDB('monitoring.db') + return _management_db @pytest.fixture(scope='session') def metrics_db(): @@ -337,8 +337,8 @@ def test_get_instant_kpi(monitoring_client): # pylint: disable=redefined-outer-n assert isinstance(response, KpiList) -def test_sqlitedb_tools_insert_kpi(sql_db): # pylint: disable=redefined-outer-name - LOGGER.warning('test_sqlitedb_tools_insert_kpi begin') +def test_managementdb_tools_insert_kpi(management_db): # pylint: disable=redefined-outer-name + LOGGER.warning('test_managementdb_tools_insert_kpi begin') _create_kpi_request = create_kpi_request() kpi_description = _create_kpi_request.kpi_description # pylint: disable=maybe-no-member kpi_sample_type = _create_kpi_request.kpi_sample_type # pylint: disable=maybe-no-member @@ -346,11 +346,11 @@ def test_sqlitedb_tools_insert_kpi(sql_db): # pylint: disable=redefined-outer-na kpi_endpoint_id = _create_kpi_request.endpoint_id.endpoint_uuid.uuid # pylint: disable=maybe-no-member kpi_service_id = _create_kpi_request.service_id.service_uuid.uuid # pylint: disable=maybe-no-member - response = sql_db.insert_KPI(kpi_description, kpi_sample_type, kpi_device_id, kpi_endpoint_id, kpi_service_id) + response = management_db.insert_KPI(kpi_description, kpi_sample_type, kpi_device_id, kpi_endpoint_id, kpi_service_id) assert isinstance(response, int) -def test_sqlitedb_tools_get_kpi(sql_db): # pylint: disable=redefined-outer-name - LOGGER.warning('test_sqlitedb_tools_get_kpi begin') +def test_managementdb_tools_get_kpi(management_db): # pylint: disable=redefined-outer-name + LOGGER.warning('test_managementdb_tools_get_kpi begin') _create_kpi_request = create_kpi_request() kpi_description = _create_kpi_request.kpi_description # pylint: disable=maybe-no-member kpi_sample_type = _create_kpi_request.kpi_sample_type # pylint: disable=maybe-no-member @@ -358,19 +358,19 @@ def test_sqlitedb_tools_get_kpi(sql_db): # pylint: disable=redefined-outer-name kpi_endpoint_id = _create_kpi_request.endpoint_id.endpoint_uuid.uuid # pylint: disable=maybe-no-member kpi_service_id = _create_kpi_request.service_id.service_uuid.uuid # pylint: disable=maybe-no-member - _kpi_id = sql_db.insert_KPI(kpi_description, kpi_sample_type, kpi_device_id, kpi_endpoint_id, kpi_service_id) - response = sql_db.get_KPI(_kpi_id) + _kpi_id = management_db.insert_KPI(kpi_description, kpi_sample_type, kpi_device_id, kpi_endpoint_id, kpi_service_id) + response = management_db.get_KPI(_kpi_id) assert isinstance(response, tuple) -def test_sqlitedb_tools_get_kpis(sql_db): # pylint: disable=redefined-outer-name - LOGGER.warning('test_sqlitedb_tools_get_kpis begin') - response = sql_db.get_KPIS() +def test_managementdb_tools_get_kpis(management_db): # pylint: disable=redefined-outer-name + LOGGER.warning('test_managementdb_tools_get_kpis begin') + response = management_db.get_KPIS() assert isinstance(response, list) -def test_sqlitedb_tools_delete_kpi(sql_db): # pylint: disable=redefined-outer-name - LOGGER.warning('test_sqlitedb_tools_get_kpi begin') +def test_managementdb_tools_delete_kpi(management_db): # pylint: disable=redefined-outer-name + LOGGER.warning('test_managementdb_tools_get_kpi begin') - response = sql_db.delete_KPI("DEV1",KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED) + response = management_db.delete_KPI("DEV1",KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED) if not response: _create_kpi_request = create_kpi_request() @@ -380,15 +380,15 @@ def test_sqlitedb_tools_delete_kpi(sql_db): # pylint: disable=redefined-outer-na kpi_endpoint_id = _create_kpi_request.endpoint_id.endpoint_uuid.uuid # pylint: disable=maybe-no-member kpi_service_id = _create_kpi_request.service_id.service_uuid.uuid # pylint: disable=maybe-no-member - sql_db.insert_KPI(kpi_description, kpi_sample_type, kpi_device_id, kpi_endpoint_id, kpi_service_id) - response = sql_db.delete_KPI("DEV1", KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED) + management_db.insert_KPI(kpi_description, kpi_sample_type, kpi_device_id, kpi_endpoint_id, kpi_service_id) + response = management_db.delete_KPI("DEV1", KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED) assert response -def test_sqlitedb_tools_delete_kpid_id(sql_db): # pylint: disable=redefined-outer-name - LOGGER.warning('test_sqlitedb_tools_delete_kpid_id begin') +def test_managementdb_tools_delete_kpid_id(management_db): # pylint: disable=redefined-outer-name + LOGGER.warning('test_managementdb_tools_delete_kpid_id begin') - response = sql_db.delete_kpid_id(1) + response = management_db.delete_kpid_id(1) if not response: _create_kpi_request = create_kpi_request() @@ -398,8 +398,8 @@ def test_sqlitedb_tools_delete_kpid_id(sql_db): # pylint: disable=redefined-oute kpi_endpoint_id = _create_kpi_request.endpoint_id.endpoint_uuid.uuid # pylint: disable=maybe-no-member kpi_service_id = _create_kpi_request.service_id.service_uuid.uuid # pylint: disable=maybe-no-member - _kpi_id = sql_db.insert_KPI(kpi_description, kpi_sample_type, kpi_device_id, kpi_endpoint_id, kpi_service_id) - response = sql_db.delete_kpid_id(_kpi_id) + _kpi_id = management_db.insert_KPI(kpi_description, kpi_sample_type, kpi_device_id, kpi_endpoint_id, kpi_service_id) + response = management_db.delete_kpid_id(_kpi_id) assert response -- GitLab From 548599eade369256cb4e3b36bd22d4316f54004e Mon Sep 17 00:00:00 2001 From: TeraFlowSDN Date: Tue, 20 Sep 2022 08:51:44 +0000 Subject: [PATCH 05/34] Minor import changes --- src/tests/ofc22/tests/LoadDescriptors.py | 2 +- src/tests/ofc22/tests/Objects.py | 2 +- src/tests/ofc22/tests/test_functional_bootstrap.py | 2 +- src/tests/ofc22/tests/test_functional_cleanup.py | 2 +- src/tests/ofc22/tests/test_functional_create_service.py | 2 +- src/tests/ofc22/tests/test_functional_delete_service.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tests/ofc22/tests/LoadDescriptors.py b/src/tests/ofc22/tests/LoadDescriptors.py index 4d3af78f5..33bc699af 100644 --- a/src/tests/ofc22/tests/LoadDescriptors.py +++ b/src/tests/ofc22/tests/LoadDescriptors.py @@ -15,7 +15,7 @@ import json, logging, sys from common.Settings import get_setting from context.client.ContextClient import ContextClient -from context.proto.context_pb2 import Context, Device, Link, Topology +from common.proto.context_pb2 import Context, Device, Link, Topology from device.client.DeviceClient import DeviceClient LOGGER = logging.getLogger(__name__) diff --git a/src/tests/ofc22/tests/Objects.py b/src/tests/ofc22/tests/Objects.py index bda08d776..66a0e023e 100644 --- a/src/tests/ofc22/tests/Objects.py +++ b/src/tests/ofc22/tests/Objects.py @@ -21,7 +21,7 @@ from common.tools.object_factory.Device import ( from common.tools.object_factory.EndPoint import json_endpoint, json_endpoint_id from common.tools.object_factory.Link import json_link, json_link_id from common.tools.object_factory.Topology import json_topology, json_topology_id -from context.proto.kpi_sample_types_pb2 import KpiSampleType +from common.proto.kpi_sample_types_pb2 import KpiSampleType # ----- Context -------------------------------------------------------------------------------------------------------- CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_UUID) diff --git a/src/tests/ofc22/tests/test_functional_bootstrap.py b/src/tests/ofc22/tests/test_functional_bootstrap.py index 334d7894b..56231512d 100644 --- a/src/tests/ofc22/tests/test_functional_bootstrap.py +++ b/src/tests/ofc22/tests/test_functional_bootstrap.py @@ -21,7 +21,7 @@ from common.tools.object_factory.Link import json_link_id from common.tools.object_factory.Topology import json_topology_id from context.client.ContextClient import ContextClient from context.client.EventsCollector import EventsCollector -from context.proto.context_pb2 import Context, ContextId, Device, Empty, Link, Topology +from common.proto.context_pb2 import Context, ContextId, Device, Empty, Link, Topology from device.client.DeviceClient import DeviceClient from .Objects import CONTEXT_ID, CONTEXTS, DEVICES, LINKS, TOPOLOGIES diff --git a/src/tests/ofc22/tests/test_functional_cleanup.py b/src/tests/ofc22/tests/test_functional_cleanup.py index eb78a5850..6c3a79dfd 100644 --- a/src/tests/ofc22/tests/test_functional_cleanup.py +++ b/src/tests/ofc22/tests/test_functional_cleanup.py @@ -21,7 +21,7 @@ from common.tools.object_factory.Link import json_link_id from common.tools.object_factory.Topology import json_topology_id from context.client.ContextClient import ContextClient from context.client.EventsCollector import EventsCollector -from context.proto.context_pb2 import ContextId, DeviceId, Empty, LinkId, TopologyId +from common.proto.context_pb2 import ContextId, DeviceId, Empty, LinkId, TopologyId from device.client.DeviceClient import DeviceClient from .Objects import CONTEXT_ID, CONTEXTS, DEVICES, LINKS, TOPOLOGIES diff --git a/src/tests/ofc22/tests/test_functional_create_service.py b/src/tests/ofc22/tests/test_functional_create_service.py index f3389fdbf..a63050181 100644 --- a/src/tests/ofc22/tests/test_functional_create_service.py +++ b/src/tests/ofc22/tests/test_functional_create_service.py @@ -23,7 +23,7 @@ from common.tools.grpc.Tools import grpc_message_to_json_string from compute.tests.mock_osm.MockOSM import MockOSM from context.client.ContextClient import ContextClient from context.client.EventsCollector import EventsCollector -from context.proto.context_pb2 import ContextId, Empty +from common.proto.context_pb2 import ContextId, Empty from .Objects import ( CONTEXT_ID, CONTEXTS, DEVICE_O1_UUID, DEVICE_R1_UUID, DEVICE_R3_UUID, DEVICES, LINKS, TOPOLOGIES, WIM_MAPPING, WIM_PASSWORD, WIM_SERVICE_CONNECTION_POINTS, WIM_SERVICE_TYPE, WIM_USERNAME) diff --git a/src/tests/ofc22/tests/test_functional_delete_service.py b/src/tests/ofc22/tests/test_functional_delete_service.py index 51e91a596..222dee5ad 100644 --- a/src/tests/ofc22/tests/test_functional_delete_service.py +++ b/src/tests/ofc22/tests/test_functional_delete_service.py @@ -23,7 +23,7 @@ from common.tools.grpc.Tools import grpc_message_to_json_string from compute.tests.mock_osm.MockOSM import MockOSM from context.client.ContextClient import ContextClient from context.client.EventsCollector import EventsCollector -from context.proto.context_pb2 import ContextId, Empty +from common.proto.context_pb2 import ContextId, Empty from .Objects import ( CONTEXT_ID, CONTEXTS, DEVICE_O1_UUID, DEVICE_R1_UUID, DEVICE_R3_UUID, DEVICES, LINKS, TOPOLOGIES, WIM_MAPPING, WIM_PASSWORD, WIM_USERNAME) -- GitLab From caa59013ba2d13f2e5ea0fc989b460e32cee9383 Mon Sep 17 00:00:00 2001 From: Sergio Gonzalez Date: Thu, 22 Sep 2022 10:55:16 +0200 Subject: [PATCH 06/34] Add subscription methods to ManagementDBTools.py --- src/monitoring/service/ManagementDBTools.py | 71 ++++++++++++++++++--- 1 file changed, 61 insertions(+), 10 deletions(-) diff --git a/src/monitoring/service/ManagementDBTools.py b/src/monitoring/service/ManagementDBTools.py index 28ce875c9..53430780e 100644 --- a/src/monitoring/service/ManagementDBTools.py +++ b/src/monitoring/service/ManagementDBTools.py @@ -17,8 +17,12 @@ import sqlite3 as sl class ManagementDB(): def __init__(self, database): self.client = sl.connect(database, check_same_thread=False) + self.create_monitoring_table() + self.create_subscription_table() + + def create_monitoring_table(self): self.client.execute(""" - CREATE TABLE IF NOT EXISTS KPI( + CREATE TABLE IF NOT EXISTS kpi( kpi_id INTEGER PRIMARY KEY AUTOINCREMENT, kpi_description TEXT, kpi_sample_type INTEGER, @@ -27,46 +31,93 @@ class ManagementDB(): service_id INTEGER ); """) + + def create_subscription_table(self): + self.client.execute(""" + CREATE TABLE IF NOT EXISTS subscription( + subs_id INTEGER PRIMARY KEY AUTOINCREMENT, + kpi_id INTEGER, + subscriber TEXT, + sampling_duration_s REAL, + sampling_interval_s REAL, + start_timestamp REAL, + end_timestamp REAL + ); + """) - def insert_KPI(self,kpi_description,kpi_sample_type,device_id,endpoint_id,service_id ): + def insert_KPI(self,kpi_description,kpi_sample_type,device_id,endpoint_id,service_id): c = self.client.cursor() - c.execute("SELECT kpi_id FROM KPI WHERE device_id is ? AND kpi_sample_type is ? AND endpoint_id is ?",(device_id,kpi_sample_type,endpoint_id)) + c.execute("SELECT kpi_id FROM kpi WHERE device_id is ? AND kpi_sample_type is ? AND endpoint_id is ?",(device_id,kpi_sample_type,endpoint_id)) data=c.fetchone() if data is None: - c.execute("INSERT INTO KPI (kpi_description,kpi_sample_type,device_id,endpoint_id,service_id) VALUES (?,?,?,?,?)", (kpi_description,kpi_sample_type,device_id,endpoint_id,service_id)) + c.execute("INSERT INTO kpi (kpi_description,kpi_sample_type,device_id,endpoint_id,service_id) VALUES (?,?,?,?,?)", (kpi_description,kpi_sample_type,device_id,endpoint_id,service_id)) self.client.commit() return c.lastrowid else: return data[0] + + def insert_subscription(self,kpi_id,subscriber,sampling_duration_s,sampling_interval_s,start_timestamp, end_timestamp): + c = self.client.cursor() + c.execute("SELECT subs_id FROM subscription WHERE kpi_id is ? AND subscriber is ? AND sampling_duration_s is ? AND sampling_interval_s is ? AND start_timestamp is ? AND end_timestamp is ?",(kpi_id,subscriber,sampling_duration_s,sampling_interval_s,start_timestamp, end_timestamp)) + data=c.fetchone() + if data is None: + c.execute("INSERT INTO subscription (kpi_id,subscriber,sampling_duration_s,sampling_interval_s,start_timestamp, end_timestamp) VALUES (?,?,?,?,?,?)", (kpi_id,subscriber,sampling_duration_s,sampling_interval_s,start_timestamp, end_timestamp)) + self.client.commit() + return c.lastrowid + else: + print("already exists") + return data[0] def delete_KPI(self,device_id,kpi_sample_type): c = self.client.cursor() - c.execute("SELECT kpi_id FROM KPI WHERE device_id is ? AND kpi_sample_type is ?",(device_id,kpi_sample_type)) + c.execute("SELECT kpi_id FROM kpi WHERE device_id is ? AND kpi_sample_type is ?",(device_id,kpi_sample_type)) data=c.fetchone() if data is None: return False else: - c.execute("DELETE FROM KPI WHERE device_id is ? AND kpi_sample_type is ?",(device_id,kpi_sample_type)) + c.execute("DELETE FROM kpi WHERE device_id is ? AND kpi_sample_type is ?",(device_id,kpi_sample_type)) + self.client.commit() + return True + + def delete_subscription(self,subs_id): + c = self.client.cursor() + c.execute("SELECT * FROM subscription WHERE subs_id is ?",(subs_id,)) + data=c.fetchone() + if data is None: + return False + else: + c.execute("DELETE FROM subscription WHERE subs_id is ?",(subs_id,)) self.client.commit() return True def delete_kpid_id(self,kpi_id): c = self.client.cursor() - c.execute("SELECT * FROM KPI WHERE kpi_id is ?",(kpi_id,)) + c.execute("SELECT * FROM kpi WHERE kpi_id is ?",(kpi_id,)) data=c.fetchone() if data is None: return False else: - c.execute("DELETE FROM KPI WHERE kpi_id is ?",(kpi_id,)) + c.execute("DELETE FROM kpi WHERE kpi_id is ?",(kpi_id,)) self.client.commit() return True def get_KPI(self,kpi_id): - data = self.client.execute("SELECT * FROM KPI WHERE kpi_id is ?",(kpi_id,)) + data = self.client.execute("SELECT * FROM kpi WHERE kpi_id is ?",(kpi_id,)) + return data.fetchone() + + def get_subscription(self,subs_id): + data = self.client.execute("SELECT * FROM subscription WHERE subs_id is ?",(subs_id,)) return data.fetchone() def get_KPIS(self): - data = self.client.execute("SELECT * FROM KPI") + data = self.client.execute("SELECT * FROM kpi") + #print("\n") + #for row in data: + # print(row) + return data.fetchall() + + def get_subscriptions(self): + data = self.client.execute("SELECT * FROM subscription") #print("\n") #for row in data: # print(row) -- GitLab From 13b78103338bcb4152c13cc78c3e9c72a23f4d38 Mon Sep 17 00:00:00 2001 From: Sergio Gonzalez Date: Fri, 23 Sep 2022 14:11:55 +0200 Subject: [PATCH 07/34] Initial implementation of SubscriptionManager --- src/monitoring/requirements.in | 1 + src/monitoring/service/MetricsDBTools.py | 9 ++++++ src/monitoring/service/SubscriptionManager.py | 31 +++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/src/monitoring/requirements.in b/src/monitoring/requirements.in index e0176e026..8ceddf216 100644 --- a/src/monitoring/requirements.in +++ b/src/monitoring/requirements.in @@ -17,6 +17,7 @@ redis==4.1.2 requests==2.27.1 xmltodict==0.12.0 questdb==1.0.1 +apscheduler=3.9.1 # pip's dependency resolver does not take into account installed packages. # p4runtime does not specify the version of grpcio/protobuf it needs, so it tries to install latest one diff --git a/src/monitoring/service/MetricsDBTools.py b/src/monitoring/service/MetricsDBTools.py index f04b2a7ba..a60968df7 100644 --- a/src/monitoring/service/MetricsDBTools.py +++ b/src/monitoring/service/MetricsDBTools.py @@ -17,6 +17,7 @@ import requests import json import logging import datetime +from common.tools.timestamp.Converters import timestamp_float_to_string LOGGER = logging.getLogger(__name__) @@ -60,6 +61,7 @@ class MetricsDB(): response = requests.get(url, params=query_params) json_response = json.loads(response.text) LOGGER.info(f"Query executed, result:{json_response}") + return json_response def create_table(self): query = f'CREATE TABLE IF NOT EXISTS {self.table}'\ @@ -73,3 +75,10 @@ class MetricsDB(): 'TIMESTAMP(timestamp);' self.run_query(query) LOGGER.info(f"Table {self.table} created") + + def get_subscription_data(self, kpi_id, end_date, sampling_interval_s): + start_date = end_date-sampling_interval_s + query = f"SELECT kpi_id, timestamp, kpi_value FROM {self.table} WHERE kpi_id = '{kpi_id}' AND (timestamp BETWEEN '{timestamp_float_to_string(start_date)}' AND '{timestamp_float_to_string(end_date)}')" + response=self.run_query(query) + kpi_list=response['dataset'] + diff --git a/src/monitoring/service/SubscriptionManager.py b/src/monitoring/service/SubscriptionManager.py index e69de29bb..eb46f3ec5 100644 --- a/src/monitoring/service/SubscriptionManager.py +++ b/src/monitoring/service/SubscriptionManager.py @@ -0,0 +1,31 @@ +from apscheduler.schedulers.background import BackgroundScheduler +from apscheduler.executors.pool import ProcessPoolExecutor +from apscheduler.triggers.interval import IntervalTrigger +from apscheduler.triggers.cron import CronTrigger +from common.tools.timestamp.Converters import timestamp_utcnow_to_float +from datetime import datetime, timezone +import time + + +class SubscriptionManager(): + def __init__(self, metrics_db): + self.metrics_db = metrics_db + self.scheduler = BackgroundScheduler(executors={'processpool': ProcessPoolExecutor(max_workers=20)}) + self.scheduler.start() + + + def create_subscription(self, subscription_id, kpi_id, sampling_interval_s, sampling_duration_s=None, start_timestamp=None, end_timestamp=None): + start_date=None + end_date=None + if sampling_duration_s: + if not start_timestamp: + start_timestamp=time.time() + end_timestamp=start_timestamp+sampling_duration_s + if start_timestamp: + start_date = datetime.fromtimestamp(start_timestamp) + if end_timestamp: + end_date = datetime.fromtimestamp(end_timestamp) + self.scheduler.add_job(self.metrics_db.get_subscription_data, args=(kpi_id, timestamp_utcnow_to_float(), sampling_interval_s),trigger='interval', seconds=sampling_interval_s, start_date=start_date, end_date=end_date, id=subscription_id) + + def delete_subscription(self, subscription_id): + self.scheduler.remove_job(subscription_id) \ No newline at end of file -- GitLab From 50ee8ccbc751c9ab171506d8aa4d668fe6cfe5fe Mon Sep 17 00:00:00 2001 From: Sergio Gonzalez Date: Fri, 23 Sep 2022 14:13:30 +0200 Subject: [PATCH 08/34] Fix monitoring requirements.in --- src/monitoring/requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/monitoring/requirements.in b/src/monitoring/requirements.in index 8ceddf216..456ae2a4a 100644 --- a/src/monitoring/requirements.in +++ b/src/monitoring/requirements.in @@ -17,7 +17,7 @@ redis==4.1.2 requests==2.27.1 xmltodict==0.12.0 questdb==1.0.1 -apscheduler=3.9.1 +apscheduler==3.9.1 # pip's dependency resolver does not take into account installed packages. # p4runtime does not specify the version of grpcio/protobuf it needs, so it tries to install latest one -- GitLab From 872e213faf08d176ddf4188603bc4cf811170dfc Mon Sep 17 00:00:00 2001 From: Sergio Gonzalez Date: Fri, 23 Sep 2022 14:15:00 +0200 Subject: [PATCH 09/34] fix monitoring requirements.in --- src/monitoring/requirements.in | 1 - 1 file changed, 1 deletion(-) diff --git a/src/monitoring/requirements.in b/src/monitoring/requirements.in index 456ae2a4a..e0176e026 100644 --- a/src/monitoring/requirements.in +++ b/src/monitoring/requirements.in @@ -17,7 +17,6 @@ redis==4.1.2 requests==2.27.1 xmltodict==0.12.0 questdb==1.0.1 -apscheduler==3.9.1 # pip's dependency resolver does not take into account installed packages. # p4runtime does not specify the version of grpcio/protobuf it needs, so it tries to install latest one -- GitLab From b823bec26f0f882d8ceb3f6f661791e862c77ce9 Mon Sep 17 00:00:00 2001 From: Javier Moreno Date: Mon, 26 Sep 2022 09:14:44 +0200 Subject: [PATCH 10/34] Minor modifications in the monitoring data model --- proto/monitoring.proto | 14 +++++++------- src/monitoring/client/MonitoringClient.py | 10 +++++----- .../service/MonitoringServiceServicerImpl.py | 16 ++++++++-------- src/monitoring/tests/test_unitary.py | 8 ++++---- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/proto/monitoring.proto b/proto/monitoring.proto index 8b83afa47..e90c67818 100644 --- a/proto/monitoring.proto +++ b/proto/monitoring.proto @@ -26,12 +26,12 @@ service MonitoringService { rpc IncludeKpi (Kpi ) returns (context.Empty ) {} rpc MonitorKpi (MonitorKpiRequest ) returns (context.Empty ) {} rpc QueryKpiData (KpiQuery ) returns (KpiList ) {} - rpc SetKpiSubscription (SubsDescriptor ) returns (stream KpiList ) {} + rpc SetKpiSubscription (SubsDescriptor ) returns (stream SubsResponse ) {} rpc GetSubsDescriptor (SubscriptionID ) returns (SubsDescriptor ) {} - rpc GetSubscriptions (context.Empty ) returns (SubsIDList ) {} + rpc GetSubscriptions (context.Empty ) returns (SubsList ) {} rpc DeleteSubscription (SubscriptionID ) returns (context.Empty ) {} rpc SetKpiAlarm (AlarmDescriptor ) returns (AlarmID ) {} - rpc GetAlarms (context.Empty ) returns (AlarmIDList ) {} + rpc GetAlarms (context.Empty ) returns (AlarmList ) {} rpc GetAlarmDescriptor (AlarmID ) returns (AlarmDescriptor ) {} rpc GetAlarmResponseStream(AlarmSubscription ) returns (stream AlarmResponse) {} rpc DeleteAlarm (AlarmID ) returns (context.Empty ) {} @@ -125,8 +125,8 @@ message SubsResponse { repeated KpiList kpi_list = 2; } -message SubsIDList { - repeated SubscriptionID subs_list = 1; +message SubsList { + repeated SubsDescriptor subs_list = 1; } message AlarmDescriptor { @@ -155,6 +155,6 @@ message AlarmResponse { context.Timestamp timestamp = 4; } -message AlarmIDList { - repeated AlarmID alarm_list = 1; +message AlarmList { + repeated AlarmDescriptor alarm_list = 1; } diff --git a/src/monitoring/client/MonitoringClient.py b/src/monitoring/client/MonitoringClient.py index 9b78d3d4f..73607a081 100644 --- a/src/monitoring/client/MonitoringClient.py +++ b/src/monitoring/client/MonitoringClient.py @@ -21,8 +21,8 @@ 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.monitoring_pb2 import Kpi, KpiDescriptor, KpiId, MonitorKpiRequest, \ - KpiDescriptorList, KpiQuery, KpiList, SubsDescriptor, SubscriptionID, SubsIDList, \ - AlarmDescriptor, AlarmID, AlarmIDList, AlarmResponse, AlarmSubscription + KpiDescriptorList, KpiQuery, KpiList, SubsDescriptor, SubscriptionID, SubsList, \ + SubsResponse, AlarmDescriptor, AlarmID, AlarmList, AlarmResponse, AlarmSubscription from common.proto.monitoring_pb2_grpc import MonitoringServiceStub LOGGER = logging.getLogger(__name__) @@ -100,7 +100,7 @@ class MonitoringClient: return response @RETRY_DECORATOR - def SetKpiSubscription(self, request : SubsDescriptor) -> Iterator[KpiList]: + def SetKpiSubscription(self, request : SubsDescriptor) -> Iterator[SubsResponse]: LOGGER.debug('SetKpiSubscription: {:s}'.format(grpc_message_to_json_string(request))) response = self.stub.SetKpiSubscription(request) LOGGER.debug('SetKpiSubscription result: {:s}'.format(grpc_message_to_json_string(response))) @@ -114,7 +114,7 @@ class MonitoringClient: return response @RETRY_DECORATOR - def GetSubscriptions(self, request : Empty) -> SubsIDList: + def GetSubscriptions(self, request : Empty) -> SubsList: LOGGER.debug('GetSubscriptions: {:s}'.format(grpc_message_to_json_string(request))) response = self.stub.GetSubscriptions(request) LOGGER.debug('GetSubscriptions result: {:s}'.format(grpc_message_to_json_string(response))) @@ -135,7 +135,7 @@ class MonitoringClient: return response @RETRY_DECORATOR - def GetAlarms(self, request : Empty) -> AlarmIDList: + def GetAlarms(self, request : Empty) -> AlarmList: LOGGER.debug('GetAlarms: {:s}'.format(grpc_message_to_json_string(request))) response = self.stub.GetAlarms(request) LOGGER.debug('GetAlarms result: {:s}'.format(grpc_message_to_json_string(response))) diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py index 19b5e7e74..4a5d7e4ba 100644 --- a/src/monitoring/service/MonitoringServiceServicerImpl.py +++ b/src/monitoring/service/MonitoringServiceServicerImpl.py @@ -23,9 +23,9 @@ 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, AlarmIDList, SubsIDList, KpiId, \ +from common.proto.monitoring_pb2 import AlarmResponse, AlarmDescriptor, AlarmList, SubsList, KpiId, \ KpiDescriptor, KpiList, KpiQuery, SubsDescriptor, SubscriptionID, AlarmID, KpiDescriptorList, \ - MonitorKpiRequest, Kpi, AlarmSubscription + MonitorKpiRequest, Kpi, AlarmSubscription, SubsResponse from common.rpc_method_wrapper.ServiceExceptions import ServiceException from monitoring.service import ManagementDBTools, MetricsDBTools @@ -217,12 +217,12 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): except Exception as e: # pragma: no cover LOGGER.exception('QueryKpiData exception') - def SetKpiSubscription ( self, request : SubsDescriptor, grpc_context : grpc.ServicerContext) -> KpiList: + def SetKpiSubscription ( self, request : SubsDescriptor, grpc_context : grpc.ServicerContext) -> SubsResponse: LOGGER.info('SubscribeKpi') try: # TBC - yield KpiList() + yield SubsResponse() except ServiceException as e: LOGGER.exception('SubscribeKpi exception') grpc_context.abort(e.code, e.details) @@ -242,12 +242,12 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): except Exception as e: # pragma: no cover LOGGER.exception('GetSubsDescriptor exception') - def GetSubscriptions ( self, request : Empty, grpc_context : grpc.ServicerContext) -> SubsIDList: + def GetSubscriptions ( self, request : Empty, grpc_context : grpc.ServicerContext) -> SubsList: LOGGER.info('GetSubscriptions') try: # TBC - return SubsIDList() + return SubsList() except ServiceException as e: LOGGER.exception('GetSubscriptions exception') grpc_context.abort(e.code, e.details) @@ -279,12 +279,12 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.exception('SetKpiAlarm exception') - def GetAlarms ( self, request : Empty, grpc_context : grpc.ServicerContext) -> AlarmIDList: + def GetAlarms ( self, request : Empty, grpc_context : grpc.ServicerContext) -> AlarmList: LOGGER.info('GetAlarms') try: # TBC - return AlarmIDList() + return AlarmList() except ServiceException as e: LOGGER.exception('GetAlarms exception') grpc_context.abort(e.code, e.details) diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py index 1ea85a5a2..ced71fa29 100644 --- a/src/monitoring/tests/test_unitary.py +++ b/src/monitoring/tests/test_unitary.py @@ -27,8 +27,8 @@ from common.orm.Factory import get_database_backend, BackendEnum as DatabaseBack from common.message_broker.Factory import get_messagebroker_backend, BackendEnum as MessageBrokerBackendEnum from common.message_broker.MessageBroker import MessageBroker from common.proto import monitoring_pb2 -from common.proto.monitoring_pb2 import KpiId, KpiDescriptor, KpiList, SubsDescriptor, SubsIDList, AlarmID, \ - AlarmDescriptor, AlarmIDList, Kpi, KpiDescriptorList +from common.proto.monitoring_pb2 import KpiId, KpiDescriptor, KpiList, SubsDescriptor, SubsList, AlarmID, \ + AlarmDescriptor, AlarmList, Kpi, KpiDescriptorList, SubsResponse from context.client.ContextClient import ContextClient from context.service.grpc_server.ContextService import ContextService @@ -276,7 +276,7 @@ def test_get_subscriptions(monitoring_client): LOGGER.warning('test_get_subscriptions') response = monitoring_client.GetSubscriptions(Empty()) LOGGER.debug(type(response)) - assert isinstance(response, SubsIDList) + assert isinstance(response, SubsList) # Test case that makes use of client fixture to test server's DeleteSubscription method def test_delete_subscription(monitoring_client): @@ -297,7 +297,7 @@ def test_get_alarms(monitoring_client): LOGGER.warning('test_get_alarms') response = monitoring_client.GetAlarms(Empty()) LOGGER.debug(type(response)) - assert isinstance(response, AlarmIDList) + assert isinstance(response, AlarmList) # Test case that makes use of client fixture to test server's GetAlarmDescriptor method -- GitLab From f8915f49e03db19c32321327661932eb8f095f94 Mon Sep 17 00:00:00 2001 From: Javier Moreno Date: Mon, 26 Sep 2022 09:25:07 +0200 Subject: [PATCH 11/34] Minor modifications in the monitoring data model --- proto/monitoring.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto/monitoring.proto b/proto/monitoring.proto index e90c67818..ea7f532bb 100644 --- a/proto/monitoring.proto +++ b/proto/monitoring.proto @@ -122,7 +122,7 @@ message SubscriptionID { message SubsResponse { SubscriptionID subs_id = 1; - repeated KpiList kpi_list = 2; + KpiList kpi_list = 2; } message SubsList { -- GitLab From 3a1c47f0ef308100ded95cb023932e0ad54ac6be Mon Sep 17 00:00:00 2001 From: Javier Moreno Date: Tue, 27 Sep 2022 09:04:55 +0200 Subject: [PATCH 12/34] WIP - Subscriptions implementation --- src/monitoring/service/ManagementDBTools.py | 2 +- src/monitoring/service/MetricsDBTools.py | 3 ++- .../service/MonitoringServiceServicerImpl.py | 25 +++++++++++++++++-- src/monitoring/service/SubscriptionManager.py | 4 +-- src/monitoring/tests/Messages.py | 9 ++++++- src/monitoring/tests/test_unitary.py | 14 ++++++----- 6 files changed, 44 insertions(+), 13 deletions(-) diff --git a/src/monitoring/service/ManagementDBTools.py b/src/monitoring/service/ManagementDBTools.py index 53430780e..09fb3049f 100644 --- a/src/monitoring/service/ManagementDBTools.py +++ b/src/monitoring/service/ManagementDBTools.py @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - +from monitoring.service.MonitoringServiceServicerImpl import LOGGER import sqlite3 as sl class ManagementDB(): diff --git a/src/monitoring/service/MetricsDBTools.py b/src/monitoring/service/MetricsDBTools.py index a60968df7..d8a7d5060 100644 --- a/src/monitoring/service/MetricsDBTools.py +++ b/src/monitoring/service/MetricsDBTools.py @@ -76,9 +76,10 @@ class MetricsDB(): self.run_query(query) LOGGER.info(f"Table {self.table} created") - def get_subscription_data(self, kpi_id, end_date, sampling_interval_s): + def get_subscription_data(self, subs_queue, kpi_id, end_date, sampling_interval_s): start_date = end_date-sampling_interval_s query = f"SELECT kpi_id, timestamp, kpi_value FROM {self.table} WHERE kpi_id = '{kpi_id}' AND (timestamp BETWEEN '{timestamp_float_to_string(start_date)}' AND '{timestamp_float_to_string(end_date)}')" response=self.run_query(query) kpi_list=response['dataset'] + # subs_queue.append(kpi_list) diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py index 4a5d7e4ba..8cf2928f4 100644 --- a/src/monitoring/service/MonitoringServiceServicerImpl.py +++ b/src/monitoring/service/MonitoringServiceServicerImpl.py @@ -13,6 +13,7 @@ # limitations under the License. import os, grpc, logging +from queue import Queue from typing import Iterator @@ -33,8 +34,10 @@ from device.client.DeviceClient import DeviceClient from prometheus_client import Counter, Summary +from monitoring.service.SubscriptionManager import SubscriptionManager + LOGGER = getJSONLogger('monitoringservice-server') -LOGGER.setLevel('DEBUG') +LOGGER.setLevel('INFO') MONITORING_GETINSTANTKPI_REQUEST_TIME = Summary( 'monitoring_getinstantkpi_processing_seconds', 'Time spent processing monitoring instant kpi request') @@ -59,6 +62,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): self.deviceClient = DeviceClient(host=DEVICESERVICE_SERVICE_HOST, port=DEVICESERVICE_SERVICE_PORT_GRPC) # instantiate the client self.metrics_db = MetricsDBTools.MetricsDB(METRICSDB_HOSTNAME,METRICSDB_ILP_PORT,METRICSDB_REST_PORT,METRICSDB_TABLE) + self.subs_manager = SubscriptionManager(self.metrics_db) LOGGER.info('MetricsDB initialized') # SetKpi (SetKpiRequest) returns (KpiId) {} @@ -221,8 +225,25 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('SubscribeKpi') try: + + subs_queue = Queue() + subs_response = SubsResponse() + + kpi_id = request.kpi_id.kpi_id.uuid + sampling_duration_s = request.sampling_duration_s + sampling_interval_s = request.sampling_interval_s + start_timestamp = request.start_timestamp.timestamp + end_timestamp = request.end_timestamp.timestamp + + subscriber = "localhost" + + subs_id = self.management_db.insert_subscription(kpi_id,subscriber,sampling_duration_s,sampling_interval_s,start_timestamp,end_timestamp) + self.subs_manager.create_subscription(subs_id,kpi_id,sampling_duration_s,sampling_interval_s,start_timestamp,end_timestamp) + + # parse queue to append kpis into the list + # TBC - yield SubsResponse() + yield subs_response except ServiceException as e: LOGGER.exception('SubscribeKpi exception') grpc_context.abort(e.code, e.details) diff --git a/src/monitoring/service/SubscriptionManager.py b/src/monitoring/service/SubscriptionManager.py index eb46f3ec5..0b6717337 100644 --- a/src/monitoring/service/SubscriptionManager.py +++ b/src/monitoring/service/SubscriptionManager.py @@ -14,7 +14,7 @@ class SubscriptionManager(): self.scheduler.start() - def create_subscription(self, subscription_id, kpi_id, sampling_interval_s, sampling_duration_s=None, start_timestamp=None, end_timestamp=None): + def create_subscription(self, subs_queue ,subscription_id, kpi_id, sampling_interval_s, sampling_duration_s=None, start_timestamp=None, end_timestamp=None): start_date=None end_date=None if sampling_duration_s: @@ -25,7 +25,7 @@ class SubscriptionManager(): start_date = datetime.fromtimestamp(start_timestamp) if end_timestamp: end_date = datetime.fromtimestamp(end_timestamp) - self.scheduler.add_job(self.metrics_db.get_subscription_data, args=(kpi_id, timestamp_utcnow_to_float(), sampling_interval_s),trigger='interval', seconds=sampling_interval_s, start_date=start_date, end_date=end_date, id=subscription_id) + self.scheduler.add_job(self.metrics_db.get_subscription_data, args=(subs_queue, kpi_id, timestamp_utcnow_to_float(), sampling_interval_s),trigger='interval', seconds=sampling_interval_s, start_date=start_date, end_date=end_date, id=subscription_id) def delete_subscription(self, subscription_id): self.scheduler.remove_job(subscription_id) \ No newline at end of file diff --git a/src/monitoring/tests/Messages.py b/src/monitoring/tests/Messages.py index b463d900b..b2795ce37 100644 --- a/src/monitoring/tests/Messages.py +++ b/src/monitoring/tests/Messages.py @@ -74,9 +74,16 @@ def kpi_query(): return _kpi_query -def subs_descriptor(): +def subs_descriptor(kpi_id): _subs_descriptor = monitoring_pb2.SubsDescriptor() + _subs_descriptor.subs_id.subs_id.uuid = "" + _subs_descriptor.kpi_id.kpi_id.uuid = kpi_id.kpi_id.uuid + _subs_descriptor.sampling_duration_s = 10 + _subs_descriptor.sampling_interval_s = 2 + _subs_descriptor.start_timestamp.timestamp = timestamp_utcnow_to_float() + _subs_descriptor.end_timestamp.timestamp = timestamp_utcnow_to_float() + 10 + return _subs_descriptor def subs_id(): diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py index ced71fa29..f73ffe65b 100644 --- a/src/monitoring/tests/test_unitary.py +++ b/src/monitoring/tests/test_unitary.py @@ -260,7 +260,9 @@ def test_query_kpi_data(monitoring_client): # pylint: disable=redefined-outer-na # Test case that makes use of client fixture to test server's SetKpiSubscription method def test_set_kpi_subscription(monitoring_client): # pylint: disable=redefined-outer-name LOGGER.warning('test_set_kpi_subscription') - response = monitoring_client.SetKpiSubscription(subs_descriptor()) + kpi_id = monitoring_client.SetKpi(create_kpi_request_c()) + monitoring_client.IncludeKpi(include_kpi_request(kpi_id)) + response = monitoring_client.SetKpiSubscription(subs_descriptor(kpi_id)) LOGGER.debug(type(response)) assert isinstance(response, _MultiThreadedRendezvous) @@ -279,11 +281,11 @@ def test_get_subscriptions(monitoring_client): assert isinstance(response, SubsList) # Test case that makes use of client fixture to test server's DeleteSubscription method -def test_delete_subscription(monitoring_client): - LOGGER.warning('test_delete_subscription') - response = monitoring_client.DeleteSubscription(subs_id()) - LOGGER.debug(type(response)) - assert isinstance(response, Empty) +# def test_delete_subscription(monitoring_client): +# LOGGER.warning('test_delete_subscription') +# response = monitoring_client.DeleteSubscription(subs_id()) +# LOGGER.debug(type(response)) +# assert isinstance(response, Empty) # Test case that makes use of client fixture to test server's SetKpiAlarm method def test_set_kpi_alarm(monitoring_client): -- GitLab From 7cf6e899f55473159b88e8c8209b1941d6d7be89 Mon Sep 17 00:00:00 2001 From: Sergio Gonzalez Date: Wed, 28 Sep 2022 16:30:24 +0200 Subject: [PATCH 13/34] Initial alarm system implementation --- src/monitoring/service/AlarmManager.py | 32 ++++++++ src/monitoring/service/ManagementDBTools.py | 54 ++++++++++--- src/monitoring/service/MetricsDBTools.py | 81 +++++++++++++++++-- src/monitoring/service/SubscriptionManager.py | 18 +++-- 4 files changed, 160 insertions(+), 25 deletions(-) diff --git a/src/monitoring/service/AlarmManager.py b/src/monitoring/service/AlarmManager.py index e69de29bb..45764150d 100644 --- a/src/monitoring/service/AlarmManager.py +++ b/src/monitoring/service/AlarmManager.py @@ -0,0 +1,32 @@ +from apscheduler.schedulers.background import BackgroundScheduler +from apscheduler.executors.pool import ProcessPoolExecutor +from datetime import datetime +import time + + +class AlarmManager(): + def __init__(self, metrics_db): + self.metrics_db = metrics_db + self.scheduler = BackgroundScheduler(executors={'processpool': ProcessPoolExecutor(max_workers=20)}) + self.scheduler.start() + + + def create_alarm(self, alarm_id, kpi_id, kpiMinValue, kpiMaxValue, inRange, includeMinValue, includeMaxValue, subscription_frequency_ms, subscription_timeout_s=None): + start_date=None + end_date=None + if subscription_timeout_s: + start_timestamp=time.time() + start_date=datetime.fromtimestamp(start_timestamp) + end_date=datetime.fromtimestamp(start_timestamp+subscription_timeout_s) + self.scheduler.add_job(self.metrics_db.get_alarm_data, args=(kpi_id, kpiMinValue, kpiMaxValue, inRange, includeMinValue, includeMaxValue, subscription_frequency_ms),trigger='interval', seconds=(subscription_frequency_ms/1000), start_date=start_date, end_date=end_date, id=alarm_id) + + def delete_alarm(self, alarm_id): + self.scheduler.remove_job(alarm_id) + +if __name__ == '__main__': + import MetricsDBTools + metrics_db=MetricsDBTools.MetricsDB("localhost",9009,9000,"monitoring",10) + alarm_manager=AlarmManager(metrics_db) + alarm_manager.create_alarm('1',1,0,1,True,True,True,1000) + time.sleep(100) + print("END") diff --git a/src/monitoring/service/ManagementDBTools.py b/src/monitoring/service/ManagementDBTools.py index 53430780e..be4420f99 100644 --- a/src/monitoring/service/ManagementDBTools.py +++ b/src/monitoring/service/ManagementDBTools.py @@ -19,6 +19,7 @@ class ManagementDB(): self.client = sl.connect(database, check_same_thread=False) self.create_monitoring_table() self.create_subscription_table() + self.create_alarm_table() def create_monitoring_table(self): self.client.execute(""" @@ -45,6 +46,21 @@ class ManagementDB(): ); """) + def create_alarm_table(self): + self.client.execute(""" + CREATE TABLE IF NOT EXISTS alarm( + alarm_id INTEGER PRIMARY KEY AUTOINCREMENT, + alarm_description TEXT, + alarm_name TEXT, + kpi_id INTEGER, + kpi_min_value REAL, + kpi_max_value REAL, + in_range INTEGER, + include_min_value INTEGER, + include_max_value INTEGER + ); + """) + def insert_KPI(self,kpi_description,kpi_sample_type,device_id,endpoint_id,service_id): c = self.client.cursor() c.execute("SELECT kpi_id FROM kpi WHERE device_id is ? AND kpi_sample_type is ? AND endpoint_id is ?",(device_id,kpi_sample_type,endpoint_id)) @@ -68,14 +84,26 @@ class ManagementDB(): print("already exists") return data[0] - def delete_KPI(self,device_id,kpi_sample_type): + def insert_alarm(self,alarm_description,alarm_name,kpi_id,kpi_min_value,kpi_max_value,in_range,include_min_value,include_max_value): + c = self.client.cursor() + c.execute("SELECT alarm_id FROM alarm WHERE alarm_description is ? AND alarm_name is ? AND kpi_id is ? AND kpi_min_value is ? AND kpi_max_value is ? AND in_range is ? AND include_min_value is ? AND include_max_value is ?",(alarm_description,alarm_name,kpi_id,kpi_min_value,kpi_max_value,in_range,include_min_value,include_max_value)) + data=c.fetchone() + if data is None: + c.execute("INSERT INTO alarm (alarm_description, alarm_name, kpi_id, kpi_min_value, kpi_max_value, in_range, include_min_value, include_max_value) VALUES (?,?,?,?,?,?)", (alarm_description,alarm_name,kpi_id,kpi_min_value,kpi_max_value,in_range,include_min_value,include_max_value)) + self.client.commit() + return c.lastrowid + else: + print("already exists") + return data[0] + + def delete_KPI(self,kpi_id): c = self.client.cursor() - c.execute("SELECT kpi_id FROM kpi WHERE device_id is ? AND kpi_sample_type is ?",(device_id,kpi_sample_type)) + c.execute("SELECT * FROM kpi WHERE kpi_id is ?",(kpi_id,)) data=c.fetchone() if data is None: return False else: - c.execute("DELETE FROM kpi WHERE device_id is ? AND kpi_sample_type is ?",(device_id,kpi_sample_type)) + c.execute("DELETE FROM kpi WHERE kpi_id is ?",(kpi_id,)) self.client.commit() return True @@ -90,14 +118,14 @@ class ManagementDB(): self.client.commit() return True - def delete_kpid_id(self,kpi_id): + def delete_alarm(self,alarm_id): c = self.client.cursor() - c.execute("SELECT * FROM kpi WHERE kpi_id is ?",(kpi_id,)) + c.execute("SELECT * FROM alarm WHERE alarm_id is ?",(alarm_id,)) data=c.fetchone() if data is None: return False else: - c.execute("DELETE FROM kpi WHERE kpi_id is ?",(kpi_id,)) + c.execute("DELETE FROM alarm WHERE alarm_id is ?",(alarm_id,)) self.client.commit() return True @@ -108,17 +136,19 @@ class ManagementDB(): def get_subscription(self,subs_id): data = self.client.execute("SELECT * FROM subscription WHERE subs_id is ?",(subs_id,)) return data.fetchone() + + def get_alarm(self,alarm_id): + data = self.client.execute("SELECT * FROM alarm WHERE alarm_id is ?",(alarm_id,)) + return data.fetchone() def get_KPIS(self): data = self.client.execute("SELECT * FROM kpi") - #print("\n") - #for row in data: - # print(row) return data.fetchall() def get_subscriptions(self): data = self.client.execute("SELECT * FROM subscription") - #print("\n") - #for row in data: - # print(row) + return data.fetchall() + + def get_alarms(self): + data = self.client.execute("SELECT * FROM alarm") return data.fetchall() \ No newline at end of file diff --git a/src/monitoring/service/MetricsDBTools.py b/src/monitoring/service/MetricsDBTools.py index a60968df7..d9c92f957 100644 --- a/src/monitoring/service/MetricsDBTools.py +++ b/src/monitoring/service/MetricsDBTools.py @@ -17,16 +17,19 @@ import requests import json import logging import datetime -from common.tools.timestamp.Converters import timestamp_float_to_string +# from common.tools.timestamp.Converters import timestamp_float_to_string +from Converters import timestamp_float_to_string, timestamp_utcnow_to_float + LOGGER = logging.getLogger(__name__) class MetricsDB(): - def __init__(self, host, ilp_port, rest_port, table): + def __init__(self, host, ilp_port, rest_port, table, commit_lag_ms): self.host=host self.ilp_port=int(ilp_port) self.rest_port=rest_port self.table=table + self.commit_lag_ms=commit_lag_ms self.create_table() def write_KPI(self,time,kpi_id,kpi_sample_type,device_id,endpoint_id,service_id,kpi_value): @@ -76,9 +79,73 @@ class MetricsDB(): self.run_query(query) LOGGER.info(f"Table {self.table} created") - def get_subscription_data(self, kpi_id, end_date, sampling_interval_s): - start_date = end_date-sampling_interval_s - query = f"SELECT kpi_id, timestamp, kpi_value FROM {self.table} WHERE kpi_id = '{kpi_id}' AND (timestamp BETWEEN '{timestamp_float_to_string(start_date)}' AND '{timestamp_float_to_string(end_date)}')" - response=self.run_query(query) - kpi_list=response['dataset'] + def get_subscription_data(self, kpi_id, sampling_interval_s): + end_date = timestamp_utcnow_to_float()-self.commit_lag_ms/1000 + start_date = end_date-sampling_interval_s + query = f"SELECT kpi_id, timestamp, kpi_value FROM {self.table} WHERE kpi_id = '{kpi_id}' AND (timestamp BETWEEN '{timestamp_float_to_string(start_date)}' AND '{timestamp_float_to_string(end_date)}')" + response=self.run_query(query) + kpi_list=response['dataset'] + print(kpi_list) + def get_alarm_data(self, kpi_id, kpiMinValue, kpiMaxValue, inRange, includeMinValue, includeMaxValue, subscription_frequency_ms): + end_date = timestamp_utcnow_to_float()-self.commit_lag_ms/1000 + start_date = end_date-subscription_frequency_ms/1000 + query = f"SELECT kpi_id, timestamp, kpi_value FROM {self.table} WHERE kpi_id = '{kpi_id}' AND (timestamp BETWEEN '{timestamp_float_to_string(start_date)}' AND '{timestamp_float_to_string(end_date)}')" + response=self.run_query(query) + kpi_list=response['dataset'] + for kpi in kpi_list: + alarm = False + kpi_value = kpi[2] + if (kpiMinValue == kpi_value and kpiMaxValue == kpi_value and inRange): + alarm = True + elif (inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and includeMaxValue): + if (kpi_value >= kpiMinValue and kpi_value <= kpiMaxValue): + alarm = True + elif (inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and not includeMaxValue): + if (kpi_value >= kpiMinValue and kpi_value < kpiMaxValue): + alarm = True + elif (inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and includeMaxValue): + if (kpi_value > kpiMinValue and kpi_value <= kpiMaxValue): + alarm = True + elif (inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and not includeMaxValue): + if (kpi_value > kpiMinValue and kpi_value < kpiMaxValue): + alarm = True + elif (not inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and includeMaxValue): + if (kpi_value <= kpiMinValue or kpi_value >= kpiMaxValue): + alarm = True + elif (not inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and not includeMaxValue): + if (kpi_value <= kpiMinValue or kpi_value > kpiMaxValue): + alarm = True + elif (not inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and includeMaxValue): + if (kpi_value < kpiMinValue or kpi_value >= kpiMaxValue): + alarm = True + elif (not inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and not includeMaxValue): + if (kpi_value < kpiMinValue or kpi_value > kpiMaxValue): + alarm = True + elif (inRange and kpiMinValue is not None and kpiMaxValue is None and includeMinValue): + if (kpi_value >= kpiMinValue): + alarm = True + elif (inRange and kpiMinValue is not None and kpiMaxValue is None and not includeMinValue): + if (kpi_value > kpiMinValue): + alarm = True + elif (not inRange and kpiMinValue is not None and kpiMaxValue is None and not includeMinValue): + if (kpi_value <= kpiMinValue): + alarm = True + elif (not inRange and kpiMinValue is not None and kpiMaxValue is None and not includeMinValue): + if (kpi_value <= kpiMinValue): + alarm = True + elif (inRange and kpiMinValue is None and kpiMaxValue is not None and includeMaxValue): + if (kpi_value <= kpiMaxValue): + alarm = True + elif (inRange and kpiMinValue is None and kpiMaxValue is not None and not includeMaxValue): + if (kpi_value < kpiMaxValue): + alarm = True + elif (not inRange and kpiMinValue is None and kpiMaxValue is not None and not includeMaxValue): + if (kpi_value >= kpiMaxValue): + alarm = True + elif (not inRange and kpiMinValue is None and kpiMaxValue is not None and not includeMaxValue): + if (kpi_value >= kpiMaxValue): + alarm = True + if alarm: + print(kpi) + # LOGGER.info(f"Alarm triggered -> kpi_value:{kpi[2]}, timestamp:{kpi[1]}") diff --git a/src/monitoring/service/SubscriptionManager.py b/src/monitoring/service/SubscriptionManager.py index eb46f3ec5..94e602bef 100644 --- a/src/monitoring/service/SubscriptionManager.py +++ b/src/monitoring/service/SubscriptionManager.py @@ -1,9 +1,6 @@ from apscheduler.schedulers.background import BackgroundScheduler from apscheduler.executors.pool import ProcessPoolExecutor -from apscheduler.triggers.interval import IntervalTrigger -from apscheduler.triggers.cron import CronTrigger -from common.tools.timestamp.Converters import timestamp_utcnow_to_float -from datetime import datetime, timezone +from datetime import datetime import time @@ -12,6 +9,7 @@ class SubscriptionManager(): self.metrics_db = metrics_db self.scheduler = BackgroundScheduler(executors={'processpool': ProcessPoolExecutor(max_workers=20)}) self.scheduler.start() + print("Subscription Manager Initialized") def create_subscription(self, subscription_id, kpi_id, sampling_interval_s, sampling_duration_s=None, start_timestamp=None, end_timestamp=None): @@ -25,7 +23,15 @@ class SubscriptionManager(): start_date = datetime.fromtimestamp(start_timestamp) if end_timestamp: end_date = datetime.fromtimestamp(end_timestamp) - self.scheduler.add_job(self.metrics_db.get_subscription_data, args=(kpi_id, timestamp_utcnow_to_float(), sampling_interval_s),trigger='interval', seconds=sampling_interval_s, start_date=start_date, end_date=end_date, id=subscription_id) + self.scheduler.add_job(self.metrics_db.get_subscription_data, args=(kpi_id, sampling_interval_s),trigger='interval', seconds=sampling_interval_s, start_date=start_date, end_date=end_date, id=subscription_id) def delete_subscription(self, subscription_id): - self.scheduler.remove_job(subscription_id) \ No newline at end of file + self.scheduler.remove_job(subscription_id) + +if __name__ == '__main__': + + import MetricsDBTools + metrics_db=MetricsDBTools.MetricsDB("localhost",9009,9000,"monitoring",1000) + subscription_manager=SubscriptionManager(metrics_db) + subscription_manager.create_subscription('1',1,1) + time.sleep(100) \ No newline at end of file -- GitLab From cd7398d7dd97e80f5a1fcca1540f0ddf96da31a4 Mon Sep 17 00:00:00 2001 From: Sergio Gonzalez Date: Thu, 29 Sep 2022 10:15:44 +0200 Subject: [PATCH 14/34] Fix insert_KPI --- src/monitoring/service/ManagementDBTools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/monitoring/service/ManagementDBTools.py b/src/monitoring/service/ManagementDBTools.py index be4420f99..c5a9c6a16 100644 --- a/src/monitoring/service/ManagementDBTools.py +++ b/src/monitoring/service/ManagementDBTools.py @@ -63,7 +63,7 @@ class ManagementDB(): def insert_KPI(self,kpi_description,kpi_sample_type,device_id,endpoint_id,service_id): c = self.client.cursor() - c.execute("SELECT kpi_id FROM kpi WHERE device_id is ? AND kpi_sample_type is ? AND endpoint_id is ?",(device_id,kpi_sample_type,endpoint_id)) + c.execute("SELECT kpi_id FROM kpi WHERE device_id is ? AND kpi_sample_type is ? AND endpoint_id is ? AND service_id is ?",(device_id,kpi_sample_type,endpoint_id,service_id)) data=c.fetchone() if data is None: c.execute("INSERT INTO kpi (kpi_description,kpi_sample_type,device_id,endpoint_id,service_id) VALUES (?,?,?,?,?)", (kpi_description,kpi_sample_type,device_id,endpoint_id,service_id)) -- GitLab From 1b4eb8b78d0f8c21f9140ce103227f7980143bd1 Mon Sep 17 00:00:00 2001 From: TeraFlowSDN Date: Thu, 29 Sep 2022 08:41:49 +0000 Subject: [PATCH 15/34] Minor import changes --- src/monitoring/service/MetricsDBTools.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/monitoring/service/MetricsDBTools.py b/src/monitoring/service/MetricsDBTools.py index d9c92f957..3883d991a 100644 --- a/src/monitoring/service/MetricsDBTools.py +++ b/src/monitoring/service/MetricsDBTools.py @@ -17,8 +17,7 @@ import requests import json import logging import datetime -# from common.tools.timestamp.Converters import timestamp_float_to_string -from Converters import timestamp_float_to_string, timestamp_utcnow_to_float +from common.tools.timestamp.Converters import timestamp_float_to_string LOGGER = logging.getLogger(__name__) -- GitLab From 015f53ca51fd02357061f38743bdc08cdaa20939 Mon Sep 17 00:00:00 2001 From: Sergio Gonzalez Date: Thu, 29 Sep 2022 11:17:14 +0200 Subject: [PATCH 16/34] Fix MetricsDBTools.py --- src/monitoring/service/MetricsDBTools.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/monitoring/service/MetricsDBTools.py b/src/monitoring/service/MetricsDBTools.py index 3883d991a..24335ca72 100644 --- a/src/monitoring/service/MetricsDBTools.py +++ b/src/monitoring/service/MetricsDBTools.py @@ -17,7 +17,7 @@ import requests import json import logging import datetime -from common.tools.timestamp.Converters import timestamp_float_to_string +from common.tools.timestamp.Converters import timestamp_float_to_string, timestamp_utcnow_to_float LOGGER = logging.getLogger(__name__) @@ -78,15 +78,15 @@ class MetricsDB(): self.run_query(query) LOGGER.info(f"Table {self.table} created") - def get_subscription_data(self, kpi_id, sampling_interval_s): + def get_subscription_data(self, kpi_id, sampling_interval_s=1): end_date = timestamp_utcnow_to_float()-self.commit_lag_ms/1000 start_date = end_date-sampling_interval_s query = f"SELECT kpi_id, timestamp, kpi_value FROM {self.table} WHERE kpi_id = '{kpi_id}' AND (timestamp BETWEEN '{timestamp_float_to_string(start_date)}' AND '{timestamp_float_to_string(end_date)}')" response=self.run_query(query) kpi_list=response['dataset'] - print(kpi_list) + print(len(kpi_list)) - def get_alarm_data(self, kpi_id, kpiMinValue, kpiMaxValue, inRange, includeMinValue, includeMaxValue, subscription_frequency_ms): + def get_alarm_data(self, kpi_id, kpiMinValue, kpiMaxValue, inRange=True, includeMinValue=True, includeMaxValue=True, subscription_frequency_ms=1000): end_date = timestamp_utcnow_to_float()-self.commit_lag_ms/1000 start_date = end_date-subscription_frequency_ms/1000 query = f"SELECT kpi_id, timestamp, kpi_value FROM {self.table} WHERE kpi_id = '{kpi_id}' AND (timestamp BETWEEN '{timestamp_float_to_string(start_date)}' AND '{timestamp_float_to_string(end_date)}')" -- GitLab From 4e5a673794392c8b82a7b49544a12f2e7c888a78 Mon Sep 17 00:00:00 2001 From: Sergio Gonzalez Date: Thu, 29 Sep 2022 11:22:33 +0200 Subject: [PATCH 17/34] Fix ManagementDBTools.py --- src/monitoring/service/ManagementDBTools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/monitoring/service/ManagementDBTools.py b/src/monitoring/service/ManagementDBTools.py index c5a9c6a16..00f8b5aa2 100644 --- a/src/monitoring/service/ManagementDBTools.py +++ b/src/monitoring/service/ManagementDBTools.py @@ -89,7 +89,7 @@ class ManagementDB(): c.execute("SELECT alarm_id FROM alarm WHERE alarm_description is ? AND alarm_name is ? AND kpi_id is ? AND kpi_min_value is ? AND kpi_max_value is ? AND in_range is ? AND include_min_value is ? AND include_max_value is ?",(alarm_description,alarm_name,kpi_id,kpi_min_value,kpi_max_value,in_range,include_min_value,include_max_value)) data=c.fetchone() if data is None: - c.execute("INSERT INTO alarm (alarm_description, alarm_name, kpi_id, kpi_min_value, kpi_max_value, in_range, include_min_value, include_max_value) VALUES (?,?,?,?,?,?)", (alarm_description,alarm_name,kpi_id,kpi_min_value,kpi_max_value,in_range,include_min_value,include_max_value)) + c.execute("INSERT INTO alarm (alarm_description, alarm_name, kpi_id, kpi_min_value, kpi_max_value, in_range, include_min_value, include_max_value) VALUES (?,?,?,?,?,?,?,?)", (alarm_description,alarm_name,kpi_id,kpi_min_value,kpi_max_value,in_range,include_min_value,include_max_value)) self.client.commit() return c.lastrowid else: -- GitLab From 1d72c20d32fdde39c8bc14f1169e2f6de9557866 Mon Sep 17 00:00:00 2001 From: Javier Moreno Date: Fri, 30 Sep 2022 13:44:58 +0200 Subject: [PATCH 18/34] Changes in the IncludeKpi Method --- proto/monitoring.proto | 2 +- .../service/MonitoringServiceServicerImpl.py | 47 +++++++++++-------- 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/proto/monitoring.proto b/proto/monitoring.proto index ea7f532bb..5eb30651e 100644 --- a/proto/monitoring.proto +++ b/proto/monitoring.proto @@ -99,7 +99,7 @@ message KpiValue { message KpiList { - repeated Kpi kpi_list = 1; + repeated Kpi kpi = 1; } message KpiDescriptorList { diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py index 8cf2928f4..f6c23680b 100644 --- a/src/monitoring/service/MonitoringServiceServicerImpl.py +++ b/src/monitoring/service/MonitoringServiceServicerImpl.py @@ -28,6 +28,7 @@ from common.proto.monitoring_pb2 import AlarmResponse, AlarmDescriptor, AlarmLis KpiDescriptor, KpiList, KpiQuery, SubsDescriptor, SubscriptionID, AlarmID, KpiDescriptorList, \ MonitorKpiRequest, Kpi, AlarmSubscription, SubsResponse from common.rpc_method_wrapper.ServiceExceptions import ServiceException +from common.tools.timestamp.Converters import timestamp_string_to_float from monitoring.service import ManagementDBTools, MetricsDBTools from device.client.DeviceClient import DeviceClient @@ -153,23 +154,23 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): try: kpiDescriptor = self.GetKpiDescriptor(request.kpi_id, grpc_context) + if kpiDescriptor is None: - LOGGER.warning('Ignoring sample with KPIId({:s}): not found in database'.format(str(request.kpi_id))) + raise Exception(LOGGER.exception('IncludeKpi exception: Sample with KPIId({:s}): not found in database'.format(str(request.kpi_id)))) + else: + kpiSampleType = KpiSampleType.Name(kpiDescriptor.kpi_sample_type).upper().replace('KPISAMPLETYPE_', '') + kpiId = request.kpi_id.kpi_id.uuid + deviceId = kpiDescriptor.device_id.device_uuid.uuid + endpointId = kpiDescriptor.endpoint_id.endpoint_uuid.uuid + serviceId = kpiDescriptor.service_id.service_uuid.uuid + time_stamp = request.timestamp.timestamp + kpi_value = getattr(request.kpi_value, request.kpi_value.WhichOneof('value')) + + # Build the structure to be included as point in the MetricsDB + self.metrics_db.write_KPI(time_stamp,kpiId,kpiSampleType,deviceId,endpointId,serviceId,kpi_value) + + #self.influx_db.read_KPI_points() return Empty() - - kpiSampleType = KpiSampleType.Name(kpiDescriptor.kpi_sample_type).upper().replace('KPISAMPLETYPE_', '') - kpiId = request.kpi_id.kpi_id.uuid - deviceId = kpiDescriptor.device_id.device_uuid.uuid - endpointId = kpiDescriptor.endpoint_id.endpoint_uuid.uuid - serviceId = kpiDescriptor.service_id.service_uuid.uuid - time_stamp = request.timestamp.timestamp - kpi_value = getattr(request.kpi_value, request.kpi_value.WhichOneof('value')) - - # Build the structure to be included as point in the MetricsDB - self.metrics_db.write_KPI(time_stamp,kpiId,kpiSampleType,deviceId,endpointId,serviceId,kpi_value) - - #self.influx_db.read_KPI_points() - except ServiceException as e: LOGGER.exception('IncludeKpi exception') # CREATEKPI_COUNTER_FAILED.inc() @@ -177,7 +178,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): except Exception: # pragma: no cover LOGGER.exception('IncludeKpi exception') # CREATEKPI_COUNTER_FAILED.inc() - return Empty() + # rpc MonitorKpi (MonitorKpiRequest) returns (context.Empty) {} def MonitorKpi ( self, request : MonitorKpiRequest, grpc_context : grpc.ServicerContext) -> Empty: @@ -235,14 +236,22 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): start_timestamp = request.start_timestamp.timestamp end_timestamp = request.end_timestamp.timestamp - subscriber = "localhost" + subscriber = "localhost" # Investigate how to get info from the requester subs_id = self.management_db.insert_subscription(kpi_id,subscriber,sampling_duration_s,sampling_interval_s,start_timestamp,end_timestamp) - self.subs_manager.create_subscription(subs_id,kpi_id,sampling_duration_s,sampling_interval_s,start_timestamp,end_timestamp) + self.subs_manager.create_subscription(subs_queue,subs_id,kpi_id,sampling_interval_s,sampling_duration_s,start_timestamp,end_timestamp) # parse queue to append kpis into the list + while not subs_queue.empty(): + list = subs_queue.get_nowait() + for item in list: + kpi = kpi.kpi_id.kpi_id.uuid = item[0] + kpi.timestamp.timestamp = timestamp_string_to_float(item[1]) + kpi.kpi_value.floatVal = item[2] # This must be improved + subs_response.kpi_list.kpi.append(kpi) + + subs_response.subs_id.subs_id.uuid = subs_id - # TBC yield subs_response except ServiceException as e: LOGGER.exception('SubscribeKpi exception') -- GitLab From bf7810d7f924d4d4183b5c4094a7c9b52b8dc0bc Mon Sep 17 00:00:00 2001 From: Sergio Gonzalez Date: Fri, 30 Sep 2022 15:02:07 +0200 Subject: [PATCH 19/34] Initial version of AlarmManager --- src/monitoring/requirements.in | 1 + src/monitoring/service/AlarmManager.py | 20 +- src/monitoring/service/ManagementDBTools.py | 308 +++++++++++------ src/monitoring/service/MetricsDBTools.py | 321 ++++++++++++------ src/monitoring/service/SubscriptionManager.py | 21 +- 5 files changed, 435 insertions(+), 236 deletions(-) diff --git a/src/monitoring/requirements.in b/src/monitoring/requirements.in index e0176e026..f0f29dcd6 100644 --- a/src/monitoring/requirements.in +++ b/src/monitoring/requirements.in @@ -17,6 +17,7 @@ redis==4.1.2 requests==2.27.1 xmltodict==0.12.0 questdb==1.0.1 +psycopg2-binary==2.9.3 # pip's dependency resolver does not take into account installed packages. # p4runtime does not specify the version of grpcio/protobuf it needs, so it tries to install latest one diff --git a/src/monitoring/service/AlarmManager.py b/src/monitoring/service/AlarmManager.py index 45764150d..dc1b02b03 100644 --- a/src/monitoring/service/AlarmManager.py +++ b/src/monitoring/service/AlarmManager.py @@ -1,15 +1,18 @@ from apscheduler.schedulers.background import BackgroundScheduler from apscheduler.executors.pool import ProcessPoolExecutor +from apscheduler.jobstores.base import JobLookupError from datetime import datetime import time +import logging +LOGGER = logging.getLogger(__name__) class AlarmManager(): def __init__(self, metrics_db): self.metrics_db = metrics_db self.scheduler = BackgroundScheduler(executors={'processpool': ProcessPoolExecutor(max_workers=20)}) self.scheduler.start() - + LOGGER.info("Alarm Manager Initialized") def create_alarm(self, alarm_id, kpi_id, kpiMinValue, kpiMaxValue, inRange, includeMinValue, includeMaxValue, subscription_frequency_ms, subscription_timeout_s=None): start_date=None @@ -19,14 +22,11 @@ class AlarmManager(): start_date=datetime.fromtimestamp(start_timestamp) end_date=datetime.fromtimestamp(start_timestamp+subscription_timeout_s) self.scheduler.add_job(self.metrics_db.get_alarm_data, args=(kpi_id, kpiMinValue, kpiMaxValue, inRange, includeMinValue, includeMaxValue, subscription_frequency_ms),trigger='interval', seconds=(subscription_frequency_ms/1000), start_date=start_date, end_date=end_date, id=alarm_id) + LOGGER.debug(f"Alarm job {alarm_id} succesfully created") def delete_alarm(self, alarm_id): - self.scheduler.remove_job(alarm_id) - -if __name__ == '__main__': - import MetricsDBTools - metrics_db=MetricsDBTools.MetricsDB("localhost",9009,9000,"monitoring",10) - alarm_manager=AlarmManager(metrics_db) - alarm_manager.create_alarm('1',1,0,1,True,True,True,1000) - time.sleep(100) - print("END") + try: + self.scheduler.remove_job(alarm_id) + LOGGER.debug(f"Alarm job {alarm_id} succesfully deleted") + except (Exception, JobLookupError) as e: + LOGGER.debug(f"Alarm job {alarm_id} does not exists") diff --git a/src/monitoring/service/ManagementDBTools.py b/src/monitoring/service/ManagementDBTools.py index 00f8b5aa2..2387ddde0 100644 --- a/src/monitoring/service/ManagementDBTools.py +++ b/src/monitoring/service/ManagementDBTools.py @@ -12,143 +12,237 @@ # See the License for the specific language governing permissions and # limitations under the License. -import sqlite3 as sl +import sqlite3 +import logging + +LOGGER = logging.getLogger(__name__) class ManagementDB(): def __init__(self, database): - self.client = sl.connect(database, check_same_thread=False) - self.create_monitoring_table() - self.create_subscription_table() - self.create_alarm_table() + try: + self.client = sqlite3.connect(database, check_same_thread=False) + self.create_monitoring_table() + self.create_subscription_table() + self.create_alarm_table() + LOGGER.info("ManagementDB initialized") + except: + LOGGER.info("ManagementDB cannot be initialized") + raise Exception("Critical error in the monitoring component") def create_monitoring_table(self): - self.client.execute(""" - CREATE TABLE IF NOT EXISTS kpi( - kpi_id INTEGER PRIMARY KEY AUTOINCREMENT, - kpi_description TEXT, - kpi_sample_type INTEGER, - device_id INTEGER, - endpoint_id INTEGER, - service_id INTEGER - ); - """) + try: + result=self.client.execute(""" + CREATE TABLE IF NOT EXISTS kpi( + kpi_id INTEGER PRIMARY KEY AUTOINCREMENT, + kpi_description TEXT, + kpi_sample_type INTEGER, + device_id INTEGER, + endpoint_id INTEGER, + service_id INTEGER + ); + """) + LOGGER.debug("KPI table created in the ManagementDB") + except sqlite3.Error as e: + LOGGER.debug(f"KPI table cannot be created in the ManagementD. {e}") + raise Exception def create_subscription_table(self): - self.client.execute(""" - CREATE TABLE IF NOT EXISTS subscription( - subs_id INTEGER PRIMARY KEY AUTOINCREMENT, - kpi_id INTEGER, - subscriber TEXT, - sampling_duration_s REAL, - sampling_interval_s REAL, - start_timestamp REAL, - end_timestamp REAL - ); - """) + try: + result= self.client.execute(""" + CREATE TABLE IF NOT EXISTS subscription( + subs_id INTEGER PRIMARY KEY AUTOINCREMENT, + kpi_id INTEGER, + subscriber TEXT, + sampling_duration_s REAL, + sampling_interval_s REAL, + start_timestamp REAL, + end_timestamp REAL + ); + """) + LOGGER.info("Subscription table created in the ManagementDB") + except sqlite3.Error as e: + LOGGER.debug(f"Subscription table cannot be created in the ManagementDB. {e}") + raise Exception def create_alarm_table(self): - self.client.execute(""" - CREATE TABLE IF NOT EXISTS alarm( - alarm_id INTEGER PRIMARY KEY AUTOINCREMENT, - alarm_description TEXT, - alarm_name TEXT, - kpi_id INTEGER, - kpi_min_value REAL, - kpi_max_value REAL, - in_range INTEGER, - include_min_value INTEGER, - include_max_value INTEGER - ); - """) + try: + result=self.client.execute(""" + CREATE TABLE IF NOT EXISTS alarm( + alarm_id INTEGER PRIMARY KEY AUTOINCREMENT, + alarm_description TEXT, + alarm_name TEXT, + kpi_id INTEGER, + kpi_min_value REAL, + kpi_max_value REAL, + in_range INTEGER, + include_min_value INTEGER, + include_max_value INTEGER + ); + """) + LOGGER.info("Alarm table created in the ManagementDB") + except sqlite3.Error as e: + LOGGER.debug(f"Alarm table cannot be created in the ManagementDB. {e}") + raise Exception def insert_KPI(self,kpi_description,kpi_sample_type,device_id,endpoint_id,service_id): - c = self.client.cursor() - c.execute("SELECT kpi_id FROM kpi WHERE device_id is ? AND kpi_sample_type is ? AND endpoint_id is ? AND service_id is ?",(device_id,kpi_sample_type,endpoint_id,service_id)) - data=c.fetchone() - if data is None: - c.execute("INSERT INTO kpi (kpi_description,kpi_sample_type,device_id,endpoint_id,service_id) VALUES (?,?,?,?,?)", (kpi_description,kpi_sample_type,device_id,endpoint_id,service_id)) - self.client.commit() - return c.lastrowid - else: - return data[0] + try: + c = self.client.cursor() + c.execute("SELECT kpi_id FROM kpi WHERE device_id is ? AND kpi_sample_type is ? AND endpoint_id is ? AND service_id is ?",(device_id,kpi_sample_type,endpoint_id,service_id)) + data=c.fetchone() + if data is None: + c.execute("INSERT INTO kpi (kpi_description,kpi_sample_type,device_id,endpoint_id,service_id) VALUES (?,?,?,?,?)", (kpi_description,kpi_sample_type,device_id,endpoint_id,service_id)) + self.client.commit() + kpi_id = c.lastrowid + LOGGER.debug(f"KPI {kpi_id} succesfully inserted in the ManagementDB") + return kpi_id + else: + kpi_id = data[0] + LOGGER.debug(f"KPI {kpi_id} already exists") + return kpi_id + except sqlite3.Error as e: + LOGGER.debug("KPI cannot be inserted in the ManagementDB: {e}") def insert_subscription(self,kpi_id,subscriber,sampling_duration_s,sampling_interval_s,start_timestamp, end_timestamp): - c = self.client.cursor() - c.execute("SELECT subs_id FROM subscription WHERE kpi_id is ? AND subscriber is ? AND sampling_duration_s is ? AND sampling_interval_s is ? AND start_timestamp is ? AND end_timestamp is ?",(kpi_id,subscriber,sampling_duration_s,sampling_interval_s,start_timestamp, end_timestamp)) - data=c.fetchone() - if data is None: - c.execute("INSERT INTO subscription (kpi_id,subscriber,sampling_duration_s,sampling_interval_s,start_timestamp, end_timestamp) VALUES (?,?,?,?,?,?)", (kpi_id,subscriber,sampling_duration_s,sampling_interval_s,start_timestamp, end_timestamp)) - self.client.commit() - return c.lastrowid - else: - print("already exists") - return data[0] + try: + c = self.client.cursor() + c.execute("SELECT subs_id FROM subscription WHERE kpi_id is ? AND subscriber is ? AND sampling_duration_s is ? AND sampling_interval_s is ? AND start_timestamp is ? AND end_timestamp is ?",(kpi_id,subscriber,sampling_duration_s,sampling_interval_s,start_timestamp, end_timestamp)) + data=c.fetchone() + if data is None: + c.execute("INSERT INTO subscription (kpi_id,subscriber,sampling_duration_s,sampling_interval_s,start_timestamp, end_timestamp) VALUES (?,?,?,?,?,?)", (kpi_id,subscriber,sampling_duration_s,sampling_interval_s,start_timestamp, end_timestamp)) + self.client.commit() + subs_id = c.lastrowid + LOGGER.debug(f"Subscription {subs_id} succesfully inserted in the ManagementDB") + return subs_id + else: + subs_id = data[0] + LOGGER.debug(f"Subscription {subs_id} already exists") + return subs_id + except sqlite3.Error as e: + LOGGER.debug("Subscription cannot be inserted in the ManagementDB: {e}") def insert_alarm(self,alarm_description,alarm_name,kpi_id,kpi_min_value,kpi_max_value,in_range,include_min_value,include_max_value): - c = self.client.cursor() - c.execute("SELECT alarm_id FROM alarm WHERE alarm_description is ? AND alarm_name is ? AND kpi_id is ? AND kpi_min_value is ? AND kpi_max_value is ? AND in_range is ? AND include_min_value is ? AND include_max_value is ?",(alarm_description,alarm_name,kpi_id,kpi_min_value,kpi_max_value,in_range,include_min_value,include_max_value)) - data=c.fetchone() - if data is None: - c.execute("INSERT INTO alarm (alarm_description, alarm_name, kpi_id, kpi_min_value, kpi_max_value, in_range, include_min_value, include_max_value) VALUES (?,?,?,?,?,?,?,?)", (alarm_description,alarm_name,kpi_id,kpi_min_value,kpi_max_value,in_range,include_min_value,include_max_value)) - self.client.commit() - return c.lastrowid - else: - print("already exists") - return data[0] + try: + c = self.client.cursor() + c.execute("SELECT alarm_id FROM alarm WHERE alarm_description is ? AND alarm_name is ? AND kpi_id is ? AND kpi_min_value is ? AND kpi_max_value is ? AND in_range is ? AND include_min_value is ? AND include_max_value is ?",(alarm_description,alarm_name,kpi_id,kpi_min_value,kpi_max_value,in_range,include_min_value,include_max_value)) + data=c.fetchone() + if data is None: + c.execute("INSERT INTO alarm (alarm_description, alarm_name, kpi_id, kpi_min_value, kpi_max_value, in_range, include_min_value, include_max_value) VALUES (?,?,?,?,?,?,?,?)", (alarm_description,alarm_name,kpi_id,kpi_min_value,kpi_max_value,in_range,include_min_value,include_max_value)) + self.client.commit() + alarm_id=c.lastrowid + LOGGER.debug(f"Alarm {alarm_id} succesfully inserted in the ManagementDB") + return alarm_id + else: + alarm_id=data[0] + LOGGER.debug(f"Alarm {alarm_id} already exists") + return alarm_id + except sqlite3.Error as e: + LOGGER.debug(f"Alarm cannot be inserted in the ManagementDB: {e}") def delete_KPI(self,kpi_id): - c = self.client.cursor() - c.execute("SELECT * FROM kpi WHERE kpi_id is ?",(kpi_id,)) - data=c.fetchone() - if data is None: - return False - else: - c.execute("DELETE FROM kpi WHERE kpi_id is ?",(kpi_id,)) - self.client.commit() - return True + try: + c = self.client.cursor() + c.execute("SELECT * FROM kpi WHERE kpi_id is ?",(kpi_id,)) + data=c.fetchone() + if data is None: + LOGGER.debug(f"KPI {kpi_id} does not exists") + return False + else: + c.execute("DELETE FROM kpi WHERE kpi_id is ?",(kpi_id,)) + self.client.commit() + LOGGER.debug(f"KPI {kpi_id} deleted from the ManagementDB") + return True + except sqlite3.Error as e: + LOGGER.debug(f"KPI cannot be deleted from the ManagementDB: {e}") def delete_subscription(self,subs_id): - c = self.client.cursor() - c.execute("SELECT * FROM subscription WHERE subs_id is ?",(subs_id,)) - data=c.fetchone() - if data is None: - return False - else: - c.execute("DELETE FROM subscription WHERE subs_id is ?",(subs_id,)) - self.client.commit() - return True + try: + c = self.client.cursor() + c.execute("SELECT * FROM subscription WHERE subs_id is ?",(subs_id,)) + data=c.fetchone() + if data is None: + LOGGER.debug(f"Subscription {subs_id} does not exists") + return False + else: + c.execute("DELETE FROM subscription WHERE subs_id is ?",(subs_id,)) + self.client.commit() + LOGGER.debug(f"Subscription {subs_id} deleted from the ManagementDB") + return True + except sqlite3.Error as e: + LOGGER.debug(f"Subscription cannot be deleted from the ManagementDB: {e}") def delete_alarm(self,alarm_id): - c = self.client.cursor() - c.execute("SELECT * FROM alarm WHERE alarm_id is ?",(alarm_id,)) - data=c.fetchone() - if data is None: - return False - else: - c.execute("DELETE FROM alarm WHERE alarm_id is ?",(alarm_id,)) - self.client.commit() - return True + try: + c = self.client.cursor() + c.execute("SELECT * FROM alarm WHERE alarm_id is ?",(alarm_id,)) + data=c.fetchone() + if data is None: + LOGGER.debug(f"Alarm {alarm_id} does not exists") + return False + else: + c.execute("DELETE FROM alarm WHERE alarm_id is ?",(alarm_id,)) + self.client.commit() + LOGGER.debug(f"Alarm {alarm_id} deleted from the ManagementDB") + return True + except sqlite3.Error as e: + LOGGER.debug(f"Alarm cannot be deleted from the ManagementDB: {e}") def get_KPI(self,kpi_id): - data = self.client.execute("SELECT * FROM kpi WHERE kpi_id is ?",(kpi_id,)) - return data.fetchone() + try: + data = self.client.execute("SELECT * FROM kpi WHERE kpi_id is ?",(kpi_id,)).fetchone() + if data: + LOGGER.debug(f"KPI {kpi_id} succesfully retrieved from the ManagementDB") + return data + else: + LOGGER.debug(f"KPI {kpi_id} does not exists") + return data + except sqlite3.Error as e: + LOGGER.debug(f"KPI {kpi_id} cannot be retrieved from the ManagementDB: {e}") def get_subscription(self,subs_id): - data = self.client.execute("SELECT * FROM subscription WHERE subs_id is ?",(subs_id,)) - return data.fetchone() + try: + data = self.client.execute("SELECT * FROM subscription WHERE subs_id is ?",(subs_id,)).fetchone() + if data: + LOGGER.debug(f"Subscription {subs_id} succesfully retrieved from the ManagementDB") + return data + else: + LOGGER.debug(f"Subscription {subs_id} does not exists") + return data + except sqlite3.Error as e: + LOGGER.debug(f"Subscription {subs_id} cannot be retrieved from the ManagementDB: {e}") def get_alarm(self,alarm_id): - data = self.client.execute("SELECT * FROM alarm WHERE alarm_id is ?",(alarm_id,)) - return data.fetchone() + try: + data = self.client.execute("SELECT * FROM alarm WHERE alarm_id is ?",(alarm_id,)).fetchone() + if data: + LOGGER.debug(f"Alarm {alarm_id} succesfully retrieved from the ManagementDB") + return data + else: + print(data) + LOGGER.debug(f"Alarm {alarm_id} does not exists") + return data + except sqlite3.Error as e: + LOGGER.debug(f"Alarm {alarm_id} cannot be retrieved from the ManagementDB: {e}") def get_KPIS(self): - data = self.client.execute("SELECT * FROM kpi") - return data.fetchall() + try: + data = self.client.execute("SELECT * FROM kpi").fetchall() + LOGGER.debug(f"KPIs succesfully retrieved from the ManagementDB") + return data + except sqlite3.Error as e: + LOGGER.debug(f"KPIs cannot be retrieved from the ManagementDB: {e}") def get_subscriptions(self): - data = self.client.execute("SELECT * FROM subscription") - return data.fetchall() + try: + data = self.client.execute("SELECT * FROM subscription").fetchall() + LOGGER.debug(f"Subscriptions succesfully retrieved from the ManagementDB") + return data + except sqlite3.Error as e: + LOGGER.debug(f"Subscriptions cannot be retrieved from the ManagementDB: {e}") def get_alarms(self): - data = self.client.execute("SELECT * FROM alarm") - return data.fetchall() \ No newline at end of file + try: + data = self.client.execute("SELECT * FROM alarm").fetchall() + LOGGER.debug(f"Alarms succesfully retrieved from the ManagementDB") + return data + except sqlite3.Error as e: + LOGGER.debug(f"Alarms cannot be retrieved from the ManagementDB: {e}") \ No newline at end of file diff --git a/src/monitoring/service/MetricsDBTools.py b/src/monitoring/service/MetricsDBTools.py index 24335ca72..1d2f1257c 100644 --- a/src/monitoring/service/MetricsDBTools.py +++ b/src/monitoring/service/MetricsDBTools.py @@ -18,133 +18,238 @@ import json import logging import datetime from common.tools.timestamp.Converters import timestamp_float_to_string, timestamp_utcnow_to_float - +import psycopg2 LOGGER = logging.getLogger(__name__) class MetricsDB(): - def __init__(self, host, ilp_port, rest_port, table, commit_lag_ms): - self.host=host - self.ilp_port=int(ilp_port) - self.rest_port=rest_port - self.table=table + def __init__(self, host, ilp_port=9009, rest_port=9000, table="monitoring", commit_lag_ms=1000, retries=10, postgre=False, postgre_port=8812, postgre_user='admin',postgre_password='quest'): + try: + self.host=host + self.ilp_port=int(ilp_port) + self.rest_port=rest_port + self.table=table + self.commit_lag_ms=commit_lag_ms + self.retries=retries + self.postgre=postgre + self.postgre_port=postgre_port + self.postgre_user=postgre_user + self.postgre_password=postgre_password + self.create_table() + LOGGER.info("MetricsDB initialized") + except: + LOGGER.info("MetricsDB cannot be initialized") + raise Exception("Critical error in the monitoring component") + + def is_postgre_enabled(self): + LOGGER.info(f"PostgreSQL is {self.postgre}") + return self.postgre + + def get_retry_number(self): + LOGGER.info(f"Retry number is {self.retries}") + return self.retries + + def get_commit_lag(self): + LOGGER.info(f"Commit lag of monitoring queries is {self.commit_lag_ms} ms") + return self.commit_lag_ms + + def enable_postgre_mode(self): + self.postgre=True + LOGGER.info("MetricsDB PostgreSQL query mode enabled") + + def disable_postgre_mode(self): + self.postgre=False + LOGGER.info("MetricsDB REST query mode enabled") + + def set_postgre_credentials(self, user, password): + self.postgre_user=user + self.postgre_password=password + LOGGER.info("MetricsDB PostgreSQL credentials changed") + + def set_retry_number(self, retries): + self.retries=retries + LOGGER.info(f"Retriy number changed to {retries}") + + def set_commit_lag(self, commit_lag_ms): self.commit_lag_ms=commit_lag_ms - self.create_table() + LOGGER.info(f"Commit lag of monitoring queries changed to {commit_lag_ms} ms") + + def create_table(self): + try: + query = f'CREATE TABLE IF NOT EXISTS {self.table}'\ + '(kpi_id SYMBOL,'\ + 'kpi_sample_type SYMBOL,'\ + 'device_id SYMBOL,'\ + 'endpoint_id SYMBOL,'\ + 'service_id SYMBOL,'\ + 'timestamp TIMESTAMP,'\ + 'kpi_value DOUBLE)'\ + 'TIMESTAMP(timestamp);' + result=self.run_query(query) + if(result==True): + LOGGER.info(f"Table {self.table} created") + except (Exception) as e: + LOGGER.debug(f"Table {self.table} cannot be created. {e}") + raise Exception def write_KPI(self,time,kpi_id,kpi_sample_type,device_id,endpoint_id,service_id,kpi_value): counter=0 - number_of_retries=10 - while (counter= kpiMinValue and kpi_value <= kpiMaxValue): - alarm = True - elif (inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and not includeMaxValue): - if (kpi_value >= kpiMinValue and kpi_value < kpiMaxValue): - alarm = True - elif (inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and includeMaxValue): - if (kpi_value > kpiMinValue and kpi_value <= kpiMaxValue): - alarm = True - elif (inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and not includeMaxValue): - if (kpi_value > kpiMinValue and kpi_value < kpiMaxValue): - alarm = True - elif (not inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and includeMaxValue): - if (kpi_value <= kpiMinValue or kpi_value >= kpiMaxValue): - alarm = True - elif (not inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and not includeMaxValue): - if (kpi_value <= kpiMinValue or kpi_value > kpiMaxValue): - alarm = True - elif (not inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and includeMaxValue): - if (kpi_value < kpiMinValue or kpi_value >= kpiMaxValue): - alarm = True - elif (not inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and not includeMaxValue): - if (kpi_value < kpiMinValue or kpi_value > kpiMaxValue): - alarm = True - elif (inRange and kpiMinValue is not None and kpiMaxValue is None and includeMinValue): - if (kpi_value >= kpiMinValue): - alarm = True - elif (inRange and kpiMinValue is not None and kpiMaxValue is None and not includeMinValue): - if (kpi_value > kpiMinValue): - alarm = True - elif (not inRange and kpiMinValue is not None and kpiMaxValue is None and not includeMinValue): - if (kpi_value <= kpiMinValue): - alarm = True - elif (not inRange and kpiMinValue is not None and kpiMaxValue is None and not includeMinValue): - if (kpi_value <= kpiMinValue): - alarm = True - elif (inRange and kpiMinValue is None and kpiMaxValue is not None and includeMaxValue): - if (kpi_value <= kpiMaxValue): - alarm = True - elif (inRange and kpiMinValue is None and kpiMaxValue is not None and not includeMaxValue): - if (kpi_value < kpiMaxValue): - alarm = True - elif (not inRange and kpiMinValue is None and kpiMaxValue is not None and not includeMaxValue): - if (kpi_value >= kpiMaxValue): - alarm = True - elif (not inRange and kpiMinValue is None and kpiMaxValue is not None and not includeMaxValue): - if (kpi_value >= kpiMaxValue): - alarm = True - if alarm: - print(kpi) - # LOGGER.info(f"Alarm triggered -> kpi_value:{kpi[2]}, timestamp:{kpi[1]}") + try: + end_date = timestamp_utcnow_to_float()-self.commit_lag_ms/1000 + start_date = end_date-subscription_frequency_ms/1000 + query = f"SELECT kpi_id, timestamp, kpi_value FROM {self.table} WHERE kpi_id = '{kpi_id}' AND (timestamp BETWEEN '{timestamp_float_to_string(start_date)}' AND '{timestamp_float_to_string(end_date)}')" + if self.postgre: + kpi_list=self.run_query_postgre(query) + else: + kpi_list=self.run_query(query) + if kpi_list: + LOGGER.debug(f"New data received for alarm of KPI {kpi_id}") + for kpi in kpi_list: + alarm = False + kpi_value = kpi[2] + if (kpiMinValue == kpi_value and kpiMaxValue == kpi_value and inRange): + alarm = True + elif (inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and includeMaxValue): + if (kpi_value >= kpiMinValue and kpi_value <= kpiMaxValue): + alarm = True + elif (inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and not includeMaxValue): + if (kpi_value >= kpiMinValue and kpi_value < kpiMaxValue): + alarm = True + elif (inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and includeMaxValue): + if (kpi_value > kpiMinValue and kpi_value <= kpiMaxValue): + alarm = True + elif (inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and not includeMaxValue): + if (kpi_value > kpiMinValue and kpi_value < kpiMaxValue): + alarm = True + elif (not inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and includeMaxValue): + if (kpi_value <= kpiMinValue or kpi_value >= kpiMaxValue): + alarm = True + elif (not inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and not includeMaxValue): + if (kpi_value <= kpiMinValue or kpi_value > kpiMaxValue): + alarm = True + elif (not inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and includeMaxValue): + if (kpi_value < kpiMinValue or kpi_value >= kpiMaxValue): + alarm = True + elif (not inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and not includeMaxValue): + if (kpi_value < kpiMinValue or kpi_value > kpiMaxValue): + alarm = True + elif (inRange and kpiMinValue is not None and kpiMaxValue is None and includeMinValue): + if (kpi_value >= kpiMinValue): + alarm = True + elif (inRange and kpiMinValue is not None and kpiMaxValue is None and not includeMinValue): + if (kpi_value > kpiMinValue): + alarm = True + elif (not inRange and kpiMinValue is not None and kpiMaxValue is None and not includeMinValue): + if (kpi_value <= kpiMinValue): + alarm = True + elif (not inRange and kpiMinValue is not None and kpiMaxValue is None and not includeMinValue): + if (kpi_value <= kpiMinValue): + alarm = True + elif (inRange and kpiMinValue is None and kpiMaxValue is not None and includeMaxValue): + if (kpi_value <= kpiMaxValue): + alarm = True + elif (inRange and kpiMinValue is None and kpiMaxValue is not None and not includeMaxValue): + if (kpi_value < kpiMaxValue): + alarm = True + elif (not inRange and kpiMinValue is None and kpiMaxValue is not None and not includeMaxValue): + if (kpi_value >= kpiMaxValue): + alarm = True + elif (not inRange and kpiMinValue is None and kpiMaxValue is not None and not includeMaxValue): + if (kpi_value >= kpiMaxValue): + alarm = True + if alarm: + #queue.append[kpi] + LOGGER.debug(f"Alarm of KPI {kpi_id} triggered -> kpi_value:{kpi[2]}, timestamp:{kpi[1]}") + else: + LOGGER.debug(f"No new data for the alarm of KPI {kpi_id}") + except (Exception) as e: + LOGGER.debug(f"Alarm data cannot be retrieved. {e}") \ No newline at end of file diff --git a/src/monitoring/service/SubscriptionManager.py b/src/monitoring/service/SubscriptionManager.py index 94e602bef..a07d40b55 100644 --- a/src/monitoring/service/SubscriptionManager.py +++ b/src/monitoring/service/SubscriptionManager.py @@ -1,16 +1,18 @@ from apscheduler.schedulers.background import BackgroundScheduler from apscheduler.executors.pool import ProcessPoolExecutor +from apscheduler.jobstores.base import JobLookupError from datetime import datetime import time +import logging +LOGGER = logging.getLogger(__name__) class SubscriptionManager(): def __init__(self, metrics_db): self.metrics_db = metrics_db self.scheduler = BackgroundScheduler(executors={'processpool': ProcessPoolExecutor(max_workers=20)}) self.scheduler.start() - print("Subscription Manager Initialized") - + LOGGER.info("Subscription Manager Initialized") def create_subscription(self, subscription_id, kpi_id, sampling_interval_s, sampling_duration_s=None, start_timestamp=None, end_timestamp=None): start_date=None @@ -24,14 +26,11 @@ class SubscriptionManager(): if end_timestamp: end_date = datetime.fromtimestamp(end_timestamp) self.scheduler.add_job(self.metrics_db.get_subscription_data, args=(kpi_id, sampling_interval_s),trigger='interval', seconds=sampling_interval_s, start_date=start_date, end_date=end_date, id=subscription_id) + LOGGER.debug(f"Subscrition job {subscription_id} succesfully created") def delete_subscription(self, subscription_id): - self.scheduler.remove_job(subscription_id) - -if __name__ == '__main__': - - import MetricsDBTools - metrics_db=MetricsDBTools.MetricsDB("localhost",9009,9000,"monitoring",1000) - subscription_manager=SubscriptionManager(metrics_db) - subscription_manager.create_subscription('1',1,1) - time.sleep(100) \ No newline at end of file + try: + self.scheduler.remove_job(subscription_id) + LOGGER.debug(f"Subscription job {subscription_id} succesfully deleted") + except (Exception, JobLookupError) as e: + LOGGER.debug(f"Subscription job {subscription_id} does not exists") \ No newline at end of file -- GitLab From 99fbab45d2c94ac208886b07a79d4de464a5de82 Mon Sep 17 00:00:00 2001 From: Javier Moreno Date: Tue, 4 Oct 2022 17:28:22 +0200 Subject: [PATCH 20/34] WIP --- src/monitoring/service/MonitoringService.py | 2 +- src/monitoring/service/__main__.py | 6 +++--- src/monitoring/tests/test_unitary.py | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/monitoring/service/MonitoringService.py b/src/monitoring/service/MonitoringService.py index 1a79ef9c1..e2cbe2862 100644 --- a/src/monitoring/service/MonitoringService.py +++ b/src/monitoring/service/MonitoringService.py @@ -16,7 +16,7 @@ from common.Constants import ServiceNameEnum from common.Settings import get_service_port_grpc from common.proto.monitoring_pb2_grpc import add_MonitoringServiceServicer_to_server from common.tools.service.GenericGrpcService import GenericGrpcService -from .MonitoringServiceServicerImpl import MonitoringServiceServicerImpl +from monitoring.service.MonitoringServiceServicerImpl import MonitoringServiceServicerImpl class MonitoringService(GenericGrpcService): def __init__(self, cls_name: str = __name__) -> None: diff --git a/src/monitoring/service/__main__.py b/src/monitoring/service/__main__.py index e37412fa0..64cc6b5e2 100644 --- a/src/monitoring/service/__main__.py +++ b/src/monitoring/service/__main__.py @@ -19,8 +19,8 @@ from common.Settings import ( ENVVAR_SUFIX_SERVICE_HOST, ENVVAR_SUFIX_SERVICE_PORT_GRPC, get_env_var_name, get_log_level, get_metrics_port, wait_for_environment_variables) from common.proto import monitoring_pb2 -from .EventTools import EventsDeviceCollector -from .MonitoringService import MonitoringService +from monitoring.service.EventTools import EventsDeviceCollector +from monitoring.service.MonitoringService import MonitoringService terminate = threading.Event() LOGGER = None @@ -79,7 +79,7 @@ def main(): grpc_service = MonitoringService() grpc_service.start() - start_monitoring() + # start_monitoring() # Wait for Ctrl+C or termination signal while not terminate.wait(timeout=0.1): pass diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py index f73ffe65b..3faff440a 100644 --- a/src/monitoring/tests/test_unitary.py +++ b/src/monitoring/tests/test_unitary.py @@ -281,11 +281,11 @@ def test_get_subscriptions(monitoring_client): assert isinstance(response, SubsList) # Test case that makes use of client fixture to test server's DeleteSubscription method -# def test_delete_subscription(monitoring_client): -# LOGGER.warning('test_delete_subscription') -# response = monitoring_client.DeleteSubscription(subs_id()) -# LOGGER.debug(type(response)) -# assert isinstance(response, Empty) +def test_delete_subscription(monitoring_client): + LOGGER.warning('test_delete_subscription') + response = monitoring_client.DeleteSubscription(subs_id()) + LOGGER.debug(type(response)) + assert isinstance(response, Empty) # Test case that makes use of client fixture to test server's SetKpiAlarm method def test_set_kpi_alarm(monitoring_client): -- GitLab From c6e8a2595d2c3fee175b94256a6d715dc2747718 Mon Sep 17 00:00:00 2001 From: Javier Moreno Date: Tue, 4 Oct 2022 17:35:23 +0200 Subject: [PATCH 21/34] Merge from develop (WIP) --- src/monitoring/service/ManagementDBTools.py | 15 +++- src/monitoring/service/MetricsDBTools.py | 17 +++- src/monitoring/service/SubscriptionManager.py | 89 +++++++++++++++++-- 3 files changed, 109 insertions(+), 12 deletions(-) diff --git a/src/monitoring/service/ManagementDBTools.py b/src/monitoring/service/ManagementDBTools.py index 09fb3049f..04693d3ff 100644 --- a/src/monitoring/service/ManagementDBTools.py +++ b/src/monitoring/service/ManagementDBTools.py @@ -11,8 +11,11 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from monitoring.service.MonitoringServiceServicerImpl import LOGGER +from common.tools.timestamp.Converters import timestamp_utcnow_to_float + import sqlite3 as sl +import os +ROOT_DIR = os.path.abspath(os.curdir) class ManagementDB(): def __init__(self, database): @@ -121,4 +124,12 @@ class ManagementDB(): #print("\n") #for row in data: # print(row) - return data.fetchall() \ No newline at end of file + return data.fetchall() + +def main(): + managementdb = ManagementDB("monitoring.db") + subs_id = managementdb.insert_subscription(2,"localhost",20,2,timestamp_utcnow_to_float(),timestamp_utcnow_to_float() + 10) + print("subs id: ", str(subs_id)) + +if __name__ == '__main__': + main() diff --git a/src/monitoring/service/MetricsDBTools.py b/src/monitoring/service/MetricsDBTools.py index d8a7d5060..522a7c211 100644 --- a/src/monitoring/service/MetricsDBTools.py +++ b/src/monitoring/service/MetricsDBTools.py @@ -76,10 +76,19 @@ class MetricsDB(): self.run_query(query) LOGGER.info(f"Table {self.table} created") - def get_subscription_data(self, subs_queue, kpi_id, end_date, sampling_interval_s): - start_date = end_date-sampling_interval_s - query = f"SELECT kpi_id, timestamp, kpi_value FROM {self.table} WHERE kpi_id = '{kpi_id}' AND (timestamp BETWEEN '{timestamp_float_to_string(start_date)}' AND '{timestamp_float_to_string(end_date)}')" + def get_subscription_data(self, subs_queue, kpi_id, end_date, sampling_interval_s, callback_return): + str_end_date = str(end_date.isoformat()) + 'Z' + print("str_end_date: " + str_end_date) + start_date = end_date - datetime.timedelta(seconds=sampling_interval_s) + str_start_date = str(start_date.isoformat()) + 'Z' + print("str_start_date: " + str(str_start_date)) + # query = f"SELECT kpi_id, timestamp, kpi_value FROM {self.table} WHERE kpi_id = '{kpi_id}' AND (timestamp BETWEEN '2022-09-28T07:21:26.595586Z' AND '2022-09-28T07:32:34.197792Z')" + query = f"SELECT kpi_id, timestamp, kpi_value FROM {self.table} WHERE kpi_id = '{kpi_id}' AND (timestamp BETWEEN '{str_start_date}' AND '{str_end_date}')" response=self.run_query(query) kpi_list=response['dataset'] - # subs_queue.append(kpi_list) + # print(kpi_list) + subs_queue.put_nowait(kpi_list) + # return kpi_list + if callback_return: + callback_return(kpi_list) diff --git a/src/monitoring/service/SubscriptionManager.py b/src/monitoring/service/SubscriptionManager.py index 0b6717337..e133cd914 100644 --- a/src/monitoring/service/SubscriptionManager.py +++ b/src/monitoring/service/SubscriptionManager.py @@ -1,11 +1,21 @@ +import os +from queue import Queue +from random import random + from apscheduler.schedulers.background import BackgroundScheduler from apscheduler.executors.pool import ProcessPoolExecutor from apscheduler.triggers.interval import IntervalTrigger from apscheduler.triggers.cron import CronTrigger -from common.tools.timestamp.Converters import timestamp_utcnow_to_float -from datetime import datetime, timezone + +from common.proto.monitoring_pb2 import Kpi, KpiList +from common.tools.timestamp import Converters +from common.tools.timestamp.Converters import timestamp_utcnow_to_float, timestamp_float_to_string +from datetime import datetime import time +from monitoring.service import MetricsDBTools +from monitoring.service.ManagementDBTools import ManagementDB + class SubscriptionManager(): def __init__(self, metrics_db): @@ -17,15 +27,82 @@ class SubscriptionManager(): def create_subscription(self, subs_queue ,subscription_id, kpi_id, sampling_interval_s, sampling_duration_s=None, start_timestamp=None, end_timestamp=None): start_date=None end_date=None + print("Inside create subscription") if sampling_duration_s: if not start_timestamp: start_timestamp=time.time() end_timestamp=start_timestamp+sampling_duration_s + print("end_timestamp: " + timestamp_float_to_string(end_timestamp)) if start_timestamp: - start_date = datetime.fromtimestamp(start_timestamp) + start_date = datetime.utcfromtimestamp(start_timestamp) + print("start_date: " + str(start_date)) if end_timestamp: - end_date = datetime.fromtimestamp(end_timestamp) - self.scheduler.add_job(self.metrics_db.get_subscription_data, args=(subs_queue, kpi_id, timestamp_utcnow_to_float(), sampling_interval_s),trigger='interval', seconds=sampling_interval_s, start_date=start_date, end_date=end_date, id=subscription_id) + end_date = datetime.utcfromtimestamp(end_timestamp) + print("end_date: " + str(end_date)) + self.scheduler.add_job(self.metrics_db.get_subscription_data, args=(subs_queue, kpi_id, start_timestamp, sampling_interval_s),trigger='interval', seconds=sampling_interval_s, start_date=start_date, end_date=end_date, id=subscription_id) + self.metrics_db.get_subscription_data(subs_queue,kpi_id,end_date,sampling_interval_s) + + def delete_subscription(self, subscription_id): - self.scheduler.remove_job(subscription_id) \ No newline at end of file + self.scheduler.remove_job(subscription_id) + + +def main(): + + subs_queue = Queue() + + managementdb = ManagementDB("monitoring.db") + metrics_db = MetricsDBTools.MetricsDB("localhost", "9009", "9000", "monitoring") + subs_manager = SubscriptionManager(metrics_db) + + print("Here") + + kpi_id = "2" + sampling_duration_s = 10 + sampling_interval_s = 2 + start_timestamp = timestamp_utcnow_to_float() + end_timestamp = timestamp_utcnow_to_float() + 10 + + + + print("Before loop") + print("start_timestamp: " + timestamp_float_to_string(start_timestamp)) + print("end_timestamp: " + timestamp_float_to_string(end_timestamp)) + + + for i in range(10): + timestamp = timestamp_utcnow_to_float() + kpitype = "KPISAMPLETYPE_PACKETS_TRANSMITTED" + deviceId = "DEV01" + endpointId = "END01" + serviceId = "SERV01" + kpi_value = 50*random() + metrics_db.write_KPI(timestamp,kpi_id,kpitype,deviceId,endpointId,serviceId,kpi_value) + time.sleep(1) + + print("After loop") + + subs_id = managementdb.insert_subscription(kpi_id, "localhost", sampling_duration_s, sampling_interval_s, start_timestamp, + end_timestamp) + + subs_manager.create_subscription(subs_queue,str(subs_id),kpi_id,sampling_interval_s,sampling_duration_s,start_timestamp,end_timestamp) + + print("Queue empty: " + str(subs_queue.empty())) + print("Queue size: " + str(subs_queue.qsize())) + + while not subs_queue.empty(): + list = subs_queue.get_nowait() + print("List: " + str(list)) + kpi_list = KpiList() + for item in list: + kpi = Kpi() + kpi.kpi_id.kpi_id.uuid = item[0] + kpi.timestamp.timestamp = Converters.timestamp_string_to_float(item[1]) + kpi.kpi_value.floatVal = item[2] + kpi_list.kpi.append(kpi) + print("Kpi List: " + str(kpi_list)) + + +if __name__ == '__main__': + main() -- GitLab From 3d96ecc65e3a1e978c77f4ebd7f36980892387b2 Mon Sep 17 00:00:00 2001 From: sergonzalezdiaz Date: Fri, 7 Oct 2022 13:17:19 +0200 Subject: [PATCH 22/34] Last commit --- src/monitoring/requirements.in | 1 + src/monitoring/service/AlarmManager.py | 32 ++ src/monitoring/service/MetricsDBTools.py | 319 ++++++++++++++---- src/monitoring/service/SubscriptionManager.py | 131 +++++++ src/monitoring/tests/test_unitary.py | 7 +- 5 files changed, 418 insertions(+), 72 deletions(-) diff --git a/src/monitoring/requirements.in b/src/monitoring/requirements.in index 50f283a19..c07f0c8f4 100644 --- a/src/monitoring/requirements.in +++ b/src/monitoring/requirements.in @@ -17,6 +17,7 @@ redis==4.1.2 requests==2.27.1 xmltodict==0.12.0 questdb==1.0.1 +psycopg2-binary==2.9.3 # pip's dependency resolver does not take into account installed packages. # p4runtime does not specify the version of grpcio/protobuf it needs, so it tries to install latest one diff --git a/src/monitoring/service/AlarmManager.py b/src/monitoring/service/AlarmManager.py index e69de29bb..dc1b02b03 100644 --- a/src/monitoring/service/AlarmManager.py +++ b/src/monitoring/service/AlarmManager.py @@ -0,0 +1,32 @@ +from apscheduler.schedulers.background import BackgroundScheduler +from apscheduler.executors.pool import ProcessPoolExecutor +from apscheduler.jobstores.base import JobLookupError +from datetime import datetime +import time +import logging + +LOGGER = logging.getLogger(__name__) + +class AlarmManager(): + def __init__(self, metrics_db): + self.metrics_db = metrics_db + self.scheduler = BackgroundScheduler(executors={'processpool': ProcessPoolExecutor(max_workers=20)}) + self.scheduler.start() + LOGGER.info("Alarm Manager Initialized") + + def create_alarm(self, alarm_id, kpi_id, kpiMinValue, kpiMaxValue, inRange, includeMinValue, includeMaxValue, subscription_frequency_ms, subscription_timeout_s=None): + start_date=None + end_date=None + if subscription_timeout_s: + start_timestamp=time.time() + start_date=datetime.fromtimestamp(start_timestamp) + end_date=datetime.fromtimestamp(start_timestamp+subscription_timeout_s) + self.scheduler.add_job(self.metrics_db.get_alarm_data, args=(kpi_id, kpiMinValue, kpiMaxValue, inRange, includeMinValue, includeMaxValue, subscription_frequency_ms),trigger='interval', seconds=(subscription_frequency_ms/1000), start_date=start_date, end_date=end_date, id=alarm_id) + LOGGER.debug(f"Alarm job {alarm_id} succesfully created") + + def delete_alarm(self, alarm_id): + try: + self.scheduler.remove_job(alarm_id) + LOGGER.debug(f"Alarm job {alarm_id} succesfully deleted") + except (Exception, JobLookupError) as e: + LOGGER.debug(f"Alarm job {alarm_id} does not exists") diff --git a/src/monitoring/service/MetricsDBTools.py b/src/monitoring/service/MetricsDBTools.py index 522a7c211..00a57e1e7 100644 --- a/src/monitoring/service/MetricsDBTools.py +++ b/src/monitoring/service/MetricsDBTools.py @@ -12,83 +12,260 @@ # See the License for the specific language governing permissions and # limitations under the License. +import time +from random import random + from questdb.ingress import Sender, IngressError import requests import json import logging import datetime -from common.tools.timestamp.Converters import timestamp_float_to_string +from common.tools.timestamp.Converters import timestamp_float_to_string, timestamp_utcnow_to_float +import psycopg2 LOGGER = logging.getLogger(__name__) + class MetricsDB(): - def __init__(self, host, ilp_port, rest_port, table): - self.host=host - self.ilp_port=int(ilp_port) - self.rest_port=rest_port - self.table=table - self.create_table() - - def write_KPI(self,time,kpi_id,kpi_sample_type,device_id,endpoint_id,service_id,kpi_value): - counter=0 - number_of_retries=10 - while (counter= kpiMinValue and kpi_value <= kpiMaxValue): + alarm = True + elif ( + inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and not includeMaxValue): + if (kpi_value >= kpiMinValue and kpi_value < kpiMaxValue): + alarm = True + elif ( + inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and includeMaxValue): + if (kpi_value > kpiMinValue and kpi_value <= kpiMaxValue): + alarm = True + elif ( + inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and not includeMaxValue): + if (kpi_value > kpiMinValue and kpi_value < kpiMaxValue): + alarm = True + elif ( + not inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and includeMaxValue): + if (kpi_value <= kpiMinValue or kpi_value >= kpiMaxValue): + alarm = True + elif ( + not inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and not includeMaxValue): + if (kpi_value <= kpiMinValue or kpi_value > kpiMaxValue): + alarm = True + elif ( + not inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and includeMaxValue): + if (kpi_value < kpiMinValue or kpi_value >= kpiMaxValue): + alarm = True + elif ( + not inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and not includeMaxValue): + if (kpi_value < kpiMinValue or kpi_value > kpiMaxValue): + alarm = True + elif (inRange and kpiMinValue is not None and kpiMaxValue is None and includeMinValue): + if (kpi_value >= kpiMinValue): + alarm = True + elif (inRange and kpiMinValue is not None and kpiMaxValue is None and not includeMinValue): + if (kpi_value > kpiMinValue): + alarm = True + elif (not inRange and kpiMinValue is not None and kpiMaxValue is None and not includeMinValue): + if (kpi_value <= kpiMinValue): + alarm = True + elif (not inRange and kpiMinValue is not None and kpiMaxValue is None and not includeMinValue): + if (kpi_value <= kpiMinValue): + alarm = True + elif (inRange and kpiMinValue is None and kpiMaxValue is not None and includeMaxValue): + if (kpi_value <= kpiMaxValue): + alarm = True + elif (inRange and kpiMinValue is None and kpiMaxValue is not None and not includeMaxValue): + if (kpi_value < kpiMaxValue): + alarm = True + elif (not inRange and kpiMinValue is None and kpiMaxValue is not None and not includeMaxValue): + if (kpi_value >= kpiMaxValue): + alarm = True + elif (not inRange and kpiMinValue is None and kpiMaxValue is not None and not includeMaxValue): + if (kpi_value >= kpiMaxValue): + alarm = True + if alarm: + # queue.append[kpi] + LOGGER.debug(f"Alarm of KPI {kpi_id} triggered -> kpi_value:{kpi[2]}, timestamp:{kpi[1]}") + else: + LOGGER.debug(f"No new data for the alarm of KPI {kpi_id}") + except (Exception) as e: + LOGGER.debug(f"Alarm data cannot be retrieved. {e}") \ No newline at end of file diff --git a/src/monitoring/service/SubscriptionManager.py b/src/monitoring/service/SubscriptionManager.py index e133cd914..2a5b05cfe 100644 --- a/src/monitoring/service/SubscriptionManager.py +++ b/src/monitoring/service/SubscriptionManager.py @@ -28,8 +28,139 @@ class SubscriptionManager(): start_date=None end_date=None print("Inside create subscription") + if sampling_duration_s: + if not start_timestamp:# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import logging +from queue import Queue +from random import random + +import pytz +from apscheduler.schedulers.background import BackgroundScheduler + +from common.proto.monitoring_pb2 import Kpi, KpiList +from common.tools.timestamp import Converters +from common.tools.timestamp.Converters import timestamp_utcnow_to_float, timestamp_float_to_string +from datetime import datetime +import time + +from monitoring.service import MetricsDBTools +from monitoring.service.ManagementDBTools import ManagementDB +from monitoring.service.MetricsDBTools import MetricsDB + +LOGGER = logging.getLogger(__name__) + +class SubscriptionManager(): + def __init__(self, metrics_db): + self.metrics_db = metrics_db + self.scheduler = BackgroundScheduler(executors={'processpool': ProcessPoolExecutor(max_workers=20)}) + self.scheduler.start() + + def create_subscription(self,subs_queue, subscription_id, kpi_id, sampling_interval_s, sampling_duration_s=None, start_timestamp=None, end_timestamp=None): + start_date = None + end_date = None if sampling_duration_s: if not start_timestamp: + start_timestamp = time.time() + end_timestamp = start_timestamp + sampling_duration_s + if start_timestamp: + start_date = datetime.utcfromtimestamp(start_timestamp).isoformat() + if end_timestamp: + end_date = datetime.utcfromtimestamp(end_timestamp).isoformat() + + LOGGER.debug(f"kpi_id: {kpi_id}") + LOGGER.debug(f"sampling_interval_s: {sampling_interval_s}") + LOGGER.debug(f"subscription_id: {subscription_id}") + LOGGER.debug(f"start_date: {start_date}") + self.scheduler.add_job(self.metrics_db.get_subscription_data, args=(subs_queue,kpi_id, sampling_interval_s), + trigger='interval', seconds=sampling_interval_s, start_date=start_date, + end_date=end_date, timezone=pytz.utc, id=str(subscription_id)) + LOGGER.debug(f"Subscrition job {subscription_id} succesfully created") + + def delete_subscription(self, subscription_id): + self.scheduler.remove_job(subscription_id) + + +def ingest_data(): + + metrics_db = MetricsDB("localhost", "9009", "9000", "monitoring") + + kpi_id = "2" + + for i in range(200): + timestamp = timestamp_utcnow_to_float() + kpitype = "KPISAMPLETYPE_PACKETS_TRANSMITTED" + deviceId = "DEV01" + endpointId = "END01" + serviceId = "SERV01" + kpi_value = 50 * random() + metrics_db.write_KPI(timestamp, kpi_id, kpitype, deviceId, endpointId, serviceId, kpi_value) + time.sleep(0.01) + +def scheduler_test(): + scheduler = BackgroundScheduler() + + subs_queue = Queue() + + managementdb = ManagementDB("monitoring.db") + metrics_db = MetricsDB("localhost", "9009", "9000", "monitoring") + subs_manager = SubscriptionManager(metrics_db) + + scheduler.start() + scheduler.add_job(ingest_data) + + kpi_id = "2" + sampling_duration_s = 20 + sampling_interval_s = 3 + real_start_time = timestamp_utcnow_to_float() + start_timestamp = real_start_time + end_timestamp = start_timestamp + sampling_duration_s + + subs_id = managementdb.insert_subscription(kpi_id, "localhost", sampling_duration_s, + sampling_interval_s,start_timestamp,end_timestamp) + subs_manager.create_subscription(subs_queue,subs_id,kpi_id,sampling_interval_s, + sampling_duration_s,start_timestamp,end_timestamp) + + try: + # This is here to simulate application activity (which keeps the main thread alive). + i = 0 + while True: + # time.sleep(sampling_interval_s) + while not subs_queue.empty(): + list = subs_queue.get_nowait() + # print(f"List: {list}") + kpi_list = KpiList() + for item in list: + kpi = Kpi() + kpi.kpi_id.kpi_id.uuid = item[0] + kpi.timestamp.timestamp = Converters.timestamp_string_to_float(item[1]) + kpi.kpi_value.floatVal = item[2] + kpi_list.kpi.append(kpi) + i += 1 + print("Kpi List: " + str(kpi_list) + " " + str(i)) + if timestamp_utcnow_to_float() > end_timestamp: + print(f"Total metrics: {i}") + break + + except (KeyboardInterrupt, SystemExit): + # Not strictly necessary if daemonic mode is enabled but should be done if possible + scheduler.shutdown() + + +if __name__ == '__main__': + scheduler_test() start_timestamp=time.time() end_timestamp=start_timestamp+sampling_duration_s print("end_timestamp: " + timestamp_float_to_string(end_timestamp)) diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py index 529fd4335..c0bbae534 100644 --- a/src/monitoring/tests/test_unitary.py +++ b/src/monitoring/tests/test_unitary.py @@ -28,7 +28,7 @@ from common.message_broker.Factory import get_messagebroker_backend, BackendEnum from common.message_broker.MessageBroker import MessageBroker from common.proto import monitoring_pb2 from common.proto.monitoring_pb2 import KpiId, KpiDescriptor, KpiList, SubsDescriptor, SubsList, AlarmID, \ - AlarmDescriptor, AlarmList, Kpi, KpiDescriptorList, SubsResponse + AlarmDescriptor, AlarmList, Kpi, KpiDescriptorList, SubsResponse, AlarmResponse from context.client.ContextClient import ContextClient from context.service.grpc_server.ContextService import ContextService @@ -268,6 +268,9 @@ def test_set_kpi_subscription(monitoring_client): # pylint: disable=redefined-ou response = monitoring_client.SetKpiSubscription(subs_descriptor(kpi_id)) LOGGER.debug(type(response)) assert isinstance(response, _MultiThreadedRendezvous) + # for item in response: + # assert isinstance(item, SubsResponse) + # Test case that makes use of client fixture to test server's GetSubsDescriptor method def test_get_subs_descriptor(monitoring_client): @@ -318,6 +321,8 @@ def test_get_alarm_response_stream(monitoring_client): response = monitoring_client.GetAlarmResponseStream(alarm_descriptor()) LOGGER.debug(type(response)) assert isinstance(response, _MultiThreadedRendezvous) + # for item in response: + # assert isinstance(item,AlarmResponse) # Test case that makes use of client fixture to test server's DeleteAlarm method -- GitLab From 35923f741e82d7657df404d12987fbb8526ac436 Mon Sep 17 00:00:00 2001 From: sergonzalezdiaz Date: Fri, 7 Oct 2022 14:56:55 +0200 Subject: [PATCH 23/34] Update SubscriptionManager.py --- src/monitoring/service/SubscriptionManager.py | 116 +----------------- 1 file changed, 2 insertions(+), 114 deletions(-) diff --git a/src/monitoring/service/SubscriptionManager.py b/src/monitoring/service/SubscriptionManager.py index f2e10286a..47f73e7f9 100644 --- a/src/monitoring/service/SubscriptionManager.py +++ b/src/monitoring/service/SubscriptionManager.py @@ -1,29 +1,4 @@ -import os -from queue import Queue -from random import random - -from apscheduler.schedulers.background import BackgroundScheduler -from apscheduler.executors.pool import ProcessPoolExecutor -from apscheduler.jobstores.base import JobLookupError -from datetime import datetime -import time -import logging - -LOGGER = logging.getLogger(__name__) - -class SubscriptionManager(): - def __init__(self, metrics_db): - self.metrics_db = metrics_db - self.scheduler = BackgroundScheduler(executors={'processpool': ProcessPoolExecutor(max_workers=20)}) - self.scheduler.start() - LOGGER.info("Subscription Manager Initialized") - - def create_subscription(self, subs_queue ,subscription_id, kpi_id, sampling_interval_s, sampling_duration_s=None, start_timestamp=None, end_timestamp=None): - start_date=None - end_date=None - print("Inside create subscription") - if sampling_duration_s: - if not start_timestamp:# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -84,91 +59,4 @@ class SubscriptionManager(): LOGGER.debug(f"Subscrition job {subscription_id} succesfully created") def delete_subscription(self, subscription_id): - self.scheduler.remove_job(subscription_id) - - -def ingest_data(): - - metrics_db = MetricsDB("localhost", "9009", "9000", "monitoring") - - kpi_id = "2" - - for i in range(200): - timestamp = timestamp_utcnow_to_float() - kpitype = "KPISAMPLETYPE_PACKETS_TRANSMITTED" - deviceId = "DEV01" - endpointId = "END01" - serviceId = "SERV01" - kpi_value = 50 * random() - metrics_db.write_KPI(timestamp, kpi_id, kpitype, deviceId, endpointId, serviceId, kpi_value) - time.sleep(0.01) - -def scheduler_test(): - scheduler = BackgroundScheduler() - - subs_queue = Queue() - - managementdb = ManagementDB("monitoring.db") - metrics_db = MetricsDB("localhost", "9009", "9000", "monitoring") - subs_manager = SubscriptionManager(metrics_db) - - scheduler.start() - scheduler.add_job(ingest_data) - - kpi_id = "2" - sampling_duration_s = 20 - sampling_interval_s = 3 - real_start_time = timestamp_utcnow_to_float() - start_timestamp = real_start_time - end_timestamp = start_timestamp + sampling_duration_s - - subs_id = managementdb.insert_subscription(kpi_id, "localhost", sampling_duration_s, - sampling_interval_s,start_timestamp,end_timestamp) - subs_manager.create_subscription(subs_queue,subs_id,kpi_id,sampling_interval_s, - sampling_duration_s,start_timestamp,end_timestamp) - - try: - # This is here to simulate application activity (which keeps the main thread alive). - i = 0 - while True: - # time.sleep(sampling_interval_s) - while not subs_queue.empty(): - list = subs_queue.get_nowait() - # print(f"List: {list}") - kpi_list = KpiList() - for item in list: - kpi = Kpi() - kpi.kpi_id.kpi_id.uuid = item[0] - kpi.timestamp.timestamp = Converters.timestamp_string_to_float(item[1]) - kpi.kpi_value.floatVal = item[2] - kpi_list.kpi.append(kpi) - i += 1 - print("Kpi List: " + str(kpi_list) + " " + str(i)) - if timestamp_utcnow_to_float() > end_timestamp: - print(f"Total metrics: {i}") - break - - except (KeyboardInterrupt, SystemExit): - # Not strictly necessary if daemonic mode is enabled but should be done if possible - scheduler.shutdown() - - -if __name__ == '__main__': - scheduler_test() - start_timestamp=time.time() - end_timestamp=start_timestamp+sampling_duration_s - print("end_timestamp: " + timestamp_float_to_string(end_timestamp)) - if start_timestamp: - start_date = datetime.utcfromtimestamp(start_timestamp) - print("start_date: " + str(start_date)) - if end_timestamp: - end_date = datetime.fromtimestamp(end_timestamp) - self.scheduler.add_job(self.metrics_db.get_subscription_data, args=(kpi_id, sampling_interval_s),trigger='interval', seconds=sampling_interval_s, start_date=start_date, end_date=end_date, id=subscription_id) - LOGGER.debug(f"Subscrition job {subscription_id} succesfully created") - - def delete_subscription(self, subscription_id): - try: - self.scheduler.remove_job(subscription_id) - LOGGER.debug(f"Subscription job {subscription_id} succesfully deleted") - except (Exception, JobLookupError) as e: - LOGGER.debug(f"Subscription job {subscription_id} does not exists") + self.scheduler.remove_job(subscription_id) \ No newline at end of file -- GitLab From 80d20f52b8317bc68b68b5d569b7813a2e8efbb2 Mon Sep 17 00:00:00 2001 From: fjmmuro Date: Mon, 10 Oct 2022 11:04:00 +0200 Subject: [PATCH 24/34] Debugging unitary tests --- src/common/tools/object_factory/Device.py | 13 ++++++- src/monitoring/service/SubscriptionManager.py | 1 + src/monitoring/tests/test_unitary.py | 38 +++++-------------- 3 files changed, 21 insertions(+), 31 deletions(-) diff --git a/src/common/tools/object_factory/Device.py b/src/common/tools/object_factory/Device.py index 32baff9ae..4a590134d 100644 --- a/src/common/tools/object_factory/Device.py +++ b/src/common/tools/object_factory/Device.py @@ -20,7 +20,8 @@ from common.tools.object_factory.ConfigRule import json_config_rule_set DEVICE_DISABLED = DeviceOperationalStatusEnum.DEVICEOPERATIONALSTATUS_DISABLED -DEVICE_EMUOLS_TYPE = DeviceTypeEnum.EMULATED_OPTICAL_LINE_SYSTEM.value +DEVICE_EMUDC_TYPE = DeviceTypeEnum.EMULATED_DATACENTER.value +DEVICE_EMUOLS_TYPE = DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM.value DEVICE_EMUPR_TYPE = DeviceTypeEnum.EMULATED_PACKET_ROUTER.value DEVICE_EMU_DRIVERS = [DeviceDriverEnum.DEVICEDRIVER_UNDEFINED] DEVICE_EMU_ADDRESS = '127.0.0.1' @@ -29,7 +30,7 @@ DEVICE_EMU_PORT = '0' DEVICE_PR_TYPE = DeviceTypeEnum.PACKET_ROUTER.value DEVICE_PR_DRIVERS = [DeviceDriverEnum.DEVICEDRIVER_OPENCONFIG] -DEVICE_TAPI_TYPE = DeviceTypeEnum.OPTICAL_LINE_SYSTEM.value +DEVICE_TAPI_TYPE = DeviceTypeEnum.OPEN_LINE_SYSTEM.value DEVICE_TAPI_DRIVERS = [DeviceDriverEnum.DEVICEDRIVER_TRANSPORT_API] # check which enum type and value assign to microwave device @@ -71,6 +72,14 @@ def json_device_emulated_tapi_disabled( device_uuid, DEVICE_EMUOLS_TYPE, DEVICE_DISABLED, endpoints=endpoints, config_rules=config_rules, drivers=drivers) +def json_device_emulated_datacenter_disabled( + device_uuid : str, endpoints : List[Dict] = [], config_rules : List[Dict] = [], + drivers : List[Dict] = DEVICE_EMU_DRIVERS + ): + return json_device( + device_uuid, DEVICE_EMUDC_TYPE, DEVICE_DISABLED, endpoints=endpoints, config_rules=config_rules, + drivers=drivers) + def json_device_packetrouter_disabled( device_uuid : str, endpoints : List[Dict] = [], config_rules : List[Dict] = [], drivers : List[Dict] = DEVICE_PR_DRIVERS diff --git a/src/monitoring/service/SubscriptionManager.py b/src/monitoring/service/SubscriptionManager.py index 47f73e7f9..6484ca53e 100644 --- a/src/monitoring/service/SubscriptionManager.py +++ b/src/monitoring/service/SubscriptionManager.py @@ -17,6 +17,7 @@ from queue import Queue from random import random import pytz +from apscheduler.executors.pool import ProcessPoolExecutor from apscheduler.schedulers.background import BackgroundScheduler from common.proto.monitoring_pb2 import Kpi, KpiList diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py index c0bbae534..f403e1437 100644 --- a/src/monitoring/tests/test_unitary.py +++ b/src/monitoring/tests/test_unitary.py @@ -380,40 +380,20 @@ def test_managementdb_tools_get_kpis(management_db): # pylint: disable=redefined def test_managementdb_tools_delete_kpi(management_db): # pylint: disable=redefined-outer-name LOGGER.warning('test_managementdb_tools_get_kpi begin') - response = management_db.delete_KPI("DEV1",KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED) - - if not response: - _create_kpi_request = create_kpi_request() - kpi_description = _create_kpi_request.kpi_description # pylint: disable=maybe-no-member - kpi_sample_type = _create_kpi_request.kpi_sample_type # pylint: disable=maybe-no-member - kpi_device_id = _create_kpi_request.device_id.device_uuid.uuid # pylint: disable=maybe-no-member - kpi_endpoint_id = _create_kpi_request.endpoint_id.endpoint_uuid.uuid # pylint: disable=maybe-no-member - kpi_service_id = _create_kpi_request.service_id.service_uuid.uuid # pylint: disable=maybe-no-member - - management_db.insert_KPI(kpi_description, kpi_sample_type, kpi_device_id, kpi_endpoint_id, kpi_service_id) - response = management_db.delete_KPI("DEV1", KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED) - - assert response - -def test_managementdb_tools_delete_kpid_id(management_db): # pylint: disable=redefined-outer-name - LOGGER.warning('test_managementdb_tools_delete_kpid_id begin') - - response = management_db.delete_kpid_id(1) + _create_kpi_request = create_kpi_request() + kpi_description = _create_kpi_request.kpi_description # pylint: disable=maybe-no-member + kpi_sample_type = _create_kpi_request.kpi_sample_type # pylint: disable=maybe-no-member + kpi_device_id = _create_kpi_request.device_id.device_uuid.uuid # pylint: disable=maybe-no-member + kpi_endpoint_id = _create_kpi_request.endpoint_id.endpoint_uuid.uuid # pylint: disable=maybe-no-member + kpi_service_id = _create_kpi_request.service_id.service_uuid.uuid # pylint: disable=maybe-no-member - if not response: - _create_kpi_request = create_kpi_request() - kpi_description = _create_kpi_request.kpi_description # pylint: disable=maybe-no-member - kpi_sample_type = _create_kpi_request.kpi_sample_type # pylint: disable=maybe-no-member - kpi_device_id = _create_kpi_request.device_id.device_uuid.uuid # pylint: disable=maybe-no-member - kpi_endpoint_id = _create_kpi_request.endpoint_id.endpoint_uuid.uuid # pylint: disable=maybe-no-member - kpi_service_id = _create_kpi_request.service_id.service_uuid.uuid # pylint: disable=maybe-no-member + _kpi_id = management_db.insert_KPI(kpi_description, kpi_sample_type, kpi_device_id, kpi_endpoint_id, + kpi_service_id) - _kpi_id = management_db.insert_KPI(kpi_description, kpi_sample_type, kpi_device_id, kpi_endpoint_id, kpi_service_id) - response = management_db.delete_kpid_id(_kpi_id) + response = management_db.delete_KPI(_kpi_id) assert response - def test_metrics_db_tools_write_kpi(metrics_db): # pylint: disable=redefined-outer-name LOGGER.warning('test_metric_sdb_tools_write_kpi begin') -- GitLab From e8d389eafb40f6ddcd57347a96dbd1fc2b78a630 Mon Sep 17 00:00:00 2001 From: fjmmuro Date: Mon, 10 Oct 2022 17:20:38 +0200 Subject: [PATCH 25/34] Initial implementation of the SetKpiAlarm --- .../service/MonitoringServiceServicerImpl.py | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py index f6c23680b..ab9138852 100644 --- a/src/monitoring/service/MonitoringServiceServicerImpl.py +++ b/src/monitoring/service/MonitoringServiceServicerImpl.py @@ -35,6 +35,7 @@ from device.client.DeviceClient import DeviceClient from prometheus_client import Counter, Summary +from monitoring.service.AlarmManager import AlarmManager from monitoring.service.SubscriptionManager import SubscriptionManager LOGGER = getJSONLogger('monitoringservice-server') @@ -64,6 +65,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): self.metrics_db = MetricsDBTools.MetricsDB(METRICSDB_HOSTNAME,METRICSDB_ILP_PORT,METRICSDB_REST_PORT,METRICSDB_TABLE) self.subs_manager = SubscriptionManager(self.metrics_db) + self.alarm_manager = AlarmManager(self.metrics_db) LOGGER.info('MetricsDB initialized') # SetKpi (SetKpiRequest) returns (KpiId) {} @@ -300,6 +302,30 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('SetKpiAlarm') try: + + alarm_description = request.alarm_description + alarm_name = request.name + kpi_id = request.kpi_id.kpi_id.uuid + kpi_min_value = request.kpi_value_range.kpiMinValue.floatVal + kpi_max_value = request.kpi_value_range.kpiMaxValue.floatVal + in_range = request.kpi_value_range.inRange + include_min_value = request.kpi_value_range.includeMinValue + include_max_value = request.kpi_value_range.includeMaxValue + # timestamp = request.timestamp.timestamp + + alarm_id = self.management_db.insert_alarm(alarm_description,alarm_name,kpi_id,kpi_min_value,kpi_max_value, + in_range,include_min_value,include_max_value) + + if request.alarm_id : + alarm_id = request.alarm_id.alarm_id.uuid + else: + alarm_id = request.alarm_id.alarm_id.uuid + + # subscription_frequency_ms = request.subscription_timeout_s + # subscription_timeout_s = request.subscription_frequency_ms + + # self.alarm_manager.create_alarm(alarm_id) + # TBC return AlarmResponse() except ServiceException as e: -- GitLab From 5fdd9ce8c2cd885b32430829b1c74aff20f14894 Mon Sep 17 00:00:00 2001 From: fjmmuro Date: Tue, 11 Oct 2022 12:31:00 +0200 Subject: [PATCH 26/34] Initial implementation of the GetAlarmResponseStream --- proto/monitoring.proto | 3 +- src/monitoring/service/AlarmManager.py | 4 +- src/monitoring/service/MetricsDBTools.py | 3 +- .../service/MonitoringServiceServicerImpl.py | 58 ++++++++++++++----- 4 files changed, 48 insertions(+), 20 deletions(-) diff --git a/proto/monitoring.proto b/proto/monitoring.proto index 5eb30651e..fc3cae7b7 100644 --- a/proto/monitoring.proto +++ b/proto/monitoring.proto @@ -151,8 +151,7 @@ message AlarmSubscription{ message AlarmResponse { AlarmID alarm_id = 1; string text = 2; - KpiValue kpi_value = 3; - context.Timestamp timestamp = 4; + KpiList kpi_list = 3; } message AlarmList { diff --git a/src/monitoring/service/AlarmManager.py b/src/monitoring/service/AlarmManager.py index dc1b02b03..e5ac8915c 100644 --- a/src/monitoring/service/AlarmManager.py +++ b/src/monitoring/service/AlarmManager.py @@ -14,14 +14,14 @@ class AlarmManager(): self.scheduler.start() LOGGER.info("Alarm Manager Initialized") - def create_alarm(self, alarm_id, kpi_id, kpiMinValue, kpiMaxValue, inRange, includeMinValue, includeMaxValue, subscription_frequency_ms, subscription_timeout_s=None): + def create_alarm(self, alarm_queue,alarm_id, kpi_id, kpiMinValue, kpiMaxValue, inRange, includeMinValue, includeMaxValue, subscription_frequency_ms, subscription_timeout_s=None): start_date=None end_date=None if subscription_timeout_s: start_timestamp=time.time() start_date=datetime.fromtimestamp(start_timestamp) end_date=datetime.fromtimestamp(start_timestamp+subscription_timeout_s) - self.scheduler.add_job(self.metrics_db.get_alarm_data, args=(kpi_id, kpiMinValue, kpiMaxValue, inRange, includeMinValue, includeMaxValue, subscription_frequency_ms),trigger='interval', seconds=(subscription_frequency_ms/1000), start_date=start_date, end_date=end_date, id=alarm_id) + self.scheduler.add_job(self.metrics_db.get_alarm_data, args=(alarm_queue,kpi_id, kpiMinValue, kpiMaxValue, inRange, includeMinValue, includeMaxValue, subscription_frequency_ms),trigger='interval', seconds=(subscription_frequency_ms/1000), start_date=start_date, end_date=end_date, id=alarm_id) LOGGER.debug(f"Alarm job {alarm_id} succesfully created") def delete_alarm(self, alarm_id): diff --git a/src/monitoring/service/MetricsDBTools.py b/src/monitoring/service/MetricsDBTools.py index 00a57e1e7..16e6373f5 100644 --- a/src/monitoring/service/MetricsDBTools.py +++ b/src/monitoring/service/MetricsDBTools.py @@ -189,7 +189,7 @@ class MetricsDB(): except (Exception) as e: LOGGER.debug(f"Subscription data cannot be retrieved. {e}") - def get_alarm_data(self, kpi_id, kpiMinValue, kpiMaxValue, inRange=True, includeMinValue=True, includeMaxValue=True, + def get_alarm_data(self, alarm_queue, kpi_id, kpiMinValue, kpiMaxValue, inRange=True, includeMinValue=True, includeMaxValue=True, subscription_frequency_ms=1000): try: end_date = timestamp_utcnow_to_float() - self.commit_lag_ms / 1000 @@ -264,6 +264,7 @@ class MetricsDB(): alarm = True if alarm: # queue.append[kpi] + alarm_queue.put_nowait(kpi) LOGGER.debug(f"Alarm of KPI {kpi_id} triggered -> kpi_value:{kpi[2]}, timestamp:{kpi[1]}") else: LOGGER.debug(f"No new data for the alarm of KPI {kpi_id}") diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py index ab9138852..3dd4ab3cf 100644 --- a/src/monitoring/service/MonitoringServiceServicerImpl.py +++ b/src/monitoring/service/MonitoringServiceServicerImpl.py @@ -303,6 +303,8 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('SetKpiAlarm') try: + response = AlarmID() + alarm_description = request.alarm_description alarm_name = request.name kpi_id = request.kpi_id.kpi_id.uuid @@ -311,30 +313,24 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): in_range = request.kpi_value_range.inRange include_min_value = request.kpi_value_range.includeMinValue include_max_value = request.kpi_value_range.includeMaxValue - # timestamp = request.timestamp.timestamp - - alarm_id = self.management_db.insert_alarm(alarm_description,alarm_name,kpi_id,kpi_min_value,kpi_max_value, - in_range,include_min_value,include_max_value) + timestamp = request.timestamp.timestamp if request.alarm_id : alarm_id = request.alarm_id.alarm_id.uuid + # Here the code to modify an existing alarm else: - alarm_id = request.alarm_id.alarm_id.uuid + alarm_id = self.management_db.insert_alarm(alarm_description, alarm_name, kpi_id, kpi_min_value, + kpi_max_value, + in_range, include_min_value, include_max_value) + response.alarm_id.uuid = alarm_id - # subscription_frequency_ms = request.subscription_timeout_s - # subscription_timeout_s = request.subscription_frequency_ms - - # self.alarm_manager.create_alarm(alarm_id) - - # TBC - return AlarmResponse() + return response except ServiceException as e: LOGGER.exception('SetKpiAlarm exception') grpc_context.abort(e.code, e.details) except Exception as e: # pragma: no cover LOGGER.exception('SetKpiAlarm exception') - def GetAlarms ( self, request : Empty, grpc_context : grpc.ServicerContext) -> AlarmList: LOGGER.info('GetAlarms') @@ -363,8 +359,40 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('GetAlarmResponseStream') try: - # TBC - yield AlarmResponse() + + if request.alarm_id: + + alarm_queue = Queue() + alarm_response = AlarmResponse() + + alarm_id = request.alarm_id.alarm_id.uuid + alarm_data = self.management_db.get_alarm(alarm_id) + + kpi_id = alarm_data[3] + kpiMinValue = alarm_data[4] + kpiMaxValue = alarm_data[5] + inRange = alarm_data[6] + includeMinValue = alarm_data[7] + includeMaxValue = alarm_data[8] + subscription_frequency_ms = request.subscription_frequency_ms + subscription_timeout_s = request.subscription_timeout_s + + self.alarm_manager.create_alarm(alarm_queue,alarm_id, kpi_id, kpiMinValue, kpiMaxValue, inRange, + includeMinValue, includeMaxValue, subscription_frequency_ms,subscription_timeout_s) + + while not alarm_queue.empty(): + list = alarm_queue.get_nowait() + for item in list: + kpi = kpi.kpi_id.kpi_id.uuid = item[0] + kpi.timestamp.timestamp = timestamp_string_to_float(item[1]) + kpi.kpi_value.floatVal = item[2] # This must be improved + alarm_response.kpi_list.kpi.append(kpi) + + alarm_response.alarmID.alarm_id.uuid = alarm_id + + yield alarm_response + else : + raise Exception(LOGGER.debug(f"Alarm {request.alarm_id} does not exists")) except ServiceException as e: LOGGER.exception('GetAlarmResponseStream exception') grpc_context.abort(e.code, e.details) -- GitLab From 2315bde28f6d144f52059c0bf4dce160cef57d57 Mon Sep 17 00:00:00 2001 From: fjmmuro Date: Tue, 11 Oct 2022 17:49:27 +0200 Subject: [PATCH 27/34] New functionalities added (Tests passed) --- proto/monitoring.proto | 8 ++++---- .../service/MonitoringServiceServicerImpl.py | 20 ++++++++++++++----- src/monitoring/tests/Messages.py | 15 ++++++++++++++ src/monitoring/tests/test_unitary.py | 5 +++-- 4 files changed, 37 insertions(+), 11 deletions(-) diff --git a/proto/monitoring.proto b/proto/monitoring.proto index fc3cae7b7..35ee52bca 100644 --- a/proto/monitoring.proto +++ b/proto/monitoring.proto @@ -122,7 +122,7 @@ message SubscriptionID { message SubsResponse { SubscriptionID subs_id = 1; - KpiList kpi_list = 2; + KpiList kpi_list = 2; } message SubsList { @@ -133,8 +133,8 @@ message AlarmDescriptor { AlarmID alarm_id = 1; string alarm_description = 2; string name = 3; - repeated KpiId kpi_id = 4; - repeated KpiValueRange kpi_value_range = 5; + KpiId kpi_id = 4; + KpiValueRange kpi_value_range = 5; context.Timestamp timestamp = 6; } @@ -143,7 +143,7 @@ message AlarmID{ } message AlarmSubscription{ - AlarmID alarmID = 1; + AlarmID alarm_id = 1; float subscription_timeout_s = 2; float subscription_frequency_ms = 3; } diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py index 3dd4ab3cf..a9d624e3a 100644 --- a/src/monitoring/service/MonitoringServiceServicerImpl.py +++ b/src/monitoring/service/MonitoringServiceServicerImpl.py @@ -252,7 +252,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): kpi.kpi_value.floatVal = item[2] # This must be improved subs_response.kpi_list.kpi.append(kpi) - subs_response.subs_id.subs_id.uuid = subs_id + subs_response.subs_id.subs_id.uuid = str(subs_id) yield subs_response except ServiceException as e: @@ -360,12 +360,13 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('GetAlarmResponseStream') try: - if request.alarm_id: + alarm_id = self.management_db.get_alarm(request.alarm_id.alarm_id.uuid) + + if alarm_id: alarm_queue = Queue() alarm_response = AlarmResponse() - alarm_id = request.alarm_id.alarm_id.uuid alarm_data = self.management_db.get_alarm(alarm_id) kpi_id = alarm_data[3] @@ -388,7 +389,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): kpi.kpi_value.floatVal = item[2] # This must be improved alarm_response.kpi_list.kpi.append(kpi) - alarm_response.alarmID.alarm_id.uuid = alarm_id + alarm_response.alarm_id.alarm_id.uuid = alarm_id yield alarm_response else : @@ -403,7 +404,16 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('DeleteAlarm') try: - # TBC + # LOGGER.info(f'DeleteAlarm {request.alarm_id.uuid}') + # alarm_id = str(request.alarm_id.uuid) + # alarm = self.management_db.get_alarm(alarm_id) + # if alarm: + # self.alarm_manager.delete_alarm(alarm_id) + # self.management_db.delete_alarm(alarm_id) + # # return Empty() + # else: + # raise Exception(LOGGER.exception( + # 'DeleteAlarm exception: Sample with AlarmID({:s}): not found in database'.format(str(alarm_id)))) return Empty() except ServiceException as e: LOGGER.exception('DeleteAlarm exception') diff --git a/src/monitoring/tests/Messages.py b/src/monitoring/tests/Messages.py index b2795ce37..c31d158ee 100644 --- a/src/monitoring/tests/Messages.py +++ b/src/monitoring/tests/Messages.py @@ -96,6 +96,21 @@ def alarm_descriptor(): return _alarm_descriptor +def alarm_descriptor_b(): + _alarm_descriptor = monitoring_pb2.AlarmDescriptor() + + _alarm_descriptor.kpi_id.kpi_id.uuid = "2" + + return _alarm_descriptor + +def alarm_subscription(alarm_id): + _alarm_descriptor = monitoring_pb2.AlarmSubscription() + + _alarm_descriptor.alarm_id.alarm_id.uuid = str(alarm_id) + + return _alarm_descriptor + + def alarm_id(): _alarm_id = monitoring_pb2.AlarmID() diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py index f403e1437..0fe1d1b84 100644 --- a/src/monitoring/tests/test_unitary.py +++ b/src/monitoring/tests/test_unitary.py @@ -50,7 +50,7 @@ from monitoring.service.MonitoringService import MonitoringService from monitoring.service.EventTools import EventsDeviceCollector from monitoring.tests.Messages import create_kpi_request, include_kpi_request, monitor_kpi_request, \ create_kpi_request_b, create_kpi_request_c, kpi_query, subs_descriptor, subs_id, alarm_descriptor, alarm_id, kpi_id, \ - kpi_descriptor_list + kpi_descriptor_list, alarm_subscription, alarm_descriptor_b from monitoring.tests.Objects import DEVICE_DEV1, DEVICE_DEV1_CONNECT_RULES, DEVICE_DEV1_UUID from monitoring.service.MonitoringServiceServicerImpl import LOGGER @@ -318,7 +318,8 @@ def test_get_alarm_descriptor(monitoring_client): # Test case that makes use of client fixture to test server's GetAlarmResponseStream method def test_get_alarm_response_stream(monitoring_client): LOGGER.warning('test_get_alarm_descriptor') - response = monitoring_client.GetAlarmResponseStream(alarm_descriptor()) + alarm_id = monitoring_client.SetKpiAlarm(alarm_descriptor()) + response = monitoring_client.GetAlarmResponseStream(alarm_subscription(alarm_id)) LOGGER.debug(type(response)) assert isinstance(response, _MultiThreadedRendezvous) # for item in response: -- GitLab From 54606c4da159aad759bd33e64e7fa05c2338840c Mon Sep 17 00:00:00 2001 From: fjmmuro Date: Fri, 14 Oct 2022 12:43:35 +0200 Subject: [PATCH 28/34] Added GetAlarmDescriptor and DeleteAlarm functionalities to the grpc monitoring server. --- .../service/MonitoringServiceServicerImpl.py | 62 +++++++++++++------ src/monitoring/tests/Messages.py | 9 +++ src/monitoring/tests/test_unitary.py | 10 +-- 3 files changed, 58 insertions(+), 23 deletions(-) diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py index a9d624e3a..e4d33acef 100644 --- a/src/monitoring/service/MonitoringServiceServicerImpl.py +++ b/src/monitoring/service/MonitoringServiceServicerImpl.py @@ -39,7 +39,7 @@ from monitoring.service.AlarmManager import AlarmManager from monitoring.service.SubscriptionManager import SubscriptionManager LOGGER = getJSONLogger('monitoringservice-server') -LOGGER.setLevel('INFO') +LOGGER.setLevel('DEBUG') MONITORING_GETINSTANTKPI_REQUEST_TIME = Summary( 'monitoring_getinstantkpi_processing_seconds', 'Time spent processing monitoring instant kpi request') @@ -315,14 +315,17 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): include_max_value = request.kpi_value_range.includeMaxValue timestamp = request.timestamp.timestamp - if request.alarm_id : + LOGGER.debug(f"request.AlarmID: {request.alarm_id.alarm_id.uuid}") + + if request.alarm_id.alarm_id.uuid is not "" : alarm_id = request.alarm_id.alarm_id.uuid # Here the code to modify an existing alarm else: alarm_id = self.management_db.insert_alarm(alarm_description, alarm_name, kpi_id, kpi_min_value, kpi_max_value, in_range, include_min_value, include_max_value) - response.alarm_id.uuid = alarm_id + LOGGER.debug(f"AlarmID: {alarm_id}") + response.alarm_id.uuid = str(alarm_id) return response except ServiceException as e: @@ -347,8 +350,28 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('GetAlarmDescriptor') try: - # TBC - return AlarmDescriptor() + + alarm_id = request.alarm_id.uuid + alarm = self.management_db.get_alarm(alarm_id) + + if alarm: + + response = AlarmDescriptor() + + LOGGER.debug(f"{alarm}") + response.alarm_id.alarm_id.uuid = alarm_id + response.alarm_description = alarm[1] + response.name = alarm[2] + response.kpi_id.kpi_id.uuid = str(alarm[3]) + response.kpi_value_range.kpiMinValue.floatVal = alarm[4] + response.kpi_value_range.kpiMaxValue.floatVal = alarm[5] + response.kpi_value_range.inRange = bool(alarm[6]) + response.kpi_value_range.includeMinValue = bool(alarm[7]) + response.kpi_value_range.includeMaxValue = bool(alarm[8]) + + return response + else: + raise Exception(LOGGER.debug(f"Alarm {request.alarm_id} does not exists")) except ServiceException as e: LOGGER.exception('GetAlarmDescriptor exception') grpc_context.abort(e.code, e.details) @@ -360,15 +383,16 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('GetAlarmResponseStream') try: - alarm_id = self.management_db.get_alarm(request.alarm_id.alarm_id.uuid) + alarm = self.management_db.get_alarm(request.alarm_id.alarm_id.uuid) - if alarm_id: + if alarm: alarm_queue = Queue() alarm_response = AlarmResponse() - alarm_data = self.management_db.get_alarm(alarm_id) + alarm_data = self.management_db.get_alarm(alarm) + alarm_id = request.alarm_id.alarm_id.uuid kpi_id = alarm_data[3] kpiMinValue = alarm_data[4] kpiMaxValue = alarm_data[5] @@ -404,17 +428,17 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('DeleteAlarm') try: - # LOGGER.info(f'DeleteAlarm {request.alarm_id.uuid}') - # alarm_id = str(request.alarm_id.uuid) - # alarm = self.management_db.get_alarm(alarm_id) - # if alarm: - # self.alarm_manager.delete_alarm(alarm_id) - # self.management_db.delete_alarm(alarm_id) - # # return Empty() - # else: - # raise Exception(LOGGER.exception( - # 'DeleteAlarm exception: Sample with AlarmID({:s}): not found in database'.format(str(alarm_id)))) - return Empty() + LOGGER.debug(f'DeleteAlarm with AlarmID: {request.alarm_id.uuid}') + alarm_id = str(request.alarm_id.uuid) + alarm = self.management_db.get_alarm(alarm_id) + if alarm: + self.alarm_manager.delete_alarm(alarm_id) + self.management_db.delete_alarm(alarm_id) + return Empty() + else: + raise Exception(LOGGER.exception( + 'DeleteAlarm exception: Sample with AlarmID({:s}): not found in database'.format(str(alarm_id)))) + # return Empty() except ServiceException as e: LOGGER.exception('DeleteAlarm exception') grpc_context.abort(e.code, e.details) diff --git a/src/monitoring/tests/Messages.py b/src/monitoring/tests/Messages.py index c31d158ee..6312a5beb 100644 --- a/src/monitoring/tests/Messages.py +++ b/src/monitoring/tests/Messages.py @@ -94,6 +94,15 @@ def subs_id(): def alarm_descriptor(): _alarm_descriptor = monitoring_pb2.AlarmDescriptor() + _alarm_descriptor.alarm_description = "Alarm Description" + _alarm_descriptor.name = "Alarm Name" + _alarm_descriptor.kpi_id.kpi_id.uuid = "1" + _alarm_descriptor.kpi_value_range.kpiMinValue.floatVal = 0.0 + _alarm_descriptor.kpi_value_range.kpiMaxValue.floatVal = 50.0 + _alarm_descriptor.kpi_value_range.inRange = True + _alarm_descriptor.kpi_value_range.includeMinValue = False + _alarm_descriptor.kpi_value_range.includeMaxValue = True + return _alarm_descriptor def alarm_descriptor_b(): diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py index 0fe1d1b84..8f6de558c 100644 --- a/src/monitoring/tests/test_unitary.py +++ b/src/monitoring/tests/test_unitary.py @@ -297,7 +297,7 @@ def test_delete_subscription(monitoring_client): def test_set_kpi_alarm(monitoring_client): LOGGER.warning('test_set_kpi_alarm') response = monitoring_client.SetKpiAlarm(alarm_descriptor()) - LOGGER.debug(type(response)) + LOGGER.debug(str(response)) assert isinstance(response, AlarmID) # Test case that makes use of client fixture to test server's GetAlarms method @@ -311,8 +311,9 @@ def test_get_alarms(monitoring_client): # Test case that makes use of client fixture to test server's GetAlarmDescriptor method def test_get_alarm_descriptor(monitoring_client): LOGGER.warning('test_get_alarm_descriptor') - response = monitoring_client.GetAlarmDescriptor(alarm_id()) - LOGGER.debug(type(response)) + alarm_id = monitoring_client.SetKpiAlarm(alarm_descriptor()) + response = monitoring_client.GetAlarmDescriptor(alarm_id) + LOGGER.debug(f"{response}") assert isinstance(response, AlarmDescriptor) # Test case that makes use of client fixture to test server's GetAlarmResponseStream method @@ -329,7 +330,8 @@ def test_get_alarm_response_stream(monitoring_client): # Test case that makes use of client fixture to test server's DeleteAlarm method def test_delete_alarm(monitoring_client): LOGGER.warning('test_delete_alarm') - response = monitoring_client.DeleteAlarm(alarm_id()) + alarm_id = monitoring_client.SetKpiAlarm(alarm_descriptor()) + response = monitoring_client.DeleteAlarm(alarm_id) LOGGER.debug(type(response)) assert isinstance(response, Empty) -- GitLab From 1df9702437c58247815d5cc51d17f212344b705d Mon Sep 17 00:00:00 2001 From: fjmmuro Date: Mon, 17 Oct 2022 11:18:09 +0200 Subject: [PATCH 29/34] Implemented DeleteKpi,GetKpiDescriptor and GetKpiDescriptorList methods in the gRPC server --- proto/monitoring.proto | 12 +-- .../service/MonitoringServiceServicerImpl.py | 78 ++++++++++++------- src/monitoring/tests/test_unitary.py | 9 +-- 3 files changed, 62 insertions(+), 37 deletions(-) diff --git a/proto/monitoring.proto b/proto/monitoring.proto index 35ee52bca..7e7fb9a98 100644 --- a/proto/monitoring.proto +++ b/proto/monitoring.proto @@ -19,12 +19,12 @@ import "context.proto"; import "kpi_sample_types.proto"; service MonitoringService { - rpc SetKpi (KpiDescriptor ) returns (KpiId ) {} - rpc DeleteKpi (KpiId ) returns (context.Empty ) {} - rpc GetKpiDescriptor (KpiId ) returns (KpiDescriptor ) {} - rpc GetKpiDescriptorList (context.Empty ) returns (KpiDescriptorList ) {} - rpc IncludeKpi (Kpi ) returns (context.Empty ) {} - rpc MonitorKpi (MonitorKpiRequest ) returns (context.Empty ) {} + rpc SetKpi (KpiDescriptor ) returns (KpiId ) {} // Stable not final + rpc DeleteKpi (KpiId ) returns (context.Empty ) {} // Stable and final + rpc GetKpiDescriptor (KpiId ) returns (KpiDescriptor ) {} // Stable and final + rpc GetKpiDescriptorList (context.Empty ) returns (KpiDescriptorList ) {} // Stable and final + rpc IncludeKpi (Kpi ) returns (context.Empty ) {} // Stable and final + rpc MonitorKpi (MonitorKpiRequest ) returns (context.Empty ) {} // Stable and final rpc QueryKpiData (KpiQuery ) returns (KpiList ) {} rpc SetKpiSubscription (SubsDescriptor ) returns (stream SubsResponse ) {} rpc GetSubsDescriptor (SubscriptionID ) returns (SubsDescriptor ) {} diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py index e4d33acef..549b31098 100644 --- a/src/monitoring/service/MonitoringServiceServicerImpl.py +++ b/src/monitoring/service/MonitoringServiceServicerImpl.py @@ -76,7 +76,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('SetKpi') try: # Here the code to create a sqlite query to crete a KPI and return a KpiID - kpi_id = KpiId() + response = KpiId() kpi_description = request.kpi_description kpi_sample_type = request.kpi_sample_type @@ -84,12 +84,15 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): kpi_endpoint_id = request.endpoint_id.endpoint_uuid.uuid kpi_service_id = request.service_id.service_uuid.uuid - data = self.management_db.insert_KPI( + if request.kpi_id.kpi_id.uuid is not "" : + response.kpi_id.uuid = request.kpi_id.kpi_id.uuid + # Here the code to modify an existing kpi + else: + data = self.management_db.insert_KPI( kpi_description, kpi_sample_type, kpi_device_id, kpi_endpoint_id, kpi_service_id) + response.kpi_id.uuid = str(data) - kpi_id.kpi_id.uuid = str(data) - # CREATEKPI_COUNTER_COMPLETED.inc() - return kpi_id + return response except ServiceException as e: LOGGER.exception('SetKpi exception') # CREATEKPI_COUNTER_FAILED.inc() @@ -103,8 +106,15 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('DeleteKpi') try: - # TBC - return Empty() + LOGGER.debug(f'DeleteKpi with KpiID: {request.kpi_id.uuid}') + kpi_id = int(request.kpi_id.uuid) + kpi = self.management_db.get_KPI(kpi_id) + if kpi: + self.management_db.delete_KPI(kpi_id) + return Empty() + else: + raise Exception(LOGGER.exception( + 'DeleteKpi exception: Sample with KpiID({:s}): not found in database'.format(str(kpi_id)))) except ServiceException as e: LOGGER.exception('DeleteKpi exception') grpc_context.abort(e.code, e.details) @@ -139,17 +149,29 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('GetKpiDescriptorList') try: - # TBC - return KpiDescriptorList() + kpi_descriptor_list = KpiDescriptorList() + + data = self.management_db.get_KPIS() + LOGGER.debug(f"data: {data}") + + for item in data: + kpi_descriptor = KpiDescriptor() + kpi_descriptor.kpi_id.kpi_id.uuid = str(item[0]) + kpi_descriptor.kpi_description = item[1] + kpi_descriptor.kpi_sample_type = item[2] + kpi_descriptor.device_id.device_uuid.uuid = str(item[3]) + kpi_descriptor.endpoint_id.endpoint_uuid.uuid = str(item[4]) + kpi_descriptor.service_id.service_uuid.uuid = str(item[5]) + + kpi_descriptor_list.kpi_descriptor_list.append(kpi_descriptor) + + return kpi_descriptor_list except ServiceException as e: LOGGER.exception('GetKpiDescriptorList exception') grpc_context.abort(e.code, e.details) except Exception as e: # pragma: no cover LOGGER.exception('GetKpiDescriptorList exception') - - - # rpc IncludeKpi(IncludeKpiRequest) returns(context.Empty) {} def IncludeKpi(self, request : Kpi, grpc_context : grpc.ServicerContext) -> Empty: LOGGER.info('IncludeKpi') @@ -171,7 +193,6 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): # Build the structure to be included as point in the MetricsDB self.metrics_db.write_KPI(time_stamp,kpiId,kpiSampleType,deviceId,endpointId,serviceId,kpi_value) - #self.influx_db.read_KPI_points() return Empty() except ServiceException as e: LOGGER.exception('IncludeKpi exception') @@ -182,24 +203,31 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): # CREATEKPI_COUNTER_FAILED.inc() - # rpc MonitorKpi (MonitorKpiRequest) returns (context.Empty) {} def MonitorKpi ( self, request : MonitorKpiRequest, grpc_context : grpc.ServicerContext) -> Empty: LOGGER.info('MonitorKpi') try: - # Sets the request to send to the device service - monitor_device_request = MonitoringSettings() + kpi_id = int(request.kpi_id.kpi_id.uuid) + kpi = self.management_db.get_KPI(kpi_id) - kpiDescriptor = self.GetKpiDescriptor(request.kpi_id, grpc_context) + if kpi: + # Sets the request to send to the device service + monitor_device_request = MonitoringSettings() - monitor_device_request.kpi_descriptor.CopyFrom(kpiDescriptor) - monitor_device_request.kpi_id.kpi_id.uuid = request.kpi_id.kpi_id.uuid - monitor_device_request.sampling_duration_s = request.monitoring_window_s - monitor_device_request.sampling_interval_s = request.sampling_rate_s + kpiDescriptor = self.GetKpiDescriptor(request.kpi_id, grpc_context) - device_client = DeviceClient() - device_client.MonitorDeviceKpi(monitor_device_request) + monitor_device_request.kpi_descriptor.CopyFrom(kpiDescriptor) + monitor_device_request.kpi_id.kpi_id.uuid = request.kpi_id.kpi_id.uuid + monitor_device_request.sampling_duration_s = request.monitoring_window_s + monitor_device_request.sampling_interval_s = request.sampling_rate_s + device_client = DeviceClient() + device_client.MonitorDeviceKpi(monitor_device_request) + + return Empty() + else: + raise Exception(LOGGER.exception( + 'DeleteKpi exception: Sample with KpiID({:s}): not found in database'.format(str(kpi_id)))) except ServiceException as e: LOGGER.exception('MonitorKpi exception') # CREATEKPI_COUNTER_FAILED.inc() @@ -302,7 +330,6 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('SetKpiAlarm') try: - response = AlarmID() alarm_description = request.alarm_description @@ -429,7 +456,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('DeleteAlarm') try: LOGGER.debug(f'DeleteAlarm with AlarmID: {request.alarm_id.uuid}') - alarm_id = str(request.alarm_id.uuid) + alarm_id = int(request.alarm_id.uuid) alarm = self.management_db.get_alarm(alarm_id) if alarm: self.alarm_manager.delete_alarm(alarm_id) @@ -438,7 +465,6 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): else: raise Exception(LOGGER.exception( 'DeleteAlarm exception: Sample with AlarmID({:s}): not found in database'.format(str(alarm_id)))) - # return Empty() except ServiceException as e: LOGGER.exception('DeleteAlarm exception') grpc_context.abort(e.code, e.details) diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py index 8f6de558c..db66f823f 100644 --- a/src/monitoring/tests/test_unitary.py +++ b/src/monitoring/tests/test_unitary.py @@ -197,25 +197,24 @@ def test_delete_kpi(monitoring_client): # pylint: disable=redefined-outer-name def test_get_kpidescritor(monitoring_client): # pylint: disable=redefined-outer-name LOGGER.warning('test_getkpidescritor_kpi begin') response = monitoring_client.SetKpi(create_kpi_request_c()) - # LOGGER.debug(str(response)) response = monitoring_client.GetKpiDescriptor(response) - # LOGGER.debug(str(response)) + LOGGER.debug(str(response)) assert isinstance(response, KpiDescriptor) # Test case that makes use of client fixture to test server's GetKpiDescriptor method def test_get_kpi_descriptor_list(monitoring_client): # pylint: disable=redefined-outer-name LOGGER.warning('test_getkpidescritor_kpi begin') - response = monitoring_client.GetKpiDescriptorList(kpi_descriptor_list()) - # LOGGER.debug(str(response)) + response = monitoring_client.GetKpiDescriptorList(Empty()) + LOGGER.debug(str(response)) assert isinstance(response, KpiDescriptorList) - # Test case that makes use of client fixture to test server's IncludeKpi method def test_include_kpi(monitoring_client): # pylint: disable=redefined-outer-name # make call to server LOGGER.warning('test_include_kpi requesting') kpi_id = monitoring_client.SetKpi(create_kpi_request_c()) response = monitoring_client.IncludeKpi(include_kpi_request(kpi_id)) + LOGGER.debug(str(response)) assert isinstance(response, Empty) # Test case that makes use of client fixture to test server's MonitorKpi method -- GitLab From 3b98e99dc29c9325b0bbc43217b48e555a0c009e Mon Sep 17 00:00:00 2001 From: fjmmuro Date: Mon, 17 Oct 2022 14:06:47 +0200 Subject: [PATCH 30/34] Implemented SetKpiSubscription, GetSubsDescriptor, GetSubscriptions, DeleteSubscription and GetAlarms methods in the monitoring gRPC server --- proto/monitoring.proto | 20 ++--- .../service/MonitoringServiceServicerImpl.py | 74 +++++++++++++++---- src/monitoring/tests/test_unitary.py | 41 +++++----- 3 files changed, 92 insertions(+), 43 deletions(-) diff --git a/proto/monitoring.proto b/proto/monitoring.proto index 7e7fb9a98..54b4b8c95 100644 --- a/proto/monitoring.proto +++ b/proto/monitoring.proto @@ -25,16 +25,16 @@ service MonitoringService { rpc GetKpiDescriptorList (context.Empty ) returns (KpiDescriptorList ) {} // Stable and final rpc IncludeKpi (Kpi ) returns (context.Empty ) {} // Stable and final rpc MonitorKpi (MonitorKpiRequest ) returns (context.Empty ) {} // Stable and final - rpc QueryKpiData (KpiQuery ) returns (KpiList ) {} - rpc SetKpiSubscription (SubsDescriptor ) returns (stream SubsResponse ) {} - rpc GetSubsDescriptor (SubscriptionID ) returns (SubsDescriptor ) {} - rpc GetSubscriptions (context.Empty ) returns (SubsList ) {} - rpc DeleteSubscription (SubscriptionID ) returns (context.Empty ) {} - rpc SetKpiAlarm (AlarmDescriptor ) returns (AlarmID ) {} - rpc GetAlarms (context.Empty ) returns (AlarmList ) {} - rpc GetAlarmDescriptor (AlarmID ) returns (AlarmDescriptor ) {} - rpc GetAlarmResponseStream(AlarmSubscription ) returns (stream AlarmResponse) {} - rpc DeleteAlarm (AlarmID ) returns (context.Empty ) {} + rpc QueryKpiData (KpiQuery ) returns (KpiList ) {} // Not implemented + rpc SetKpiSubscription (SubsDescriptor ) returns (stream SubsResponse ) {} // Stable not final + rpc GetSubsDescriptor (SubscriptionID ) returns (SubsDescriptor ) {} // Stable and final + rpc GetSubscriptions (context.Empty ) returns (SubsList ) {} // Stable and final + rpc DeleteSubscription (SubscriptionID ) returns (context.Empty ) {} // Stable and final + rpc SetKpiAlarm (AlarmDescriptor ) returns (AlarmID ) {} // Stable not final + rpc GetAlarms (context.Empty ) returns (AlarmList ) {} // Stable and final + rpc GetAlarmDescriptor (AlarmID ) returns (AlarmDescriptor ) {} // Stable and final + rpc GetAlarmResponseStream(AlarmSubscription ) returns (stream AlarmResponse) {} // Not Stable not final + rpc DeleteAlarm (AlarmID ) returns (context.Empty ) {} // Stable and final rpc GetStreamKpi (KpiId ) returns (stream Kpi ) {} rpc GetInstantKpi (KpiId ) returns (KpiList ) {} } diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py index 549b31098..9f7389567 100644 --- a/src/monitoring/service/MonitoringServiceServicerImpl.py +++ b/src/monitoring/service/MonitoringServiceServicerImpl.py @@ -125,8 +125,6 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('getting Kpi by KpiID') try: kpi_db = self.management_db.get_KPI(int(request.kpi_id.uuid)) - # LOGGER.info('sql_db.get_KPIS={:s}'.format(str(self.sql_db.get_KPIS()))) - # LOGGER.info('kpi_db={:s}'.format(str(kpi_db))) if kpi_db is None: return None kpiDescriptor = KpiDescriptor() @@ -141,7 +139,6 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): except ServiceException as e: LOGGER.exception('GetKpiDescriptor exception') grpc_context.abort(e.code, e.details) - except Exception: # pragma: no cover LOGGER.exception('GetKpiDescriptor exception') @@ -294,8 +291,21 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('GetSubsDescriptor') try: - # TBC - return SubsDescriptor() + subs_db = self.management_db.get_subscription(int(request.subs_id.uuid)) + if subs_db is None: return None + + LOGGER.debug(subs_db) + + response = SubsDescriptor() + + response.subs_id.subs_id.uuid = str(subs_db[0]) + response.kpi_id.kpi_id.uuid = str(subs_db[1]) + response.sampling_duration_s = subs_db[3] + response.sampling_interval_s = subs_db[4] + response.start_timestamp.timestamp = subs_db[5] + response.end_timestamp.timestamp = subs_db[6] + + return response except ServiceException as e: LOGGER.exception('GetSubsDescriptor exception') grpc_context.abort(e.code, e.details) @@ -306,8 +316,22 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('GetSubscriptions') try: - # TBC - return SubsList() + response = SubsList() + data = self.management_db.get_subscriptions() + + for subs_db in data: + subs_descriptor = SubsDescriptor() + + subs_descriptor.subs_id.subs_id.uuid = str(subs_db[0]) + subs_descriptor.kpi_id.kpi_id.uuid = str(subs_db[1]) + subs_descriptor.sampling_duration_s = subs_db[3] + subs_descriptor.sampling_interval_s = subs_db[4] + subs_descriptor.start_timestamp.timestamp = subs_db[5] + subs_descriptor.end_timestamp.timestamp = subs_db[6] + + response.subs_list.append(subs_descriptor) + + return response except ServiceException as e: LOGGER.exception('GetSubscriptions exception') grpc_context.abort(e.code, e.details) @@ -318,8 +342,15 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('DeleteSubscription') try: - # TBC - return Empty() + LOGGER.debug(f'DeleteSubscription with SubsID: {request.subs_id.uuid}') + subs_id = int(request.subs_id.uuid) + subs_db = self.management_db.get_subscription(int(request.subs_id.uuid)) + if subs_db: + self.management_db.delete_subscription(subs_id) + return Empty() + else: + raise Exception(LOGGER.exception( + 'DeleteSubscription exception: Sample with SubsID({:s}): not found in database'.format(str(subs_id)))) except ServiceException as e: LOGGER.exception('DeleteSubscription exception') grpc_context.abort(e.code, e.details) @@ -365,8 +396,25 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('GetAlarms') try: - # TBC - return AlarmList() + response = AlarmList() + data = self.management_db.get_alarms() + + for alarm in data: + alarm_descriptor = AlarmDescriptor() + + alarm_descriptor.alarm_id.alarm_id.uuid = str(alarm[0]) + alarm_descriptor.alarm_description = alarm[1] + alarm_descriptor.name = alarm[2] + alarm_descriptor.kpi_id.kpi_id.uuid = str(alarm[3]) + alarm_descriptor.kpi_value_range.kpiMinValue.floatVal = alarm[4] + alarm_descriptor.kpi_value_range.kpiMaxValue.floatVal = alarm[5] + alarm_descriptor.kpi_value_range.inRange = bool(alarm[6]) + alarm_descriptor.kpi_value_range.includeMinValue = bool(alarm[7]) + alarm_descriptor.kpi_value_range.includeMaxValue = bool(alarm[8]) + + response.alarm_list.append(alarm_descriptor) + + return response except ServiceException as e: LOGGER.exception('GetAlarms exception') grpc_context.abort(e.code, e.details) @@ -377,7 +425,6 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('GetAlarmDescriptor') try: - alarm_id = request.alarm_id.uuid alarm = self.management_db.get_alarm(alarm_id) @@ -386,7 +433,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): response = AlarmDescriptor() LOGGER.debug(f"{alarm}") - response.alarm_id.alarm_id.uuid = alarm_id + response.alarm_id.alarm_id.uuid = str(alarm_id) response.alarm_description = alarm[1] response.name = alarm[2] response.kpi_id.kpi_id.uuid = str(alarm[3]) @@ -409,7 +456,6 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('GetAlarmResponseStream') try: - alarm = self.management_db.get_alarm(request.alarm_id.alarm_id.uuid) if alarm: diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py index db66f823f..0f84d719c 100644 --- a/src/monitoring/tests/test_unitary.py +++ b/src/monitoring/tests/test_unitary.py @@ -265,32 +265,38 @@ def test_set_kpi_subscription(monitoring_client): # pylint: disable=redefined-ou kpi_id = monitoring_client.SetKpi(create_kpi_request_c()) monitoring_client.IncludeKpi(include_kpi_request(kpi_id)) response = monitoring_client.SetKpiSubscription(subs_descriptor(kpi_id)) - LOGGER.debug(type(response)) assert isinstance(response, _MultiThreadedRendezvous) - # for item in response: - # assert isinstance(item, SubsResponse) - + for item in response: + LOGGER.debug(item) + assert isinstance(item, SubsResponse) # Test case that makes use of client fixture to test server's GetSubsDescriptor method def test_get_subs_descriptor(monitoring_client): LOGGER.warning('test_get_subs_descriptor') - response = monitoring_client.GetSubsDescriptor(subs_id()) - LOGGER.debug(type(response)) - assert isinstance(response, SubsDescriptor) + kpi_id = monitoring_client.SetKpi(create_kpi_request_c()) + monitoring_client.IncludeKpi(include_kpi_request(kpi_id)) + response = monitoring_client.SetKpiSubscription(subs_descriptor(kpi_id)) + for item in response: + response = monitoring_client.GetSubsDescriptor(item.subs_id) + LOGGER.debug(response) + assert isinstance(response, SubsDescriptor) # Test case that makes use of client fixture to test server's GetSubscriptions method def test_get_subscriptions(monitoring_client): LOGGER.warning('test_get_subscriptions') response = monitoring_client.GetSubscriptions(Empty()) - LOGGER.debug(type(response)) + LOGGER.debug(response) assert isinstance(response, SubsList) # Test case that makes use of client fixture to test server's DeleteSubscription method def test_delete_subscription(monitoring_client): LOGGER.warning('test_delete_subscription') - response = monitoring_client.DeleteSubscription(subs_id()) - LOGGER.debug(type(response)) - assert isinstance(response, Empty) + kpi_id = monitoring_client.SetKpi(create_kpi_request_c()) + monitoring_client.IncludeKpi(include_kpi_request(kpi_id)) + subs = monitoring_client.SetKpiSubscription(subs_descriptor(kpi_id)) + for item in subs: + response = monitoring_client.DeleteSubscription(item.subs_id) + assert isinstance(response, Empty) # Test case that makes use of client fixture to test server's SetKpiAlarm method def test_set_kpi_alarm(monitoring_client): @@ -303,16 +309,15 @@ def test_set_kpi_alarm(monitoring_client): def test_get_alarms(monitoring_client): LOGGER.warning('test_get_alarms') response = monitoring_client.GetAlarms(Empty()) - LOGGER.debug(type(response)) + LOGGER.debug(response) assert isinstance(response, AlarmList) - # Test case that makes use of client fixture to test server's GetAlarmDescriptor method def test_get_alarm_descriptor(monitoring_client): LOGGER.warning('test_get_alarm_descriptor') alarm_id = monitoring_client.SetKpiAlarm(alarm_descriptor()) response = monitoring_client.GetAlarmDescriptor(alarm_id) - LOGGER.debug(f"{response}") + LOGGER.debug(response) assert isinstance(response, AlarmDescriptor) # Test case that makes use of client fixture to test server's GetAlarmResponseStream method @@ -320,11 +325,10 @@ def test_get_alarm_response_stream(monitoring_client): LOGGER.warning('test_get_alarm_descriptor') alarm_id = monitoring_client.SetKpiAlarm(alarm_descriptor()) response = monitoring_client.GetAlarmResponseStream(alarm_subscription(alarm_id)) - LOGGER.debug(type(response)) assert isinstance(response, _MultiThreadedRendezvous) - # for item in response: - # assert isinstance(item,AlarmResponse) - + for item in response: + LOGGER.debug(response) + assert isinstance(item,AlarmResponse) # Test case that makes use of client fixture to test server's DeleteAlarm method def test_delete_alarm(monitoring_client): @@ -348,7 +352,6 @@ def test_get_instant_kpi(monitoring_client): # pylint: disable=redefined-outer-n LOGGER.debug(str(response)) assert isinstance(response, KpiList) - def test_managementdb_tools_insert_kpi(management_db): # pylint: disable=redefined-outer-name LOGGER.warning('test_managementdb_tools_insert_kpi begin') _create_kpi_request = create_kpi_request() -- GitLab From 32efcf5414f7b383cd75f1485403741590f43745 Mon Sep 17 00:00:00 2001 From: fjmmuro Date: Mon, 17 Oct 2022 17:49:10 +0200 Subject: [PATCH 31/34] Changes in the monitoring.proto --- proto/monitoring.proto | 10 +++++----- src/common/proto | 1 - .../service/MonitoringServiceServicerImpl.py | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) delete mode 120000 src/common/proto diff --git a/proto/monitoring.proto b/proto/monitoring.proto index 54b4b8c95..9e20fcd27 100644 --- a/proto/monitoring.proto +++ b/proto/monitoring.proto @@ -35,8 +35,8 @@ service MonitoringService { rpc GetAlarmDescriptor (AlarmID ) returns (AlarmDescriptor ) {} // Stable and final rpc GetAlarmResponseStream(AlarmSubscription ) returns (stream AlarmResponse) {} // Not Stable not final rpc DeleteAlarm (AlarmID ) returns (context.Empty ) {} // Stable and final - rpc GetStreamKpi (KpiId ) returns (stream Kpi ) {} - rpc GetInstantKpi (KpiId ) returns (KpiList ) {} + rpc GetStreamKpi (KpiId ) returns (stream Kpi ) {} // Stable not final + rpc GetInstantKpi (KpiId ) returns (KpiList ) {} // Stable not final } message KpiDescriptor { @@ -58,7 +58,7 @@ message MonitorKpiRequest { } message KpiQuery { - repeated KpiId kpi_id = 1; + KpiId kpi_id = 1; float monitoring_window_s = 2; float sampling_rate_s = 3; uint32 last_n_samples = 4; // used when you want something like "get the last N many samples @@ -126,7 +126,7 @@ message SubsResponse { } message SubsList { - repeated SubsDescriptor subs_list = 1; + repeated SubsDescriptor subs_descriptor = 1; } message AlarmDescriptor { @@ -155,5 +155,5 @@ message AlarmResponse { } message AlarmList { - repeated AlarmDescriptor alarm_list = 1; + repeated AlarmDescriptor alarm_descriptor = 1; } diff --git a/src/common/proto b/src/common/proto deleted file mode 120000 index 0ae252a78..000000000 --- a/src/common/proto +++ /dev/null @@ -1 +0,0 @@ -../../proto/src/python \ No newline at end of file diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py index 9f7389567..291c9347d 100644 --- a/src/monitoring/service/MonitoringServiceServicerImpl.py +++ b/src/monitoring/service/MonitoringServiceServicerImpl.py @@ -329,7 +329,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): subs_descriptor.start_timestamp.timestamp = subs_db[5] subs_descriptor.end_timestamp.timestamp = subs_db[6] - response.subs_list.append(subs_descriptor) + response.subs_descriptor.append(subs_descriptor) return response except ServiceException as e: @@ -412,7 +412,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): alarm_descriptor.kpi_value_range.includeMinValue = bool(alarm[7]) alarm_descriptor.kpi_value_range.includeMaxValue = bool(alarm[8]) - response.alarm_list.append(alarm_descriptor) + response.alarm_descriptor.append(alarm_descriptor) return response except ServiceException as e: -- GitLab From d266daffdee69641d1cea48fdafe9945168ec8fc Mon Sep 17 00:00:00 2001 From: fjmmuro Date: Tue, 18 Oct 2022 12:04:20 +0200 Subject: [PATCH 32/34] Debuging --- .../service/MonitoringServiceServicerImpl.py | 30 ++++++++++++++++--- src/monitoring/tests/test_unitary.py | 8 +++-- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py index 291c9347d..09990c55e 100644 --- a/src/monitoring/service/MonitoringServiceServicerImpl.py +++ b/src/monitoring/service/MonitoringServiceServicerImpl.py @@ -272,7 +272,8 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): while not subs_queue.empty(): list = subs_queue.get_nowait() for item in list: - kpi = kpi.kpi_id.kpi_id.uuid = item[0] + kpi = Kpi() + kpi.kpi_id.kpi_id.uuid = item[0] kpi.timestamp.timestamp = timestamp_string_to_float(item[1]) kpi.kpi_value.floatVal = item[2] # This must be improved subs_response.kpi_list.kpi.append(kpi) @@ -481,7 +482,8 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): while not alarm_queue.empty(): list = alarm_queue.get_nowait() for item in list: - kpi = kpi.kpi_id.kpi_id.uuid = item[0] + kpi = Kpi() + kpi.kpi_id.kpi_id.uuid = item[0] kpi.timestamp.timestamp = timestamp_string_to_float(item[1]) kpi.kpi_value.floatVal = item[2] # This must be improved alarm_response.kpi_list.kpi.append(kpi) @@ -520,10 +522,30 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): def GetStreamKpi ( self, request : KpiId, grpc_context : grpc.ServicerContext) -> Iterator[Kpi]: LOGGER.info('GetStreamKpi') + + kpi_db = self.management_db.get_KPI(int(request.kpi_id.uuid)) + if kpi_db is None: return None + yield Kpi() @MONITORING_GETINSTANTKPI_REQUEST_TIME.time() - def GetInstantKpi ( self, request : KpiId, grpc_context : grpc.ServicerContext) -> KpiList: + def GetInstantKpi ( self, request : KpiId, grpc_context : grpc.ServicerContext) -> Kpi: LOGGER.info('GetInstantKpi') - return KpiList() \ No newline at end of file + + kpi_id = request.kpi_id.uuid + kpi_db = self.management_db.get_KPI(int(kpi_id)) + if kpi_db is None: return None + + response = Kpi() + + query = f"SELECT kpi_id, timestamp, kpi_value FROM monitoring WHERE kpi_id = '{kpi_id}' " \ + f"LATEST ON timestamp PARTITION BY kpi_id" + data = self.metrics_db.run_query(query) + + response.kpi_id.kpi_id.uuid = data[0] + response.timestamp.timestamp = timestamp_string_to_float(data[1]) + response.kpi_value.floatVal = data[2] # This must be improved + response.kpi.append(response) + + return response \ No newline at end of file diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py index 0f84d719c..32d801cbf 100644 --- a/src/monitoring/tests/test_unitary.py +++ b/src/monitoring/tests/test_unitary.py @@ -348,9 +348,11 @@ def test_get_stream_kpi(monitoring_client): # pylint: disable=redefined-outer-na # Test case that makes use of client fixture to test server's GetInstantKpi method def test_get_instant_kpi(monitoring_client): # pylint: disable=redefined-outer-name LOGGER.warning('test_getinstant_kpi begin') - response = monitoring_client.GetInstantKpi(kpi_id()) - LOGGER.debug(str(response)) - assert isinstance(response, KpiList) + kpi_id = monitoring_client.SetKpi(create_kpi_request_c()) + monitoring_client.IncludeKpi(include_kpi_request(kpi_id)) + response = monitoring_client.GetInstantKpi(kpi_id) + LOGGER.debug(response) + assert isinstance(response, Kpi) def test_managementdb_tools_insert_kpi(management_db): # pylint: disable=redefined-outer-name LOGGER.warning('test_managementdb_tools_insert_kpi begin') -- GitLab From 2406fe92275933cabf62db23cf8fc8a9b9c7d6ad Mon Sep 17 00:00:00 2001 From: fjmmuro Date: Tue, 18 Oct 2022 12:23:38 +0200 Subject: [PATCH 33/34] Solving GetInstantKpi --- proto/monitoring.proto | 2 +- .../service/MonitoringServiceServicerImpl.py | 14 ++++++++------ src/monitoring/tests/test_unitary.py | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/proto/monitoring.proto b/proto/monitoring.proto index 9e20fcd27..9be39db90 100644 --- a/proto/monitoring.proto +++ b/proto/monitoring.proto @@ -36,7 +36,7 @@ service MonitoringService { rpc GetAlarmResponseStream(AlarmSubscription ) returns (stream AlarmResponse) {} // Not Stable not final rpc DeleteAlarm (AlarmID ) returns (context.Empty ) {} // Stable and final rpc GetStreamKpi (KpiId ) returns (stream Kpi ) {} // Stable not final - rpc GetInstantKpi (KpiId ) returns (KpiList ) {} // Stable not final + rpc GetInstantKpi (KpiId ) returns (Kpi ) {} // Stable not final } message KpiDescriptor { diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py index 09990c55e..f21d77a02 100644 --- a/src/monitoring/service/MonitoringServiceServicerImpl.py +++ b/src/monitoring/service/MonitoringServiceServicerImpl.py @@ -273,7 +273,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): list = subs_queue.get_nowait() for item in list: kpi = Kpi() - kpi.kpi_id.kpi_id.uuid = item[0] + kpi.kpi_id.kpi_id.uuid = str(item[0]) kpi.timestamp.timestamp = timestamp_string_to_float(item[1]) kpi.kpi_value.floatVal = item[2] # This must be improved subs_response.kpi_list.kpi.append(kpi) @@ -483,7 +483,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): list = alarm_queue.get_nowait() for item in list: kpi = Kpi() - kpi.kpi_id.kpi_id.uuid = item[0] + kpi.kpi_id.kpi_id.uuid = str(item[0]) kpi.timestamp.timestamp = timestamp_string_to_float(item[1]) kpi.kpi_value.floatVal = item[2] # This must be improved alarm_response.kpi_list.kpi.append(kpi) @@ -535,17 +535,19 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): kpi_id = request.kpi_id.uuid kpi_db = self.management_db.get_KPI(int(kpi_id)) - if kpi_db is None: return None + if kpi_db is None: + LOGGER.debug('No found') + return None response = Kpi() query = f"SELECT kpi_id, timestamp, kpi_value FROM monitoring WHERE kpi_id = '{kpi_id}' " \ f"LATEST ON timestamp PARTITION BY kpi_id" - data = self.metrics_db.run_query(query) + data = self.metrics_db.run_query(query)[0] + LOGGER.debug(data) - response.kpi_id.kpi_id.uuid = data[0] + response.kpi_id.kpi_id.uuid = str(data[0]) response.timestamp.timestamp = timestamp_string_to_float(data[1]) response.kpi_value.floatVal = data[2] # This must be improved - response.kpi.append(response) return response \ No newline at end of file diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py index 32d801cbf..17423fb2e 100644 --- a/src/monitoring/tests/test_unitary.py +++ b/src/monitoring/tests/test_unitary.py @@ -351,7 +351,7 @@ def test_get_instant_kpi(monitoring_client): # pylint: disable=redefined-outer-n kpi_id = monitoring_client.SetKpi(create_kpi_request_c()) monitoring_client.IncludeKpi(include_kpi_request(kpi_id)) response = monitoring_client.GetInstantKpi(kpi_id) - LOGGER.debug(response) + LOGGER.debug(type(response)) assert isinstance(response, Kpi) def test_managementdb_tools_insert_kpi(management_db): # pylint: disable=redefined-outer-name -- GitLab From 16528565ea5393f17f603a99494f7ce3cae33b0c Mon Sep 17 00:00:00 2001 From: fjmmuro Date: Tue, 25 Oct 2022 17:06:54 +0200 Subject: [PATCH 34/34] Monitoring server improved and rebased from develop --- src/device/service/drivers/__init__.py | 60 +++---- .../service/drivers/transport_api/Tools.py | 12 +- src/monitoring/service/ManagementDBTools.py | 3 +- .../service/MonitoringServiceServicerImpl.py | 150 ++++++++++-------- src/monitoring/tests/Messages.py | 3 +- src/monitoring/tests/test_unitary.py | 9 +- src/tests/netx22-p4/README.md | 36 ++++- src/webui/service/main/DescriptorTools.py | 14 +- src/webui/service/main/routes.py | 19 ++- .../service/templates/service/detail.html | 7 +- tutorial/1-0-deployment.md | 8 +- tutorial/1-1-1-create-vm-oracle-virtualbox.md | 19 ++- tutorial/1-1-create-vm.md | 16 +- tutorial/1-3-deploy-tfs.md | 78 ++++----- tutorial/1-4-access-webui.md | 32 ++-- tutorial/1-5-deploy-logs-troubleshooting.md | 23 +-- tutorial/2-0-run-experiments.md | 17 +- tutorial/2-4-ecoc22.md | 134 +++++++++------- tutorial/3-0-development.md | 18 ++- tutorial/3-1-configure-vscode.md | 10 +- tutorial/README.md | 28 ++-- 21 files changed, 407 insertions(+), 289 deletions(-) diff --git a/src/device/service/drivers/__init__.py b/src/device/service/drivers/__init__.py index 5fe786667..535b553a8 100644 --- a/src/device/service/drivers/__init__.py +++ b/src/device/service/drivers/__init__.py @@ -25,8 +25,8 @@ DRIVERS = [] from .emulated.EmulatedDriver import EmulatedDriver # pylint: disable=wrong-import-position DRIVERS.append( (EmulatedDriver, [ + # TODO: multi-filter is not working { - # Driver==EMULATED, all device types => use Emulated FilterFieldEnum.DEVICE_TYPE: [ DeviceTypeEnum.EMULATED_DATACENTER, DeviceTypeEnum.EMULATED_MICROVAWE_RADIO_SYSTEM, @@ -37,40 +37,40 @@ DRIVERS.append( DeviceTypeEnum.EMULATED_PACKET_ROUTER, DeviceTypeEnum.EMULATED_PACKET_SWITCH, - DeviceTypeEnum.DATACENTER, - DeviceTypeEnum.MICROVAWE_RADIO_SYSTEM, - DeviceTypeEnum.OPEN_LINE_SYSTEM, - DeviceTypeEnum.OPTICAL_ROADM, - DeviceTypeEnum.OPTICAL_TRANSPONDER, - DeviceTypeEnum.P4_SWITCH, - DeviceTypeEnum.PACKET_ROUTER, - DeviceTypeEnum.PACKET_SWITCH, + #DeviceTypeEnum.DATACENTER, + #DeviceTypeEnum.MICROVAWE_RADIO_SYSTEM, + #DeviceTypeEnum.OPEN_LINE_SYSTEM, + #DeviceTypeEnum.OPTICAL_ROADM, + #DeviceTypeEnum.OPTICAL_TRANSPONDER, + #DeviceTypeEnum.P4_SWITCH, + #DeviceTypeEnum.PACKET_ROUTER, + #DeviceTypeEnum.PACKET_SWITCH, ], FilterFieldEnum.DRIVER: [ ORM_DeviceDriverEnum.UNDEFINED, ], }, - { - # Emulated devices, all drivers => use Emulated - FilterFieldEnum.DEVICE_TYPE: [ - DeviceTypeEnum.EMULATED_DATACENTER, - DeviceTypeEnum.EMULATED_MICROVAWE_RADIO_SYSTEM, - DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM, - DeviceTypeEnum.EMULATED_OPTICAL_ROADM, - DeviceTypeEnum.EMULATED_OPTICAL_TRANSPONDER, - DeviceTypeEnum.EMULATED_P4_SWITCH, - DeviceTypeEnum.EMULATED_PACKET_ROUTER, - DeviceTypeEnum.EMULATED_PACKET_SWITCH, - ], - FilterFieldEnum.DRIVER: [ - ORM_DeviceDriverEnum.UNDEFINED, - ORM_DeviceDriverEnum.OPENCONFIG, - ORM_DeviceDriverEnum.TRANSPORT_API, - ORM_DeviceDriverEnum.P4, - ORM_DeviceDriverEnum.IETF_NETWORK_TOPOLOGY, - ORM_DeviceDriverEnum.ONF_TR_352, - ], - } + #{ + # # Emulated devices, all drivers => use Emulated + # FilterFieldEnum.DEVICE_TYPE: [ + # DeviceTypeEnum.EMULATED_DATACENTER, + # DeviceTypeEnum.EMULATED_MICROVAWE_RADIO_SYSTEM, + # DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM, + # DeviceTypeEnum.EMULATED_OPTICAL_ROADM, + # DeviceTypeEnum.EMULATED_OPTICAL_TRANSPONDER, + # DeviceTypeEnum.EMULATED_P4_SWITCH, + # DeviceTypeEnum.EMULATED_PACKET_ROUTER, + # DeviceTypeEnum.EMULATED_PACKET_SWITCH, + # ], + # FilterFieldEnum.DRIVER: [ + # ORM_DeviceDriverEnum.UNDEFINED, + # ORM_DeviceDriverEnum.OPENCONFIG, + # ORM_DeviceDriverEnum.TRANSPORT_API, + # ORM_DeviceDriverEnum.P4, + # ORM_DeviceDriverEnum.IETF_NETWORK_TOPOLOGY, + # ORM_DeviceDriverEnum.ONF_TR_352, + # ], + #} ])) if LOAD_ALL_DEVICE_DRIVERS: diff --git a/src/device/service/drivers/transport_api/Tools.py b/src/device/service/drivers/transport_api/Tools.py index 8f18c56b3..6faee37ce 100644 --- a/src/device/service/drivers/transport_api/Tools.py +++ b/src/device/service/drivers/transport_api/Tools.py @@ -36,9 +36,15 @@ def config_getter(root_url, resource_key, timeout): context = json.loads(response.content) if resource_key == RESOURCE_ENDPOINTS: - for sip in context['tapi-common:context']['service-interface-point']: - result.append( - ('/endpoints/endpoint[{:s}]'.format(sip['uuid']), {'uuid': sip['uuid'], 'type': '10Gbps'})) + if 'tapi-common:context' in context: + context = context['tapi-common:context'] + elif 'context' in context: + context = context['context'] + for sip in context['service-interface-point']: + endpoint_type = sip.get('layer-protocol-name', '10Gbps') + endpoint_url = '/endpoints/endpoint[{:s}]'.format(sip['uuid']) + endpoint_data = {'uuid': sip['uuid'], 'type': endpoint_type} + result.append((endpoint_url, endpoint_data)) return result diff --git a/src/monitoring/service/ManagementDBTools.py b/src/monitoring/service/ManagementDBTools.py index 9b603917c..2387ddde0 100644 --- a/src/monitoring/service/ManagementDBTools.py +++ b/src/monitoring/service/ManagementDBTools.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from common.tools.timestamp.Converters import timestamp_utcnow_to_float import sqlite3 import logging @@ -246,4 +245,4 @@ class ManagementDB(): LOGGER.debug(f"Alarms succesfully retrieved from the ManagementDB") return data except sqlite3.Error as e: - LOGGER.debug(f"Alarms cannot be retrieved from the ManagementDB: {e}") + LOGGER.debug(f"Alarms cannot be retrieved from the ManagementDB: {e}") \ No newline at end of file diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py index f21d77a02..1d2b793a4 100644 --- a/src/monitoring/service/MonitoringServiceServicerImpl.py +++ b/src/monitoring/service/MonitoringServiceServicerImpl.py @@ -111,10 +111,9 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): kpi = self.management_db.get_KPI(kpi_id) if kpi: self.management_db.delete_KPI(kpi_id) - return Empty() else: - raise Exception(LOGGER.exception( - 'DeleteKpi exception: Sample with KpiID({:s}): not found in database'.format(str(kpi_id)))) + LOGGER.info('DeleteKpi error: KpiID({:s}): not found in database'.format(str(kpi_id))) + return Empty() except ServiceException as e: LOGGER.exception('DeleteKpi exception') grpc_context.abort(e.code, e.details) @@ -124,17 +123,17 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): def GetKpiDescriptor(self, request: KpiId, grpc_context: grpc.ServicerContext) -> KpiDescriptor: LOGGER.info('getting Kpi by KpiID') try: - kpi_db = self.management_db.get_KPI(int(request.kpi_id.uuid)) - if kpi_db is None: return None - + kpi_id = request.kpi_id.uuid + kpi_db = self.management_db.get_KPI(int(kpi_id)) kpiDescriptor = KpiDescriptor() - - kpiDescriptor.kpi_description = kpi_db[1] - kpiDescriptor.kpi_sample_type = kpi_db[2] - kpiDescriptor.device_id.device_uuid.uuid = str(kpi_db[3]) - kpiDescriptor.endpoint_id.endpoint_uuid.uuid = str(kpi_db[4]) - kpiDescriptor.service_id.service_uuid.uuid = str(kpi_db[5]) - + if kpi_db is None: + LOGGER.info('GetKpiDescriptor error: KpiID({:s}): not found in database'.format(str(kpi_id))) + else: + kpiDescriptor.kpi_description = kpi_db[1] + kpiDescriptor.kpi_sample_type = kpi_db[2] + kpiDescriptor.device_id.device_uuid.uuid = str(kpi_db[3]) + kpiDescriptor.endpoint_id.endpoint_uuid.uuid = str(kpi_db[4]) + kpiDescriptor.service_id.service_uuid.uuid = str(kpi_db[5]) return kpiDescriptor except ServiceException as e: LOGGER.exception('GetKpiDescriptor exception') @@ -174,13 +173,14 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('IncludeKpi') try: + kpi_id = request.kpi_id.kpi_id.uuid kpiDescriptor = self.GetKpiDescriptor(request.kpi_id, grpc_context) if kpiDescriptor is None: - raise Exception(LOGGER.exception('IncludeKpi exception: Sample with KPIId({:s}): not found in database'.format(str(request.kpi_id)))) + LOGGER.info('IncludeKpi error: KpiID({:s}): not found in database'.format(str(kpi_id))) else: kpiSampleType = KpiSampleType.Name(kpiDescriptor.kpi_sample_type).upper().replace('KPISAMPLETYPE_', '') - kpiId = request.kpi_id.kpi_id.uuid + kpiId = kpi_id deviceId = kpiDescriptor.device_id.device_uuid.uuid endpointId = kpiDescriptor.endpoint_id.endpoint_uuid.uuid serviceId = kpiDescriptor.service_id.service_uuid.uuid @@ -190,7 +190,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): # Build the structure to be included as point in the MetricsDB self.metrics_db.write_KPI(time_stamp,kpiId,kpiSampleType,deviceId,endpointId,serviceId,kpi_value) - return Empty() + return Empty() except ServiceException as e: LOGGER.exception('IncludeKpi exception') # CREATEKPI_COUNTER_FAILED.inc() @@ -206,6 +206,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): try: kpi_id = int(request.kpi_id.kpi_id.uuid) kpi = self.management_db.get_KPI(kpi_id) + response = Empty() if kpi: # Sets the request to send to the device service @@ -220,11 +221,9 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): device_client = DeviceClient() device_client.MonitorDeviceKpi(monitor_device_request) - - return Empty() else: - raise Exception(LOGGER.exception( - 'DeleteKpi exception: Sample with KpiID({:s}): not found in database'.format(str(kpi_id)))) + LOGGER.info('MonitorKpi error: KpiID({:s}): not found in database'.format(str(kpi_id))) + return response except ServiceException as e: LOGGER.exception('MonitorKpi exception') # CREATEKPI_COUNTER_FAILED.inc() @@ -234,8 +233,6 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): grpc_context.abort(grpc.StatusCode.INTERNAL, str(e)) # CREATEKPI_COUNTER_FAILED.inc() - return Empty() - def QueryKpiData ( self, request : KpiQuery, grpc_context : grpc.ServicerContext) -> KpiList: @@ -292,19 +289,19 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('GetSubsDescriptor') try: + subs_id = request.subs_id.uuid subs_db = self.management_db.get_subscription(int(request.subs_id.uuid)) - if subs_db is None: return None - - LOGGER.debug(subs_db) - response = SubsDescriptor() - - response.subs_id.subs_id.uuid = str(subs_db[0]) - response.kpi_id.kpi_id.uuid = str(subs_db[1]) - response.sampling_duration_s = subs_db[3] - response.sampling_interval_s = subs_db[4] - response.start_timestamp.timestamp = subs_db[5] - response.end_timestamp.timestamp = subs_db[6] + if subs_db is None: + LOGGER.info('GetSubsDescriptor error: SubsID({:s}): not found in database'.format(str(subs_id))) + else: + LOGGER.debug(subs_db) + response.subs_id.subs_id.uuid = str(subs_db[0]) + response.kpi_id.kpi_id.uuid = str(subs_db[1]) + response.sampling_duration_s = subs_db[3] + response.sampling_interval_s = subs_db[4] + response.start_timestamp.timestamp = subs_db[5] + response.end_timestamp.timestamp = subs_db[6] return response except ServiceException as e: @@ -348,10 +345,9 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): subs_db = self.management_db.get_subscription(int(request.subs_id.uuid)) if subs_db: self.management_db.delete_subscription(subs_id) - return Empty() else: - raise Exception(LOGGER.exception( - 'DeleteSubscription exception: Sample with SubsID({:s}): not found in database'.format(str(subs_id)))) + LOGGER.info('DeleteSubscription error: SubsID({:s}): not found in database'.format(str(subs_id))) + return Empty() except ServiceException as e: LOGGER.exception('DeleteSubscription exception') grpc_context.abort(e.code, e.details) @@ -428,11 +424,9 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): try: alarm_id = request.alarm_id.uuid alarm = self.management_db.get_alarm(alarm_id) + response = AlarmDescriptor() if alarm: - - response = AlarmDescriptor() - LOGGER.debug(f"{alarm}") response.alarm_id.alarm_id.uuid = str(alarm_id) response.alarm_description = alarm[1] @@ -443,10 +437,10 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): response.kpi_value_range.inRange = bool(alarm[6]) response.kpi_value_range.includeMinValue = bool(alarm[7]) response.kpi_value_range.includeMaxValue = bool(alarm[8]) - - return response else: - raise Exception(LOGGER.debug(f"Alarm {request.alarm_id} does not exists")) + LOGGER.info('GetAlarmDescriptor error: AlarmID({:s}): not found in database'.format(str(alarm_id))) + response.alarm_id.alarm_id.uuid = "NoID" + return response except ServiceException as e: LOGGER.exception('GetAlarmDescriptor exception') grpc_context.abort(e.code, e.details) @@ -457,12 +451,14 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('GetAlarmResponseStream') try: - alarm = self.management_db.get_alarm(request.alarm_id.alarm_id.uuid) + alarm_id = request.alarm_id.alarm_id.uuid + alarm = self.management_db.get_alarm(alarm_id) + alarm_response = AlarmResponse() if alarm: alarm_queue = Queue() - alarm_response = AlarmResponse() + alarm_data = self.management_db.get_alarm(alarm) @@ -492,7 +488,9 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): yield alarm_response else : - raise Exception(LOGGER.debug(f"Alarm {request.alarm_id} does not exists")) + LOGGER.info('GetAlarmResponseStream error: AlarmID({:s}): not found in database'.format(str(alarm_id))) + alarm_response.alarm_id.alarm_id.uuid = "NoID" + return alarm_response except ServiceException as e: LOGGER.exception('GetAlarmResponseStream exception') grpc_context.abort(e.code, e.details) @@ -504,15 +502,15 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('DeleteAlarm') try: LOGGER.debug(f'DeleteAlarm with AlarmID: {request.alarm_id.uuid}') - alarm_id = int(request.alarm_id.uuid) - alarm = self.management_db.get_alarm(alarm_id) + alarm_id = int(request.alarm_id.uuid) + alarm = self.management_db.get_alarm(alarm_id) + response = Empty() if alarm: self.alarm_manager.delete_alarm(alarm_id) self.management_db.delete_alarm(alarm_id) - return Empty() else: - raise Exception(LOGGER.exception( - 'DeleteAlarm exception: Sample with AlarmID({:s}): not found in database'.format(str(alarm_id)))) + LOGGER.info('DeleteAlarm error: AlarmID({:s}): not found in database'.format(str(alarm_id))) + return response except ServiceException as e: LOGGER.exception('DeleteAlarm exception') grpc_context.abort(e.code, e.details) @@ -523,31 +521,43 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): LOGGER.info('GetStreamKpi') - kpi_db = self.management_db.get_KPI(int(request.kpi_id.uuid)) - if kpi_db is None: return None - - yield Kpi() + kpi_id = request.kpi_id.uuid + kpi_db = self.management_db.get_KPI(int(kpi_id)) + response = Kpi() + if kpi_db is None: + LOGGER.info('GetInstantKpi error: KpiID({:s}): not found in database'.format(str(kpi_id))) + response.kpi_id.kpi_id.uuid = "NoID" + return response + else: + yield response @MONITORING_GETINSTANTKPI_REQUEST_TIME.time() def GetInstantKpi ( self, request : KpiId, grpc_context : grpc.ServicerContext) -> Kpi: LOGGER.info('GetInstantKpi') + try: + kpi_id = request.kpi_id.uuid + response = Kpi() + if kpi_id is "": + LOGGER.info('GetInstantKpi error: KpiID({:s}): not found in database'.format(str(kpi_id))) + response.kpi_id.kpi_id.uuid = "NoID" + else: + query = f"SELECT kpi_id, timestamp, kpi_value FROM monitoring WHERE kpi_id = '{kpi_id}' " \ + f"LATEST ON timestamp PARTITION BY kpi_id" + data = self.metrics_db.run_query(query)[0] + LOGGER.debug(data) - kpi_id = request.kpi_id.uuid - kpi_db = self.management_db.get_KPI(int(kpi_id)) - if kpi_db is None: - LOGGER.debug('No found') - return None - - response = Kpi() - - query = f"SELECT kpi_id, timestamp, kpi_value FROM monitoring WHERE kpi_id = '{kpi_id}' " \ - f"LATEST ON timestamp PARTITION BY kpi_id" - data = self.metrics_db.run_query(query)[0] - LOGGER.debug(data) + response.kpi_id.kpi_id.uuid = str(data[0]) + response.timestamp.timestamp = timestamp_string_to_float(data[1]) + response.kpi_value.floatVal = data[2] # This must be improved - response.kpi_id.kpi_id.uuid = str(data[0]) - response.timestamp.timestamp = timestamp_string_to_float(data[1]) - response.kpi_value.floatVal = data[2] # This must be improved + return response + except ServiceException as e: + LOGGER.exception('SetKpi exception') + # CREATEKPI_COUNTER_FAILED.inc() + grpc_context.abort(e.code, e.details) + except Exception as e: # pragma: no cover + LOGGER.exception('SetKpi exception') + # CREATEKPI_COUNTER_FAILED.inc() + grpc_context.abort(grpc.StatusCode.INTERNAL, str(e)) - return response \ No newline at end of file diff --git a/src/monitoring/tests/Messages.py b/src/monitoring/tests/Messages.py index 6312a5beb..3e5cd8a20 100644 --- a/src/monitoring/tests/Messages.py +++ b/src/monitoring/tests/Messages.py @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import datetime +from random import random from common.proto import monitoring_pb2 from common.proto.kpi_sample_types_pb2 import KpiSampleType @@ -61,7 +62,7 @@ def include_kpi_request(kpi_id): _include_kpi_request = monitoring_pb2.Kpi() _include_kpi_request.kpi_id.kpi_id.uuid = kpi_id.kpi_id.uuid _include_kpi_request.timestamp.timestamp = timestamp_utcnow_to_float() - _include_kpi_request.kpi_value.int32Val = 500 # pylint: disable=maybe-no-member + _include_kpi_request.kpi_value.floatVal = 500*random() # pylint: disable=maybe-no-member return _include_kpi_request def kpi_descriptor_list(): diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py index 17423fb2e..21ac97fb0 100644 --- a/src/monitoring/tests/test_unitary.py +++ b/src/monitoring/tests/test_unitary.py @@ -348,12 +348,15 @@ def test_get_stream_kpi(monitoring_client): # pylint: disable=redefined-outer-na # Test case that makes use of client fixture to test server's GetInstantKpi method def test_get_instant_kpi(monitoring_client): # pylint: disable=redefined-outer-name LOGGER.warning('test_getinstant_kpi begin') - kpi_id = monitoring_client.SetKpi(create_kpi_request_c()) + kpi_id = monitoring_client.SetKpi(KpiId()) monitoring_client.IncludeKpi(include_kpi_request(kpi_id)) + sleep(0.3) response = monitoring_client.GetInstantKpi(kpi_id) - LOGGER.debug(type(response)) + LOGGER.debug(response) assert isinstance(response, Kpi) - + response = monitoring_client.GetInstantKpi(KpiId()) + LOGGER.debug(type(response)) + assert response.kpi_id.kpi_id.uuid == "NoID" def test_managementdb_tools_insert_kpi(management_db): # pylint: disable=redefined-outer-name LOGGER.warning('test_managementdb_tools_insert_kpi begin') _create_kpi_request = create_kpi_request() diff --git a/src/tests/netx22-p4/README.md b/src/tests/netx22-p4/README.md index 51884787d..ddc759f43 100644 --- a/src/tests/netx22-p4/README.md +++ b/src/tests/netx22-p4/README.md @@ -20,23 +20,47 @@ environment as described in Remember to source the scenario settings appropriately, e.g., `cd ~/tfs-ctrl && source my_deploy.sh` in each terminal you open. -Additionally mininet should be installed, we suggest using the mininet packaged in the [Next-Gen SDN Tutorial][https://github.com/opennetworkinglab/ngsdn-tutorial], as it provides an easy way to deploy mininet dockerized and comes with the BMv2Stratum software switch. +Additionally mininet with a p4 switch (bmv2 for example) should be installed, we suggest using the mininet packaged in the [Next-Gen SDN Tutorial][https://github.com/opennetworkinglab/ngsdn-tutorial], as it provides an easy way to deploy mininet dockerized and comes with the BMv2Stratum software switch. -## Test Execution +### Next-Gen SDN Tutorial installation -### Mininet -To execute this functional test, first make sure that mininet is running the correct topology. -If you have used the Next-Gen SDN Tutorial for it, you may add the topology provided in the mininet folder of the ngsdn tutorial and add the following make rule to its Makefile +To install the recommended mininet from the Next-Gen SDN Tutorial follow these steps: + +First of all you should have the following dependencies installed: + +- Docker v1.13.0+ (with docker-compose) +- make +- Python 3 + +Then clone the repo +``` +cd ~ +git clone -b advanced https://github.com/opennetworkinglab/ngsdn-tutorial +``` + +After the repo is downloaded do the following to download the required docker images +``` +cd ~/ngsdn-tutorial +make deps +``` + +Add the following make rule to the ~/ngsdn-tutorial/Makefile ``` start-simple: NGSDN_TOPO_PY := topo-simple.py start-simple: _start ``` -After that run +And copy the topology file from ~/tfs-ctrl/src/tests/netx22-p4/mininet/topo-simple.py to the ~/ngsdn-tutorial/mininet/ directory. + +## Test Execution + +### Mininet +To execute this functional test, first start mininet: ``` make start-simple make mn-cli ``` + You will be prompted with the mininet cli. Run the following and let it run until the end of the experiment ``` client ping server diff --git a/src/webui/service/main/DescriptorTools.py b/src/webui/service/main/DescriptorTools.py index 31bb793d8..094be2f7d 100644 --- a/src/webui/service/main/DescriptorTools.py +++ b/src/webui/service/main/DescriptorTools.py @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import copy -from typing import Dict, List, Optional, Tuple +import copy, json +from typing import Dict, List, Optional, Tuple, Union def get_descriptors_add_contexts(contexts : List[Dict]) -> List[Dict]: contexts_add = copy.deepcopy(contexts) @@ -49,6 +49,16 @@ def get_descriptors_add_slices(slices : List[Dict]) -> List[Dict]: slices_add.append(slice_copy) return slices_add +TypeResourceValue = Union[str, int, bool, float, dict, list] +def format_custom_config_rules(config_rules : List[Dict]) -> List[Dict]: + for config_rule in config_rules: + if 'custom' not in config_rule: continue + custom_resource_value : TypeResourceValue = config_rule['custom']['resource_value'] + if isinstance(custom_resource_value, (dict, list)): + custom_resource_value = json.dumps(custom_resource_value, sort_keys=True, indent=0) + config_rule['custom']['resource_value'] = custom_resource_value + return config_rules + def split_devices_by_rules(devices : List[Dict]) -> Tuple[List[Dict], List[Dict]]: devices_add = [] devices_config = [] diff --git a/src/webui/service/main/routes.py b/src/webui/service/main/routes.py index 80dfb30c2..9b1b08857 100644 --- a/src/webui/service/main/routes.py +++ b/src/webui/service/main/routes.py @@ -21,7 +21,7 @@ from device.client.DeviceClient import DeviceClient from service.client.ServiceClient import ServiceClient from slice.client.SliceClient import SliceClient from webui.service.main.DescriptorTools import ( - get_descriptors_add_contexts, get_descriptors_add_services, get_descriptors_add_slices, + format_custom_config_rules, get_descriptors_add_contexts, get_descriptors_add_services, get_descriptors_add_slices, get_descriptors_add_topologies, split_devices_by_rules) from webui.service.main.forms import ContextForm, DescriptorForm @@ -84,6 +84,23 @@ def process_descriptors(descriptors): slices = descriptors.get('slices' , []) connections = descriptors.get('connections', []) + # Format CustomConfigRules in Devices, Services and Slices provided in JSON format + for device in devices: + config_rules = device.get('device_config', {}).get('config_rules', []) + config_rules = format_custom_config_rules(config_rules) + device['device_config']['config_rules'] = config_rules + + for service in services: + config_rules = service.get('service_config', {}).get('config_rules', []) + config_rules = format_custom_config_rules(config_rules) + service['service_config']['config_rules'] = config_rules + + for slice in slices: + config_rules = slice.get('slice_config', {}).get('config_rules', []) + config_rules = format_custom_config_rules(config_rules) + slice['slice_config']['config_rules'] = config_rules + + # Context and Topology require to create the entity first, and add devices, links, services, slices, etc. in a # second stage. contexts_add = get_descriptors_add_contexts(contexts) diff --git a/src/webui/service/templates/service/detail.html b/src/webui/service/templates/service/detail.html index 94581019e..975369ca2 100644 --- a/src/webui/service/templates/service/detail.html +++ b/src/webui/service/templates/service/detail.html @@ -32,14 +32,13 @@ Update - -
--> +
--> +
-
diff --git a/tutorial/1-0-deployment.md b/tutorial/1-0-deployment.md index 6d56808da..6aa46aab7 100644 --- a/tutorial/1-0-deployment.md +++ b/tutorial/1-0-deployment.md @@ -1,8 +1,10 @@ # 1. Deployment Guide -This section walks you through the process of deploying TeraFlowSDN on top of a Virtual Machine (VM) running MicroK8s -Kubernetes platform. The guide includes the details on configuring and installing the VM, installing and configuring -MicroK8s, and deploying and reporting the status of the TeraFlowSDN controller. +This section walks you through the process of deploying TeraFlowSDN on top of a Virtual +Machine (VM) running [MicroK8s Kubernetes platform](https://microk8s.io). +The guide includes the details on configuring and installing the VM, installing and +configuring MicroK8s, and deploying and reporting the status of the TeraFlowSDN +controller. ## Table of Content: - [1.1. Create VM for the TeraFlowSDN controller](./1-1-create-vm.md) diff --git a/tutorial/1-1-1-create-vm-oracle-virtualbox.md b/tutorial/1-1-1-create-vm-oracle-virtualbox.md index ea0da6cab..0a074d56a 100644 --- a/tutorial/1-1-1-create-vm-oracle-virtualbox.md +++ b/tutorial/1-1-1-create-vm-oracle-virtualbox.md @@ -1,14 +1,15 @@ ## 1.1.1. Oracle VirtualBox ### 1.1.1.1. Create a NAT Network in VirtualBox -In "Oracle VM VirtualBox Manager", Menu "File > Preferences... > Network", create a NAT network with the following -specifications: +In "Oracle VM VirtualBox Manager", Menu "File > Preferences... > Network", create a NAT +network with the following specifications: |Name |CIDR |DHCP |IPv6 | |-----------|-----------|--------|--------| |TFS-NAT-Net|10.0.2.0/24|Disabled|Disabled| -Within the newly created "TFS-NAT-Net" NAT network, configure the following IPv4 forwarding rules: +Within the newly created "TFS-NAT-Net" NAT network, configure the following IPv4 +forwarding rules: |Name|Protocol|Host IP |Host Port|Guest IP |Guest Port| |----|--------|---------|---------|---------|----------| @@ -36,8 +37,9 @@ __Note__: IP address 10.0.2.10 is the one that will be assigned to the VM. __Note__: (*) settings to be editing after the VM is created. ### 1.1.1.3. Install Ubuntu 20.04 LTS Operating System -In "Oracle VM VirtualBox Manager", start the VM in normal mode, and follow the installation procedure. Below we provide -some installation guidelines: +In "Oracle VM VirtualBox Manager", start the VM in normal mode, and follow the +installation procedure. +Below we provide some installation guidelines: - Installation Language: English - Autodetect your keyboard - Configure static network specifications: @@ -73,9 +75,10 @@ sudo apt-get dist-upgrade -y ``` ## 1.1.1.5. Install VirtualBox Guest Additions -On VirtualBox Manager, open the VM main screen. If you are running the VM in headless mode, right click over the VM in -the VirtualBox Manager window and click "Show". If a dialog informing about how to leave the interface of the VM is -hown, confirm pressing "Switch" button. The interface of the VM should appear. +On VirtualBox Manager, open the VM main screen. If you are running the VM in headless +mode, right click over the VM in the VirtualBox Manager window and click "Show". +If a dialog informing about how to leave the interface of the VM is shown, confirm +pressing "Switch" button. The interface of the VM should appear. Click menu "Device > Insert Guest Additions CD image..." diff --git a/tutorial/1-1-create-vm.md b/tutorial/1-1-create-vm.md index ce74e6dc6..6ebed2f19 100644 --- a/tutorial/1-1-create-vm.md +++ b/tutorial/1-1-create-vm.md @@ -1,12 +1,16 @@ # 1.1. Create VM for the TeraFlowSDN controller -In this section, we install a VM to be used as the deployment, execution, and development environment for the ETSI -TeraFlowSDN controller. If you already have a remote physical server fitting the requirements specified in this section -feel free to use it instead of deploying a local VM. Other virtualization environments can also be used; in that case, -you will need to adapt these instructions to your particular case. +In this section, we install a VM to be used as the deployment, execution, and +development environment for the ETSI TeraFlowSDN controller. +If you already have a remote physical server fitting the requirements specified in this +section feel free to use it instead of deploying a local VM. +Other virtualization environments can also be used; in that case, you will need to adapt +these instructions to your particular case. -Different Hypervisors are considered for that. Check the table of contents for available options. If you want to -contribute with other Hypervisors, [contact](./README.md#contact) the TFS team through Slack. +Different Hypervisors are considered for that. +Check the table of contents for available options. +If you want to contribute with other Hypervisors, [contact](./README.md#contact) the TFS +team through Slack. ## Table of Content: - [1.1.1. Oracle VirtualBox](./1-1-1-create-vm-oracle-virtualbox.md) diff --git a/tutorial/1-3-deploy-tfs.md b/tutorial/1-3-deploy-tfs.md index 9b2da4fc1..ffd9dfe49 100644 --- a/tutorial/1-3-deploy-tfs.md +++ b/tutorial/1-3-deploy-tfs.md @@ -1,7 +1,7 @@ # 1.3. Deploy TeraFlowSDN over MicroK8s -This section describes how to deploy TeraFlowSDN controller on top of MicroK8s using the environment configured in the -previous sections. +This section describes how to deploy TeraFlowSDN controller on top of MicroK8s using the +environment configured in the previous sections. ## 1.3.1. Install prerequisites @@ -11,52 +11,42 @@ sudo apt-get install -y git curl jq ## 1.3.2. Clone the Git repository of the TeraFlowSDN controller -__Important__: Right now, we have two repositories hosting the code of TeraFlowSDN: GitLab.com and ETSI owned GitLab - repository. Nowadays, only GitLab.com repository accepts code contributions that are periodically - mirrored to ETSI labs. In the near future, we plan to swap the repository roles and new contributions - will be accepted only at ETSI labs, while GitLab.com will probably be kept as a mirror of ETSI. If you - plan to contribute code to the TeraFlowSDN controller, by now, clone from GitLab.com. We will update the - tutorial as soon as roles of repositories are swapped. - -Clone from GitLab (if you want to contribute code to TeraFlowSDN): -```bash -mkdir ~/tfs-ctrl -git clone https://gitlab.com/teraflow-h2020/controller.git ~/tfs-ctrl -``` - -Clone from ETSI owned GitLab (if you do not plan to contribute code): +Clone from ETSI-hosted GitLab code repository: ```bash mkdir ~/tfs-ctrl git clone https://labs.etsi.org/rep/tfs/controller.git ~/tfs-ctrl ``` +__Important__: The original H2020-TeraFlow project hosted on GitLab.com has been +archieved and will not receive further contributions/updates. +Please, clone from [ETSI-hosted GitLab code repository](https://labs.etsi.org/rep/tfs/controller). + ## 1.3.3. Checkout the appropriate Git branch -By default 'master' branch is checked out. If you want to deploy 'develop' that incorporates the most up-to-date code +By default the *master* branch is checked out. +If you want to deploy the *develop* branch, that incorporates the most up-to-date code contributions and features, run the following command: ```bash cd ~/tfs-ctrl git checkout develop ``` -__Important__: During the elaboration and validation of the tutorials, you should checkout branch - "feat/microk8s-deployment". Otherwise, you will not have important files such as "my_deploy.sh" or - "deploy.sh". As soon as the tutorials are completed and approved, we will remove this note and merge the - "feat/microk8s-deployment" into "develop" and later into "master", and then the previous step will be - effective. - ## 1.3.4. Prepare a deployment script with the deployment settings -Create a new deployment script, e.g., `my_deploy.sh`, adding the appropriate settings as follows. This script, by -default, makes use of the private Docker registry enabled in MicroK8s, as specified in `TFS_REGISTRY_IMAGE`. It builds -the Docker images for the subset of components defined in `TFS_COMPONENTS`, tags them with the tag defined in -`TFS_IMAGE_TAG`, deploys them in the namespace defined in `TFS_K8S_NAMESPACE`, and (optionally) deploys the extra -Kubernetes manifests listed in `TFS_EXTRA_MANIFESTS`. Besides, it lets you specify in `TFS_GRAFANA_PASSWORD` the -password to be set for the Grafana `admin` user. +Create a new deployment script, e.g., `my_deploy.sh`, adding the appropriate settings as +follows. +This script, by default, makes use of the private Docker registry enabled in MicroK8s, +as specified in `TFS_REGISTRY_IMAGE`. +It builds the Docker images for the subset of components defined in `TFS_COMPONENTS`, +tags them with the tag defined in `TFS_IMAGE_TAG`, deploys them in the namespace defined +in `TFS_K8S_NAMESPACE`, and (optionally) deploys the extra Kubernetes manifests listed +in `TFS_EXTRA_MANIFESTS`. +Besides, it lets you specify in `TFS_GRAFANA_PASSWORD` the password to be set for the +Grafana `admin` user. ```bash cd ~/tfs-ctrl -tee my_deploy.sh >/dev/null </dev/null << EOF export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/" export TFS_COMPONENTS="context device automation pathcomp service slice compute monitoring webui" export TFS_IMAGE_TAG="dev" @@ -68,10 +58,12 @@ EOF ## 1.3.5. Deploy TFS controller -First, source the deployment settings defined in the previous section. This way, you do not need to specify the -environment variables in each and every command you execute to operate the TFS controller. Be aware to re-source the -file if you open new terminal sessions. -Then, run the following command to deploy TeraFlowSDN controller on top of the MicroK8s Kubernetes platform. +First, source the deployment settings defined in the previous section. +This way, you do not need to specify the environment variables in each and every command +you execute to operate the TFS controller. +Be aware to re-source the file if you open new terminal sessions. +Then, run the following command to deploy TeraFlowSDN controller on top of the MicroK8s +Kubernetes platform. ```bash cd ~/tfs-ctrl @@ -79,16 +71,14 @@ source my_deploy.sh ./deploy.sh ``` -The script does the following steps: -1. Build the Docker images for the components defined in `TFS_COMPONENTS` -2. Tag the Docker images with the value of `TFS_IMAGE_TAG` -3. Push the Docker images to the repository defined in `TFS_REGISTRY_IMAGE` -4. Create the namespace defined in `TFS_K8S_NAMESPACE` -5. Deploy the components defined in `TFS_COMPONENTS` -6. Create the file `tfs_runtime_env_vars.sh` with the environment variables for the components defined in - `TFS_COMPONENTS` defining their local host addresses and their port numbers. -7. Create an ingress controller listening at port 80 for HTTP connections to enable external access to the TeraFlowSDN - WebUI, Grafana Dashboards, Context Debug endpoints, and Compute NBI interfaces. +The script performs the following steps: +1. Builds the Docker images for the components defined in `TFS_COMPONENTS` +2. Tags the Docker images with the value of `TFS_IMAGE_TAG` +3. Pushes the Docker images to the repository defined in `TFS_REGISTRY_IMAGE` +4. Creates the namespace defined in `TFS_K8S_NAMESPACE` +5. Deploys the components defined in `TFS_COMPONENTS` +6. Creates the file `tfs_runtime_env_vars.sh` with the environment variables for the components defined in `TFS_COMPONENTS` defining their local host addresses and their port numbers. +7. Create an ingress controller listening at port 80 for HTTP connections to enable external access to the TeraFlowSDN WebUI, Grafana Dashboards, Context Debug endpoints, and Compute NBI interfaces. 8. Initialize and configure the Grafana dashboards 9. Report a summary of the deployment (see [1.5. Show Deployment and Log per Component](./1-5-deploy-logs-troubleshooting.md)) diff --git a/tutorial/1-4-access-webui.md b/tutorial/1-4-access-webui.md index 7769669e3..aa66ef190 100644 --- a/tutorial/1-4-access-webui.md +++ b/tutorial/1-4-access-webui.md @@ -1,18 +1,26 @@ # 1.4. Access TeraFlowSDN WebUI and Grafana Dashboards -This section describes how to get access to the TeraFlowSDN controller WebUI and the monitoring Grafana dashboards. +This section describes how to get access to the TeraFlowSDN controller WebUI and the +monitoring Grafana dashboards. ## 1.4.1. Access the TeraFlowSDN WebUI -If you followed the installation steps based on MicroK8s, you got an ingress controller installed that exposes on TCP -port 80. In the creation of the VM, a forward from local TCP port 8080 to VM's TCP port 80 is configured, so the WebUIs -and REST APIs of TeraFlowSDN should be exposed on endpoint `127.0.0.1:8080`. -Besides, the ingress controller defines the following reverse proxy paths: +If you followed the installation steps based on MicroK8s, you got an ingress controller +installed that exposes on TCP port 80. +In the creation of the VM, a forward from local TCP port 8080 to VM's TCP port 80 is +configured, so the WebUIs and REST APIs of TeraFlowSDN should be exposed on the endpoint +`127.0.0.1:8080` of your local machine. +Besides, the ingress controller defines the following reverse proxy paths +(on your local machine): - `http://127.0.0.1:8080/webui`: points to the WebUI of TeraFlowSDN. -- `http://127.0.0.1:8080/grafana`: points to the Grafana dashboards. This endpoint brings access to the monitoring - dashboards of TeraFlowSDN. The credentials for the `admin`user are those defined in the `my_deploy.sh` script, in the - `TFS_GRAFANA_PASSWORD` variable. -- `http://127.0.0.1:8080/context`: points to the REST API exposed by the TeraFlowSDN Context component. This endpoint - is mainly used for debugging purposes. Note that this endpoint is designed to be accessed from the WebUI. -- `http://127.0.0.1:8080/restconf`: points to the Compute component NBI based on RestCONF. This endpoint enables - connecting external software, such as ETSI OpenSourceMANO NFV Orchestrator, to TeraFlowSDN. +- `http://127.0.0.1:8080/grafana`: points to the Grafana dashboards. + This endpoint brings access to the monitoring dashboards of TeraFlowSDN. + The credentials for the `admin`user are those defined in the `my_deploy.sh` script, in + the `TFS_GRAFANA_PASSWORD` variable. +- `http://127.0.0.1:8080/context`: points to the REST API exposed by the TeraFlowSDN + Context component. + This endpoint is mainly used for debugging purposes. + Note that this endpoint is designed to be accessed from the WebUI. +- `http://127.0.0.1:8080/restconf`: points to the Compute component NBI based on RestCONF. + This endpoint enables connecting external software, such as ETSI OpenSourceMANO NFV + Orchestrator, to TeraFlowSDN. diff --git a/tutorial/1-5-deploy-logs-troubleshooting.md b/tutorial/1-5-deploy-logs-troubleshooting.md index ce16a279c..3aa7acaee 100644 --- a/tutorial/1-5-deploy-logs-troubleshooting.md +++ b/tutorial/1-5-deploy-logs-troubleshooting.md @@ -1,30 +1,33 @@ # 1.5. Show Deployment and Log per Component -This section presents some helper scripts to inspect the status of the deployment and the logs of the components. These -scripts are particularly helpful for troubleshooting during execution of experiments, development, and debugging. +This section presents some helper scripts to inspect the status of the deployment and +the logs of the components. +These scripts are particularly helpful for troubleshooting during execution of +experiments, development, and debugging. ## 1.5.1. Report the deployment of the TFS controller The summary report given at the end of the [Deploy TFS controller](./1-3-deploy-tfs.md#135-deploy-tfs-controller) -procedure can be generated manually at any time by running the following command. You can avoid sourcing `my_deploy.sh` -if it has been already done. +procedure can be generated manually at any time by running the following command. +You can avoid sourcing `my_deploy.sh` if it has been already done. ```bash cd ~/tfs-ctrl source my_deploy.sh ./show_deploy.sh ``` -Use this script to validate that all the pods, deployments, replica sets, ingress controller, etc. are ready and have -the appropriate state, e.g., "running" for Pods, and the services are deployed and have appropriate IP addresses and -port numbers. +Use this script to validate that all the pods, deployments, replica sets, ingress +controller, etc. are ready and have the appropriate state, e.g., *running* for Pods, and +the services are deployed and have appropriate IP addresses and port numbers. ## 1.5.2. Report the log of a specific TFS controller component -A number of scripts are pre-created in the `scripts` folder to facilitate the inspection of the component logs. For -instance, to dump the log of the Context component, run the following command. You can avoid sourcing `my_deploy.sh` -if it has been already done. +A number of scripts are pre-created in the `scripts` folder to facilitate the inspection +of the component logs. +For instance, to dump the log of the Context component, run the following command. +You can avoid sourcing `my_deploy.sh` if it has been already done. ```bash source my_deploy.sh diff --git a/tutorial/2-0-run-experiments.md b/tutorial/2-0-run-experiments.md index 82f6a56bf..8b5c8f6b8 100644 --- a/tutorial/2-0-run-experiments.md +++ b/tutorial/2-0-run-experiments.md @@ -1,12 +1,19 @@ -# 2. Run Experiments Guide (WORK IN PROGRESS) +# 2. Run Experiments Guide -This section walks you through the process of running experiments in TeraFlowSDN on top of a Oracle VirtualBox-based VM -running MicroK8s Kubernetes platform. The guide includes the details on configuring the Python environment, some basic +This section walks you through the process of running experiments in TeraFlowSDN on top +of a Oracle VirtualBox-based VM running MicroK8s Kubernetes platform. +The guide includes the details on configuring the Python environment, some basic commands you might need, configuring the network topology, and executing different experiments. +Note that the steps followed here are likely to work regardless of the platform (VM) +where TeraFlowSDN is deployed over. + +Note also that this guide will keep growing with the new experiments and demonstrations +that are being carried out involving the ETSI TeraFlowSDN controller. + ## Table of Content: - [2.1. Configure the Python environment](./2-1-python-environment.md) - [2.2. OFC'22 Demo - Bootstrap devices, Monitor device Endpoints, Manage L3VPN Services](./2-2-ofc22.md) -- [2.3. OECC/PSC'22 Demo (WORK IN PROGRESS)](./2-3-oeccpsc22.md) -- [2.4. ECOC'22 Demo - Disjoint DC-2-DC L3VPN Service (WORK IN PROGRESS)](./2-4-ecoc22.md) +- [2.3. OECC/PSC'22 Demo (PENDING)](./2-3-oeccpsc22.md) +- [2.4. ECOC'22 Demo - Disjoint DC-2-DC L2VPN Service](./2-4-ecoc22.md) - [2.5. NFV-SDN'22 Demo (PENDING)](./2-5-nfvsdn22.md) diff --git a/tutorial/2-4-ecoc22.md b/tutorial/2-4-ecoc22.md index 6fc9333b5..87bc12be7 100644 --- a/tutorial/2-4-ecoc22.md +++ b/tutorial/2-4-ecoc22.md @@ -1,120 +1,132 @@ -# 2.4. ECOC'22 Demo - Disjoint DC-2-DC L3VPN Service (WORK IN PROGRESS) +# 2.4. ECOC'22 Demo - Disjoint DC-2-DC L2VPN Service -This functional test reproduces the experimental assessment of "Experimental Demonstration of Transport Network Slicing -with SLA Using the TeraFlowSDN Controller" presented at [ECOC'22](https://www.ecoc2022.org/). +This functional test reproduces the experimental assessment of *Experimental +Demonstration of Transport Network Slicing with SLA Using the TeraFlowSDN Controller* +presented at [ECOC'22](https://www.optica.org/en-us/events/topical_meetings/ecoc/schedule/?day=Tuesday#Tuesday). ## 2.4.1. Functional test folder -This functional test can be found in folder `./src/tests/ecoc22/`. A convenience alias `./ecoc22/` pointing to that -folder has been defined. +This functional test can be found in folder `./src/tests/ecoc22/`. +A convenience alias `./ecoc22/` pointing to that folder has been defined. ## 2.4.2. Execute with real devices -This functional test has only been tested with emulated devices; however, if you have access to real devices, you can -modify the files `./ecoc22/tests/Objects.py` and `./ecoc22/tests/Credentials.py` to point to your devices, and map to -your network topology. -Otherwise, you can modify the `./ecoc22/tests/descriptors_emulated.json` that is designed to be uploaded through the -WebUI instead of using the command line scripts. +This functional test has only been tested with emulated devices; +however, if you have access to real devices, you can modify the files +`./ecoc22/tests/Objects.py` and `./ecoc22/tests/Credentials.py` to point to your devices, +and map to your network topology. +Otherwise, you can modify the `./ecoc22/tests/descriptors_emulated.json` that is +designed to be uploaded through the WebUI instead of using the command line scripts. -__Important__: The device drivers operating with real devices, e.g., OpenConfigDriver, P4Driver, and TransportApiDriver, - have to be considered as experimental. The configuration and monitoring capabilities they support are +__Important__: The device drivers operating with real devices, e.g., OpenConfigDriver, + P4Driver, and TransportApiDriver, have to be considered as experimental. + The configuration and monitoring capabilities they support are limited or partially implemented/tested. Use them with care. ## 2.4.3. Deployment and Dependencies -To run this functional test, it is assumed you have deployed a MicroK8s-based Kubernetes environment and a TeraFlowSDN -controller instance as described in the [Tutorial: Deployment Guide](./1-0-deployment.md), and you configured the Python +To run this functional test, it is assumed you have deployed a MicroK8s-based Kubernetes +environment and a TeraFlowSDN controller instance as described in the +[Tutorial: Deployment Guide](./1-0-deployment.md), and you configured the Python environment as described in [Tutorial: Run Experiments Guide > 2.1. Configure Python Environment](./2-1-python-environment.md). -Remember to source the scenario settings appropriately, e.g., `cd ~/tfs-ctrl && source my_deploy.sh` in each terminal -you open. -Next, remember to source the environment variables created by the deployment, e.g., -`cd ~/tfs-ctrl && source tfs_runtime_env_vars.sh`. +Remember to source the scenario settings, e.g., `cd ~/tfs-ctrl && source ecoc22/deploy_specs.sh` +in each terminal you open. Then, re-build the protocol buffers code from the proto files: `./proto/generate_code_python.sh` -## 2.4.4. Access to the WebUI and Dashboard +## 2.4.4. Access to the WebUI -When the deployment completes, you can connect to the TeraFlowSDN WebUI and Dashboards as described in +When the deployment completes, you can connect to the TeraFlowSDN WebUI as described in [Tutorial: Deployment Guide > 1.4. Access TeraFlowSDN WebUI and Grafana Dashboards](./1-4-access-webui.md) Notes: -- the default credentials for the Grafana Dashboiard is user/pass: `admin`/`admin123+`. -- this functional test does not involve the Monitoring component, so no monitoring data is plotted in Grafana. +- this experiment does not make use of Monitoring, so Grafana is not used. +- the default credentials for the Grafana Dashboard is user/pass: `admin`/`admin123+`. +- this functional test does not involve the Monitoring component, so no monitoring + data is plotted in Grafana. ## 2.4.5. Test execution To execute this functional test, four main steps needs to be carried out: 1. Device bootstrapping -2. L3VPN Service creation -3. L3VPN Service removal +2. L2VPN Slice and Services creation +3. L2VPN Slice and Services removal 4. Cleanup -Upon the execution of each test progresses, a report will be generated indicating PASSED / FAILED / SKIPPED. If there -is some error during the execution, you should see a detailed report on the error. See the troubleshooting section if -needed. +Upon the execution of each test progresses, a report will be generated indicating +*PASSED* / *FAILED* / *SKIPPED*. +If there is some error during the execution, you should see a detailed report on the +error. +See the troubleshooting section if needed. -You can check the logs of the different components using the appropriate `scripts/show_logs_[component].sh` scripts -after you execute each step. +You can check the logs of the different components using the appropriate +`scripts/show_logs_[component].sh` scripts after you execute each step. ### 2.4.5.1. Device bootstrapping -This step configures some basic entities (Context and Topology), the devices, and the links in the topology. The -expected results are: +This step configures some basic entities (Context and Topology), the devices, and the +links in the topology. +The expected results are: - The devices to be added into the Topology. -- The devices to be pre-configured and initialized as ENABLED by the Automation component. -- The monitoring for the device ports (named as endpoints in TeraFlowSDN) to be activated and data collection to - automatically start. +- The devices to be pre-configured and initialized as *ENABLED* by the Automation component. - The links to be added to the topology. -To run this step, you can do it from the WebUI by uploading the file `./ecoc22/tests/descriptors_emulated.json` that -contains the descriptors of the contexts, topologies, devices, and links, or by executing the -`./ecoc22/run_test_01_bootstrap.sh` script. +To run this step, you can do it from the WebUI by uploading the file +`./ecoc22/tests/descriptors_emulated.json` that contains the descriptors of the contexts, +topologies, devices, and links, or by executing the `./ecoc22/run_test_01_bootstrap.sh` script. -When the bootstrapping finishes, check in the Grafana L3-Monitoring Dashboard and you should see the monitoring data -being plotted and updated every 5 seconds (by default). Given that there is no service configured, you should see a -0-valued flat plot. +In the WebUI, select the *admin* Context. +Then, in the *Devices* tab you should see that 5 different emulated devices have been +created and activated: 4 packet routers, and 1 optical Open Line System (OLS) controller. +Besides, in the *Services* tab you should see that there is no service created. -In the WebUI, select the "admin" Context. Then, in the "Devices" tab you should see that 5 different emulated devices -have been created and activated: 4 packet routers, and 1 optical line system controller. Besides, in the "Services" tab -you should see that there is no service created. Note here that the emulated devices produce synthetic -randomly-generated data and do not care about the services configured. +### 2.4.5.2. L2VPN Slice and Services creation -### 2.4.5.2. L3VPN Service creation - -This step configures a new service emulating the request an OSM WIM would make by means of a Mock OSM instance. +This step configures a new service emulating the request an OSM WIM would make by means +of a Mock OSM instance. To run this step, execute the `./ecoc22/run_test_02_create_service.sh` script. -When the script finishes, check the WebUI "Services" tab. You should see that two services have been created, one for -the optical layer and another for the packet layer. Besides, you can check the "Devices" tab to see the configuration -rules that have been configured in each device. In the Grafana Dashboard, given that there is now a service configured, -you should see the plots with the monitored data for the device. By default, device R1-EMU is selected. +When the script finishes, check the WebUI *Slices* and *Services* tab. +You should see that, for the connectivity service requested by MockOSM, one slice has +been created, three services have been created (two for the optical layer and another +for the packet layer). +Note that the two services for the optical layer correspond to the primary (service_uuid +ending with ":0") and the backup (service_uuid ending with ":1") services. +Each of the services indicates the connections and sub-services that are supporting them. +Besides, you can check the *Devices* tab to see the configuration rules that have been +configured in each device. -### 2.4.5.3. L3VPN Service removal +### 2.4.5.3. L2VPN Slice and Services removal -This step deconfigures the previously created services emulating the request an OSM WIM would make by means of a Mock -OSM instance. +This step deconfigures the previously created slices and services emulating the request +an OSM WIM would make by means of a Mock OSM instance. -To run this step, execute the `./ecoc22/run_test_03_delete_service.sh` script, or delete the L3NM service from the WebUI. +To run this step, execute the `./ecoc22/run_test_03_delete_service.sh` script, or delete +the slice from the WebUI. -When the script finishes, check the WebUI "Services" tab. You should see that the two services have been removed. -Besides, in the "Devices" tab you can see that the appropriate configuration rules have been deconfigured. In the -Grafana Dashboard, given that there is no service configured, you should see a 0-valued flat plot again. +When the script finishes, check the WebUI *Slices* and *Services* tab. You should see +that the slice and the services have been removed. +Besides, in the *Devices* tab you can see that the appropriate configuration rules have +been deconfigured. ### 2.4.5.4. Cleanup -This last step performs a cleanup of the scenario removing all the TeraFlowSDN entities for completeness. +This last step performs a cleanup of the scenario removing all the TeraFlowSDN entities +for completeness. To run this step, execute the `./ecoc22/run_test_04_cleanup.sh` script. -When the script finishes, check the WebUI "Devices" tab, you should see that the devices have been removed. Besides, in -the "Services" tab you can see that the "admin" Context has no services given that that context has been removed. +When the script finishes, check the WebUI *Devices* tab, you should see that the devices +have been removed. +Besides, in the *Slices* and *Services* tab you can see that the *admin* Context has no services +given that that context has been removed. diff --git a/tutorial/3-0-development.md b/tutorial/3-0-development.md index c2b13315a..05e03ef8f 100644 --- a/tutorial/3-0-development.md +++ b/tutorial/3-0-development.md @@ -1,10 +1,18 @@ # 3. Development Guide (WORK IN PROGRESS) -This section walks you through the process of developing new components for the TeraFlowSDN controller. For convenience, -this guide assumes you are using the Oracle VirtualBox-based VM running MicroK8s Kubernetes platform as described in the -[Deployment Guide](./1-0-deployment.md). The guide includes the details on +This section walks you through the process of developing new components for +the TeraFlowSDN controller. +In particular, the guide includes the details on how to configure VSCode IDE, +develop a new component, and debug individual components. + +For convenience, this guide assumes you are using the Oracle VirtualBox-based +VM running MicroK8s Kubernetes platform as described in the +[Deployment Guide](./1-0-deployment.md). +BEsides, it assumes you installed the appropriate Python and PyEnv as +described in [2.1. Configure Python Environment](./2-1-python-environment.md). ## Table of Content: - [3.1. Configure VSCode and Connect to the VM](./3-1-configure-vscode.md) -- [3.2. Development Commands, Tricks, and Hints (WORK IN PROGRESS)](./3-2-develop-cth.md) -- [3.3. Debugging individual components in VSCode](./3.3-debug-comp.md) +- [3.2. Developing a new component: Forecaster (WORK IN PROGRESS)](./3-2-develop-new-component.md) +- [3.3. Debugging individual components in VSCode](./3-3-debug-comp.md) +- [3.4. Development Commands, Tricks, and Hints (WORK IN PROGRESS)](./3-4-develop-cth.md) diff --git a/tutorial/3-1-configure-vscode.md b/tutorial/3-1-configure-vscode.md index 10493ce22..e7dbf3a6a 100644 --- a/tutorial/3-1-configure-vscode.md +++ b/tutorial/3-1-configure-vscode.md @@ -88,5 +88,11 @@ This step installs Python extensions in VSCode server running in the VM. - In VSCode (connected to the VM), click left button "Explorer" - Click "Ctrl+Alt+P" and type "Python: Select Interpreter". Select option "Python: 3.9.13 64-bit ('tfs')" -in terminal: set python path to be used by VSCode: -`echo "PYTHONPATH=./src" > ~/tfs-ctrl/.env` + +## 3.1.6. Define environment variables for VSCode +The source code in the TFS controller project is hosted in folder `src/`. To help VSCode find the Python modules and +packages, add the following file into your working space root folder: + +```bash +echo "PYTHONPATH=./src" >> ~/tfs-ctrl/.env +``` diff --git a/tutorial/README.md b/tutorial/README.md index 836434e51..f2fb3a219 100644 --- a/tutorial/README.md +++ b/tutorial/README.md @@ -2,22 +2,26 @@ ## Abstract -This document provides a walkthrough on how to prepare your environment for executing and contributing to the -[ETSI TeraFlowSDN OSG](https://tfs.etsi.org/). +This document provides a walkthrough on how to prepare your environment for executing +and contributing to the [ETSI TeraFlowSDN OSG](https://tfs.etsi.org/). -This walkthrough makes some reasonable assumptions to simplify the deployment of the ETSI TeraFlowSDN controller, the -execution of experiments and tests, and development of new contributions. In particular, we assume: +This walkthrough makes some reasonable assumptions to simplify the deployment of the +ETSI TeraFlowSDN controller, the execution of experiments and tests, and development of +new contributions. +In particular, we assume: - [VirtualBox](https://www.virtualbox.org/) version 6.1.34 r150636 -- [VSCode](https://code.visualstudio.com/) with the "Remote SSH" extension +- [VSCode](https://code.visualstudio.com/) with the + [*Remote SSH*](https://code.visualstudio.com/docs/remote/ssh) extension - VM software: - [Ubuntu Server 20.04 LTS](https://releases.ubuntu.com/20.04/) - [MicroK8s](https://microk8s.io/) ## Contact -If your environment does not fit with the proposed assumptions and you experience some trouble preparing it to work -with the ETSI TeraFlowSDN controller, contact the ETSI TeraFlowSDN OSG team through +If your environment does not fit with the proposed assumptions and you experience issues +preparing it to work with the ETSI TeraFlowSDN controller, contact the ETSI TeraFlowSDN +OSG team through [Slack](https://join.slack.com/t/teraflowsdn/shared_invite/zt-18gc5jvkh-1_DEZHFhxeuOqzJZPq~U~A) @@ -28,12 +32,14 @@ with the ETSI TeraFlowSDN controller, contact the ETSI TeraFlowSDN OSG team thro - [1.3. Deploy TeraFlowSDN over MicroK8s](./1-3-deploy-tfs.md) - [1.4. Access TeraFlowSDN WebUI and Grafana Dashboards](./1-4-access-webui.md) - [1.5. Show Deployment and Log per Component](./1-5-deploy-logs-troubleshooting.md) -- [2. Run Experiments Guide (WORK IN PROGRESS)](./2-0-run-experiments.md) +- [2. Run Experiments Guide](./2-0-run-experiments.md) - [2.1. Configure the Python environment](./2-1-python-environment.md) - [2.2. OFC'22 Demo - Bootstrap devices, Monitor device Endpoints, Manage L3VPN Services](./2-2-ofc22.md) - - [2.3. OECC/PSC'22 Demo (WORK IN PROGRESS)](./2-3-oeccpsc22.md) - - [2.4. ECOC'22 Demo (PENDING)](./2-4-ecoc22.md) + - [2.3. OECC/PSC'22 Demo (PENDING)](./2-3-oeccpsc22.md) + - [2.4. ECOC'22 Demo - Disjoint DC-2-DC L2VPN Service](./2-4-ecoc22.md) - [2.5. NFV-SDN'22 Demo (PENDING)](./2-5-nfvsdn22.md) - [3. Development Guide (WORK IN PROGRESS)](./3-0-development.md) - [3.1. Configure VSCode and Connect to the VM](./3-1-configure-vscode.md) - - [3.2. Development Commands, Tricks, and Hints (WORK IN PROGRESS)](./3-2-develop-cth.md) + - [3.2. Developing a new component: Forecaster (WORK IN PROGRESS)](./3-4-develop-new-component.md) + - [3.3. Debugging individual components in VSCode](./3-3-debug-comp.md) + - [3.4. Development Commands, Tricks, and Hints (WORK IN PROGRESS)](./3-2-develop-cth.md) -- GitLab