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

openstackclient/tests/unit/common/test_module.py

@@ -128,11 +128,6 @@ class TestCommandList(utils.TestCommand):
         self.assertEqual(datalist, tuple(data))
 
 
-@mock.patch.dict(
-    'openstackclient.common.module.sys.modules',
-    values=MODULES,
-    clear=True,
-)
 class TestModuleList(utils.TestCommand):
     def setUp(self):
         super().setUp()
@@ -150,7 +145,12 @@ class TestModuleList(utils.TestCommand):
         # In base command class Lister in cliff, abstract method take_action()
         # returns a tuple containing the column names and an iterable
         # containing the data to be listed.
-        columns, data = self.cmd.take_action(parsed_args)
+        with mock.patch.dict(
+            'openstackclient.common.module.sys.modules',
+            values=MODULES,
+            clear=True,
+        ):
+            columns, data = self.cmd.take_action(parsed_args)
 
         # Output xxxclient and openstacksdk, but not regular module, like: zlib
         self.assertIn(module_name_1, columns)
@@ -177,7 +177,12 @@ class TestModuleList(utils.TestCommand):
         # In base command class Lister in cliff, abstract method take_action()
         # returns a tuple containing the column names and an iterable
         # containing the data to be listed.
-        columns, data = self.cmd.take_action(parsed_args)
+        with mock.patch.dict(
+            'openstackclient.common.module.sys.modules',
+            values=MODULES,
+            clear=True,
+        ):
+            columns, data = self.cmd.take_action(parsed_args)
 
         # Output xxxclient, openstacksdk and regular module, like: zlib
         self.assertIn(module_name_1, columns)

openstackclient/tests/unit/common/test_project_cleanup.py

@@ -17,7 +17,9 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.unit import utils as test_utils
 
 
-class TestProjectCleanup(test_utils.TestCommand):
+class TestProjectCleanup(
+    identity_fakes.FakeClientMixin, test_utils.TestCommand
+):
     project = identity_fakes.FakeProject.create_one_project()
 
     def setUp(self):

openstackclient/tests/unit/common/test_quota.py

@@ -10,6 +10,7 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
+import copy
 from unittest import mock
 
 from openstack.block_storage.v3 import quota_set as _volume_quota_set
@@ -381,8 +382,6 @@ class TestQuotaSet(TestQuota):
         self.cmd = quota.SetQuota(self.app, None)
 
     def test_quota_set(self):
-        floating_ip_num = 100
-        fix_ip_num = 100
         injected_file_num = 100
         injected_file_size_num = 10240
         injected_path_size_num = 255
@@ -391,16 +390,10 @@ class TestQuotaSet(TestQuota):
         ram_num = 51200
         instance_num = 10
         property_num = 128
