mgr/orchestrator_cli: collapse TYPE and ID columns

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/pybind/mgr/orchestrator.py b/src/pybind/mgr/orchestrator.py
index dc9e57f2fe9ed7a686b0b80279d99932469626fa..ea96f7296b6aef686aef052fa22324885748a993 100644 (file)
--- a/src/pybind/mgr/orchestrator.py
+++ b/src/pybind/mgr/orchestrator.py
@@ -671,6 +671,11 @@ class ServiceDescription(object):
         # Service status description when status == -1.
         self.status_desc = status_desc
 
+    def name(self):
+        if self.service_instance:
+            return '%s.%s' % (self.service_type, self.service_instance)
+        return self.service_type
+
     def to_json(self):
         out = {
             'nodename': self.nodename,

diff --git a/src/pybind/mgr/orchestrator_cli/module.py b/src/pybind/mgr/orchestrator_cli/module.py
index 6f9f3c30008b7c9e33bafbff9d950bd2580a37a0..7cd699b258d25646eb2591911bc2422eb2938fdc 100644 (file)
--- a/src/pybind/mgr/orchestrator_cli/module.py
+++ b/src/pybind/mgr/orchestrator_cli/module.py
@@ -266,7 +266,7 @@ class OrchestratorCli(orchestrator.OrchestratorClientMixin, MgrModule):
             table.align = 'l'
             table.left_padding_width = 0
             table.right_padding_width = 1
-            for s in services:
+            for s in sorted(services, key=lambda s: s.name()):
                 if s.service is None:
                     service_id = s.service_instance
                 else: