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

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()
 
@@ -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

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

@@ -0,0 +1,287 @@
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+#
+
+import uuid
+
+from osc_lib import exceptions
+
+from openstackclient.compute.v2 import server_share
+from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
+
+
+class TestServerShareList(compute_fakes.TestComputev2):
+    def setUp(self):
+        super().setUp()
+
+        self.set_compute_api_version('2.97')
+
+        self.server = compute_fakes.create_one_server()
+        self.shares = compute_fakes.create_shares()
+
+        self.compute_client.find_server.return_value = self.server
+        self.compute_client.share_attachments.return_value = self.shares
+
+        self.cmd = server_share.ListServerShare(self.app, None)
+
+    def test_server_share_list(self):
+        arglist = [
+            self.server.id,
+        ]
+        verifylist = [
+            ('server', self.server.id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.assertEqual(("Share ID", "Status", "Tag"), columns)
+        self.assertEqual(
+            (
+                (
+                    self.shares[0].share_id,
+                    self.shares[0].status,
+                    self.shares[0].tag,
+                ),
+                (
+                    self.shares[1].share_id,
+                    self.shares[1].status,
+                    self.shares[1].tag,
+                ),
+            ),
+            tuple(data),
+        )
+        self.compute_client.share_attachments.assert_called_once_with(
+            self.server,
+        )
+
+    def test_server_share_list_pre_v297(self):
+        self.set_compute_api_version('2.96')
+        arglist = [self.server.id]
+        verifylist = [('server', self.server.id)]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )
+
+
+class TestServerShareShow(compute_fakes.TestComputev2):
+    def setUp(self):
+        super().setUp()
+
+        self.set_compute_api_version('2.97')
+
+        self.server = compute_fakes.create_one_server()
+        self.share = compute_fakes.create_one_share()
+
+        self.compute_client.find_server.return_value = self.server
+        self.compute_client.get_share_attachment.return_value = self.share
+
+        self.shared_file_system_client = (
+            self.app.client_manager.sdk_connection.shared_file_system
+        )
+        self._manila_share_id = uuid.uuid4().hex
+        self.shared_file_system_client.find_share.return_value = type(
+            'FakeShare', (), {'id': self._manila_share_id}
+        )()
+
+        self.cmd = server_share.ShowServerShare(self.app, None)
+
+    def test_server_share_show(self):
+        arglist = [
+            self.server.id,
+            self._manila_share_id,
+        ]
+        verifylist = [
+            ('server', self.server.id),
+            ('share', self._manila_share_id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.assertEqual(
+            ('Export Location', 'Share ID', 'Status', 'Tag', 'UUID'), columns
+        )
+        self.assertEqual(
+            (
+                self.share.export_location,
+                self.share.share_id,
+                self.share.status,
+                self.share.tag,
+                self.share.uuid,
+            ),
+            tuple(data),
+        )
+        self.shared_file_system_client.find_share.assert_called_once_with(
+            self._manila_share_id, ignore_missing=False
+        )
+        self.compute_client.get_share_attachment.assert_called_once_with(
+            self.server, self._manila_share_id
+        )
+
+    def test_server_share_show_pre_v297(self):
+        self.set_compute_api_version('2.96')
+        arglist = [self.server.id, self._manila_share_id]
+        verifylist = [
+            ('server', self.server.id),
+            ('share', self._manila_share_id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )
+
+
+class TestServerShareCreate(compute_fakes.TestComputev2):
+    def setUp(self):
+        super().setUp()
+
+        self.set_compute_api_version('2.97')
+
+        self.server = compute_fakes.create_one_server()
+        self.share = compute_fakes.create_one_share()
+
+        self.compute_client.find_server.return_value = self.server
+        self.compute_client.create_share_attachment.return_value = self.share
+
+        self.shared_file_system_client = (
+            self.app.client_manager.sdk_connection.shared_file_system
+        )
+        self._manila_share_id = uuid.uuid4().hex
+        self.shared_file_system_client.find_share.return_value = type(
+            'FakeShare', (), {'id': self._manila_share_id}
+        )()
+
+        self.cmd = server_share.AddServerShare(self.app, None)
+
+    def test_server_share_create(self):
+        arglist = [
+            self.server.id,
+            self._manila_share_id,
+            "--tag",
+            "my-tag",
+        ]
+        verifylist = [
+            ('server', self.server.id),
+            ('share', self._manila_share_id),
+            ('tag', 'my-tag'),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.assertEqual(
+            ("Export Location", "Share ID", "Status", "Tag", "UUID"), columns
+        )
+        self.assertEqual(
+            (
+                self.share.export_location,
+                self.share.share_id,
+                self.share.status,
+                self.share.tag,
+                self.share.uuid,
+            ),
+            tuple(data),
+        )
+        self.shared_file_system_client.find_share.assert_called_once_with(
+            self._manila_share_id, ignore_missing=False
+        )
+        self.compute_client.create_share_attachment.assert_called_once_with(
+            self.server, self._manila_share_id, tag='my-tag'
+        )
+
+    def test_server_share_create_no_tag(self):
+        arglist = [
+            self.server.id,
+            self._manila_share_id,
+        ]
+        verifylist = [
+            ('server', self.server.id),
+            ('share', self._manila_share_id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+
+        self.compute_client.create_share_attachment.assert_called_once_with(
+            self.server, self._manila_share_id
+        )
+
+    def test_server_share_create_pre_v297(self):
+        self.set_compute_api_version('2.96')
+        arglist = [self.server.id, self._manila_share_id]
+        verifylist = [
+            ('server', self.server.id),
+            ('share', self._manila_share_id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )
+
+
+class TestServerShareDelete(compute_fakes.TestComputev2):
+    def setUp(self):
+        super().setUp()
+
+        self.set_compute_api_version('2.97')
+
+        self.server = compute_fakes.create_one_server()
+
+        self.compute_client.find_server.return_value = self.server
+
+        self.shared_file_system_client = (
+            self.app.client_manager.sdk_connection.shared_file_system
+        )
+        self._manila_share_id = uuid.uuid4().hex
+        self.shared_file_system_client.find_share.return_value = type(
+            'FakeShare', (), {'id': self._manila_share_id}
+        )()
+
+        self.cmd = server_share.RemoveServerShare(self.app, None)
+
+    def test_server_share_delete(self):
+        arglist = [
+            self.server.id,
+            self._manila_share_id,
+        ]
+        verifylist = [
+            ('server', self.server.id),
+            ('share', self._manila_share_id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+
+        self.shared_file_system_client.find_share.assert_called_once_with(
+            self._manila_share_id, ignore_missing=False
+        )
+        self.compute_client.delete_share_attachment.assert_called_once_with(
+            self.server,
+            self._manila_share_id,
+        )
+
+    def test_server_share_delete_pre_v297(self):
+        self.set_compute_api_version('2.96')
+        arglist = [self.server.id, self._manila_share_id]
+        verifylist = [
+            ('server', self.server.id),
+            ('share', self._manila_share_id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )

openstackclient/tests/unit/identity/v3/fakes.py

@@ -682,6 +682,7 @@ class FakeClientMixin:
         self.app.client_manager.sdk_connection.identity = mock.Mock(
             _proxy.Proxy
         )
+        self.app.client_manager.sdk_connection.identity.api_version = '3'
         self.identity_sdk_client = (
             self.app.client_manager.sdk_connection.identity
         )
@@ -716,6 +717,7 @@ class TestFederatedIdentity(utils.TestCommand):
         self.app.client_manager.sdk_connection.identity = mock.Mock(
             _proxy.Proxy
         )
+        self.app.client_manager.sdk_connection.identity.api_version = '3'
         self.identity_sdk_client = (
             self.app.client_manager.sdk_connection.identity
         )
@@ -736,6 +738,7 @@ class TestOAuth1(utils.TestCommand):
         self.app.client_manager.sdk_connection.identity = mock.Mock(
             _proxy.Proxy
         )
+        self.app.client_manager.sdk_connection.identity.api_version = '3'
         self.identity_sdk_client = (
             self.app.client_manager.sdk_connection.identity
         )

openstackclient/tests/unit/identity/v3/test_group.py

@@ -103,7 +103,7 @@ class TestGroupAddUser(identity_fakes.TestIdentityv3):
         except exceptions.CommandError as e:
             msg = f"1 of 2 users not added to group {self._group.name}."
             self.assertEqual(msg, str(e))
-        msg = f"{self.users[0].name} not added to group {self._group.name}: {str(sdk_exc.ResourceNotFound())}"
+        msg = f"{self.users[0].name} not added to group {self._group.name}: {sdk_exc.ResourceNotFound()!s}"
         mock_error.assert_called_once_with(msg)
 
 
@@ -553,14 +553,7 @@ class TestGroupList(identity_fakes.TestIdentityv3):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        # Set expected values
-        kwargs = {
-            'domain_id': self.domain.id,
-        }
-
-        self.identity_sdk_client.user_groups.assert_called_with(
-            self.user.id, **kwargs
-        )
+        self.identity_sdk_client.user_groups.assert_called_with(self.user.id)
 
         self.assertEqual(self.columns, columns)
 
@@ -587,10 +580,7 @@ class TestGroupList(identity_fakes.TestIdentityv3):
 
         self.identity_sdk_client.groups.assert_called_with()
 
-        long_columns = self.columns + (
-            'Domain ID',
-            'Description',
-        )
+        long_columns = (*self.columns, 'Domain ID', 'Description')
         datalist = (
             (
                 self.group.id,
@@ -687,7 +677,7 @@ class TestGroupRemoveUser(identity_fakes.TestIdentityv3):
         except exceptions.CommandError as e:
             msg = f"1 of 2 users not removed from group {self._group.id}."
             self.assertEqual(msg, str(e))
-        msg = f"{self.users[0].id} not removed from group {self._group.id}: {str(sdk_exc.ResourceNotFound())}"
+        msg = f"{self.users[0].id} not removed from group {self._group.id}: {sdk_exc.ResourceNotFound()!s}"
         mock_error.assert_called_once_with(msg)