Merge "SDK Refactor: Prepare address scope commands"

1 files changed, 16 insertions, 12 deletions

diff --git a/openstackclient/network/v2/address_scope.py b/openstackclient/network/v2/address_scope.py
index 6cd13f8c..95f6c947 100644
--- a/openstackclient/network/v2/address_scope.py
+++ b/openstackclient/network/v2/address_scope.py
@@ -21,18 +21,18 @@ from osc_lib import utils
 
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
+from openstackclient.network import sdk_utils
 
 
 LOG = logging.getLogger(__name__)
 
 
 def _get_columns(item):
-    columns = list(item.keys())
-    if 'tenant_id' in columns:
-        columns.remove('tenant_id')
-        columns.append('project_id')
-
-    return tuple(sorted(columns))
+    column_map = {
+        'is_shared': 'shared',
+        'tenant_id': 'project_id',
+    }
+    return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)
 
 
 def _get_attrs(client_manager, parsed_args):
@@ -55,6 +55,8 @@ def _get_attrs(client_manager, parsed_args):
     return attrs
 
 
+# TODO(rtheis): Use the SDK resource mapped attribute names once the
+# OSC minimum requirements include SDK 1.0.
 class CreateAddressScope(command.ShowOne):
     """Create a new Address Scope"""
 
@@ -97,10 +99,10 @@ class CreateAddressScope(command.ShowOne):
         client = self.app.client_manager.network
         attrs = _get_attrs(self.app.client_manager, parsed_args)
         obj = client.create_address_scope(**attrs)
-        columns = _get_columns(obj)
+        display_columns, columns = _get_columns(obj)
         data = utils.get_item_properties(obj, columns, formatters={})
 
-        return (columns, data)
+        return (display_columns, data)
 
 
 class DeleteAddressScope(command.Command):
@@ -147,8 +149,8 @@ class ListAddressScope(command.Lister):
             'id',
             'name',
             'ip_version',
-            'shared',
-            'tenant_id',
+            'is_shared',
+            'project_id',
         )
         column_headers = (
             'ID',
@@ -165,6 +167,8 @@ class ListAddressScope(command.Lister):
                 ) for s in data))
 
 
+# TODO(rtheis): Use the SDK resource mapped attribute names once the
+# OSC minimum requirements include SDK 1.0.
 class SetAddressScope(command.Command):
     """Set address scope properties"""
 
@@ -227,7 +231,7 @@ class ShowAddressScope(command.ShowOne):
         obj = client.find_address_scope(
             parsed_args.address_scope,
             ignore_missing=False)
-        columns = _get_columns(obj)
+        display_columns, columns = _get_columns(obj)
         data = utils.get_item_properties(obj, columns, formatters={})
 
-        return (columns, data)
+        return (display_columns, data)