From e2a9a9607cc84c0afc2fc5524681a3adebdc68ec Mon Sep 17 00:00:00 2001
From: Stephen Finucane <sfinucan@redhat.com>
Date: Thu, 5 Nov 2020 11:29:54 +0000
Subject: compute: Fix 'server group * -f yaml' output

Make use of 'FormattableColumn'-derived formatters, which provide better
output than what we were using before, particularly for the YAML output
format.

Change-Id: Id6d25a0a348596d5a0430ff7afbf87b049a76bc8
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
---
 openstackclient/compute/v2/server_group.py | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'openstackclient/compute/v2')

diff --git a/openstackclient/compute/v2/server_group.py b/openstackclient/compute/v2/server_group.py
index a3363244..d245c092 100644
--- a/openstackclient/compute/v2/server_group.py
+++ b/openstackclient/compute/v2/server_group.py
@@ -18,6 +18,7 @@
 import logging
 
 from novaclient import api_versions
+from osc_lib.cli import format_columns
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
@@ -29,8 +30,8 @@ LOG = logging.getLogger(__name__)
 
 
 _formatters = {
-    'policies': utils.format_list,
-    'members': utils.format_list,
+    'policies': format_columns.ListColumn,
+    'members': format_columns.ListColumn,
 }
 
 
@@ -93,8 +94,8 @@ class CreateServerGroup(command.ShowOne):
         info.update(server_group._info)
 
         columns = _get_columns(info)
-        data = utils.get_dict_properties(info, columns,
-                                         formatters=_formatters)
+        data = utils.get_dict_properties(
+            info, columns, formatters=_formatters)
         return columns, data
 
 
@@ -176,14 +177,18 @@ class ListServerGroup(command.Lister):
                 policy_key,
             )
 
-        return (column_headers,
-                (utils.get_item_properties(
+        return (
+            column_headers,
+            (
+                utils.get_item_properties(
                     s, columns,
                     formatters={
-                        'Policies': utils.format_list,
-                        'Members': utils.format_list,
+                        'Policies': format_columns.ListColumn,
+                        'Members': format_columns.ListColumn,
                     }
-                ) for s in data))
+                ) for s in data
+            ),
+        )
 
 
 class ShowServerGroup(command.ShowOne):
@@ -205,6 +210,6 @@ class ShowServerGroup(command.ShowOne):
         info = {}
         info.update(group._info)
         columns = _get_columns(info)
-        data = utils.get_dict_properties(info, columns,
-                                         formatters=_formatters)
+        data = utils.get_dict_properties(
+            info, columns, formatters=_formatters)
         return columns, data
-- 
cgit v1.2.1