From 7ba78f856d2cbcac179fb1e5a5b7c824118d9f9a Mon Sep 17 00:00:00 2001 From: Qiming Teng Date: Fri, 23 Dec 2016 09:13:05 +0000 Subject: [PATCH] Revert "Revert "Get project_id and user_id when show profile"" This reverts commit 427ff590066890d9e331500e7899eb068a24e958. Change-Id: I8d93d915ff8cc67dfda88f3f35e640300d73c0b4 --- senlinclient/tests/unit/v1/test_profile.py | 9 +++++++++ senlinclient/v1/profile.py | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/senlinclient/tests/unit/v1/test_profile.py b/senlinclient/tests/unit/v1/test_profile.py index 7782e1e..e6571fe 100644 --- a/senlinclient/tests/unit/v1/test_profile.py +++ b/senlinclient/tests/unit/v1/test_profile.py @@ -100,6 +100,15 @@ class TestProfileShow(TestProfile): parsed_args = self.check_parser(self.cmd, arglist, []) self.cmd.take_action(parsed_args) self.mock_client.get_profile.assert_called_with('my_profile') + profile = self.mock_client.get_profile('my_profile') + self.assertEqual(self.response['profile']['project'], + profile.project_id) + self.assertEqual(self.response['profile']['id'], profile.id) + self.assertEqual(self.response['profile']['metadata'], + profile.metadata) + self.assertEqual(self.response['profile']['name'], profile.name) + self.assertEqual(self.response['profile']['spec'], profile.spec) + self.assertEqual(self.response['profile']['type'], profile.type) def test_profile_show_not_found(self): arglist = ['my_profile'] diff --git a/senlinclient/v1/profile.py b/senlinclient/v1/profile.py index c0e289a..aed6219 100644 --- a/senlinclient/v1/profile.py +++ b/senlinclient/v1/profile.py @@ -64,11 +64,11 @@ def _show_profile(senlin_client, profile_id): 'id', 'metadata', 'name', - 'project', + 'project_id', 'spec', 'type', 'updated_at', - 'user' + 'user_id' ] return columns, utils.get_dict_properties(data.to_dict(), columns, formatters=formatters)