diff --git a/watcherclient/tests/v1/test_action_shell.py b/watcherclient/tests/v1/test_action_shell.py index 03ec174..4afe646 100644 --- a/watcherclient/tests/v1/test_action_shell.py +++ b/watcherclient/tests/v1/test_action_shell.py @@ -29,7 +29,7 @@ ACTION_1 = { 'action_plan_uuid': 'f8e47706-efcf-49a4-a5c4-af604eb492f2', 'state': 'PENDING', 'action_type': 'migrate', - 'next_uuid': '239f02a5-9649-4e14-9d33-ac2bf67cb755', + 'parents': ['239f02a5-9649-4e14-9d33-ac2bf67cb755'], 'input_parameters': {"test": 1}, 'created_at': datetime.datetime.now().isoformat(), 'updated_at': None, @@ -41,7 +41,7 @@ ACTION_2 = { 'action_plan_uuid': 'f8e47706-efcf-49a4-a5c4-af604eb492f2', 'state': 'PENDING', 'action_type': 'migrate', - 'next_uuid': '67653274-eb24-c7ba-70f6-a84e73d80843', + 'parents': ['67653274-eb24-c7ba-70f6-a84e73d80843'], 'input_parameters': {"test": 2}, 'created_at': datetime.datetime.now().isoformat(), 'updated_at': None, @@ -51,7 +51,7 @@ ACTION_2 = { ACTION_3 = { 'uuid': '67653274-eb24-c7ba-70f6-a84e73d80843', 'action_plan_uuid': 'a5199d0e-0702-4613-9234-5ae2af8dafea', - 'next_uuid': None, + 'parents': [], 'state': 'PENDING', 'action_type': 'sleep', 'created_at': datetime.datetime.now().isoformat(), diff --git a/watcherclient/v1/resource_fields.py b/watcherclient/v1/resource_fields.py index cc7c90c..307ecee 100644 --- a/watcherclient/v1/resource_fields.py +++ b/watcherclient/v1/resource_fields.py @@ -61,18 +61,18 @@ ACTION_PLAN_SHORT_LIST_FIELD_LABELS = ['UUID', 'Audit', 'State', 'Updated At', 'Global efficacy'] # Action -ACTION_FIELDS = ['uuid', 'created_at', 'updated_at', 'deleted_at', 'next_uuid', +ACTION_FIELDS = ['uuid', 'created_at', 'updated_at', 'deleted_at', 'parents', 'state', 'action_plan_uuid', 'action_type', 'input_parameters'] ACTION_FIELD_LABELS = ['UUID', 'Created At', 'Updated At', 'Deleted At', - 'Next Action', 'State', 'Action Plan', 'Action', + 'Parents', 'State', 'Action Plan', 'Action', 'Parameters'] -ACTION_SHORT_LIST_FIELDS = ['uuid', 'next_uuid', +ACTION_SHORT_LIST_FIELDS = ['uuid', 'parents', 'state', 'action_plan_uuid', 'action_type'] -ACTION_SHORT_LIST_FIELD_LABELS = ['UUID', 'Next Action', 'State', +ACTION_SHORT_LIST_FIELD_LABELS = ['UUID', 'Parents', 'State', 'Action Plan', 'Action'] # Goals