X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcore%2Fmodels.py;h=8fe3b6b5741d5fb7d729a52f0881b7f747048fca;hb=refs%2Fchanges%2F03%2F10803%2F1;hp=1810c9b2fc32836b24b312a1b0c5c67ff741ef93;hpb=b6233b3d90ca1ba617e476b915fba056cf7891f7;p=osm%2FMON.git diff --git a/osm_mon/core/models.py b/osm_mon/core/models.py index 1810c9b..8fe3b6b 100644 --- a/osm_mon/core/models.py +++ b/osm_mon/core/models.py @@ -24,9 +24,16 @@ import uuid class Alarm: - - def __init__(self, name: str = None, severity: str = None, threshold: float = None, operation: str = None, - statistic: str = None, metric: str = None, tags: dict = {}): + def __init__( + self, + name: str = None, + severity: str = None, + threshold: float = None, + operation: str = None, + statistic: str = None, + metric: str = None, + tags: dict = {}, + ): self.uuid = str(uuid.uuid4()) self.name = name self.severity = severity @@ -38,24 +45,26 @@ class Alarm: def to_dict(self) -> dict: alarm = { - 'uuid': self.uuid, - 'name': self.name, - 'severity': self.severity, - 'threshold': self.threshold, - 'statistic': self.statistic, - 'metric': self.metric, - 'tags': self.tags + "uuid": self.uuid, + "name": self.name, + "severity": self.severity, + "threshold": self.threshold, + "statistic": self.statistic, + "metric": self.metric, + "tags": self.tags, + "operation": self.operation, } return alarm @staticmethod def from_dict(data: dict): alarm = Alarm() - alarm.uuid = data.get('uuid', str(uuid.uuid4())) - alarm.name = data.get('name') - alarm.severity = data.get('severity') - alarm.threshold = data.get('threshold') - alarm.statistic = data.get('statistic') - alarm.metric = data.get('metric') - alarm.tags = data.get('tags') + alarm.uuid = data.get("uuid", str(uuid.uuid4())) + alarm.name = data.get("name") + alarm.severity = data.get("severity") + alarm.threshold = float(data.get("threshold")) + alarm.statistic = data.get("statistic") + alarm.metric = data.get("metric") + alarm.tags = data.get("tags") + alarm.operation = data.get("operation") return alarm