Avoid duplicated project_id when show network resources

Project_id appear twice when show network resources. This
patch check and not append if it already has one.

Change-Id: I744988f3f52d4a744e397a6a82fefdc4c17eacbf
Closes-Bug: #1636123
Partially-Implements: blueprint duplicated-project-id

3 files changed, 14 insertions, 11 deletions

diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py
index 6cae87ee..0b636308 100644
--- a/openstackclient/network/v2/port.py
+++ b/openstackclient/network/v2/port.py
@@ -50,7 +50,8 @@ def _get_columns(item):
     columns = list(item.keys())
     if 'tenant_id' in columns:
         columns.remove('tenant_id')
-        columns.append('project_id')
+        if 'project_id' not in columns:
+            columns.append('project_id')
     binding_columns = [
         'binding:host_id',
         'binding:profile',
diff --git a/openstackclient/network/v2/router.py b/openstackclient/network/v2/router.py
index cbd412b5..c387831a 100644
--- a/openstackclient/network/v2/router.py
+++ b/openstackclient/network/v2/router.py
@@ -25,6 +25,7 @@ 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__)
@@ -59,11 +60,10 @@ _formatters = {
 
 
 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 = {
+        'tenant_id': 'project_id',
+    }
+    return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)
 
 
 def _get_attrs(client_manager, parsed_args):
@@ -215,10 +215,10 @@ class CreateRouter(command.ShowOne):
             attrs['ha'] = parsed_args.ha
         obj = client.create_router(**attrs)
 
-        columns = _get_columns(obj)
+        display_columns, columns = _get_columns(obj)
         data = utils.get_item_properties(obj, columns, formatters=_formatters)
 
-        return (columns, data)
+        return (display_columns, data)
 
 
 class DeleteRouter(command.Command):
@@ -523,9 +523,10 @@ class ShowRouter(command.ShowOne):
     def take_action(self, parsed_args):
         client = self.app.client_manager.network
         obj = client.find_router(parsed_args.router, ignore_missing=False)
-        columns = _get_columns(obj)
+        display_columns, columns = _get_columns(obj)
         data = utils.get_item_properties(obj, columns, formatters=_formatters)
-        return (columns, data)
+
+        return (display_columns, data)
 
 
 class UnsetRouter(command.Command):
diff --git a/openstackclient/network/v2/security_group.py b/openstackclient/network/v2/security_group.py
index 554dd61d..8c5c7fee 100644
--- a/openstackclient/network/v2/security_group.py
+++ b/openstackclient/network/v2/security_group.py
@@ -81,8 +81,9 @@ def _get_columns(item):
         columns.remove('security_group_rules')
         property_column_mappings.append(('rules', 'security_group_rules'))
     if 'tenant_id' in columns:
-        columns.append('project_id')
         columns.remove('tenant_id')
+        if 'project_id' not in columns:
+            columns.append('project_id')
         property_column_mappings.append(('project_id', 'tenant_id'))
     display_columns = sorted(columns)