Merge "SDK Refactor: Prepare network segment commands"

Author: Jenkins

openstackclient/network/v2/network_segment.py

@@ -20,11 +20,16 @@
 from osc_lib import utils
 
 from openstackclient.i18n import _
+from openstackclient.network import sdk_utils
 
 
 LOG = logging.getLogger(__name__)
 
 
+def _get_columns(item):
+    return sdk_utils.get_osc_show_columns_for_sdk_resource(item, {})
+
+
 class CreateNetworkSegment(command.ShowOne):
     """Create new network segment"""
 
@@ -84,9 +89,9 @@ def take_action(self, parsed_args):
         if parsed_args.segment is not None:
             attrs['segmentation_id'] = parsed_args.segment
         obj = client.create_segment(**attrs)
-        columns = tuple(sorted(obj.keys()))
+        display_columns, columns = _get_columns(obj)
         data = utils.get_item_properties(obj, columns)
-        return (columns, data)
+        return (display_columns, data)
 
 
 class DeleteNetworkSegment(command.Command):
@@ -236,6 +241,6 @@ def take_action(self, parsed_args):
             parsed_args.network_segment,
             ignore_missing=False
         )
-        columns = tuple(sorted(obj.keys()))
+        display_columns, columns = _get_columns(obj)
         data = utils.get_item_properties(obj, columns)
-        return (columns, data)
+        return (display_columns, data)