projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactors alarms to decouple them from vnf specific data
[osm/MON.git]
/
osm_mon
/
core
/
database.py
diff --git
a/osm_mon/core/database.py
b/osm_mon/core/database.py
index
07d92cf
..
61bd180
100644
(file)
--- a/
osm_mon/core/database.py
+++ b/
osm_mon/core/database.py
@@
-26,7
+26,7
@@
import logging
import os
from typing import Iterable
import os
from typing import Iterable
-from peewee import CharField, FloatField, Model, AutoField, Proxy
+from peewee import CharField, FloatField, Model, AutoField, Proxy
, ForeignKeyField
from peewee_migrate import Router
from playhouse.db_url import connect
from peewee_migrate import Router
from playhouse.db_url import connect
@@
-52,10
+52,13
@@
class Alarm(BaseModel):
threshold = FloatField()
operation = CharField()
statistic = CharField()
threshold = FloatField()
operation = CharField()
statistic = CharField()
- monitoring_param = CharField()
- vdur_name = CharField()
- vnf_member_index = CharField()
- nsr_id = CharField()
+ metric = CharField()
+
+
+class AlarmTag(BaseModel):
+ name = CharField()
+ value = CharField()
+ alarm = ForeignKeyField(Alarm, related_name='tags', on_delete='CASCADE')
class DatabaseManager:
class DatabaseManager:
@@
-70,6
+73,12
@@
class DatabaseManager:
db.close()
db.close()
+class AlarmTagRepository:
+ @staticmethod
+ def create(**query) -> Alarm:
+ return AlarmTag.create(**query)
+
+
class AlarmRepository:
@staticmethod
def create(**query) -> Alarm:
class AlarmRepository:
@staticmethod
def create(**query) -> Alarm: