X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_policy_module%2Fcore%2Fagent.py;h=4a2052760db192a2bc17fb7235359af8d68cc2f6;hb=055c4ee00f83647e7e807aa3d44c3384d9d79aa2;hp=56caecd873f165448a1a46b97091aaf078788df6;hpb=be42d54170ca40d8d52e2c9fc8d888621585d6cf;p=osm%2FPOL.git diff --git a/osm_policy_module/core/agent.py b/osm_policy_module/core/agent.py index 56caecd..4a20527 100644 --- 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. "