Get rid of tenant_id in the network commands

Finally drop tenant_id completely from the networking service.

Change-Id: I5f62f2a76592eaaaed6703624e959df41a6ecc8f

20 files changed, 26 insertions, 69 deletions

diff --git a/openstackclient/network/v2/address_group.py b/openstackclient/network/v2/address_group.py
index c3dac382..b08fa872 100644
--- a/openstackclient/network/v2/address_group.py
+++ b/openstackclient/network/v2/address_group.py
@@ -28,9 +28,7 @@ LOG = logging.getLogger(__name__)
 
 
 def _get_columns(item):
-    column_map = {
-        'tenant_id': 'project_id',
-    }
+    column_map = {}
     hidden_columns = ['location']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
@@ -56,7 +54,7 @@ def _get_attrs(client_manager, parsed_args):
             parsed_args.project,
             parsed_args.project_domain,
         ).id
-        attrs['tenant_id'] = project_id
+        attrs['project_id'] = project_id
 
     return attrs
 
diff --git a/openstackclient/network/v2/address_scope.py b/openstackclient/network/v2/address_scope.py
index 9183ef78..488e1600 100644
--- a/openstackclient/network/v2/address_scope.py
+++ b/openstackclient/network/v2/address_scope.py
@@ -29,7 +29,6 @@ LOG = logging.getLogger(__name__)
 def _get_columns(item):
     column_map = {
         'is_shared': 'shared',
-        'tenant_id': 'project_id',
     }
     hidden_columns = ['location']
     return utils.get_osc_show_columns_for_sdk_resource(
@@ -54,7 +53,7 @@ def _get_attrs(client_manager, parsed_args):
             parsed_args.project,
             parsed_args.project_domain,
         ).id
-        attrs['tenant_id'] = project_id
+        attrs['project_id'] = project_id
 
     return attrs
 
@@ -220,7 +219,6 @@ class ListAddressScope(command.Lister):
                 parsed_args.project,
                 parsed_args.project_domain,
             ).id
-            attrs['tenant_id'] = project_id
             attrs['project_id'] = project_id
         data = client.address_scopes(**attrs)
 
diff --git a/openstackclient/network/v2/floating_ip.py b/openstackclient/network/v2/floating_ip.py
index 83d816eb..4c03074d 100644
--- a/openstackclient/network/v2/floating_ip.py
+++ b/openstackclient/network/v2/floating_ip.py
@@ -27,9 +27,7 @@ _formatters = {
 
 
 def _get_network_columns(item):
-    column_map = {
-        'tenant_id': 'project_id',
-    }
+    column_map = {}
     hidden_columns = ['location']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
@@ -40,9 +38,6 @@ def _get_network_columns(item):
 
 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))
 
 
@@ -86,7 +81,7 @@ def _get_attrs(client_manager, parsed_args):
             parsed_args.project,
             parsed_args.project_domain,
         ).id
-        attrs['tenant_id'] = project_id
+        attrs['project_id'] = project_id
 
     if parsed_args.dns_domain:
         attrs['dns_domain'] = parsed_args.dns_domain
@@ -354,7 +349,6 @@ class ListFloatingIP(common.NetworkAndComputeLister):
                 parsed_args.project,
                 parsed_args.project_domain,
             )
