python-openstackclient 9.0.0__py3-none-any.whl → 10.1.0__py3-none-any.whl

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
@@ -64,7 +66,7 @@ class FakeClientMixin:
         )
 
 
-class TestComputev2(
+class TestCompute(
     identity_fakes.FakeClientMixin,
     network_fakes.FakeClientMixin,
     image_fakes.FakeClientMixin,
@@ -102,20 +104,6 @@ def create_one_agent(attrs=None):
     return agent_attrs
 
 
-def create_agents(attrs=None, count=2):
-    """Create multiple fake agents.
-
-    :param dict attrs: A dictionary with all attributes
-    :param int count: The number of agents to fake
-    :return: A list of dictionaries faking the agents
-    """
-    agents = []
-    for i in range(0, count):
-        agents.append(create_one_agent(attrs))
-
-    return agents
-
-
 def create_one_extension(attrs=None):
     """Create a fake extension.
 
@@ -350,20 +338,6 @@ def create_one_flavor(attrs=None):
     return flavor
 
 
-def create_flavors(attrs=None, count=2):
-    """Create multiple fake flavors.
-
-    :param dict attrs: A dictionary with all attributes
-    :param int count: The number of flavors to fake
-    :return: A list of fake :class:`openstack.compute.v2.flavor.Flavor` objects
-    """
-    flavors = []
-    for i in range(0, count):
-        flavors.append(create_one_flavor(attrs))
-
-    return flavors
-
-
 def create_one_flavor_access(attrs=None):
     """Create a fake flavor access.
 
@@ -497,19 +471,6 @@ def create_one_floating_ip_pool(attrs=None):
     return floating_ip_pool_attrs
 
 
-def create_floating_ip_pools(attrs=None, count=2):
-    """Create multiple fake floating IP pools.
-
-    :param dict attrs: A dictionary with all attributes
-    :param int count: The number of floating IP pools to fake
-    :return: A list of dictionaries faking the floating IP pools
-    """
-    floating_ip_pools = []
-    for i in range(0, count):
-        floating_ip_pools.append(create_one_floating_ip_pool(attrs))
-    return floating_ip_pools
-
-
 def create_one_network(attrs=None):
     """Create a fake network.
 
@@ -728,21 +689,6 @@ def create_one_server_migration(attrs=None):
     return migration
 
 
-def create_server_migrations(attrs=None, methods=None, count=2):
-    """Create multiple server migrations.
-
-    :param dict attrs: A dictionary with all attributes
-    :param int count: The number of server migrations to fake
-    :return A list of fake
-        openstack.compute.v2.server_migration.ServerMigration objects
-    """
-    migrations = []
-    for i in range(0, count):
-        migrations.append(create_one_server_migration(attrs, methods))
-
-    return migrations
-
-
 def create_one_volume_attachment(attrs=None):
     """Create a fake volume attachment.
 
@@ -788,6 +734,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_agent.py

@@ -37,7 +37,7 @@ def _generate_fake_agent():
     }
 
 
-class TestAgentCreate(compute_fakes.TestComputev2):
+class TestAgentCreate(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -106,7 +106,7 @@ class TestAgentCreate(compute_fakes.TestComputev2):
         self.assertEqual(self.data, data)
 
 
-class TestAgentDelete(compute_fakes.TestComputev2):
+class TestAgentDelete(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -180,7 +180,7 @@ class TestAgentDelete(compute_fakes.TestComputev2):
         )
 
 
-class TestAgentList(compute_fakes.TestComputev2):
+class TestAgentList(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -247,7 +247,7 @@ class TestAgentList(compute_fakes.TestComputev2):
         )
 
 
-class TestAgentSet(compute_fakes.TestComputev2):
+class TestAgentSet(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -27,7 +27,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit.image.v2 import fakes as image_fakes
 
 
-class TestAggregate(compute_fakes.TestComputev2):
+class TestAggregate(compute_fakes.TestCompute):
     columns = (
         'availability_zone',
         'created_at',

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

@@ -22,7 +22,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit import utils
 
 
-class TestConsoleLog(compute_fakes.TestComputev2):
+class TestConsoleLog(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -77,7 +77,7 @@ class TestConsoleLog(compute_fakes.TestComputev2):
         )
 
 
-class TestConsoleUrlShow(compute_fakes.TestComputev2):
+class TestConsoleUrlShow(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -19,7 +19,7 @@ from openstackclient.compute.v2 import console_connection
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 
 
-class TestConsoleTokens(compute_fakes.TestComputev2):
+class TestConsoleTokens(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -26,7 +26,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit import utils as tests_utils
 
 
-class TestFlavor(compute_fakes.TestComputev2):
+class TestFlavor(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -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_host.py

@@ -58,7 +58,7 @@ def _generate_fake_host():
     }
 
 
-class TestHostList(compute_fakes.TestComputev2):
+class TestHostList(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -111,7 +111,7 @@ class TestHostList(compute_fakes.TestComputev2):
         self.assertEqual(self.data, list(data))
 
 
-class TestHostSet(compute_fakes.TestComputev2):
+class TestHostSet(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -160,7 +160,7 @@ class TestHostSet(compute_fakes.TestComputev2):
         )
 
 
-class TestHostShow(compute_fakes.TestComputev2):
+class TestHostShow(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -24,7 +24,7 @@ from openstackclient.compute.v2 import hypervisor
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 
 
-class TestHypervisorList(compute_fakes.TestComputev2):
+class TestHypervisorList(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -280,7 +280,7 @@ class TestHypervisorList(compute_fakes.TestComputev2):
         )
 
 
-class TestHypervisorShow(compute_fakes.TestComputev2):
+class TestHypervisorShow(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -53,7 +53,7 @@ def create_one_hypervisor_stats(attrs=None):
     return stats_info
 
 
-class TestHypervisorStatsShow(compute_fakes.TestComputev2):
+class TestHypervisorStatsShow(compute_fakes.TestCompute):
     _stats = create_one_hypervisor_stats()
 
     def setUp(self):

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

@@ -28,7 +28,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit import utils as tests_utils
 
 
-class TestKeypair(compute_fakes.TestComputev2):
+class TestKeypair(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -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

@@ -64,7 +64,7 @@ class TestPowerStateColumn(test_utils.TestCase):
         self.assertEqual('N/A', server.PowerStateColumn(0x08).human_readable())
 
 
-class TestServer(compute_fakes.TestComputev2):
+class TestServer(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -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,
 ):
@@ -1021,8 +967,8 @@ class TestServerRemoveVolume(TestServerVolume):
 
         self.assertIsNone(result)
         self.compute_client.delete_volume_attachment.assert_called_once_with(
-            self.volume,
             self.server,
+            self.volume,
             ignore_missing=False,
         )
 
@@ -1118,7 +1064,7 @@ class TestServerAddNetwork(TestServer):
         )
 
 
-class TestServerAddSecurityGroup(compute_fakes.TestComputev2):
+class TestServerAddSecurityGroup(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -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',
@@ -4372,7 +4318,7 @@ class TestServerCreate(TestServer):
         self.compute_client.create_server.assert_not_called()
 
 
-class TestServerDelete(compute_fakes.TestComputev2):
+class TestServerDelete(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -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)
@@ -5879,7 +5825,7 @@ class TestServerListV2100(_TestServerList):
         self.assertCountEqual(columns, set(columns))
 
 
-class TestServerAction(compute_fakes.TestComputev2):
+class TestServerAction(compute_fakes.TestCompute):
     def run_method_with_sdk_servers(self, method_name, server_count):
         servers = compute_fakes.create_servers(count=server_count)
         self.compute_client.find_server.side_effect = servers
@@ -7540,7 +7486,7 @@ class TestServerEvacuate(TestServer):
         )
 
 
-class TestServerRemoveFixedIP(compute_fakes.TestComputev2):
+class TestServerRemoveFixedIP(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -7569,7 +7515,7 @@ class TestServerRemoveFixedIP(compute_fakes.TestComputev2):
         self.assertIsNone(result)
 
 
-class TestServerRescue(compute_fakes.TestComputev2):
+class TestServerRescue(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -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()
 
@@ -7871,7 +7786,7 @@ class TestServerRemoveSecurityGroup(TestServer):
         self.assertIsNone(result)
 
 
-class TestServerResize(compute_fakes.TestComputev2):
+class TestServerResize(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -8077,7 +7992,7 @@ class TestServerResize(compute_fakes.TestComputev2):
         )
 
 
-class TestServerResizeConfirm(compute_fakes.TestComputev2):
+class TestServerResizeConfirm(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -8109,7 +8024,7 @@ class TestServerResizeConfirm(compute_fakes.TestComputev2):
 
 
 # TODO(stephenfin): Remove in OSC 7.0
-class TestServerMigrateConfirm(compute_fakes.TestComputev2):
+class TestServerMigrateConfirm(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -8147,7 +8062,7 @@ class TestServerMigrateConfirm(compute_fakes.TestComputev2):
         )
 
 
-class TestServerConfirmMigration(compute_fakes.TestComputev2):
+class TestServerConfirmMigration(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -8178,7 +8093,7 @@ class TestServerConfirmMigration(compute_fakes.TestComputev2):
         self.assertIsNone(result)
 
 
-class TestServerResizeRevert(compute_fakes.TestComputev2):
+class TestServerResizeRevert(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -8210,7 +8125,7 @@ class TestServerResizeRevert(compute_fakes.TestComputev2):
 
 
 # TODO(stephenfin): Remove in OSC 7.0
-class TestServerMigrateRevert(compute_fakes.TestComputev2):
+class TestServerMigrateRevert(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -8248,7 +8163,7 @@ class TestServerMigrateRevert(compute_fakes.TestComputev2):
         )
 
 
-class TestServerRevertMigration(compute_fakes.TestComputev2):
+class TestServerRevertMigration(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -8896,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
@@ -9313,7 +9228,7 @@ class TestServerUnpause(TestServerAction):
         self.run_method_with_sdk_servers('unpause_server', 3)
 
 
-class TestServerUnrescue(compute_fakes.TestComputev2):
+class TestServerUnrescue(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -22,7 +22,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit.image.v2 import fakes as image_fakes
 
 
-class TestServerBackupCreate(compute_fakes.TestComputev2):
+class TestServerBackupCreate(compute_fakes.TestCompute):
     def image_columns(self, image):
         columnlist = (
             'id',