From 97e85c1c8ad227f366194cead66fcb4cea74805f Mon Sep 17 00:00:00 2001 From: liyi Date: Tue, 11 Jul 2017 17:26:13 +0800 Subject: [PATCH] Unify style of 'domain' field The output of CLI need unify style of 'domain' filed. Change-Id: I09b6d4ec952ce30d2d74e6a51e58e16d1d585718 Partial-Bug: #1703545 --- senlinclient/v1/policy.py | 17 ++++------------- senlinclient/v1/profile.py | 16 +++------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/senlinclient/v1/policy.py b/senlinclient/v1/policy.py index d8c0bd5..bd2b602 100644 --- a/senlinclient/v1/policy.py +++ b/senlinclient/v1/policy.py @@ -138,19 +138,10 @@ def _show_policy(senlin_client, policy_id): formatters = { 'spec': senlin_utils.json_formatter } - columns = [ - 'created_at', - 'data', - 'domain', - 'id', - 'name', - 'project_id', - 'spec', - 'type', - 'updated_at', - 'user_id' - ] - return columns, utils.get_dict_properties(policy.to_dict(), columns, + + data = policy.to_dict() + columns = sorted(data.keys()) + return columns, utils.get_dict_properties(data, columns, formatters=formatters) diff --git a/senlinclient/v1/profile.py b/senlinclient/v1/profile.py index 0efcd3d..ac116cf 100644 --- a/senlinclient/v1/profile.py +++ b/senlinclient/v1/profile.py @@ -57,19 +57,9 @@ def _show_profile(senlin_client, profile_id): ['type', 'version', 'properties'], ['property', 'value']) - columns = [ - 'created_at', - 'domain', - 'id', - 'metadata', - 'name', - 'project_id', - 'spec', - 'type', - 'updated_at', - 'user_id' - ] - return columns, utils.get_dict_properties(data.to_dict(), columns, + data = data.to_dict() + columns = sorted(data.keys()) + return columns, utils.get_dict_properties(data, columns, formatters=formatters)