Merge "network: Address nits for I3c313fc9329837dde67815901528a34dca98ebcc"

Zuul · openstack-gerrit · commit d6646d714b95 · 2021-01-12T13:54:11.000Z
diff --git a/openstackclient/network/v2/address_group.py b/openstackclient/network/v2/address_group.py
@@ -36,10 +36,7 @@ def _get_columns(item):
 
 
 def _format_addresses(addresses):
-    ret = []
-    for addr in addresses:
-        ret.append(str(netaddr.IPNetwork(addr)))
-    return ret
+    return [str(netaddr.IPNetwork(addr)) for addr in addresses]
 
 
 def _get_attrs(client_manager, parsed_args):
@@ -185,7 +182,6 @@ def take_action(self, parsed_args):
                 parsed_args.project,
                 parsed_args.project_domain,
             ).id
-            attrs['tenant_id'] = project_id
             attrs['project_id'] = project_id
         data = client.address_groups(**attrs)
 
diff --git a/openstackclient/tests/unit/network/v2/test_address_group.py b/openstackclient/tests/unit/network/v2/test_address_group.py
@@ -282,7 +282,7 @@ def test_address_group_list_project(self):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.network.address_groups.assert_called_once_with(
-            **{'tenant_id': project.id, 'project_id': project.id})
+            project_id=project.id)
         self.assertEqual(self.columns, columns)
         self.assertItemsEqual(self.data, list(data))
 
@@ -297,11 +297,10 @@ def test_address_group_project_domain(self):
             ('project', project.id),
         ]
         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}
 
-        self.network.address_groups.assert_called_once_with(**filters)
+        self.network.address_groups.assert_called_once_with(
+            project_id=project.id)
         self.assertEqual(self.columns, columns)
         self.assertItemsEqual(self.data, list(data))
 
