From 9b019fcbc81966d63d8dbddb1ea8a376a768441a Mon Sep 17 00:00:00 2001 From: jonnary Date: Thu, 15 Dec 2016 14:56:17 +0800 Subject: [PATCH] Fix `openstack cluster policy vaildate` bug This patch fixes project_id and user_id show bug in command `openstack cluster policy validate`. Change-Id: Id0c5e2a19722799d7921928ec0e86dde370a1a05 Depends-On:If088bf2e606b6bd74e520ff11b9ad2e1d97f5773 Closes-Bug: #1650121 --- senlinclient/tests/unit/v1/test_policy.py | 12 ++++++++++++ senlinclient/v1/policy.py | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/senlinclient/tests/unit/v1/test_policy.py b/senlinclient/tests/unit/v1/test_policy.py index 9c4164d..811f0c6 100644 --- a/senlinclient/tests/unit/v1/test_policy.py +++ b/senlinclient/tests/unit/v1/test_policy.py @@ -421,3 +421,15 @@ class TestPolicyValidate(TestPolicy): parsed_args = self.check_parser(self.cmd, arglist, []) self.cmd.take_action(parsed_args) self.mock_client.validate_policy.assert_called_with(**self.defaults) + policy = self.mock_client.validate_policy(**self.defaults) + self.assertEqual(self.response['policy']['project'], + policy.project_id) + self.assertEqual(self.response['policy']['data'], policy.data) + self.assertEqual(self.response['policy']['id'], policy.id) + self.assertEqual(self.response['policy']['name'], policy.name) + self.assertEqual(self.response['policy']['project'], + policy.project_id) + self.assertEqual(self.response['policy']['spec'], policy.spec) + self.assertEqual(self.response['policy']['type'], policy.type) + self.assertEqual(self.response['policy']['updated_at'], + policy.updated_at) diff --git a/senlinclient/v1/policy.py b/senlinclient/v1/policy.py index a35b2a6..efa8ce1 100644 --- a/senlinclient/v1/policy.py +++ b/senlinclient/v1/policy.py @@ -144,11 +144,11 @@ def _show_policy(senlin_client, policy_id): 'domain', 'id', 'name', - 'project', + 'project_id', 'spec', 'type', 'updated_at', - 'user' + 'user_id' ] return columns, utils.get_dict_properties(policy.to_dict(), columns, formatters=formatters)