-            query['tenant_id'] = project.id
             query['project_id'] = project.id
         if parsed_args.router is not None:
             router = network_client.find_router(parsed_args.router,
diff --git a/openstackclient/network/v2/floating_ip_port_forwarding.py b/openstackclient/network/v2/floating_ip_port_forwarding.py
index 8f3c1888..b33633d3 100644
--- a/openstackclient/network/v2/floating_ip_port_forwarding.py
+++ b/openstackclient/network/v2/floating_ip_port_forwarding.py
@@ -26,9 +26,7 @@ LOG = logging.getLogger(__name__)
 
 
 def _get_columns(item):
-    column_map = {
-        'tenant_id': 'project_id',
-    }
+    column_map = {}
     hidden_columns = ['location']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
diff --git a/openstackclient/network/v2/ip_availability.py b/openstackclient/network/v2/ip_availability.py
index e15ff2e9..9e56c5bd 100644
--- a/openstackclient/network/v2/ip_availability.py
+++ b/openstackclient/network/v2/ip_availability.py
@@ -26,9 +26,7 @@ _formatters = {
 
 
 def _get_columns(item):
-    column_map = {
-        'tenant_id': 'project_id',
-    }
+    column_map = {}
     hidden_columns = ['location']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
@@ -89,7 +87,6 @@ class ListIPAvailability(command.Lister):
                 parsed_args.project,
                 parsed_args.project_domain,
             ).id
-            filters['tenant_id'] = project_id
             filters['project_id'] = project_id
         data = client.network_ip_availabilities(**filters)
         return (column_headers,
diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py
index 827d29b7..a239e0fe 100644
--- a/openstackclient/network/v2/network.py
+++ b/openstackclient/network/v2/network.py
@@ -58,7 +58,6 @@ def _get_columns_network(item):
         'is_shared': 'shared',
         'ipv4_address_scope_id': 'ipv4_address_scope',
         'ipv6_address_scope_id': 'ipv6_address_scope',
-        'tenant_id': 'project_id',
         'tags': 'tags',
     }
     hidden_columns = ['location']
@@ -70,9 +69,7 @@ def _get_columns_network(item):
 
 
 def _get_columns_compute(item):
-    column_map = {
-        'tenant_id': 'project_id',
-    }
+    column_map = {}
     return utils.get_osc_show_columns_for_sdk_resource(item, column_map)
 
 
@@ -101,8 +98,6 @@ def _get_attrs_network(client_manager, parsed_args):
             parsed_args.project,
             parsed_args.project_domain,
         ).id
-        # TODO(dtroyer): Remove tenant_id when we clean up the SDK refactor
-        attrs['tenant_id'] = project_id
         attrs['project_id'] = project_id
 
     # "network set" command doesn't support setting availability zone hints.
@@ -573,7 +568,6 @@ class ListNetwork(common.NetworkAndComputeLister):
                 parsed_args.project,
                 parsed_args.project_domain,
             )
-            args['tenant_id'] = project.id
             args['project_id'] = project.id
 
         if parsed_args.share:
diff --git a/openstackclient/network/v2/network_auto_allocated_topology.py b/openstackclient/network/v2/network_auto_allocated_topology.py
index 8fecfa97..496606ba 100644
--- a/openstackclient/network/v2/network_auto_allocated_topology.py
+++ b/openstackclient/network/v2/network_auto_allocated_topology.py
@@ -25,9 +25,7 @@ LOG = logging.getLogger(__name__)
 
 
 def _get_columns(item):
-    column_map = {
-        'tenant_id': 'project_id',
-    }
+    column_map = {}
     hidden_columns = ['location']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
@@ -56,7 +54,7 @@ def _get_attrs(client_manager, parsed_args):
             parsed_args.project,
             parsed_args.project_domain,
         ).id
-        attrs['tenant_id'] = project_id
+        attrs['project_id'] = project_id
     if parsed_args.check_resources:
         attrs['check_resources'] = True
 
diff --git a/openstackclient/network/v2/network_flavor.py b/openstackclient/network/v2/network_flavor.py
index 453b8d99..862155ce 100644
--- a/openstackclient/network/v2/network_flavor.py
+++ b/openstackclient/network/v2/network_flavor.py
@@ -29,7 +29,6 @@ LOG = logging.getLogger(__name__)
 def _get_columns(item):
     column_map = {
         'is_enabled': 'enabled',
-        'tenant_id': 'project_id',
     }
 
     hidden_columns = ['location']
@@ -57,7 +56,7 @@ def _get_attrs(client_manager, parsed_args):
             parsed_args.project,
             parsed_args.project_domain,
         ).id
