Bug 2315: Fix for Unable to update healing policy using NS Update

[osm/POL.git] / osm_policy_module / core / agent.py

diff --git a/osm_policy_module/core/agent.py b/osm_policy_module/core/agent.py
index 56caecd..4a20527 100644 (file)
--- a/osm_policy_module/core/agent.py
+++ b/osm_policy_module/core/agent.py
@@ -48,19 +48,16 @@ ALLOWED_KAFKA_KEYS = [
 
 
 class PolicyModuleAgent:
-    def __init__(self, config: Config, loop=None):
+    def __init__(self, config: Config):
         self.conf = config
-        if not loop:
-            loop = asyncio.get_event_loop()
-        self.loop = loop
         self.msg_bus = MessageBusClient(config)
         self.db_client = CommonDbClient(config)
-        self.autoscaling_service = AutoscalingService(config, loop)
-        self.alarming_service = AlarmingService(config, loop)
-        self.healing_service = HealingService(config, loop)
+        self.autoscaling_service = AutoscalingService(config)
+        self.alarming_service = AlarmingService(config)
+        self.healing_service = HealingService(config)
 
     def run(self):
-        self.loop.run_until_complete(self.start())
+        asyncio.run(self.start())
 
     async def start(self):
         Path("/tmp/osm_pol_agent_health_flag").touch()
@@ -75,7 +72,6 @@ class PolicyModuleAgent:
         log.debug("_process_msg topic=%s key=%s msg=%s", topic, key, msg)
         try:
             if key in ALLOWED_KAFKA_KEYS:
-
                 if key == "instantiated":
                     await self._handle_instantiated(msg)
 
@@ -188,10 +184,14 @@ class PolicyModuleAgent:
                 nsr_id, vnf_member_index
             )
             await self.alarming_service.delete_vnf_alarms(nsr_id, vnf_member_index)
+            await self.healing_service.delete_healing_alarms(nsr_id, vnf_member_index)
             await self.autoscaling_service.configure_scaling_groups(
                 nsr_id, vnf_member_index
             )
             await self.alarming_service.configure_vnf_alarms(nsr_id, vnf_member_index)
+            await self.healing_service.configure_healing_alarms(
+                nsr_id, vnf_member_index
+            )
         else:
             log.info(
                 "Network service is not in COMPLETED or PARTIALLY_COMPLETED state. "