X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_policy_module%2Fcommon%2Fmon_client.py;h=f57846242183337a4902fad75138f738b65d59cb;hb=refs%2Ftags%2Fv7.0.0;hp=5e9155233194f8855cf10c9dc519d150417ee56b;hpb=f7451f8879d188c9fef9c976d82aa39141601938;p=osm%2FPOL.git

diff --git a/osm_policy_module/common/mon_client.py b/osm_policy_module/common/mon_client.py
index 5e91552..f578462 100644
--- a/osm_policy_module/common/mon_client.py
+++ b/osm_policy_module/common/mon_client.py
@@ -43,7 +43,7 @@ class MonClient:
             loop = asyncio.get_event_loop()
         self.loop = loop
 
-    async def create_alarm(self, metric_name: str, ns_id: str, vdu_name: str, vnf_member_index: int, threshold: int,
+    async def create_alarm(self, metric_name: str, ns_id: str, vdu_name: str, vnf_member_index: str, threshold: int,
                            statistic: str, operation: str):
         cor_id = random.randint(1, 10e7)
         msg = self._build_create_alarm_payload(cor_id,
@@ -92,7 +92,7 @@ class MonClient:
             raise ValueError('No alarm deletion response from MON. Is MON up?')
         return alarm_uuid
 
-    async def delete_alarm(self, ns_id: str, vnf_member_index: int, vdu_name: str, alarm_uuid: str):
+    async def delete_alarm(self, ns_id: str, vnf_member_index: str, vdu_name: str, alarm_uuid: str):
         cor_id = random.randint(1, 10e7)
         msg = self._build_delete_alarm_payload(cor_id, ns_id, vdu_name, vnf_member_index, alarm_uuid)
         log.debug("Sending delete_alarm_request %s", msg)
@@ -137,7 +137,7 @@ class MonClient:
                                     metric_name: str,
                                     ns_id: str,
                                     vdu_name: str,
-                                    vnf_member_index: int,
+                                    vnf_member_index: str,
                                     threshold: int,
                                     statistic: str,
                                     operation: str):
@@ -146,13 +146,15 @@ class MonClient:
             'correlation_id': cor_id,
             'alarm_name': 'osm_alarm_{}_{}_{}_{}'.format(ns_id, vnf_member_index, vdu_name, metric_name),
             'metric_name': metric_name,
-            'ns_id': ns_id,
-            'vdu_name': vdu_name,
-            'vnf_member_index': vnf_member_index,
             'operation': operation,
             'severity': 'critical',
             'threshold_value': threshold,
-            'statistic': statistic
+            'statistic': statistic,
+            'tags': {
+                'ns_id': ns_id,
+                'vdu_name': vdu_name,
+                'vnf_member_index': vnf_member_index,
+            }
         }
         msg = {
             'alarm_create_request': alarm_create_request,
@@ -160,13 +162,15 @@ class MonClient:
         return msg
 
     def _build_delete_alarm_payload(self, cor_id: int, ns_id: str, vdu_name: str,
-                                    vnf_member_index: int, alarm_uuid: str):
+                                    vnf_member_index: str, alarm_uuid: str):
         alarm_delete_request = {
             'correlation_id': cor_id,
             'alarm_uuid': alarm_uuid,
-            'ns_id': ns_id,
-            'vdu_name': vdu_name,
-            'vnf_member_index': vnf_member_index
+            'tags': {
+                'ns_id': ns_id,
+                'vdu_name': vdu_name,
+                'vnf_member_index': vnf_member_index
+            }
         }
         msg = {
             'alarm_delete_request': alarm_delete_request,