Merge "Removed unused 'alarm' field"

This commit is contained in:
Jenkins
2016-04-19 08:02:20 +00:00
committed by Gerrit Code Review
8 changed files with 3 additions and 19 deletions

View File

@@ -81,7 +81,6 @@ class TestDefaultWorkFlowEngine(base.DbTestCase):
'action_type': action_type,
'input_parameters': parameters,
'state': objects.action.State.PENDING,
'alarm': None,
'next': next,
}
new_action = objects.Action(self.context, **action)

View File

@@ -266,24 +266,21 @@ class DbActionTestCase(base.DbTestCase):
description='description action 1',
uuid=w_utils.generate_uuid(),
next=None,
state='PENDING',
alarm=None)
state='PENDING')
action2 = self._create_test_action(
id=2,
action_plan_id=2,
description='description action 2',
uuid=w_utils.generate_uuid(),
next=action1['uuid'],
state='PENDING',
alarm=None)
state='PENDING')
action3 = self._create_test_action(
id=3,
action_plan_id=1,
description='description action 3',
uuid=w_utils.generate_uuid(),
next=action2['uuid'],
state='ONGOING',
alarm=None)
state='ONGOING')
res = self.dbapi.get_action_list(self.context,
filters={'state': 'ONGOING'})
self.assertEqual([action3['id']], [r.id for r in res])

View File

@@ -91,7 +91,6 @@ def get_test_action(**kwargs):
'resource_id':
'10a47dd1-4874-4298-91cf-eff046dbdb8d'}),
'state': kwargs.get('state', 'PENDING'),
'alarm': kwargs.get('alarm', None),
'next': kwargs.get('next', 2),
'created_at': kwargs.get('created_at'),
'updated_at': kwargs.get('updated_at'),