Don't show tenant_id in network objects

osfrickler · osfrickler · commit 604ceeedf98e · 2022-06-27T10:50:03.000+02:00
Patch [0] dropped mapping the tenant_id attribute to project_id.
However, the Neutron API still returns the tenant_id attribute in
addition to the project_id and so we still need to discard it from
the output.

[0] I5f62f2a76592eaaaed6703624e959df41a6ecc8f

Signed-off-by: Dr. Jens Harbott &lt;harbott@osism.tech&gt;
Change-Id: Iba1e003bf587802f28928cb44d160b3b3fb1f840
diff --git a/openstackclient/network/v2/floating_ip.py b/openstackclient/network/v2/floating_ip.py
@@ -28,7 +28,7 @@
 
 def _get_network_columns(item):
     column_map = {}
-    hidden_columns = ['location']
+    hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
         column_map,
diff --git a/openstackclient/network/v2/floating_ip_port_forwarding.py b/openstackclient/network/v2/floating_ip_port_forwarding.py
@@ -27,7 +27,7 @@
 
 def _get_columns(item):
     column_map = {}
-    hidden_columns = ['location']
+    hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
         column_map,
diff --git a/openstackclient/network/v2/l3_conntrack_helper.py b/openstackclient/network/v2/l3_conntrack_helper.py
@@ -26,7 +26,7 @@
 
 def _get_columns(item):
     column_map = {}
-    hidden_columns = ['location']
+    hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
         column_map,
diff --git a/openstackclient/network/v2/local_ip.py b/openstackclient/network/v2/local_ip.py
@@ -29,7 +29,7 @@
 
 def _get_columns(item):
     column_map = {}
-    hidden_columns = ['location']
+    hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item, column_map, hidden_columns)
 
diff --git a/openstackclient/network/v2/local_ip_association.py b/openstackclient/network/v2/local_ip_association.py
@@ -29,7 +29,7 @@
 
 def _get_columns(item):
     column_map = {}
-    hidden_columns = ['location', 'name', 'id']
+    hidden_columns = ['location', 'name', 'id', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item, column_map, hidden_columns)
 
diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py
@@ -60,6 +60,7 @@ def _get_columns_network(item):
         'ipv6_address_scope_id': 'ipv6_address_scope',
         'tags': 'tags',
     }
+    hidden_columns = ['location', 'tenant_id']
     hidden_columns = ['location']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
diff --git a/openstackclient/network/v2/network_agent.py b/openstackclient/network/v2/network_agent.py
@@ -50,7 +50,7 @@ def _get_network_columns(item):
         'is_admin_state_up': 'admin_state_up',
         'is_alive': 'alive',
     }
-    hidden_columns = ['location', 'name']
+    hidden_columns = ['location', 'name', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
         column_map,
diff --git a/openstackclient/network/v2/network_flavor.py b/openstackclient/network/v2/network_flavor.py
@@ -31,7 +31,7 @@ def _get_columns(item):
         'is_enabled': 'enabled',
     }
 
-    hidden_columns = ['location']
+    hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
         column_map,
diff --git a/openstackclient/network/v2/network_meter.py b/openstackclient/network/v2/network_meter.py
@@ -30,7 +30,7 @@ def _get_columns(item):
     column_map = {
         'is_shared': 'shared',
     }
-    hidden_columns = ['location']
+    hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
         column_map,
diff --git a/openstackclient/network/v2/network_meter_rule.py b/openstackclient/network/v2/network_meter_rule.py
@@ -28,7 +28,7 @@
 
 def _get_columns(item):
     column_map = {}
-    hidden_columns = ['location']
+    hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
         column_map,
diff --git a/openstackclient/network/v2/network_qos_policy.py b/openstackclient/network/v2/network_qos_policy.py
@@ -30,7 +30,7 @@ def _get_columns(item):
     column_map = {
         'is_shared': 'shared',
     }
-    hidden_columns = ['location']
+    hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
         column_map,
diff --git a/openstackclient/network/v2/network_qos_rule.py b/openstackclient/network/v2/network_qos_rule.py
@@ -47,7 +47,7 @@
 
 def _get_columns(item):
     column_map = {}
-    hidden_columns = ['location']
+    hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
         column_map,
diff --git a/openstackclient/network/v2/network_qos_rule_type.py b/openstackclient/network/v2/network_qos_rule_type.py
@@ -24,9 +24,9 @@ def _get_columns(item):
         "type": "rule_type_name",
         "drivers": "drivers",
     }
