X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_policy_module%2Fcore%2Fagent.py;h=696f69c405e4e6f7091049239d5c850634eb60de;hb=d37c54c64eec65c9a3c490a31eef3a02a76cb474;hp=9867c0ccf147edb472e3f72a9c4caa5043bf56a9;hpb=7ef2b88a9c0c6ead16861411584d017e1fe216d7;p=osm%2FPOL.git

diff --git a/osm_policy_module/core/agent.py b/osm_policy_module/core/agent.py
index 9867c0c..696f69c 100644
--- a/osm_policy_module/core/agent.py
+++ b/osm_policy_module/core/agent.py
@@ -37,23 +37,27 @@ from osm_policy_module.core.config import Config
 
 log = logging.getLogger(__name__)
 
-ALLOWED_KAFKA_KEYS = ["instantiated", "scaled", "terminated", "notify_alarm", "policy_updated", "vnf_terminated"]
+ALLOWED_KAFKA_KEYS = [
+    "instantiated",
+    "scaled",
+    "terminated",
+    "notify_alarm",
+    "policy_updated",
+    "vnf_terminated",
+]
 
 
 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()
@@ -68,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)
 
@@ -167,39 +170,49 @@ class PolicyModuleAgent:
 
     async def _handle_policy_update(self, content):
         log.info("_handle_policy_update: %s", content)
-        nsr_id = content['nsr_id']
-        vnf_member_index = content['vnf_member_index']
+        nsr_id = content["nsr_id"]
+        vnf_member_index = content["vnf_member_index"]
         if (
             content["operationState"] == "COMPLETED"
             or content["operationState"] == "PARTIALLY_COMPLETED"
         ):
             log.info(
                 "Updating policies of VNF with nsr_id: %s and vnf-member-index: %s"
-                % (nsr_id, vnf_member_index))
-            await self.autoscaling_service.delete_scaling_groups(nsr_id, vnf_member_index)
+                % (nsr_id, vnf_member_index)
+            )
+            await self.autoscaling_service.delete_scaling_groups(
+                nsr_id, vnf_member_index
+            )
             await self.alarming_service.delete_vnf_alarms(nsr_id, vnf_member_index)
-            await self.autoscaling_service.configure_scaling_groups(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)
         else:
             log.info(
                 "Network service is not in COMPLETED or PARTIALLY_COMPLETED state. "
                 "Current state is %s. Skipping...",
-                content['operationState'])
+                content["operationState"],
+            )
 
     async def _handle_vnf_terminated(self, content):
-        nsr_id = content['nsr_id']
-        vnf_member_index = content['vnf_member_index']
+        nsr_id = content["nsr_id"]
+        vnf_member_index = content["vnf_member_index"]
         if (
             content["operationState"] == "COMPLETED"
             or content["operationState"] == "PARTIALLY_COMPLETED"
         ):
             log.info(
                 "Deleting policies of VNF with nsr_id: %s and vnf-member-index: %s"
-                % (nsr_id, vnf_member_index))
-            await self.autoscaling_service.delete_scaling_groups(nsr_id, vnf_member_index)
+                % (nsr_id, vnf_member_index)
+            )
+            await self.autoscaling_service.delete_scaling_groups(
+                nsr_id, vnf_member_index
+            )
             await self.alarming_service.delete_vnf_alarms(nsr_id, vnf_member_index)
         else:
             log.info(
                 "Network service is not in COMPLETED or PARTIALLY_COMPLETED state. "
                 "Current state is %s. Skipping...",
-                content['operationState'])
+                content["operationState"],
+            )