X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=policy_module%2Fosm_policy_module%2Fcommon%2Fmon_client.py;h=d1336db21874356fb36da53dee8d0b4b05685eda;hb=d9a55971b0b87f0d43883f840478f6fbc5f62fde;hp=0d86046c06fbf4ac8584b718d11438feff85b017;hpb=034a5305e1535971979b842e4ee73bee40d8b1af;p=osm%2FMON.git

diff --git a/policy_module/osm_policy_module/common/mon_client.py b/policy_module/osm_policy_module/common/mon_client.py
index 0d86046..d1336db 100644
--- a/policy_module/osm_policy_module/common/mon_client.py
+++ b/policy_module/osm_policy_module/common/mon_client.py
@@ -42,15 +42,18 @@ class MonClient:
                                       key_serializer=str.encode,
                                       value_serializer=str.encode)
 
-    def create_alarm(self, metric_name, resource_uuid, vim_uuid, threshold, statistic, operation):
+    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, 1000000)
-        msg = self._create_alarm_payload(cor_id, metric_name, resource_uuid, vim_uuid, threshold, statistic, operation)
+        msg = self._create_alarm_payload(cor_id, metric_name, ns_id, vdu_name, vnf_member_index, threshold, statistic,
+                                         operation)
         log.info("Sending create_alarm_request %s", msg)
         future = self.producer.send(topic='alarm_request', key='create_alarm_request', value=json.dumps(msg))
         future.get(timeout=60)
         consumer = KafkaConsumer(bootstrap_servers=self.kafka_server,
                                  key_deserializer=bytes.decode,
-                                 value_deserializer=bytes.decode)
+                                 value_deserializer=bytes.decode,
+                                 consumer_timeout_ms=10000)
         consumer.subscribe(['alarm_response'])
         for message in consumer:
             if message.key == 'create_alarm_response':
@@ -63,12 +66,15 @@ class MonClient:
 
         raise ValueError('Timeout: No alarm creation response from MON. Is MON up?')
 
-    def _create_alarm_payload(self, cor_id, metric_name, resource_uuid, vim_uuid, threshold, statistic, operation):
+    def _create_alarm_payload(self, cor_id: int, metric_name: str, ns_id: str, vdu_name: str, vnf_member_index: str,
+                              threshold: int, statistic: str, operation: str):
         alarm_create_request = {
             'correlation_id': cor_id,
             'alarm_name': str(uuid.uuid4()),
             'metric_name': metric_name,
-            'resource_uuid': resource_uuid,
+            'ns_id': ns_id,
+            'vdu_name': vdu_name,
+            'vnf_member_index': vnf_member_index,
             'operation': operation,
             'severity': 'critical',
             'threshold_value': threshold,
@@ -76,7 +82,6 @@ class MonClient:
         }
         msg = {
             'alarm_create_request': alarm_create_request,
-            'vim_uuid': vim_uuid
         }
         return msg