Commit 39b6e0c8 authored by francisco.moreno.external@atos.net's avatar francisco.moreno.external@atos.net
Browse files

Added delete rpcs to monitoring.proto

parent e2c60f70

proto/monitoring.proto

+2 −0
Original line number Diff line number Diff line
@@ -31,12 +31,14 @@ service MonitoringService { 
  rpc SubscribeKpi          (SubsDescriptor     ) returns (stream KpiList      ) {}

  rpc GetSubsDescriptor     (SubscriptionID     ) returns (SubsDescriptor      ) {}

  rpc GetSubscriptions      (context.Empty      ) returns (SubsIDList          ) {}

  rpc DeleteSubscription    (SubscriptionID     ) returns (context.Empty       ) {}

  rpc EditKpiSubscription   (SubsDescriptor     ) returns (context.Empty       ) {}

  rpc CreateKpiAlarm        (AlarmDescriptor    ) returns (AlarmID             ) {}

  rpc EditKpiAlarm          (AlarmDescriptor    ) returns (context.Empty       ) {}

  rpc GetAlarms             (context.Empty      ) returns (AlarmIDList         ) {}

  rpc GetAlarmDescriptor    (AlarmID            ) returns (AlarmDescriptor     ) {}

  rpc GetAlarmResponseStream(AlarmSubscription  ) returns (stream AlarmResponse) {}

  rpc DeleteAlarm           (AlarmID            ) returns (context.Empty       ) {}

  rpc GetStreamKpi          (KpiId              ) returns (stream Kpi          ) {}

  rpc GetInstantKpi         (KpiId              ) returns (KpiList             ) {}

}

src/monitoring/client/MonitoringClient.py

+13 −0
Original line number Diff line number Diff line
@@ -134,6 +134,13 @@ class MonitoringClient: 
        LOGGER.debug('GetSubscriptions result: {:s}'.format(grpc_message_to_json_string(response)))

        return response



    @RETRY_DECORATOR

    def DeleteSubscription(self, request : SubscriptionID) -> Empty:

        LOGGER.debug('DeleteSubscription: {:s}'.format(grpc_message_to_json_string(request)))

        response = self.stub.DeleteSubscription(request)

        LOGGER.debug('DeleteSubscription result: {:s}'.format(grpc_message_to_json_string(response)))

        return response



    @RETRY_DECORATOR

    def EditKpiSubscription(self, request : SubsDescriptor) -> Empty:

        LOGGER.debug('EditKpiSubscription: {:s}'.format(grpc_message_to_json_string(request)))
@@ -174,6 +181,12 @@ class MonitoringClient: 
        LOGGER.debug('GetAlarmResponseStream result: {:s}'.format(grpc_message_to_json_string(response)))

        return response



    def DeleteAlarm(self, request : AlarmID) -> Empty:

        LOGGER.debug('DeleteAlarm: {:s}'.format(grpc_message_to_json_string(request)))

        response = self.stub.DeleteAlarm(request)

        LOGGER.debug('DeleteAlarm result: {:s}'.format(grpc_message_to_json_string(response)))

        return response



    @RETRY_DECORATOR

    def GetStreamKpi(self, request : KpiId) -> Iterator[Kpi]:

        LOGGER.debug('GetStreamKpi: {:s}'.format(grpc_message_to_json_string(request)))

src/monitoring/service/MonitoringServiceServicerImpl.py

+24 −0
Original line number Diff line number Diff line
@@ -288,6 +288,18 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): 
        except Exception as e:  # pragma: no cover

            LOGGER.exception('GetSubscriptions exception')



    def DeleteSubscription ( self, request : SubscriptionID, grpc_context : grpc.ServicerContext) -> Empty:



        LOGGER.info('DeleteSubscription')

        try:

             # TBC

            return Empty()

        except ServiceException as e:

            LOGGER.exception('DeleteSubscription exception')

            grpc_context.abort(e.code, e.details)

        except Exception as e:  # pragma: no cover

            LOGGER.exception('DeleteSubscription exception')



    def EditKpiSubscription ( self, request : SubsDescriptor, grpc_context : grpc.ServicerContext) -> Empty:



        LOGGER.info('EditKpiSubscription')
@@ -359,3 +371,15 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): 
            grpc_context.abort(e.code, e.details)

        except Exception as e:  # pragma: no cover

            LOGGER.exception('GetAlarmResponseStream exception')



    def DeleteAlarm ( self, request : AlarmID, grpc_context : grpc.ServicerContext) -> Empty:



        LOGGER.info('DeleteAlarm')

        try:

             # TBC

            return Empty()

        except ServiceException as e:

            LOGGER.exception('DeleteAlarm exception')

            grpc_context.abort(e.code, e.details)

        except Exception as e:  # pragma: no cover

            LOGGER.exception('DeleteAlarm exception')