python-openstackclient 8.3.0__py3-none-any.whl → 10.0.0__py3-none-any.whl

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

@@ -333,7 +333,7 @@ class TestCreateNetworkSegmentRange(TestNetworkSegmentRange):
                 'shared': self._network_segment_range.shared,
                 'project_id': mock.ANY,
                 'network_type': self._network_segment_range.network_type,
-                'physical_network': self._network_segment_range.physical_network,  # noqa: E501
+                'physical_network': self._network_segment_range.physical_network,
                 'minimum': self._network_segment_range.minimum,
                 'maximum': self._network_segment_range.maximum,
                 'name': self._network_segment_range.name,
@@ -450,10 +450,7 @@ class TestListNetworkSegmentRange(TestNetworkSegmentRange):
         'Minimum ID',
         'Maximum ID',
     )
-    columns_long = columns + (
-        'Used',
-        'Available',
-    )
+    columns_long = (*columns, 'Used', 'Available')
 
     data = []
     for _network_segment_range in _network_segment_ranges:
@@ -544,11 +541,11 @@ class TestSetNetworkSegmentRange(TestNetworkSegmentRange):
     # The network segment range updated.
     minimum_updated = _network_segment_range.minimum - 5
     maximum_updated = _network_segment_range.maximum + 5
-    available_updated = (
-        list(range(minimum_updated, 104))
-        + [105]
-        + list(range(107, maximum_updated + 1))
-    )
+    available_updated = [
+        *list(range(minimum_updated, 104)),
+        105,
+        *list(range(107, maximum_updated + 1)),
+    ]
     _network_segment_range_updated = (
         network_fakes.create_one_network_segment_range(
             attrs={

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

@@ -468,7 +468,7 @@ class TestListNetworkTrunk(TestNetworkTrunk):
     )
 
     columns = ('ID', 'Name', 'Parent Port', 'Description')
-    columns_long = columns + ('Status', 'State', 'Created At', 'Updated At')
+    columns_long = (*columns, 'Status', 'State', 'Created At', 'Updated At')
     data = []
     for t in new_trunks:
         data.append((t['id'], t['name'], t['port_id'], t['description']))

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

@@ -711,17 +711,14 @@ class TestListRouter(TestRouter):
         'Distributed',
         'HA',
     )
-    columns_long = columns + (
+    columns_long = (
+        *columns,
         'Routes',
         'External gateway info',
         'Availability zones',
         'Tags',
     )
-    columns_long_no_az = columns + (
-        'Routes',
-        'External gateway info',
-        'Tags',
-    )
+    columns_long_no_az = (*columns, 'Routes', 'External gateway info', 'Tags')
 
     data = []
     for r in routers:
@@ -824,7 +821,7 @@ class TestListRouter(TestRouter):
         with mock.patch.object(
             self.network_client, "routers", return_value=_routers
         ):
-            columns, data = self.cmd.take_action(parsed_args)
+            columns, _data = self.cmd.take_action(parsed_args)
 
         self.assertNotIn("is_distributed", columns)
         self.assertNotIn("is_ha", columns)
@@ -1900,7 +1897,7 @@ class TestShowRouter(TestRouter):
         with mock.patch.object(
             self.network_client, "find_router", return_value=_router
         ):
-            columns, data = self.cmd.take_action(parsed_args)
+            columns, _data = self.cmd.take_action(parsed_args)
 
         self.assertNotIn("is_distributed", columns)
         self.assertNotIn("is_ha", columns)
@@ -1922,7 +1919,9 @@ class TestShowRouter(TestRouter):
             columns, data = self.cmd.take_action(parsed_args)
 
         self.assertIn("routes", columns)
-        self.assertIsNone(list(data)[columns.index('routes')].human_readable())
+        self.assertEqual(
+            list(data)[columns.index('routes')].human_readable(), ''
+        )
 
 
 class TestUnsetRouter(TestRouter):

openstackclient/tests/unit/network/v2/{test_security_group_network.py → test_security_group.py}

@@ -299,26 +299,7 @@ class TestListSecurityGroupNetwork(TestSecurityGroupNetwork):
 
     def test_security_group_list_no_options(self):
         arglist = []
-        verifylist = [
-            ('all_projects', False),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        columns, data = self.cmd.take_action(parsed_args)
-
-        self.network_client.security_groups.assert_called_once_with(
-            fields=security_group.ListSecurityGroup.FIELDS_TO_RETRIEVE
-        )
-        self.assertEqual(self.columns, columns)
-        self.assertCountEqual(self.data, list(data))
-
-    def test_security_group_list_all_projects(self):
-        arglist = [
-            '--all-projects',
-        ]
-        verifylist = [
-            ('all_projects', True),
-        ]
+        verifylist = []
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)

openstackclient/tests/unit/network/v2/{test_security_group_rule_network.py → test_security_group_rule.py}

@@ -171,22 +171,6 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
         parsed_args = self.check_parser(self.cmd, arglist, [])
         self.assertEqual('IPv6', parsed_args.ethertype)
 
-    def test_create_all_protocol_options(self):
-        arglist = [
-            '--protocol',
-            'tcp',
-            '--proto',
-            'tcp',
-            self._security_group.id,
-        ]
-        self.assertRaises(
-            tests_utils.ParserException,
-            self.check_parser,
-            self.cmd,
-            arglist,
-            [],
-        )
-
     def test_create_all_port_range_options(self):
         arglist = [
             '--dst-port',
@@ -251,7 +235,7 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
         self.assertEqual(self.expected_columns, columns)
         self.assertEqual(self.expected_data, data)
 
-    def test_create_proto_option(self):
+    def test_create_protocol_option(self):
         self._setup_security_group_rule(
             {
                 'protocol': 'icmp',
@@ -259,15 +243,14 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
             }
         )
         arglist = [
-            '--proto',
+            '--protocol',
             self._security_group_rule.protocol,
             '--remote-ip',
             self._security_group_rule.remote_ip_prefix,
             self._security_group.id,
         ]
         verifylist = [
-            ('proto', self._security_group_rule.protocol),
-            ('protocol', None),
+            ('protocol', self._security_group_rule.protocol),
             ('remote_ip', self._security_group_rule.remote_ip_prefix),
             ('group', self._security_group.id),
         ]
@@ -295,15 +278,14 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
             }
         )
         arglist = [
-            '--proto',
+            '--protocol',
             'any',
             '--remote-ip',
             self._security_group_rule.remote_ip_prefix,
             self._security_group.id,
         ]
         verifylist = [
-            ('proto', 'any'),
-            ('protocol', None),
+            ('protocol', 'any'),
             ('remote_ip', self._security_group_rule.remote_ip_prefix),
             ('group', self._security_group.id),
         ]
@@ -1173,22 +1155,6 @@ class TestListSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
         self.assertEqual(self.expected_columns_with_group, columns)
         self.assertEqual(self.expected_data_with_group, list(data))
 
-    def test_list_with_ignored_options(self):
-        self._security_group_rule_tcp.port_range_min = 80
-        arglist = [
-            '--all-projects',
-        ]
-        verifylist = [
-            ('all_projects', True),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        columns, data = self.cmd.take_action(parsed_args)
-
-        self.network_client.security_group_rules.assert_called_once_with(**{})
-        self.assertEqual(self.expected_columns_no_group, columns)
-        self.assertEqual(self.expected_data_no_group, list(data))
-
     def test_list_with_protocol(self):
         self._security_group_rule_tcp.port_range_min = 80
         arglist = [
@@ -1265,7 +1231,7 @@ class TestListSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
         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 +1257,7 @@ class TestListSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
         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

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

@@ -798,7 +798,8 @@ class TestListSubnet(TestSubnet):
         'Network',
         'Subnet',
     )
-    columns_long = columns + (
+    columns_long = (
+        *columns,
         'Project',
         'DHCP',
         'Name Servers',

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

@@ -471,7 +471,8 @@ class TestListSubnetPool(TestSubnetPool):
         'Name',
         'Prefixes',
     )
-    columns_long = columns + (
+    columns_long = (
+        *columns,
         'Default Prefix Length',
         'Address Scope',
         'Default Subnet Pool',

openstackclient/tests/unit/object/v1/fakes.py

@@ -11,9 +11,8 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
-from keystoneauth1 import session
+from unittest import mock
 
 from openstackclient.api import object_store_v1 as object_store
 from openstackclient.tests.unit import utils
@@ -80,12 +79,14 @@ OBJECT_2 = {
 object_upload_name = 'test-object-name'
 
 
-class TestObjectv1(utils.TestCommand):
+class FakeClientMixin:
     def setUp(self):
         super().setUp()
 
-        self.app.client_manager.session = session.Session()
-        self.app.client_manager.object_store = object_store.APIv1(
-            session=self.app.client_manager.session,
-            endpoint=ENDPOINT,
+        self.app.client_manager.object_store = mock.Mock(
+            spec=object_store.APIv1
         )
+        self.object_store_client = self.app.client_manager.object_store
+
+
+class TestObjectV1(FakeClientMixin, utils.TestCommand): ...

openstackclient/tests/unit/object/v1/test_container.py

@@ -14,48 +14,21 @@
 #
 
 import copy
-from unittest import mock
 
-from openstackclient.api import object_store_v1 as object_store
 from openstackclient.object.v1 import container
 from openstackclient.tests.unit.object.v1 import fakes as object_fakes
 
 
-AUTH_TOKEN = "foobar"
-AUTH_URL = "http://0.0.0.0"
-
-
-class FakeClient:
-    def __init__(self, endpoint=None, **kwargs):
-        self.endpoint = AUTH_URL
-        self.token = AUTH_TOKEN
-
-
-class TestContainer(object_fakes.TestObjectv1):
-    columns = ('Name',)
-
+class TestContainerDelete(object_fakes.TestObjectV1):
     def setUp(self):
         super().setUp()
-        self.app.client_manager.object_store = object_store.APIv1(
-            session=mock.Mock(),
-            service_type="object-store",
-        )
-        self.api = self.app.client_manager.object_store
-
 
-@mock.patch('openstackclient.api.object_store_v1.APIv1.object_delete')
-@mock.patch('openstackclient.api.object_store_v1.APIv1.object_list')
-@mock.patch('openstackclient.api.object_store_v1.APIv1.container_delete')
-class TestContainerDelete(TestContainer):
-    def setUp(self):
-        super().setUp()
+        self.object_store_client.container_delete.return_value = None
 
         # Get the command object to test
         self.cmd = container.DeleteContainer(self.app, None)
 
-    def test_container_delete(self, c_mock, o_list_mock, o_delete_mock):
-        c_mock.return_value = None
-
+    def test_container_delete(self):
         arglist = [
             object_fakes.container_name,
         ]
@@ -68,16 +41,17 @@ class TestContainerDelete(TestContainer):
         self.assertIsNone(self.cmd.take_action(parsed_args))
 
         kwargs = {}
-        c_mock.assert_called_with(
+        self.object_store_client.container_delete.assert_called_with(
             container=object_fakes.container_name, **kwargs
         )
-        self.assertFalse(o_list_mock.called)
-        self.assertFalse(o_delete_mock.called)
+        self.object_store_client.object_list.assert_not_called()
+        self.object_store_client.object_delete.assert_not_called()
 
-    def test_recursive_delete(self, c_mock, o_list_mock, o_delete_mock):
-        c_mock.return_value = None
-        o_list_mock.return_value = [object_fakes.OBJECT]
-        o_delete_mock.return_value = None
+    def test_recursive_delete(self):
+        self.object_store_client.object_delete.return_value = None
+        self.object_store_client.object_list.return_value = [
+            object_fakes.OBJECT
+        ]
 
         arglist = [
             '--recursive',
@@ -91,20 +65,22 @@ class TestContainerDelete(TestContainer):
 
         self.assertIsNone(self.cmd.take_action(parsed_args))
 
-        kwargs = {}
-        c_mock.assert_called_with(
-            container=object_fakes.container_name, **kwargs
+        self.object_store_client.container_delete.assert_called_with(
+            container=object_fakes.container_name
         )
-        o_list_mock.assert_called_with(container=object_fakes.container_name)
-        o_delete_mock.assert_called_with(
+        self.object_store_client.object_list.assert_called_with(
+            container=object_fakes.container_name
+        )
+        self.object_store_client.object_delete.assert_called_with(
             container=object_fakes.container_name,
             object=object_fakes.OBJECT['name'],
         )
 
-    def test_r_delete(self, c_mock, o_list_mock, o_delete_mock):
-        c_mock.return_value = None
-        o_list_mock.return_value = [object_fakes.OBJECT]
-        o_delete_mock.return_value = None
+    def test_r_delete(self):
+        self.object_store_client.object_delete.return_value = None
+        self.object_store_client.object_list.return_value = [
+            object_fakes.OBJECT
+        ]
 
         arglist = [
             '-r',
@@ -118,27 +94,29 @@ class TestContainerDelete(TestContainer):
 
         self.assertIsNone(self.cmd.take_action(parsed_args))
 
-        kwargs = {}
-        c_mock.assert_called_with(
-            container=object_fakes.container_name, **kwargs
+        self.object_store_client.container_delete.assert_called_with(
+            container=object_fakes.container_name
         )
-        o_list_mock.assert_called_with(container=object_fakes.container_name)
-        o_delete_mock.assert_called_with(
+        self.object_store_client.object_list.assert_called_with(
+            container=object_fakes.container_name
+        )
+        self.object_store_client.object_delete.assert_called_with(
             container=object_fakes.container_name,
             object=object_fakes.OBJECT['name'],
         )
 
 
-@mock.patch('openstackclient.api.object_store_v1.APIv1.container_list')
-class TestContainerList(TestContainer):
+class TestContainerList(object_fakes.TestObjectV1):
+    columns = ('Name',)
+
     def setUp(self):
         super().setUp()
 
         # Get the command object to test
         self.cmd = container.ListContainer(self.app, None)
 
-    def test_object_list_containers_no_options(self, c_mock):
-        c_mock.return_value = [
+    def test_object_list_containers_no_options(self):
+        self.object_store_client.container_list.return_value = [
             copy.deepcopy(object_fakes.CONTAINER),
             copy.deepcopy(object_fakes.CONTAINER_3),
             copy.deepcopy(object_fakes.CONTAINER_2),
@@ -153,9 +131,7 @@ class TestContainerList(TestContainer):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        # Set expected values
-        kwargs = {}
-        c_mock.assert_called_with(**kwargs)
+        self.object_store_client.container_list.assert_called_with()
 
         self.assertEqual(self.columns, columns)
         datalist = (
@@ -165,8 +141,8 @@ class TestContainerList(TestContainer):
         )
         self.assertEqual(datalist, tuple(data))
 
-    def test_object_list_containers_prefix(self, c_mock):
-        c_mock.return_value = [
+    def test_object_list_containers_prefix(self):
+        self.object_store_client.container_list.return_value = [
             copy.deepcopy(object_fakes.CONTAINER),
             copy.deepcopy(object_fakes.CONTAINER_3),
         ]
@@ -185,11 +161,9 @@ class TestContainerList(TestContainer):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        # Set expected values
-        kwargs = {
-            'prefix': 'bit',
-        }
-        c_mock.assert_called_with(**kwargs)
+        self.object_store_client.container_list.assert_called_with(
+            prefix='bit',
+        )
 
         self.assertEqual(self.columns, columns)
         datalist = (
@@ -198,8 +172,8 @@ class TestContainerList(TestContainer):
         )
         self.assertEqual(datalist, tuple(data))
 
-    def test_object_list_containers_marker(self, c_mock):
-        c_mock.return_value = [
+    def test_object_list_containers_marker(self):
+        self.object_store_client.container_list.return_value = [
             copy.deepcopy(object_fakes.CONTAINER),
             copy.deepcopy(object_fakes.CONTAINER_3),
         ]
@@ -221,12 +195,10 @@ class TestContainerList(TestContainer):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        # Set expected values
-        kwargs = {
-            'marker': object_fakes.container_name,
-            'end_marker': object_fakes.container_name_3,
-        }
-        c_mock.assert_called_with(**kwargs)
+        self.object_store_client.container_list.assert_called_with(
+            marker=object_fakes.container_name,
+            end_marker=object_fakes.container_name_3,
+        )
 
         self.assertEqual(self.columns, columns)
         datalist = (
@@ -235,8 +207,8 @@ class TestContainerList(TestContainer):
         )
         self.assertEqual(datalist, tuple(data))
 
-    def test_object_list_containers_limit(self, c_mock):
-        c_mock.return_value = [
+    def test_object_list_containers_limit(self):
+        self.object_store_client.container_list.return_value = [
             copy.deepcopy(object_fakes.CONTAINER),
             copy.deepcopy(object_fakes.CONTAINER_3),
         ]
@@ -255,11 +227,9 @@ class TestContainerList(TestContainer):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        # Set expected values
-        kwargs = {
-            'limit': 2,
-        }
-        c_mock.assert_called_with(**kwargs)
+        self.object_store_client.container_list.assert_called_with(
+            limit=2,
+        )
 
         self.assertEqual(self.columns, columns)
         datalist = (
@@ -268,8 +238,8 @@ class TestContainerList(TestContainer):
         )
         self.assertEqual(datalist, tuple(data))
 
-    def test_object_list_containers_long(self, c_mock):
-        c_mock.return_value = [
+    def test_object_list_containers_long(self):
+        self.object_store_client.container_list.return_value = [
             copy.deepcopy(object_fakes.CONTAINER),
             copy.deepcopy(object_fakes.CONTAINER_3),
         ]
@@ -287,9 +257,7 @@ class TestContainerList(TestContainer):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        # Set expected values
-        kwargs = {}
-        c_mock.assert_called_with(**kwargs)
+        self.object_store_client.container_list.assert_called_with()
 
         collist = ('Name', 'Bytes', 'Count')
         self.assertEqual(collist, columns)
@@ -307,8 +275,8 @@ class TestContainerList(TestContainer):
         )
         self.assertEqual(datalist, tuple(data))
 
-    def test_object_list_containers_all(self, c_mock):
-        c_mock.return_value = [
+    def test_object_list_containers_all(self):
+        self.object_store_client.container_list.return_value = [
             copy.deepcopy(object_fakes.CONTAINER),
             copy.deepcopy(object_fakes.CONTAINER_2),
             copy.deepcopy(object_fakes.CONTAINER_3),
@@ -327,11 +295,9 @@ class TestContainerList(TestContainer):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        # Set expected values
-        kwargs = {
-            'full_listing': True,
-        }
-        c_mock.assert_called_with(**kwargs)
+        self.object_store_client.container_list.assert_called_with(
+            full_listing=True,
+        )
 
         self.assertEqual(self.columns, columns)
         datalist = (
@@ -342,16 +308,17 @@ class TestContainerList(TestContainer):
         self.assertEqual(datalist, tuple(data))
 
 
-@mock.patch('openstackclient.api.object_store_v1.APIv1.container_show')
-class TestContainerShow(TestContainer):
+class TestContainerShow(object_fakes.TestObjectV1):
     def setUp(self):
         super().setUp()
 
         # Get the command object to test
         self.cmd = container.ShowContainer(self.app, None)
 
-    def test_container_show(self, c_mock):
-        c_mock.return_value = copy.deepcopy(object_fakes.CONTAINER)
+    def test_container_show(self):
+        self.object_store_client.container_show.return_value = copy.deepcopy(
+            object_fakes.CONTAINER
+        )
 
         arglist = [
             object_fakes.container_name,
@@ -366,11 +333,8 @@ class TestContainerShow(TestContainer):
         # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
 
-        # Set expected values
-        kwargs = {}
-        # lib.container.show_container(api, url, container)
-        c_mock.assert_called_with(
-            container=object_fakes.container_name, **kwargs
+        self.object_store_client.container_show.assert_called_with(
+            container=object_fakes.container_name,
         )
 
         collist = ('bytes', 'count', 'name')

openstackclient/tests/unit/object/v1/test_container_all.py

@@ -13,17 +13,24 @@
 
 import copy
 
+from keystoneauth1 import session
 from requests_mock.contrib import fixture
 
+from openstackclient.api import object_store_v1 as object_store
 from openstackclient.object.v1 import container as container_cmds
 from openstackclient.tests.unit.object.v1 import fakes as object_fakes
 
 
-class TestContainerAll(object_fakes.TestObjectv1):
+class TestContainerAll(object_fakes.TestObjectV1):
     def setUp(self):
         super().setUp()
 
+        # these tests require a "real" client since we mock requests
         self.requests_mock = self.useFixture(fixture.Fixture())
+        self.app.client_manager.object_store = object_store.APIv1(
+            session=session.Session(),
+            endpoint=object_fakes.ENDPOINT,
+        )
 
 
 class TestContainerCreate(TestContainerAll):