-        attrs['tenant_id'] = project_id
+        attrs['project_id'] = project_id
 
     return attrs
 
diff --git a/openstackclient/network/v2/network_flavor_profile.py b/openstackclient/network/v2/network_flavor_profile.py
index 90f8d7e0..719f955c 100644
--- a/openstackclient/network/v2/network_flavor_profile.py
+++ b/openstackclient/network/v2/network_flavor_profile.py
@@ -27,7 +27,6 @@ LOG = logging.getLogger(__name__)
 def _get_columns(item):
     column_map = {
         'is_enabled': 'enabled',
-        'tenant_id': 'project_id',
     }
 
     hidden_columns = ['location']
@@ -57,7 +56,7 @@ def _get_attrs(client_manager, parsed_args):
             parsed_args.project,
             parsed_args.project_domain,
         ).id
-        attrs['tenant_id'] = project_id
+        attrs['project_id'] = project_id
 
     return attrs
 
diff --git a/openstackclient/network/v2/network_meter.py b/openstackclient/network/v2/network_meter.py
index 56970195..b7b77fb1 100644
--- a/openstackclient/network/v2/network_meter.py
+++ b/openstackclient/network/v2/network_meter.py
@@ -29,7 +29,6 @@ LOG = logging.getLogger(__name__)
 def _get_columns(item):
     column_map = {
         'is_shared': 'shared',
-        'tenant_id': 'project_id',
     }
     hidden_columns = ['location']
     return utils.get_osc_show_columns_for_sdk_resource(
@@ -51,7 +50,7 @@ def _get_attrs(client_manager, parsed_args):
             parsed_args.project,
             parsed_args.project_domain,
         ).id
-        attrs['tenant_id'] = project_id
+        attrs['project_id'] = project_id
     if parsed_args.share:
         attrs['shared'] = True
     if parsed_args.no_share:
diff --git a/openstackclient/network/v2/network_meter_rule.py b/openstackclient/network/v2/network_meter_rule.py
index 95686372..0f427275 100644
--- a/openstackclient/network/v2/network_meter_rule.py
+++ b/openstackclient/network/v2/network_meter_rule.py
@@ -27,9 +27,7 @@ LOG = logging.getLogger(__name__)
 
 
 def _get_columns(item):
-    column_map = {
-        'tenant_id': 'project_id',
-    }
+    column_map = {}
     hidden_columns = ['location']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
@@ -64,7 +62,7 @@ def _get_attrs(client_manager, parsed_args):
             parsed_args.project,
             parsed_args.project_domain,
         ).id
-        attrs['tenant_id'] = project_id
+        attrs['project_id'] = project_id
 
     return attrs
 
diff --git a/openstackclient/network/v2/network_qos_policy.py b/openstackclient/network/v2/network_qos_policy.py
index 3725cbb8..bc257901 100644
--- a/openstackclient/network/v2/network_qos_policy.py
+++ b/openstackclient/network/v2/network_qos_policy.py
@@ -29,7 +29,6 @@ LOG = logging.getLogger(__name__)
 def _get_columns(item):
     column_map = {
         'is_shared': 'shared',
-        'tenant_id': 'project_id',
     }
     hidden_columns = ['location']
     return utils.get_osc_show_columns_for_sdk_resource(
@@ -64,7 +63,7 @@ def _get_attrs(client_manager, parsed_args):
             parsed_args.project,
             parsed_args.project_domain,
         ).id
-        attrs['tenant_id'] = project_id
+        attrs['project_id'] = project_id
 
     return attrs
 
diff --git a/openstackclient/network/v2/network_qos_rule.py b/openstackclient/network/v2/network_qos_rule.py
index 3cc388de..a4129b83 100644
--- a/openstackclient/network/v2/network_qos_rule.py
+++ b/openstackclient/network/v2/network_qos_rule.py
@@ -46,9 +46,7 @@ ACTION_SHOW = 'get'
 
 
 def _get_columns(item):
-    column_map = {
-        'tenant_id': 'project_id',
-    }
+    column_map = {}
     hidden_columns = ['location']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
diff --git a/openstackclient/network/v2/network_rbac.py b/openstackclient/network/v2/network_rbac.py
index 10ee1c1e..00667395 100644
--- a/openstackclient/network/v2/network_rbac.py
+++ b/openstackclient/network/v2/network_rbac.py
@@ -29,7 +29,6 @@ LOG = logging.getLogger(__name__)
 def _get_columns(item):
     column_map = {
         'target_tenant': 'target_project_id',
-        'tenant_id': 'project_id',
     }
     hidden_columns = ['location']
     return utils.get_osc_show_columns_for_sdk_resource(
@@ -87,7 +86,7 @@ def _get_attrs(client_manager, parsed_args):
             parsed_args.project,
             parsed_args.project_domain,
         ).id
-        attrs['tenant_id'] = project_id
+        attrs['project_id'] = project_id
 
     return attrs
 
diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py
index 85a32545..b55e729f 100644
--- a/openstackclient/network/v2/port.py
+++ b/openstackclient/network/v2/port.py
@@ -63,7 +63,6 @@ def _get_columns(item):
         'binding:vnic_type': 'binding_vnic_type',
         'is_admin_state_up': 'admin_state_up',
         'is_port_security_enabled': 'port_security_enabled',
-        'tenant_id': 'project_id',
     }
     hidden_columns = ['location']
     return utils.get_osc_show_columns_for_sdk_resource(
@@ -139,7 +138,7 @@ def _get_attrs(client_manager, parsed_args):
             parsed_args.project,
             parsed_args.project_domain,
         ).id
-        attrs['tenant_id'] = project_id
+        attrs['project_id'] = project_id
 
     if parsed_args.disable_port_security:
         attrs['port_security_enabled'] = False
@@ -687,7 +686,6 @@ class ListPort(command.Lister):
                 parsed_args.project,
                 parsed_args.project_domain,
             ).id
-            filters['tenant_id'] = project_id
             filters['project_id'] = project_id
         if parsed_args.name:
             filters['name'] = parsed_args.name
diff --git a/openstackclient/network/v2/router.py b/openstackclient/network/v2/router.py
index 61c176e3..f1fce298 100644
--- a/openstackclient/network/v2/router.py
+++ b/openstackclient/network/v2/router.py
@@ -67,7 +67,6 @@ _formatters = {
 
 def _get_columns(item):
     column_map = {
-        'tenant_id': 'project_id',
         'is_ha': 'ha',
         'is_distributed': 'distributed',
         'is_admin_state_up': 'admin_state_up',
@@ -110,7 +109,7 @@ def _get_attrs(client_manager, parsed_args):
             parsed_args.project,
             parsed_args.project_domain,
         ).id
-        attrs['tenant_id'] = project_id
+        attrs['project_id'] = project_id
     if parsed_args.external_gateway:
         gateway_info = {}
         n_client = client_manager.network
@@ -515,7 +514,6 @@ class ListRouter(command.Lister):
                 parsed_args.project,
                 parsed_args.project_domain,
             ).id
-            args['tenant_id'] = project_id
             args['project_id'] = project_id
 
         _tag.get_tag_filtering_args(parsed_args, args)
diff --git a/openstackclient/network/v2/security_group.py b/openstackclient/network/v2/security_group.py
index df627088..d8c38f45 100644
--- a/openstackclient/network/v2/security_group.py
+++ b/openstackclient/network/v2/security_group.py
@@ -35,7 +35,6 @@ 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)
 
