X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=policy_module%2Fosm_policy_module%2Fcore%2Fagent.py;h=cdd5dfc9eb8b8b24b8307a20fdfa39daa5b0015c;hb=dec1bb5edc73cc455d7b2c759c77c1dd4ca77ff3;hp=a38feeb4e262aa2d2ed6e11ff4ea5e741ed52b43;hpb=822fb1930b4abdf834462d0cd26247b0960dcac0;p=osm%2FMON.git diff --git a/policy_module/osm_policy_module/core/agent.py b/policy_module/osm_policy_module/core/agent.py index a38feeb..cdd5dfc 100644 --- a/policy_module/osm_policy_module/core/agent.py +++ b/policy_module/osm_policy_module/core/agent.py @@ -25,15 +25,12 @@ import json import logging from typing import Dict, List -import peewee import yaml - from kafka import KafkaConsumer -from osm_policy_module.core.config import Config -from osm_policy_module.common.lcm_client import LcmClient - from osm_policy_module.common.alarm_config import AlarmConfig +from osm_policy_module.common.lcm_client import LcmClient from osm_policy_module.common.mon_client import MonClient +from osm_policy_module.core.config import Config from osm_policy_module.core.database import ScalingRecord, ScalingAlarm log = logging.getLogger(__name__) @@ -48,11 +45,10 @@ class PolicyModuleAgent: # Initialize Kafka consumer log.info("Connecting to Kafka server at %s", kafka_server) - # TODO: Add logic to handle deduplication of messages when using group_id. - # See: https://stackoverflow.com/a/29836412 consumer = KafkaConsumer(bootstrap_servers=kafka_server, key_deserializer=bytes.decode, - value_deserializer=bytes.decode) + value_deserializer=bytes.decode, + group_id="pm-consumer") consumer.subscribe(['lcm_pm', 'alarm_response']) for message in consumer: @@ -116,7 +112,7 @@ class PolicyModuleAgent: log.info("Sending scaling action message for ns: %s", alarm_id) lcm_client.scale(alarm.scaling_record.nsr_id, alarm.scaling_record.name, alarm.action) except ScalingAlarm.DoesNotExist: - log.info("There is no action configured for alarm %.", alarm_id) + log.info("There is no action configured for alarm %s.", alarm_id) except Exception: log.exception("Error consuming message: ")