X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=osm_mon%2Fcore%2Fdatabase.py;h=4cbd75f8fe60e6c0e7434158befb72f51b539016;hb=b525e6c8619d494d4e254def394cf5b62de4df4a;hp=7e4bf7c1543567c06974bf353ec85e5bd0173ff6;hpb=f271068982efc8ce8b25ddd2ecef7b1bad06fb19;p=osm%2FMON.git

diff --git a/osm_mon/core/database.py b/osm_mon/core/database.py
index 7e4bf7c..4cbd75f 100644
--- a/osm_mon/core/database.py
+++ b/osm_mon/core/database.py
@@ -23,19 +23,21 @@
 ##
 
 import logging
+import uuid
 
-from peewee import *
-from playhouse.sqlite_ext import SqliteExtDatabase
+from peewee import CharField, TextField, FloatField, Model, AutoField, Proxy
+from playhouse.db_url import connect
 
-from osm_mon.plugins.OpenStack.settings import Config
+from osm_mon.core.settings import Config
 
 log = logging.getLogger(__name__)
-cfg = Config.instance()
 
-db = SqliteExtDatabase('mon.db')
+db = Proxy()
 
 
 class BaseModel(Model):
+    id = AutoField(primary_key=True)
+
     class Meta:
         database = db
 
@@ -48,50 +50,79 @@ class VimCredentials(BaseModel):
     user = CharField()
     password = CharField()
     tenant_name = CharField()
-    config = TextField()
-    region_name = CharField()
-    endpoint_type = CharField()
+    config = TextField(default='{}')
+
 
 class Alarm(BaseModel):
-    alarm_id = CharField()
-    credentials = ForeignKeyField(VimCredentials, backref='alarms')
+    uuid = CharField(unique=True)
+    name = CharField()
+    severity = CharField()
+    threshold = FloatField()
+    operation = CharField()
+    statistic = CharField()
+    monitoring_param = CharField()
+    vdur_name = CharField()
+    vnf_member_index = CharField()
+    nsr_id = CharField()
 
 
 class DatabaseManager:
-    def create_tables(self):
-        try:
-            db.connect()
+    def __init__(self):
+        cfg = Config.instance()
+        cfg.read_environ()
+        db.initialize(connect(cfg.DATABASE))
+
+    def create_tables(self) -> None:
+        with db.atomic():
             db.create_tables([VimCredentials, Alarm])
-            db.close()
-        except Exception as e:
-            log.exception("Error creating tables: ")
 
-    def get_credentials(self, vim_uuid):
-        return VimCredentials.get_or_none(VimCredentials.uuid == vim_uuid)
+    def get_credentials(self, vim_uuid: str = None) -> VimCredentials:
+        with db.atomic():
+            return VimCredentials.get_or_none(VimCredentials.uuid == vim_uuid)
 
-    def save_credentials(self, vim_credentials):
+    def save_credentials(self, vim_credentials) -> VimCredentials:
         """Saves vim credentials. If a record with same uuid exists, overwrite it."""
-        exists = VimCredentials.get_or_none(VimCredentials.uuid == vim_credentials.uuid)
-        if exists:
-            vim_credentials.id = exists.id
-        vim_credentials.save()
-
-    def get_credentials_for_alarm_id(self, alarm_id, vim_type):
-        alarm = Alarm.select() \
-            .where(Alarm.alarm_id == alarm_id) \
-            .join(VimCredentials) \
-            .where(VimCredentials.type == vim_type).get()
-        return alarm.credentials
-
-    def save_alarm(self, alarm_id, vim_uuid):
-        """Saves alarm. If a record with same id and vim_uuid exists, overwrite it."""
-        alarm = Alarm()
-        alarm.alarm_id = alarm_id
-        creds = VimCredentials.get(VimCredentials.uuid == vim_uuid)
-        alarm.credentials = creds
-        exists = Alarm.select(Alarm.alarm_id == alarm.alarm_id) \
-            .join(VimCredentials) \
-            .where(VimCredentials.uuid == vim_uuid)
-        if len(exists):
-            alarm.id = exists[0].id
-        alarm.save()
+        with db.atomic():
+            exists = VimCredentials.get_or_none(VimCredentials.uuid == vim_credentials.uuid)
+            if exists:
+                vim_credentials.id = exists.id
+            vim_credentials.save()
+            return vim_credentials
+
+    def get_alarm(self, alarm_id) -> Alarm:
+        with db.atomic():
+            alarm = (Alarm.select()
+                     .where(Alarm.alarm_id == alarm_id)
+                     .get())
+            return alarm
+
+    def save_alarm(self, name, threshold, operation, severity, statistic, metric_name, vdur_name,
+                   vnf_member_index, nsr_id) -> Alarm:
+        """Saves alarm."""
+        # TODO: Add uuid optional param and check if exists to handle updates (see self.save_credentials)
+        with db.atomic():
+            alarm = Alarm()
+            alarm.uuid = str(uuid.uuid4())
+            alarm.name = name
+            alarm.threshold = threshold
+            alarm.operation = operation
+            alarm.severity = severity
+            alarm.statistic = statistic
+            alarm.monitoring_param = metric_name
+            alarm.vdur_name = vdur_name
+            alarm.vnf_member_index = vnf_member_index
+            alarm.nsr_id = nsr_id
+            alarm.save()
+            return alarm
+
+    def delete_alarm(self, alarm_uuid) -> None:
+        with db.atomic():
+            alarm = (Alarm.select()
+                     .where(Alarm.uuid == alarm_uuid)
+                     .get())
+            alarm.delete_instance()
+
+    def get_vim_type(self, vim_account_id) -> str:
+        """Get the vim type that is required by the message."""
+        credentials = self.get_credentials(vim_account_id)
+        return str(credentials.type)