X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_policy_module%2Fcore%2Fdatabase.py;h=7bf11d82ca10d30d4f6a301ddff816a8b6abeee9;hb=8537aea539c90c284f2d9a303533950e3853d1da;hp=3a896529831d8db116665b59b8b3c700b19d8458;hpb=e8ee171063d81a02033729273793f5ba2c2b71cc;p=osm%2FPOL.git diff --git a/osm_policy_module/core/database.py b/osm_policy_module/core/database.py index 3a89652..7bf11d8 100644 --- a/osm_policy_module/core/database.py +++ b/osm_policy_module/core/database.py @@ -26,8 +26,17 @@ import logging import os from typing import Iterable, List -from peewee import CharField, IntegerField, ForeignKeyField, Model, TextField, AutoField, DateTimeField, Proxy, \ - BooleanField +from peewee import ( + CharField, + IntegerField, + ForeignKeyField, + Model, + TextField, + AutoField, + DateTimeField, + Proxy, + BooleanField, +) from peewee_migrate import Router from playhouse.db_url import connect @@ -56,16 +65,20 @@ class ScalingGroup(BaseModel): class ScalingPolicy(BaseModel): name = CharField() cooldown_time = IntegerField() - scale_in_operation = CharField(default='AND') - scale_out_operation = CharField(default='OR') + scale_in_operation = CharField(default="AND") + scale_out_operation = CharField(default="OR") enabled = BooleanField(default=True) last_scale = DateTimeField(default=datetime.datetime.now) - scaling_group = ForeignKeyField(ScalingGroup, related_name='scaling_policies', on_delete='CASCADE') + scaling_group = ForeignKeyField( + ScalingGroup, related_name="scaling_policies", on_delete="CASCADE" + ) class ScalingCriteria(BaseModel): name = CharField() - scaling_policy = ForeignKeyField(ScalingPolicy, related_name='scaling_criterias', on_delete='CASCADE') + scaling_policy = ForeignKeyField( + ScalingPolicy, related_name="scaling_criterias", on_delete="CASCADE" + ) class ScalingAlarm(BaseModel): @@ -73,8 +86,10 @@ class ScalingAlarm(BaseModel): action = CharField() vnf_member_index = CharField() vdu_name = CharField() - scaling_criteria = ForeignKeyField(ScalingCriteria, related_name='scaling_alarms', on_delete='CASCADE') - last_status = CharField(default='insufficient-data') + scaling_criteria = ForeignKeyField( + ScalingCriteria, related_name="scaling_alarms", on_delete="CASCADE" + ) + last_status = CharField(default="insufficient-data") class VnfAlarm(BaseModel): @@ -88,12 +103,12 @@ class VnfAlarm(BaseModel): class AlarmAction(BaseModel): type = CharField() url = TextField() - alarm = ForeignKeyField(VnfAlarm, related_name='actions', on_delete='CASCADE') + alarm = ForeignKeyField(VnfAlarm, related_name="actions", on_delete="CASCADE") class DatabaseManager: def __init__(self, config: Config): - db.initialize(connect(config.get('sql', 'database_uri'))) + db.initialize(connect(config.get("sql", "database_uri"))) def create_tables(self) -> None: db.connect() @@ -104,7 +119,6 @@ class DatabaseManager: class ScalingAlarmRepository: - @staticmethod def list(*expressions) -> Iterable[ScalingAlarm]: return ScalingAlarm.select().where(*expressions) @@ -123,7 +137,6 @@ class ScalingAlarmRepository: class ScalingGroupRepository: - @staticmethod def list(*expressions) -> Iterable[ScalingGroup]: return ScalingGroup.select().where(*expressions) @@ -138,7 +151,6 @@ class ScalingGroupRepository: class ScalingPolicyRepository: - @staticmethod def list(*expressions, join_classes: List = None) -> Iterable[ScalingPolicy]: query = ScalingPolicy.select() @@ -161,7 +173,6 @@ class ScalingPolicyRepository: class ScalingCriteriaRepository: - @staticmethod def list(*expressions, join_classes: List = None) -> Iterable[ScalingCriteria]: query = ScalingCriteria.select() @@ -184,7 +195,6 @@ class ScalingCriteriaRepository: class VnfAlarmRepository: - @staticmethod def list(*expressions) -> Iterable[VnfAlarm]: return VnfAlarm.select().where(*expressions) @@ -199,7 +209,6 @@ class VnfAlarmRepository: class AlarmActionRepository: - @staticmethod def list(*expressions) -> Iterable[AlarmAction]: return AlarmAction.select().where(*expressions)