From 3a10bc25e5ac4f07af7c73b97b9714c7f683cfb7 Mon Sep 17 00:00:00 2001 From: XueFeng Liu Date: Tue, 27 Dec 2016 04:08:07 +0000 Subject: [PATCH] Revert "Revert "Revert "Fix `openstack cluster profile validate` bug""" This reverts commit 3525aef3a6474c74ec046ef66fe5c3b2d7465737. Change-Id: Ic403676653ea57c5c407c80ab31e75af02ab1eac --- senlinclient/tests/unit/v1/test_profile.py | 11 ----------- senlinclient/v1/profile.py | 4 ++-- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/senlinclient/tests/unit/v1/test_profile.py b/senlinclient/tests/unit/v1/test_profile.py index 34213012..e6571fe7 100644 --- a/senlinclient/tests/unit/v1/test_profile.py +++ b/senlinclient/tests/unit/v1/test_profile.py @@ -457,14 +457,3 @@ 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 80d1239a..fc03fbdf 100644 --- a/senlinclient/v1/profile.py +++ b/senlinclient/v1/profile.py @@ -368,11 +368,11 @@ class ValidateProfile(command.ShowOne): 'id', 'metadata', 'name', - 'project_id', + 'project', 'spec', 'type', 'updated_at', - 'user_id' + 'user' ] return columns, utils.get_dict_properties(profile.to_dict(), columns, formatters=formatters)