Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removed nullable flag from audit_id in ActionPlan"

Browse Source
This commit is contained in:
Jenkins
2016-11-18 14:40:53 +00:00
committed by Gerrit Code Review
parent 06682fe7c3 74cb93fca8
commit 7e2fd7ed9a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
watcher/objects/action_plan.py
View File

@@ -93,14 +93,15 @@ class ActionPlan(base.WatcherPersistentObject, base.WatcherObject,
# Version 1.0: Initial version # Version 1.0: Initial version
# Version 1.1: Added 'audit' and 'strategy' object field # Version 1.1: Added 'audit' and 'strategy' object field
VERSION = '1.1' # Version 1.2: audit_id is not nullable anymore
VERSION = '1.2'
dbapi = db_api.get_instance() dbapi = db_api.get_instance()
fields = { fields = {
'id': wfields.IntegerField(), 'id': wfields.IntegerField(),
'uuid': wfields.UUIDField(), 'uuid': wfields.UUIDField(),
'audit_id': wfields.IntegerField(nullable=True), 'audit_id': wfields.IntegerField(),
'strategy_id': wfields.IntegerField(), 'strategy_id': wfields.IntegerField(),
'first_action_id': wfields.IntegerField(nullable=True), 'first_action_id': wfields.IntegerField(nullable=True),
'state': wfields.StringField(nullable=True), 'state': wfields.StringField(nullable=True),

2
watcher/tests/objects/test_objects.py
View File

@@ -413,7 +413,7 @@ expected_object_fingerprints = {
'Strategy': '1.1-73f164491bdd4c034f48083a51bdeb7b', 'Strategy': '1.1-73f164491bdd4c034f48083a51bdeb7b',
'AuditTemplate': '1.1-b291973ffc5efa2c61b24fe34fdccc0b', 'AuditTemplate': '1.1-b291973ffc5efa2c61b24fe34fdccc0b',
'Audit': '1.1-dc246337c8d511646cb537144fcb0f3a', 'Audit': '1.1-dc246337c8d511646cb537144fcb0f3a',
'ActionPlan': '1.1-299bd9c76f2402a0b2167f8e4d744a05', 'ActionPlan': '1.2-42709eadf6b2bd228ea87817e8c3e31e',
'Action': '1.1-52c77e4db4ce0aa9480c9760faec61a1', 'Action': '1.1-52c77e4db4ce0aa9480c9760faec61a1',
'EfficacyIndicator': '1.0-655b71234a82bc7478aff964639c4bb0', 'EfficacyIndicator': '1.0-655b71234a82bc7478aff964639c4bb0',
'ScoringEngine': '1.0-4abbe833544000728e17bd9e83f97576', 'ScoringEngine': '1.0-4abbe833544000728e17bd9e83f97576',