From c4103f627d16223c5e8b45702c459674a8d66bc3 Mon Sep 17 00:00:00 2001
From: jonnary <liu.xuefeng1@zte.com.cn>
Date: Thu, 15 Dec 2016 13:32:33 +0800
Subject: [PATCH] Fix `openstack  cluster policy show` bug

This patch fixes project_id and user_id show bug in
command `openstack  cluster policy show`.

Change-Id: I4f2bad581b9ac56beb8bfd0e3ab2750701459e6d
Depends-On:If088bf2e606b6bd74e520ff11b9ad2e1d97f5773
Closes-Bug:#1650120
---
 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..201dd37 100644
--- a/senlinclient/tests/unit/v1/test_policy.py
+++ b/senlinclient/tests/unit/v1/test_policy.py
@@ -177,6 +177,18 @@ class TestPolicyShow(TestPolicy):
         parsed_args = self.check_parser(self.cmd, arglist, [])
         self.cmd.take_action(parsed_args)
         self.mock_client.get_policy.assert_called_with('sp001')
+        policy = self.mock_client.get_policy('sp001')
+        self.assertEqual(self.response['policy']['created_at'],
+                         policy.created_at)
+        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)
 
     def test_policy_show_not_found(self):
         arglist = ['sp001']
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)