projects
/
osm
/
POL.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adds use of OSMPOL_SQL_DATABASE_URI config param to connect to DB
[osm/POL.git]
/
osm_policy_module
/
core
/
database.py
diff --git
a/osm_policy_module/core/database.py
b/osm_policy_module/core/database.py
index
5d927d0
..
e522b8d
100644
(file)
--- 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
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()
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):
class BaseModel(Model):
@@
-44,6
+44,7
@@
class BaseModel(Model):
class ScalingGroup(BaseModel):
nsr_id = CharField()
class ScalingGroup(BaseModel):
nsr_id = CharField()
+ vnf_member_index = IntegerField()
name = CharField()
content = TextField()
name = CharField()
content = TextField()
@@
-51,7
+52,7
@@
class ScalingGroup(BaseModel):
class ScalingPolicy(BaseModel):
name = CharField()
cooldown_time = IntegerField()
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')
scaling_group = ForeignKeyField(ScalingGroup, related_name='scaling_policies')