diff --git a/watcherclient/tests/v1/test_action.py b/watcherclient/tests/v1/test_action.py index 9cf3e67..7fc8ea3 100644 --- a/watcherclient/tests/v1/test_action.py +++ b/watcherclient/tests/v1/test_action.py @@ -30,7 +30,6 @@ ACTION1 = { 'description': 'Action_1 description', 'next': '239f02a5-9649-4e14-9d33-ac2bf67cb755', 'state': 'PENDING', - 'alarm': None } ACTION2 = { @@ -40,7 +39,6 @@ ACTION2 = { 'description': 'Action_2 description', 'next': '67653274-eb24-c7ba-70f6-a84e73d80843', 'state': 'PENDING', - 'alarm': None } ACTION3 = { @@ -50,7 +48,6 @@ ACTION3 = { 'description': 'Action_3 description', 'next': None, 'state': 'PENDING', - 'alarm': None } ACTION_PLAN1 = { @@ -254,7 +251,6 @@ class ActionManagerTest(testtools.TestCase): self.assertEqual(expect, self.api.calls) self.assertEqual(ACTION1['uuid'], action.uuid) self.assertEqual(ACTION1['action_plan'], action.action_plan) - self.assertEqual(ACTION1['alarm'], action.alarm) self.assertEqual(ACTION1['next'], action.next) def test_delete(self): diff --git a/watcherclient/tests/v1/test_action_shell.py b/watcherclient/tests/v1/test_action_shell.py index e803dca..fc8e87a 100644 --- a/watcherclient/tests/v1/test_action_shell.py +++ b/watcherclient/tests/v1/test_action_shell.py @@ -31,7 +31,6 @@ class ActionShellTest(utils.BaseTestCase): action = object() a_shell._print_action_show(action) exp = ['action_type', - 'alarm', 'applies_to', 'created_at', 'deleted_at', diff --git a/watcherclient/v1/resource_fields.py b/watcherclient/v1/resource_fields.py index aad5df7..e818470 100644 --- a/watcherclient/v1/resource_fields.py +++ b/watcherclient/v1/resource_fields.py @@ -58,11 +58,11 @@ ACTION_PLAN_SHORT_LIST_FIELD_LABELS = ['UUID', 'Audit', 'State', 'Updated At'] # Action ACTION_FIELDS = ['uuid', 'created_at', 'updated_at', 'deleted_at', 'next_uuid', - 'description', 'alarm', 'state', 'action_plan_uuid', + 'description', 'state', 'action_plan_uuid', 'action_type', 'applies_to', 'input_parameters'] ACTION_FIELD_LABELS = ['UUID', 'Created At', 'Updated At', 'Deleted At', - 'Next Action', 'Description', 'Alarm', 'State', + 'Next Action', 'Description', 'State', 'Action Plan', 'Action', 'Applies to', 'Parameters'] ACTION_SHORT_LIST_FIELDS = ['uuid', 'next_uuid',