From 853987c723a62f6583b74716af06f43ed9e694e4 Mon Sep 17 00:00:00 2001
From: dixiaoli <dixiaobj@cn.ibm.com>
Date: Mon, 29 Feb 2016 16:38:22 +0800
Subject: [PATCH] Sort resource show columns

This change is aimed to sort the resource show columns.

Blueprint: senlin-support-python-openstackclient

Change-Id: I93b4323e9bfd69b9ea41adf3d8a9061babe6f28c
---
 senlinclient/osc/v1/action.py         | 2 +-
 senlinclient/osc/v1/build_info.py     | 2 +-
 senlinclient/osc/v1/cluster.py        | 2 +-
 senlinclient/osc/v1/cluster_policy.py | 2 +-
 senlinclient/osc/v1/event.py          | 2 +-
 senlinclient/osc/v1/node.py           | 2 +-
 senlinclient/osc/v1/receiver.py       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/senlinclient/osc/v1/action.py b/senlinclient/osc/v1/action.py
index 4c2dc59e..2ab4a3a4 100644
--- a/senlinclient/osc/v1/action.py
+++ b/senlinclient/osc/v1/action.py
@@ -141,6 +141,6 @@ class ShowAction(show.ShowOne):
             'depends_on': senlin_utils.list_formatter,
             'depended_by': senlin_utils.list_formatter,
         }
-        columns = list(six.iterkeys(action))
+        columns = sorted(list(six.iterkeys(action)))
         return columns, utils.get_dict_properties(action.to_dict(), columns,
                                                   formatters=formatters)
diff --git a/senlinclient/osc/v1/build_info.py b/senlinclient/osc/v1/build_info.py
index e5a4b249..9de5dca8 100644
--- a/senlinclient/osc/v1/build_info.py
+++ b/senlinclient/osc/v1/build_info.py
@@ -40,6 +40,6 @@ class BuildInfo(show.ShowOne):
             'api': senlin_utils.json_formatter,
             'engine': senlin_utils.json_formatter,
         }
-        columns = list(six.iterkeys(result))
+        columns = sorted(list(six.iterkeys(result)))
         return columns, utils.get_dict_properties(result.to_dict(), columns,
                                                   formatters=formatters)
diff --git a/senlinclient/osc/v1/cluster.py b/senlinclient/osc/v1/cluster.py
index 223720eb..5968aa98 100644
--- a/senlinclient/osc/v1/cluster.py
+++ b/senlinclient/osc/v1/cluster.py
@@ -137,7 +137,7 @@ def _show_cluster(senlin_client, cluster_id):
         'metadata': senlin_utils.json_formatter,
         'nodes': senlin_utils.list_formatter
     }
-    columns = list(six.iterkeys(cluster))
+    columns = sorted(list(six.iterkeys(cluster)))
     return columns, utils.get_dict_properties(cluster.to_dict(), columns,
                                               formatters=formatters)
 
diff --git a/senlinclient/osc/v1/cluster_policy.py b/senlinclient/osc/v1/cluster_policy.py
index 129529cd..e7462f26 100644
--- a/senlinclient/osc/v1/cluster_policy.py
+++ b/senlinclient/osc/v1/cluster_policy.py
@@ -113,7 +113,7 @@ class ClusterPolicyShow(show.ShowOne):
         senlin_client = self.app.client_manager.clustering
         policy = senlin_client.get_cluster_policy(parsed_args.policy,
                                                   parsed_args.cluster)
-        columns = list(six.iterkeys(policy))
+        columns = sorted(list(six.iterkeys(policy)))
         return columns, utils.get_dict_properties(policy.to_dict(), columns)
 
 
diff --git a/senlinclient/osc/v1/event.py b/senlinclient/osc/v1/event.py
index 0bd43727..cc2ee8bc 100644
--- a/senlinclient/osc/v1/event.py
+++ b/senlinclient/osc/v1/event.py
@@ -129,5 +129,5 @@ class ShowEvent(show.ShowOne):
         except sdk_exc.ResourceNotFound:
             raise exc.CommandError(_("Event not found: %s")
                                    % parsed_args.event)
-        columns = list(six.iterkeys(event))
+        columns = sorted(list(six.iterkeys(event)))
         return columns, utils.get_dict_properties(event.to_dict(), columns)
diff --git a/senlinclient/osc/v1/node.py b/senlinclient/osc/v1/node.py
index d917586f..3526f341 100644
--- a/senlinclient/osc/v1/node.py
+++ b/senlinclient/osc/v1/node.py
@@ -162,7 +162,7 @@ def _show_node(senlin_client, node_id, show_details=False):
         formatters['details'] = senlin_utils.nested_dict_formatter(
             list(node['details'].keys()), ['property', 'value'])
 
-    columns = list(six.iterkeys(node))
+    columns = sorted(list(six.iterkeys(node)))
     return columns, utils.get_dict_properties(node.to_dict(), columns,
                                               formatters=formatters)
 
diff --git a/senlinclient/osc/v1/receiver.py b/senlinclient/osc/v1/receiver.py
index 13363927..d8215bcf 100644
--- a/senlinclient/osc/v1/receiver.py
+++ b/senlinclient/osc/v1/receiver.py
@@ -142,7 +142,7 @@ def _show_receiver(senlin_client, receiver_id):
         'params': senlin_utils.json_formatter,
         'channel': senlin_utils.json_formatter,
     }
-    columns = list(six.iterkeys(receiver))
+    columns = sorted(list(six.iterkeys(receiver)))
     return columns, utils.get_dict_properties(receiver.to_dict(), columns,
                                               formatters=formatters)