From 862f297d191b7f1f7c40779cbfd3b6a69ad19a88 Mon Sep 17 00:00:00 2001 From: XueFeng Liu Date: Wed, 11 Jan 2017 05:45:30 +0000 Subject: [PATCH] Revert "Revert "Revert "Revert "Fix `openstack cluster profile validate` bug"""" This reverts commit 3a10bc25e5ac4f07af7c73b97b9714c7f683cfb7. Change-Id: I6bfb47096002c37de974627b7f8da9fb16adf6dc (cherry picked from commit 8953c284ad8c7f5d90a6f892247e214eb574f1d5) --- senlinclient/tests/unit/v1/test_profile.py | 11 +++++++++++ senlinclient/v1/profile.py | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/senlinclient/tests/unit/v1/test_profile.py b/senlinclient/tests/unit/v1/test_profile.py index e6571fe..3421301 100644 --- a/senlinclient/tests/unit/v1/test_profile.py +++ b/senlinclient/tests/unit/v1/test_profile.py @@ -457,3 +457,14 @@ class TestProfileValidate(TestProfile): parsed_args = self.check_parser(self.cmd, arglist, []) self.cmd.take_action(parsed_args) self.mock_client.validate_profile.assert_called_with(**self.defaults) + profile = self.mock_client.validate_profile(**self.defaults) + self.assertEqual(self.response['profile']['project'], + profile.project_id) + self.assertEqual(self.response['profile']['user'], + profile.user_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) diff --git a/senlinclient/v1/profile.py b/senlinclient/v1/profile.py index c2d8309..e811076 100644 --- a/senlinclient/v1/profile.py +++ b/senlinclient/v1/profile.py @@ -368,11 +368,11 @@ class ValidateProfile(command.ShowOne): 'id', 'metadata', 'name', - 'project', + 'project_id', 'spec', 'type', 'updated_at', - 'user' + 'user_id' ] return columns, utils.get_dict_properties(profile.to_dict(), columns, formatters=formatters)