Merge "Remove tenant_id from networking code"

Author: Zuul

openstackclient/network/v2/network_trunk.py

@@ -392,7 +392,7 @@ def _get_attrs_for_trunk(network_client, identity_client, parsed_args):
             parsed_args.project,
             parsed_args.project_domain,
         ).id
-        attrs['tenant_id'] = project_id
+        attrs['project_id'] = project_id
 
     return attrs
 

openstackclient/network/v2/router.py

@@ -76,15 +76,15 @@ def _get_columns(item):
     }
     if hasattr(item, 'interfaces_info'):
         column_map['interfaces_info'] = 'interfaces_info'
-    invisible_columns = ['location', 'tenant_id']
+    hidden_columns = ['location', 'tenant_id']
     if item.is_ha is None:
-        invisible_columns.append('is_ha')
+        hidden_columns.append('is_ha')
         column_map.pop('is_ha')
     if item.is_distributed is None:
-        invisible_columns.append('is_distributed')
+        hidden_columns.append('is_distributed')
         column_map.pop('is_distributed')
     return utils.get_osc_show_columns_for_sdk_resource(
-        item, column_map, invisible_columns
+        item, column_map, hidden_columns
     )
 
 

openstackclient/network/v2/security_group_rule.py

@@ -524,7 +524,6 @@ def take_action_network(self, client, parsed_args):
                 parsed_args.project,
                 parsed_args.project_domain,
             ).id
-            query['tenant_id'] = project_id
             query['project_id'] = project_id
 
         rules = [

openstackclient/tests/unit/network/v2/test_security_group_rule_network.py

@@ -1265,7 +1265,7 @@ def test_list_with_project(self):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        filters = {'tenant_id': project.id, 'project_id': project.id}
+        filters = {'project_id': project.id}
 
         self.network_client.security_group_rules.assert_called_once_with(
             **filters
@@ -1291,7 +1291,7 @@ def test_list_with_project_domain(self):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        filters = {'tenant_id': project.id, 'project_id': project.id}
+        filters = {'project_id': project.id}
 
         self.network_client.security_group_rules.assert_called_once_with(
             **filters