Reformat MON to standardized format
Change-Id: I5869a8c1d0a53c5f6ad6b8859e6469d447bfb63d
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/osm_mon/server/server.py b/osm_mon/server/server.py
index 117c054..ce6255c 100755
--- a/osm_mon/server/server.py
+++ b/osm_mon/server/server.py
@@ -36,7 +36,6 @@
class Server:
-
def __init__(self, config: Config, loop=None):
self.conf = config
if not loop:
@@ -49,9 +48,7 @@
self.loop.run_until_complete(self.start())
async def start(self):
- topics = [
- "alarm_request"
- ]
+ topics = ["alarm_request"]
try:
await self.msg_bus.aioread(topics, self._process_msg)
except Exception as e:
@@ -65,53 +62,71 @@
if topic == "alarm_request":
if key == "create_alarm_request":
- alarm_details = values['alarm_create_request']
- cor_id = alarm_details['correlation_id']
+ alarm_details = values["alarm_create_request"]
+ cor_id = alarm_details["correlation_id"]
response_builder = ResponseBuilder()
try:
alarm = self.service.create_alarm(
- alarm_details['alarm_name'],
- alarm_details['threshold_value'],
- alarm_details['operation'].lower(),
- alarm_details['severity'].lower(),
- alarm_details['statistic'].lower(),
- alarm_details['metric_name'],
- alarm_details['tags']
+ alarm_details["alarm_name"],
+ alarm_details["threshold_value"],
+ alarm_details["operation"].lower(),
+ alarm_details["severity"].lower(),
+ alarm_details["statistic"].lower(),
+ alarm_details["metric_name"],
+ alarm_details["tags"],
)
- response = response_builder.generate_response('create_alarm_response',
- cor_id=cor_id,
- status=True,
- alarm_id=alarm.uuid)
+ response = response_builder.generate_response(
+ "create_alarm_response",
+ cor_id=cor_id,
+ status=True,
+ alarm_id=alarm.uuid,
+ )
except Exception:
log.exception("Error creating alarm: ")
- response = response_builder.generate_response('create_alarm_response',
- cor_id=cor_id,
- status=False,
- alarm_id=None)
- await self._publish_response('alarm_response_' + str(cor_id), 'create_alarm_response', response)
+ response = response_builder.generate_response(
+ "create_alarm_response",
+ cor_id=cor_id,
+ status=False,
+ alarm_id=None,
+ )
+ await self._publish_response(
+ "alarm_response_" + str(cor_id),
+ "create_alarm_response",
+ response,
+ )
if key == "delete_alarm_request":
- alarm_details = values['alarm_delete_request']
- alarm_uuid = alarm_details['alarm_uuid']
+ alarm_details = values["alarm_delete_request"]
+ alarm_uuid = alarm_details["alarm_uuid"]
response_builder = ResponseBuilder()
- cor_id = alarm_details['correlation_id']
+ cor_id = alarm_details["correlation_id"]
try:
self.service.delete_alarm(alarm_uuid)
- response = response_builder.generate_response('delete_alarm_response',
- cor_id=cor_id,
- status=True,
- alarm_id=alarm_uuid)
+ response = response_builder.generate_response(
+ "delete_alarm_response",
+ cor_id=cor_id,
+ status=True,
+ alarm_id=alarm_uuid,
+ )
except Exception:
log.exception("Error deleting alarm: ")
- response = response_builder.generate_response('delete_alarm_response',
- cor_id=cor_id,
- status=False,
- alarm_id=alarm_uuid)
- await self._publish_response('alarm_response_' + str(cor_id), 'delete_alarm_response', response)
+ response = response_builder.generate_response(
+ "delete_alarm_response",
+ cor_id=cor_id,
+ status=False,
+ alarm_id=alarm_uuid,
+ )
+ await self._publish_response(
+ "alarm_response_" + str(cor_id),
+ "delete_alarm_response",
+ response,
+ )
except Exception:
log.exception("Exception processing message: ")
async def _publish_response(self, topic: str, key: str, msg: dict):
- log.info("Sending response %s to topic %s with key %s", json.dumps(msg), topic, key)
+ log.info(
+ "Sending response %s to topic %s with key %s", json.dumps(msg), topic, key
+ )
await self.msg_bus.aiowrite(topic, key, msg)
diff --git a/osm_mon/server/service.py b/osm_mon/server/service.py
index b68b367..298043e 100755
--- a/osm_mon/server/service.py
+++ b/osm_mon/server/service.py
@@ -30,26 +30,28 @@
class ServerService:
-
def __init__(self, config: Config):
self.common_db = CommonDbClient(config)
- def create_alarm(self,
- name: str,
- threshold: float,
- operation: str,
- severity: str,
- statistic: str,
- metric_name: str,
- tags: dict) -> Alarm:
+ def create_alarm(
+ self,
+ name: str,
+ threshold: float,
+ operation: str,
+ severity: str,
+ statistic: str,
+ metric_name: str,
+ tags: dict,
+ ) -> Alarm:
log.debug("create_alarm")
- alarm = Alarm(name, severity, threshold, operation, statistic, metric_name, tags)
+ alarm = Alarm(
+ name, severity, threshold, operation, statistic, metric_name, tags
+ )
self.common_db.create_alarm(alarm)
log.info("Alarm %s created", alarm.name)
return alarm
- def delete_alarm(self,
- alarm_uuid: str) -> None:
+ def delete_alarm(self, alarm_uuid: str) -> None:
log.debug("delete_alarm")
self.common_db.delete_alarm(alarm_uuid)
log.info("Alarm %s is deleted", alarm_uuid)