@@ -85,6 +84,7 @@ _formatters_compute = {
 
 
 def _get_columns(item):
+    # We still support Nova managed security groups, where we have tenant_id.
     column_map = {
         'security_group_rules': 'rules',
         'tenant_id': 'project_id',
@@ -164,7 +164,7 @@ class CreateSecurityGroup(common.NetworkAndComputeShowOne,
                 parsed_args.project,
                 parsed_args.project_domain,
             ).id
-            attrs['tenant_id'] = project_id
+            attrs['project_id'] = project_id
         attrs.update(
             self._parse_extra_properties(parsed_args.extra_properties))
 
@@ -269,7 +269,6 @@ class ListSecurityGroup(common.NetworkAndComputeLister):
                 parsed_args.project,
                 parsed_args.project_domain,
             ).id
-            filters['tenant_id'] = project_id
             filters['project_id'] = project_id
 
         _tag.get_tag_filtering_args(parsed_args, filters)
diff --git a/openstackclient/network/v2/security_group_rule.py b/openstackclient/network/v2/security_group_rule.py
index df567bcf..a1122616 100644
--- a/openstackclient/network/v2/security_group_rule.py
+++ b/openstackclient/network/v2/security_group_rule.py
@@ -71,9 +71,7 @@ def _format_remote_ip_prefix(rule):
 
 
 def _get_columns(item):
-    column_map = {
-        'tenant_id': 'project_id',
-    }
+    column_map = {}
     hidden_columns = ['location']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
@@ -357,7 +355,7 @@ class CreateSecurityGroupRule(common.NetworkAndComputeShowOne,
                 parsed_args.project,
                 parsed_args.project_domain,
             ).id
-            attrs['tenant_id'] = project_id
+            attrs['project_id'] = project_id
 
         attrs.update(
             self._parse_extra_properties(parsed_args.extra_properties))
diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py
index 88500375..bf6a46d4 100644
--- a/openstackclient/network/v2/subnet.py
+++ b/openstackclient/network/v2/subnet.py
@@ -137,7 +137,6 @@ def _get_columns(item):
     column_map = {
         'is_dhcp_enabled': 'enable_dhcp',
         'subnet_pool_id': 'subnetpool_id',
-        'tenant_id': 'project_id',
     }
     # Do not show this column when displaying a subnet
     invisible_columns = [
@@ -188,7 +187,7 @@ def _get_attrs(client_manager, parsed_args, is_create=True):
                 parsed_args.project,
                 parsed_args.project_domain,
             ).id
-            attrs['tenant_id'] = project_id
+            attrs['project_id'] = project_id
         attrs['network_id'] = client.find_network(parsed_args.network,
                                                   ignore_missing=False).id
         if parsed_args.subnet_pool is not None:
@@ -522,7 +521,6 @@ class ListSubnet(command.Lister):
                 parsed_args.project,
                 parsed_args.project_domain,
             ).id
-            filters['tenant_id'] = project_id
             filters['project_id'] = project_id
         if parsed_args.network:
             network_id = network_client.find_network(parsed_args.network,
diff --git a/openstackclient/network/v2/subnet_pool.py b/openstackclient/network/v2/subnet_pool.py
index 72a9493b..b4142f37 100644
--- a/openstackclient/network/v2/subnet_pool.py
+++ b/openstackclient/network/v2/subnet_pool.py
@@ -36,7 +36,6 @@ def _get_columns(item):
         'is_shared': 'shared',
         'maximum_prefix_length': 'max_prefixlen',
         'minimum_prefix_length': 'min_prefixlen',
-        'tenant_id': 'project_id',
     }
     hidden_columns = ['location']
     return utils.get_osc_show_columns_for_sdk_resource(
@@ -91,7 +90,7 @@ def _get_attrs(client_manager, parsed_args):
             parsed_args.project,
             parsed_args.project_domain,
         ).id
-        attrs['tenant_id'] = project_id
+        attrs['project_id'] = project_id
 
     if parsed_args.description is not None:
         attrs['description'] = parsed_args.description
@@ -329,7 +328,6 @@ class ListSubnetPool(command.Lister):
                 parsed_args.project,
                 parsed_args.project_domain,
             ).id
-            filters['tenant_id'] = project_id
             filters['project_id'] = project_id
         if parsed_args.name is not None:
             filters['name'] = parsed_args.name