X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_policy_module%2Fcore%2Fdatabase.py;h=3ca2e33e21aa87ae7b6e1dd501f32ac3eacede0b;hb=d4a1635456ef7e4ae1f643553d827cd1b9145d6f;hp=db8cf285fb5347632929dc18ad13569cd32174cd;hpb=b77fe26906b4acdf5f2b110f07433382520f44ff;p=osm%2FPOL.git

diff --git a/osm_policy_module/core/database.py b/osm_policy_module/core/database.py
index db8cf28..3ca2e33 100644
--- a/osm_policy_module/core/database.py
+++ b/osm_policy_module/core/database.py
@@ -23,16 +23,18 @@
 ##
 import datetime
 import logging
+import os
 
-from peewee import CharField, IntegerField, ForeignKeyField, Model, TextField, AutoField, DateTimeField
+from peewee import CharField, IntegerField, ForeignKeyField, Model, TextField, AutoField, DateTimeField, Proxy
+from peewee_migrate import Router
 from playhouse.db_url import connect
 
+from osm_policy_module import migrations
 from osm_policy_module.core.config import Config
 
 log = logging.getLogger(__name__)
-cfg = Config.instance()
 
-db = connect(cfg.OSMPOL_SQL_DATABASE_URI)
+db = Proxy()
 
 
 class BaseModel(Model):
@@ -70,10 +72,14 @@ class ScalingAlarm(BaseModel):
 
 
 class DatabaseManager:
-    def create_tables(self):
-        db.connect()
-        db.create_tables([ScalingGroup, ScalingPolicy, ScalingCriteria, ScalingAlarm])
-        db.close()
+    def __init__(self, config: Config):
+        db.initialize(connect(config.get('sql', 'database_uri')))
+
+    def create_tables(self) -> None:
+        with db.atomic():
+            router = Router(db, os.path.dirname(migrations.__file__))
+            router.run()
 
     def get_alarm(self, alarm_uuid: str):
-        return ScalingAlarm.select().where(ScalingAlarm.alarm_uuid == alarm_uuid).get()
+        with db.atomic():
+            return ScalingAlarm.select().where(ScalingAlarm.alarm_uuid == alarm_uuid).get()