From 3322ab5f018e119d3b92571d6ce174e34be5d422 Mon Sep 17 00:00:00 2001 From: jonnary Date: Sat, 24 Dec 2016 13:08:40 +0800 Subject: [PATCH] Add user and project support in action parse action-show can't show user and project, this patch adds in server side. Other patches will follow up. Change-Id: Iaef6c3a6dcb2ae688669d736f1850112d9916faa Closes-Bug: #1652423 --- senlin/engine/actions/base.py | 2 ++ senlin/objects/action.py | 2 ++ senlin/tests/unit/engine/actions/test_action_base.py | 8 +++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/senlin/engine/actions/base.py b/senlin/engine/actions/base.py index 6ed65f431..00a44b63c 100644 --- a/senlin/engine/actions/base.py +++ b/senlin/engine/actions/base.py @@ -484,6 +484,8 @@ class Action(object): 'created_at': utils.isotime(self.created_at), 'updated_at': utils.isotime(self.updated_at), 'data': self.data, + 'user': self.user, + 'project': self.project, } return action_dict diff --git a/senlin/objects/action.py b/senlin/objects/action.py index 32c7feafd..42fc81e63 100644 --- a/senlin/objects/action.py +++ b/senlin/objects/action.py @@ -180,5 +180,7 @@ class Action(base.SenlinObject, base.VersionedObjectDictCompat): 'created_at': utils.isotime(self.created_at), 'updated_at': utils.isotime(self.updated_at), 'data': self.data, + 'user': self.user, + 'project': self.project, } return action_dict diff --git a/senlin/tests/unit/engine/actions/test_action_base.py b/senlin/tests/unit/engine/actions/test_action_base.py index d6076a394..8825b4e3a 100644 --- a/senlin/tests/unit/engine/actions/test_action_base.py +++ b/senlin/tests/unit/engine/actions/test_action_base.py @@ -37,6 +37,8 @@ CLUSTER_ID = 'e1cfd82b-dc95-46ad-86e8-37864d7be1cd' OBJID = '571fffb8-f41c-4cbc-945c-cb2937d76f19' OWNER_ID = 'c7114713-ee68-409d-ba5d-0560a72a386c' ACTION_ID = '4c2cead2-fd74-418a-9d12-bd2d9bd7a812' +USER_ID = '3c4d64baadcd437d8dd49054899e73dd' +PROJECT_ID = 'cf7a6ae28dde4f46aa8fe55d318a608f' class DummyAction(ab.Action): @@ -50,7 +52,7 @@ class ActionBaseTest(base.SenlinTestCase): def setUp(self): super(ActionBaseTest, self).setUp() - self.ctx = utils.dummy_context() + self.ctx = utils.dummy_context(project=PROJECT_ID, user_id=USER_ID) self.action_values = { 'name': 'FAKE_NAME', 'cause': 'FAKE_CAUSE', @@ -66,6 +68,8 @@ class ActionBaseTest(base.SenlinTestCase): 'created_at': timeutils.utcnow(True), 'updated_at': None, 'data': {'data_key': 'data_value'}, + 'user': USER_ID, + 'user': PROJECT_ID, } def _verify_new_action(self, obj, target, action): @@ -590,6 +594,8 @@ class ActionBaseTest(base.SenlinTestCase): 'created_at': ts, 'updated_at': None, 'data': {'data_key': 'data_value'}, + 'user': USER_ID, + 'project': PROJECT_ID, } res = action.to_dict()