projects
/
osm
/
POL.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adds deletion of scaling alarms in POL and MON after ns termination
[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
7702cfd
..
a39f982
100644
(file)
--- a/
osm_policy_module/core/database.py
+++ b/
osm_policy_module/core/database.py
@@
-53,20
+53,20
@@
class ScalingPolicy(BaseModel):
name = CharField()
cooldown_time = IntegerField()
last_scale = DateTimeField(default=datetime.datetime.now)
name = CharField()
cooldown_time = IntegerField()
last_scale = DateTimeField(default=datetime.datetime.now)
- scaling_group = ForeignKeyField(ScalingGroup, related_name='scaling_policies')
+ scaling_group = ForeignKeyField(ScalingGroup, related_name='scaling_policies'
, on_delete='CASCADE'
)
class ScalingCriteria(BaseModel):
name = CharField()
class ScalingCriteria(BaseModel):
name = CharField()
- scaling_policy = ForeignKeyField(ScalingPolicy, related_name='scaling_criterias')
+ scaling_policy = ForeignKeyField(ScalingPolicy, related_name='scaling_criterias'
, on_delete='CASCADE'
)
class ScalingAlarm(BaseModel):
class ScalingAlarm(BaseModel):
- alarm_
id = CharField(
)
+ alarm_
uuid = CharField(unique=True
)
action = CharField()
vnf_member_index = IntegerField()
vdu_name = CharField()
action = CharField()
vnf_member_index = IntegerField()
vdu_name = CharField()
- scaling_criteria = ForeignKeyField(ScalingCriteria, related_name='scaling_alarms')
+ scaling_criteria = ForeignKeyField(ScalingCriteria, related_name='scaling_alarms'
, on_delete='CASCADE'
)
class DatabaseManager:
class DatabaseManager:
@@
-77,3
+77,6
@@
class DatabaseManager:
db.close()
except Exception:
log.exception("Error creating tables: ")
db.close()
except Exception:
log.exception("Error creating tables: ")
+
+ def get_alarm(self, alarm_uuid: str):
+ return ScalingAlarm.select().where(ScalingAlarm.alarm_uuid == alarm_uuid).get()