-    invisible_columns = ["id", "location", "name"]
+    hidden_columns = ["id", "location", "name", 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
-        item, column_map, invisible_columns)
+        item, column_map, hidden_columns)
 
 
 class ListNetworkQosRuleType(command.Lister):
diff --git a/openstackclient/network/v2/network_segment.py b/openstackclient/network/v2/network_segment.py
@@ -27,7 +27,7 @@
 
 def _get_columns(item):
     column_map = {}
-    hidden_columns = ['location']
+    hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
         column_map,
diff --git a/openstackclient/network/v2/network_segment_range.py b/openstackclient/network/v2/network_segment_range.py
@@ -33,7 +33,7 @@
 
 def _get_columns(item):
     column_map = {}
-    hidden_columns = ['location']
+    hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
         column_map,
diff --git a/openstackclient/network/v2/security_group.py b/openstackclient/network/v2/security_group.py
@@ -35,6 +35,7 @@ def _format_network_security_group_rules(sg_rules):
         for key in empty_keys:
             sg_rule.pop(key)
         sg_rule.pop('security_group_id', None)
+        sg_rule.pop('tenant_id', None)
         sg_rule.pop('project_id', None)
     return utils.format_list_of_dicts(sg_rules)
 
diff --git a/openstackclient/network/v2/security_group_rule.py b/openstackclient/network/v2/security_group_rule.py
@@ -72,7 +72,7 @@ def _format_remote_ip_prefix(rule):
 
 def _get_columns(item):
     column_map = {}
-    hidden_columns = ['location']
+    hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
         column_map,
diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py
@@ -138,16 +138,17 @@ def _get_columns(item):
         'is_dhcp_enabled': 'enable_dhcp',
         'subnet_pool_id': 'subnetpool_id',
     }
-    # Do not show this column when displaying a subnet
-    invisible_columns = [
+    # Do not show these columns when displaying a subnet
+    hidden_columns = [
         'location',
         'use_default_subnet_pool',
-        'prefix_length'
+        'prefix_length',
+        'tenant_id',
     ]
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
         column_map,
-        invisible_columns
+        hidden_columns
     )
 
 
diff --git a/openstackclient/network/v2/subnet_pool.py b/openstackclient/network/v2/subnet_pool.py
@@ -37,7 +37,7 @@ def _get_columns(item):
         'maximum_prefix_length': 'max_prefixlen',
         'minimum_prefix_length': 'min_prefixlen',
     }
-    hidden_columns = ['location']
+    hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
         column_map,

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ def _get_columns_network(item):`
`60`	`60`	`'ipv6_address_scope_id': 'ipv6_address_scope',`
`61`	`61`	`'tags': 'tags',`
`62`	`62`	`}`
	`63`	`+ hidden_columns = ['location', 'tenant_id']`
`63`	`64`	`hidden_columns = ['location']`
`64`	`65`	`return utils.get_osc_show_columns_for_sdk_resource(`
`65`	`66`	`item,`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ def _get_network_columns(item):`
`50`	`50`	`'is_admin_state_up': 'admin_state_up',`
`51`	`51`	`'is_alive': 'alive',`
`52`	`52`	`}`
`53`		`- hidden_columns = ['location', 'name']`
	`53`	`+ hidden_columns = ['location', 'name', 'tenant_id']`
`54`	`54`	`return utils.get_osc_show_columns_for_sdk_resource(`
`55`	`55`	`item,`
`56`	`56`	`column_map,`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ def _get_columns(item):`
`31`	`31`	`'is_enabled': 'enabled',`
`32`	`32`	`}`
`33`	`33`
`34`		`- hidden_columns = ['location']`
	`34`	`+ hidden_columns = ['location', 'tenant_id']`
`35`	`35`	`return utils.get_osc_show_columns_for_sdk_resource(`
`36`	`36`	`item,`
`37`	`37`	`column_map,`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ def _get_columns(item):`
`30`	`30`	`column_map = {`
`31`	`31`	`'is_shared': 'shared',`
`32`	`32`	`}`
`33`		`- hidden_columns = ['location']`
	`33`	`+ hidden_columns = ['location', 'tenant_id']`
`34`	`34`	`return utils.get_osc_show_columns_for_sdk_resource(`
`35`	`35`	`item,`
`36`	`36`	`column_map,`