Commit 9e82e3c7 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Monitoring component: 

- pre-merge fixes
parent 4fc4317d

src/monitoring/service/AlarmManager.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ class AlarmManager(): 
                               trigger='interval', seconds=(subscription_frequency_ms/1000), start_date=start_date,

                               trigger='interval', seconds=(subscription_frequency_ms/1000), start_date=start_date,

                               end_date=end_date,timezone=pytz.utc, id=str(alarm_id))

                               end_date=end_date,timezone=pytz.utc, id=str(alarm_id))

        LOGGER.debug(f"Alarm job {alarm_id} succesfully created")

        LOGGER.debug(f"Alarm job {alarm_id} succesfully created")

        job.remove()

        #job.remove()





    def delete_alarm(self, alarm_id):

    def delete_alarm(self, alarm_id):

        try:

        try:

src/monitoring/service/MonitoringServiceServicerImpl.py

+3 −3
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): 
            kpi_connection_id = request.connection_id.connection_uuid.uuid

            kpi_connection_id = request.connection_id.connection_uuid.uuid









            if request.kpi_id.kpi_id.uuid is not "":

            if request.kpi_id.kpi_id.uuid != "":

                response.kpi_id.uuid = request.kpi_id.kpi_id.uuid

                response.kpi_id.uuid = request.kpi_id.kpi_id.uuid

            #     Here the code to modify an existing kpi

            #     Here the code to modify an existing kpi

            else:

            else:
@@ -424,7 +424,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): 




            LOGGER.debug(f"request.AlarmID: {request.alarm_id.alarm_id.uuid}")

            LOGGER.debug(f"request.AlarmID: {request.alarm_id.alarm_id.uuid}")





            if request.alarm_id.alarm_id.uuid is not "":

            if request.alarm_id.alarm_id.uuid != "":

                alarm_id = request.alarm_id.alarm_id.uuid

                alarm_id = request.alarm_id.alarm_id.uuid

            #     Here the code to modify an existing alarm

            #     Here the code to modify an existing alarm

            else:

            else:
@@ -596,7 +596,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer): 
        try:

        try:

            kpi_id = request.kpi_id.uuid

            kpi_id = request.kpi_id.uuid

            response = Kpi()

            response = Kpi()

            if kpi_id is "":

            if kpi_id == "":

                LOGGER.info('GetInstantKpi error: KpiID({:s}): not found in database'.format(str(kpi_id)))

                LOGGER.info('GetInstantKpi error: KpiID({:s}): not found in database'.format(str(kpi_id)))

                response.kpi_id.kpi_id.uuid = "NoID"

                response.kpi_id.kpi_id.uuid = "NoID"

            else:

            else:

src/monitoring/service/SubscriptionManager.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ class SubscriptionManager(): 
                               trigger='interval', seconds=sampling_interval_s, start_date=start_date,

                               trigger='interval', seconds=sampling_interval_s, start_date=start_date,

                               end_date=end_date, timezone=pytz.utc, id=str(subscription_id))

                               end_date=end_date, timezone=pytz.utc, id=str(subscription_id))

        LOGGER.debug(f"Subscrition job {subscription_id} succesfully created")

        LOGGER.debug(f"Subscrition job {subscription_id} succesfully created")

        job.remove()

        #job.remove()





    def delete_subscription(self, subscription_id):

    def delete_subscription(self, subscription_id):

        self.scheduler.remove_job(subscription_id)

        self.scheduler.remove_job(subscription_id)