SOL006 patch for POL

[osm/POL.git] / osm_policy_module / alarming / service.py

diff --git a/osm_policy_module/alarming/service.py b/osm_policy_module/alarming/service.py
index e45787e..55fe864 100644 (file)
--- a/osm_policy_module/alarming/service.py
+++ b/osm_policy_module/alarming/service.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# pylint: disable=no-member
 
 # Copyright 2018 Whitestack, LLC
 # *************************************************************
@@ -26,6 +27,7 @@ import json
 import logging
 
 import requests
+from requests.exceptions import ConnectionError
 
 from osm_policy_module.common.common_db_client import CommonDbClient
 from osm_policy_module.common.lcm_client import LcmClient
@@ -84,17 +86,18 @@ class AlarmingService:
                                 vnf_monitoring_param = next(
                                     filter(
                                         lambda param: param['id'] == alarm_descriptor['vnf-monitoring-param-ref'],
-                                        vnfd['monitoring-param'])
+                                        vdu.get('monitoring-parameter', [])
+                                    ),
+                                    {}
                                 )
-                                metric_name = self._get_metric_name(vnf_monitoring_param, vdur, vnfd)
+                                metric_name = self._get_metric_name(vnf_monitoring_param)
                                 alarm_uuid = await self.mon_client.create_alarm(
                                     metric_name=metric_name,
                                     ns_id=nsr_id,
                                     vdu_name=vdur['name'],
                                     vnf_member_index=vnfr['member-vnf-index-ref'],
                                     threshold=alarm_descriptor['value'],
-                                    operation=alarm_descriptor['operation'],
-                                    statistic=vnf_monitoring_param['aggregation-type']
+                                    operation=alarm_descriptor['operation']
                                 )
                                 alarm = VnfAlarmRepository.create(
                                     alarm_id=alarm_descriptor['alarm-id'],
@@ -130,6 +133,7 @@ class AlarmingService:
             database.db.close()
 
     async def delete_orphaned_alarms(self, nsr_id):
+        # TODO: Review as it seems this code is never called
         log.info("Deleting orphaned vnf alarms for network service %s", nsr_id)
         database.db.connect()
         try:
@@ -187,26 +191,17 @@ class AlarmingService:
                     if action.type == status:
                         log.info("Executing request to url %s for vnf alarm %s with status %s", action.url,
                                  alarm.alarm_id, status)
-                        requests.post(url=action.url, json=json.dumps(payload))
+                        try:
+                            requests.post(url=action.url, json=json.dumps(payload))
+                        except ConnectionError:
+                            log.exception("Error connecting to url %s", action.url)
+
         except VnfAlarm.DoesNotExist:
             log.debug("There is no alarming action configured for alarm %s.", alarm_uuid)
         finally:
             database.db.close()
 
-    def _get_metric_name(self, vnf_monitoring_param: dict, vdur: dict, vnfd: dict):
-        vdu = next(
-            filter(lambda vdu: vdu['id'] == vdur['vdu-id-ref'], vnfd['vdu'])
-        )
-        if 'vdu-monitoring-param' in vnf_monitoring_param:
-            vdu_monitoring_param = next(filter(
-                lambda param: param['id'] == vnf_monitoring_param['vdu-monitoring-param'][
-                    'vdu-monitoring-param-ref'], vdu['monitoring-param']))
-            nfvi_metric = vdu_monitoring_param['nfvi-metric']
-            return nfvi_metric
-        if 'vdu-metric' in vnf_monitoring_param:
-            vnf_metric_name = vnf_monitoring_param['vdu-metric']['vdu-metric-name-ref']
-            return vnf_metric_name
-        if 'vnf-metric' in vnf_monitoring_param:
-            vnf_metric_name = vnf_monitoring_param['vnf-metric']['vnf-metric-name-ref']
-            return vnf_metric_name
+    def _get_metric_name(self, vnf_monitoring_param: dict):
+        if 'performance-metric' in vnf_monitoring_param:
+            return vnf_monitoring_param['performance-metric']
         raise ValueError('No metric name found for vnf_monitoring_param %s' % vnf_monitoring_param['id'])