From 3525aef3a6474c74ec046ef66fe5c3b2d7465737 Mon Sep 17 00:00:00 2001 From: Qiming Teng Date: Fri, 23 Dec 2016 09:22:49 +0000 Subject: [PATCH] Revert "Revert "Fix `openstack cluster profile validate` bug"" This reverts commit 130a522cad462b8bb12ceb92b2e437d63706e384. Let's do it again because the global requirements version is bumped now. Change-Id: I41a0384527fa76c1747628651a771d012426b86c --- 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 fc03fbd..80d1239 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)