From 130a522cad462b8bb12ceb92b2e437d63706e384 Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Fri, 23 Dec 2016 03:01:47 +0000 Subject: [PATCH] Revert "Fix `openstack cluster profile validate` bug" Like I21fe5dad0b401672fdde719b8d0adff5fef1e54d, this relies on features from the SDK has not been released/integrated with upper-constraints.txt This reverts commit 82771162c96f6ce82aa7deefcb3f2112f553b420. Change-Id: Idf4be216ffb7ecb2632489754c830b9357f8173d --- 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)