-        secgroup_rule_num = 20
-        secgroup_num = 10
         servgroup_num = 10
         servgroup_members_num = 10
 
         arglist = [
-            '--floating-ips',
-            str(floating_ip_num),
-            '--fixed-ips',
-            str(fix_ip_num),
             '--injected-files',
             str(injected_file_num),
             '--injected-file-size',
@@ -417,10 +410,6 @@ class TestQuotaSet(TestQuota):
             str(instance_num),
             '--properties',
             str(property_num),
-            '--secgroup-rules',
-            str(secgroup_rule_num),
-            '--secgroups',
-            str(secgroup_num),
             '--server-groups',
             str(servgroup_num),
             '--server-group-members',
@@ -428,8 +417,6 @@ class TestQuotaSet(TestQuota):
             self.projects[0].name,
         ]
         verifylist = [
-            ('floating_ips', floating_ip_num),
-            ('fixed_ips', fix_ip_num),
             ('injected_files', injected_file_num),
             (
                 'injected_file_content_bytes',
@@ -441,8 +428,6 @@ class TestQuotaSet(TestQuota):
             ('ram', ram_num),
             ('instances', instance_num),
             ('metadata_items', property_num),
-            ('security_group_rules', secgroup_rule_num),
-            ('security_groups', secgroup_num),
             ('server_groups', servgroup_num),
             ('server_group_members', servgroup_members_num),
             ('force', False),
@@ -454,18 +439,14 @@ class TestQuotaSet(TestQuota):
         result = self.cmd.take_action(parsed_args)
 
         kwargs = {
-            'floating_ips': floating_ip_num,
-            'fixed_ips': fix_ip_num,
             'injected_files': injected_file_num,
-            'injected_file_content_bytes': injected_file_size_num,  # noqa: E501
+            'injected_file_content_bytes': injected_file_size_num,
             'injected_file_path_bytes': injected_path_size_num,
             'key_pairs': key_pair_num,
             'cores': core_num,
             'ram': ram_num,
             'instances': instance_num,
             'metadata_items': property_num,
-            'security_group_rules': secgroup_rule_num,
-            'security_groups': secgroup_num,
             'server_groups': servgroup_num,
             'server_group_members': servgroup_members_num,
         }
@@ -728,7 +709,7 @@ class TestQuotaSet(TestQuota):
 
         kwargs_compute = {
             'injected_files': injected_file_num,
-            'injected_file_content_bytes': injected_file_size_num,  # noqa: E501
+            'injected_file_content_bytes': injected_file_size_num,
             'injected_file_path_bytes': injected_path_size_num,
             'key_pairs': key_pair_num,
             'cores': core_num,
@@ -826,7 +807,7 @@ class TestQuotaSet(TestQuota):
 
         kwargs_compute = {
             'injected_files': injected_file_num,
-            'injected_file_content_bytes': injected_file_size_num,  # noqa: E501
+            'injected_file_content_bytes': injected_file_size_num,
             'injected_file_path_bytes': injected_path_size_num,
             'key_pairs': key_pair_num,
             'cores': core_num,
@@ -1122,6 +1103,64 @@ class TestQuotaShow(TestQuota):
         )
         self.assertNotCalled(self.network_client.get_quota_default)
 
+    def test_quota_show__with_network_and_usage(self):
+        # ensure we do not interfere with other tests
+        self._network_quota_details = copy.deepcopy(
+            self._network_quota_details
+        )
+        # set a couple of resources
+        self._network_quota_details["floating_ips"].update(
+            limit=30, reserved=20, used=7
+        )
+        self._network_quota_details["security_group_rules"].update(
+            limit=9, reserved=7, used=5
+        )
+
+        arglist = [
+            '--network',
+            '--usage',
+            self.projects[0].name,
+        ]
+        verifylist = [
+            ('service', 'network'),
+            ('project', self.projects[0].name),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        headers, result_gen = self.cmd.take_action(parsed_args)
+
+        self.assertEqual(('Resource', 'Limit', 'In Use', 'Reserved'), headers)
+
+        result = sorted(result_gen)
+
+        self.assertEqual(
+            [
+                ('floating_ips', 30, 7, 20),
+                ('health_monitors', 0, 0, 0),
+                ('l7_policies', 0, 0, 0),
+                ('listeners', 0, 0, 0),
+                ('load_balancers', 0, 0, 0),
+                ('networks', 0, 0, 0),
+                ('pools', 0, 0, 0),
+                ('ports', 0, 0, 0),
+                ('rbac_policies', 0, 0, 0),
+                ('routers', 0, 0, 0),
+                ('security_group_rules', 9, 5, 7),
+                ('security_groups', 0, 0, 0),
+                ('subnet_pools', 0, 0, 0),
+                ('subnets', 0, 0, 0),
+            ],
+            result,
+        )
+
+        self.compute_client.get_quota_set.assert_not_called()
+        self.volume_sdk_client.get_quota_set.assert_not_called()
+        self.network_client.get_quota.assert_called_once_with(
+            self.projects[0].id,
+            details=True,
+        )
+        self.assertNotCalled(self.network_client.get_quota_default)
+
     def test_quota_show__with_default(self):
         arglist = [
             '--default',

openstackclient/tests/unit/compute/v2/fakes.py

@@ -29,7 +29,9 @@ from openstack.compute.v2 import server as _server
 from openstack.compute.v2 import server_action as _server_action
 from openstack.compute.v2 import server_interface as _server_interface
 from openstack.compute.v2 import server_migration as _server_migration
+from openstack.compute.v2 import server_share as _server_share
 from openstack.compute.v2 import volume_attachment as _volume_attachment
+from openstack.test import fakes as sdk_fakes
 
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.unit.image.v2 import fakes as image_fakes
@@ -788,6 +790,29 @@ def create_volume_attachments(attrs=None, count=2):
     return volume_attachments
 
 
+def create_one_share(attrs=None):
+    """Create a fake share attachment.
+
+    :param dict attrs: A dictionary with all attributes
+    :return: A fake openstack.compute.v2.server_share.ShareMapping
+        object
+    """
+    return sdk_fakes.generate_fake_resource(
+        _server_share.ShareMapping, **(attrs or {})
+    )
+
+
+def create_shares(attrs=None, count=2):
+    """Create multiple fake share attachments.
+
+    :param dict attrs: A dictionary with all attributes
+    :param int count: The number of share attachments to fake
+    :return: A list of fake
+        openstack.compute.v2.server_share.ShareMapping objects
+    """
+    return [create_one_share(attrs) for _ in range(count)]
+
+
 def create_one_server_interface(attrs=None):
     """Create a fake ServerInterface.
 

openstackclient/tests/unit/compute/v2/test_flavor.py

@@ -106,7 +106,6 @@ class TestFlavorCreate(TestFlavor):
             'id': None,
             'ephemeral': 0,
             'swap': 0,
-            'rxtx_factor': 1.0,
             'is_public': True,
         }
 
@@ -395,6 +394,32 @@ class TestFlavorCreate(TestFlavor):
             exceptions.CommandError, self.cmd.take_action, parsed_args
         )
 
+    def test_flavor_create_with_rxtx_factor_post_v2102(self):
+        self.set_compute_api_version('2.102')
+
+        arglist = [
+            '--id',
+            self.flavor.id,
+            '--ram',
+            str(self.flavor.ram),
+            '--vcpus',
+            str(self.flavor.vcpus),
+            '--rxtx-factor',
+            '1.0',
+            self.flavor.name,
+        ]
+        verifylist = [
+            ('ram', self.flavor.ram),
+            ('vcpus', self.flavor.vcpus),
+            ('rxtx_factor', 1.0),
+            ('name', self.flavor.name),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
+
 
 class TestFlavorDelete(TestFlavor):
     def setUp(self):
@@ -494,7 +519,8 @@ class TestFlavorList(TestFlavor):
             'VCPUs',
             'Is Public',
         )
-        self.columns_long = self.columns + (
+        self.columns_long = (
+            *self.columns,
             'Swap',
             'RXTX Factor',
             'Properties',

openstackclient/tests/unit/compute/v2/test_keypair.py

@@ -90,8 +90,8 @@ class TestKeypairCreate(TestKeypair):
             public_key=mock_generate.return_value.public_key,
         )
 
-        self.assertEqual({}, columns)
-        self.assertEqual({}, data)
+        self.assertEqual((), columns)
+        self.assertEqual((), data)
 
     def test_keypair_create_public_key(self):
         self.data = (
@@ -279,8 +279,8 @@ class TestKeypairCreate(TestKeypair):
             public_key=mock_generate.return_value.public_key,
         )
 
-        self.assertEqual({}, columns)
-        self.assertEqual({}, data)
+        self.assertEqual((), columns)
+        self.assertEqual((), data)
 
     def test_key_pair_create_with_user_pre_v210(self):
         self.set_compute_api_version('2.9')
@@ -740,8 +740,8 @@ class TestKeypairShow(TestKeypair):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.assertEqual({}, columns)
-        self.assertEqual({}, data)
+        self.assertEqual((), columns)
+        self.assertEqual((), data)
 
     def test_keypair_show_with_user(self):
         self.set_compute_api_version('2.10')

openstackclient/tests/unit/compute/v2/test_server.py

@@ -341,61 +341,7 @@ class TestServerAddFixedIP(TestServer):
             )
 
 
-class TestServerAddFloatingIPCompute(compute_fakes.TestComputev2):
-    def setUp(self):
-        super().setUp()
-
-        self.app.client_manager.network_endpoint_enabled = False
-        self.server = compute_fakes.create_one_server()
-        self.compute_client.find_server.return_value = self.server
-
-        self.cmd = server.AddFloatingIP(self.app, None)
-
-    def test_server_add_floating_ip_default(self):
-        arglist = [
-            self.server.name,
-            '1.2.3.4',
-        ]
-        verifylist = [
-            ('server', self.server.name),
-            ('ip_address', '1.2.3.4'),
-        ]
-
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.cmd.take_action(parsed_args)
-
-        self.compute_client.find_server.assert_called_once_with(
-            self.server.name, ignore_missing=False
-        )
-        self.compute_client.add_floating_ip_to_server.assert_called_once_with(
-            self.server, '1.2.3.4', fixed_address=None
-        )
-
-    def test_server_add_floating_ip_fixed(self):
-        arglist = [
-            '--fixed-ip-address',
-            '5.6.7.8',
-            self.server.name,
-            '1.2.3.4',
-        ]
-        verifylist = [
-            ('fixed_ip_address', '5.6.7.8'),
-            ('server', self.server.name),
-            ('ip_address', '1.2.3.4'),
-        ]
-
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.cmd.take_action(parsed_args)
-
-        self.compute_client.find_server.assert_called_once_with(
-            self.server.name, ignore_missing=False
-        )
-        self.compute_client.add_floating_ip_to_server.assert_called_once_with(
-            self.server, '1.2.3.4', fixed_address='5.6.7.8'
-        )
-
-
-class TestServerAddFloatingIPNetwork(
+class TestServerAddFloatingIP(
     TestServer,
     network_fakes.TestNetworkV2,
 ):
@@ -1608,8 +1554,8 @@ class TestServerCreate(TestServer):
                 port_port2.id: port_port2,
             }[name_or_id]
 
-        self.app.client_manager.network.find_network.side_effect = find_network
-        self.app.client_manager.network.find_port.side_effect = find_port
+        self.network_client.find_network.side_effect = find_network
+        self.network_client.find_port.side_effect = find_port
 
         arglist = [
             '--image',
@@ -1728,7 +1674,7 @@ class TestServerCreate(TestServer):
         self.set_compute_api_version('2.43')
 
         network = network_fakes.create_one_network()
-        self.app.client_manager.network.find_network.return_value = network
+        self.network_client.find_network.return_value = network
 
         arglist = [
             '--image',
@@ -4865,7 +4811,7 @@ class TestServerList(_TestServerList):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        columns, data = self.cmd.take_action(parsed_args)
+        columns, _data = self.cmd.take_action(parsed_args)
 
         self.compute_client.servers.assert_called_with(**self.kwargs)
         self.assertIn('Project ID', columns)
@@ -5329,7 +5275,7 @@ class TestServerList(_TestServerList):
         ]
 
         # Add the expected host_status column and data.
-        columns_long = self.columns_long + ('Host Status',)
+        columns_long = (*self.columns_long, 'Host Status')
         self.data2 = tuple(
             (
                 s.id,
@@ -5560,7 +5506,7 @@ class TestServerListV273(_TestServerList):
         }
         fake_server = _server.Server(**server_dict)
         self.servers.append(fake_server)
-        columns, data = self.cmd.take_action(parsed_args)
+        _columns, data = self.cmd.take_action(parsed_args)
         # get the first three servers out since our interest is in the partial
         # server.
         next(data)
@@ -5708,7 +5654,7 @@ class TestServerListV296(_TestServerList):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        columns, data = self.cmd.take_action(parsed_args)
+        columns, _data = self.cmd.take_action(parsed_args)
 
         self.compute_client.servers.assert_called_with(**self.kwargs)
         self.assertIn('Project ID', columns)
@@ -5860,7 +5806,7 @@ class TestServerListV2100(_TestServerList):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        columns, data = self.cmd.take_action(parsed_args)
+        columns, _data = self.cmd.take_action(parsed_args)
 
         self.compute_client.servers.assert_called_with(**self.kwargs)
         self.assertIn('Project ID', columns)
@@ -7648,38 +7594,7 @@ class TestServerRescue(compute_fakes.TestComputev2):
         self.assertIsNone(result)
 
 
-class TestServerRemoveFloatingIPCompute(compute_fakes.TestComputev2):
-    def setUp(self):
-        super().setUp()
-
-        self.app.client_manager.network_endpoint_enabled = False
-        self.server = compute_fakes.create_one_server()
-        self.compute_client.find_server.return_value = self.server
-
-        self.cmd = server.RemoveFloatingIP(self.app, None)
-
-    def test_server_remove_floating_ip(self):
-        arglist = [
-            self.server.name,
-            '1.2.3.4',
-        ]
-        verifylist = [
-            ('server', self.server.name),
-            ('ip_address', '1.2.3.4'),
-        ]
-
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.cmd.take_action(parsed_args)
-
-        self.compute_client.find_server.assert_called_once_with(
-            self.server.name, ignore_missing=False
-        )
-        self.compute_client.remove_floating_ip_from_server.assert_called_once_with(
-            self.server, '1.2.3.4'
-        )
-
-
-class TestServerRemoveFloatingIPNetwork(network_fakes.TestNetworkV2):
+class TestServerRemoveFloatingIP(network_fakes.TestNetworkV2):
     def setUp(self):
         super().setUp()
 
@@ -7896,15 +7811,13 @@ class TestServerResize(compute_fakes.TestComputev2):
             ('server', self.server.id),
         ]
 
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        result = self.cmd.take_action(parsed_args)
-
-        self.compute_client.find_server.assert_called_once_with(
-            self.server.id, ignore_missing=False
+        self.assertRaises(
+            test_utils.ParserException,
+            self.check_parser,
+            self.cmd,
+            arglist,
+            verifylist,
         )
-        self.compute_client.find_flavor.assert_not_called()
-        self.compute_client.resize_server.assert_not_called()
-        self.assertIsNone(result)
 
     def test_server_resize(self):
         arglist = [
@@ -8898,7 +8811,7 @@ class TestServerShow(TestServer):
             None,  # OS-EXT-SRV-ATTR:user_data
             server.PowerStateColumn(
                 self.server.power_state
-            ),  # OS-EXT-STS:power_state  # noqa: E501
+            ),  # OS-EXT-STS:power_state
             None,  # OS-EXT-STS:task_state
             None,  # OS-EXT-STS:vm_state
             None,  # OS-SRV-USG:launched_at