X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_policy_module%2Fcore%2Fdatabase.py;h=e522b8d97effad8006f4143583ecb6641c1bc4ea;hb=refs%2Fchanges%2F54%2F6654%2F4;hp=5d927d0d01910c162742fb87963f024886dd97c6;hpb=cb76d133adebeda011a00b73c1df161ef3d6db8c;p=osm%2FPOL.git diff --git a/osm_policy_module/core/database.py b/osm_policy_module/core/database.py index 5d927d0..e522b8d 100644 --- a/osm_policy_module/core/database.py +++ b/osm_policy_module/core/database.py @@ -25,14 +25,14 @@ import datetime import logging from peewee import CharField, IntegerField, ForeignKeyField, Model, TextField, AutoField, DateTimeField -from playhouse.sqlite_ext import SqliteExtDatabase +from playhouse.db_url import connect from osm_policy_module.core.config import Config log = logging.getLogger(__name__) cfg = Config.instance() -db = SqliteExtDatabase('policy_module.db') +db = connect(cfg.OSMPOL_SQL_DATABASE_URI) class BaseModel(Model): @@ -44,6 +44,7 @@ class BaseModel(Model): class ScalingGroup(BaseModel): nsr_id = CharField() + vnf_member_index = IntegerField() name = CharField() content = TextField() @@ -51,7 +52,7 @@ class ScalingGroup(BaseModel): class ScalingPolicy(BaseModel): name = CharField() cooldown_time = IntegerField() - last_scale = DateTimeField(default=datetime.datetime.min) + last_scale = DateTimeField(default=datetime.datetime.now) scaling_group = ForeignKeyField(ScalingGroup, related_name='scaling_policies')