X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcore%2Fdatabase.py;h=d1c2e6b774773f3b6f32af7d097cd95444d54bab;hb=refs%2Fchanges%2F22%2F7322%2F3;hp=a41c0fddcd3c654e80531f931319d346fb6979ef;hpb=de3d570360a0a31d3054a6ff72b09ae9f559b59c;p=osm%2FMON.git

diff --git a/osm_mon/core/database.py b/osm_mon/core/database.py
index a41c0fd..d1c2e6b 100644
--- a/osm_mon/core/database.py
+++ b/osm_mon/core/database.py
@@ -22,19 +22,21 @@
 # contact: bdiaz@whitestack.com or glavado@whitestack.com
 ##
 
+import json
 import logging
+import os
 import uuid
 
-from peewee import CharField, TextField, FloatField, Model, AutoField
+from peewee import CharField, TextField, FloatField, Model, AutoField, Proxy
+from peewee_migrate import Router
 from playhouse.db_url import connect
 
-from osm_mon.core.settings import Config
+from osm_mon import migrations
+from osm_mon.core.config import Config
 
 log = logging.getLogger(__name__)
-cfg = Config.instance()
-cfg.read_environ()
 
-db = connect(cfg.DATABASE)
+db = Proxy()
 
 
 class BaseModel(Model):
@@ -52,7 +54,7 @@ class VimCredentials(BaseModel):
     user = CharField()
     password = CharField()
     tenant_name = CharField()
-    config = TextField(default='{}')
+    config = TextField()
 
 
 class Alarm(BaseModel):
@@ -69,56 +71,87 @@ class Alarm(BaseModel):
 
 
 class DatabaseManager:
+    def __init__(self, config: Config):
+        db.initialize(connect(config.get('sql', 'database_uri')))
+
     def create_tables(self) -> None:
+        db.connect()
+        with db.atomic():
+            router = Router(db, os.path.dirname(migrations.__file__))
+            router.run()
+        db.close()
+
+    def get_credentials(self, vim_uuid: str = None) -> VimCredentials:
+        db.connect()
         try:
-            db.connect()
-            db.create_tables([VimCredentials, Alarm])
+            with db.atomic():
+                vim_credentials = VimCredentials.get_or_none(VimCredentials.uuid == vim_uuid)
+                return vim_credentials
+        finally:
             db.close()
-        except Exception:
-            log.exception("Error creating tables: ")
-
-    def get_credentials(self, vim_uuid) -> VimCredentials:
-        return VimCredentials.get_or_none(VimCredentials.uuid == vim_uuid)
 
     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()
-        return vim_credentials
+        db.connect()
+        try:
+            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
+        finally:
+            db.close()
 
     def get_alarm(self, alarm_id) -> Alarm:
-        alarm = (Alarm.select()
-                 .where(Alarm.alarm_id == alarm_id)
-                 .get())
-        return alarm
+        db.connect()
+        try:
+            with db.atomic():
+                alarm = (Alarm.select()
+                         .where(Alarm.alarm_id == alarm_id)
+                         .get())
+                return alarm
+        finally:
+            db.close()
 
     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)
-        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
+        db.connect()
+        try:
+            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
+        finally:
+            db.close()
 
     def delete_alarm(self, alarm_uuid) -> None:
-        alarm = (Alarm.select()
-                 .where(Alarm.uuid == alarm_uuid)
-                 .get())
-        alarm.delete_instance()
+        db.connect()
+        with db.atomic():
+            alarm = (Alarm.select()
+                     .where(Alarm.uuid == alarm_uuid)
+                     .get())
+            alarm.delete_instance()
+        db.close()
 
     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)
+        config = json.loads(credentials.config)
+        if 'vim_type' in config:
+            vim_type = config['vim_type']
+            return str(vim_type.lower())
+        else:
+            return str(credentials.type)