python-openstackclient 6.6.0__py3-none-any.whl → 7.0.0__py3-none-any.whl

openstackclient/tests/unit/volume/v3/test_volume_attachment.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from cinderclient import api_versions
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 
@@ -24,22 +23,12 @@ class TestVolumeAttachment(volume_fakes.TestVolume):
     def setUp(self):
         super().setUp()
 
-        self.volumes_mock = self.volume_client.volumes
-        self.volumes_mock.reset_mock()
-
-        self.volume_attachments_mock = self.volume_client.attachments
-        self.volume_attachments_mock.reset_mock()
-
         self.projects_mock = self.app.client_manager.identity.projects
-        self.projects_mock.reset_mock()
-
-        self.servers_mock = self.compute_client.servers
-        self.servers_mock.reset_mock()
 
 
 class TestVolumeAttachmentCreate(TestVolumeAttachment):
     volume = volume_fakes.create_one_volume()
-    server = compute_fakes.create_one_server()
+    server = compute_fakes.create_one_sdk_server()
     volume_attachment = volume_fakes.create_one_volume_attachment(
         attrs={'instance': server.id, 'volume_id': volume.id},
     )
@@ -68,17 +57,16 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment):
     def setUp(self):
         super().setUp()
 
-        self.volumes_mock.get.return_value = self.volume
-        self.servers_mock.get.return_value = self.server
-        # VolumeAttachmentManager.create returns a dict
-        self.volume_attachments_mock.create.return_value = (
+        self.volume_sdk_client.find_volume.return_value = self.volume
+        self.volume_sdk_client.create_attachment.return_value = (
             self.volume_attachment.to_dict()
         )
+        self.compute_sdk_client.find_server.return_value = self.server
 
         self.cmd = volume_attachment.CreateVolumeAttachment(self.app, None)
 
     def test_volume_attachment_create(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.27')
+        self.set_volume_api_version('3.27')
 
         arglist = [
             self.volume.id,
@@ -101,19 +89,23 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.volumes_mock.get.assert_called_once_with(self.volume.id)
-        self.servers_mock.get.assert_called_once_with(self.server.id)
-        self.volume_attachments_mock.create.assert_called_once_with(
+        self.volume_sdk_client.find_volume.assert_called_once_with(
+            self.volume.id, ignore_missing=False
+        )
+        self.compute_sdk_client.find_server.assert_called_once_with(
+            self.server.id, ignore_missing=False
+        )
+        self.volume_sdk_client.create_attachment.assert_called_once_with(
             self.volume.id,
-            {},
-            self.server.id,
-            None,
+            connector={},
+            instance=self.server.id,
+            mode=None,
         )
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_volume_attachment_create_with_connect(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.54')
+        self.set_volume_api_version('3.54')
 
         arglist = [
             self.volume.id,
@@ -164,19 +156,23 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment):
             ]
         )
 
-        self.volumes_mock.get.assert_called_once_with(self.volume.id)
-        self.servers_mock.get.assert_called_once_with(self.server.id)
-        self.volume_attachments_mock.create.assert_called_once_with(
+        self.volume_sdk_client.find_volume.assert_called_once_with(
+            self.volume.id, ignore_missing=False
+        )
+        self.compute_sdk_client.find_server.assert_called_once_with(
+            self.server.id, ignore_missing=False
+        )
+        self.volume_sdk_client.create_attachment.assert_called_once_with(
             self.volume.id,
-            connect_info,
-            self.server.id,
-            'null',
+            connector=connect_info,
+            instance=self.server.id,
+            mode='null',
         )
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_volume_attachment_create_pre_v327(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.26')
+        self.set_volume_api_version('3.26')
 
         arglist = [
             self.volume.id,
@@ -196,7 +192,7 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment):
         )
 
     def test_volume_attachment_create_with_mode_pre_v354(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.53')
+        self.set_volume_api_version('3.53')
 
         arglist = [
             self.volume.id,
@@ -219,7 +215,7 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment):
         )
 
     def test_volume_attachment_create_with_connect_missing_arg(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.54')
+        self.set_volume_api_version('3.54')
 
         arglist = [
             self.volume.id,
@@ -249,12 +245,12 @@ class TestVolumeAttachmentDelete(TestVolumeAttachment):
     def setUp(self):
         super().setUp()
 
-        self.volume_attachments_mock.delete.return_value = None
+        self.volume_sdk_client.delete_attachment.return_value = None
 
         self.cmd = volume_attachment.DeleteVolumeAttachment(self.app, None)
 
     def test_volume_attachment_delete(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.27')
+        self.set_volume_api_version('3.27')
 
         arglist = [
             self.volume_attachment.id,
@@ -266,13 +262,13 @@ class TestVolumeAttachmentDelete(TestVolumeAttachment):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.volume_attachments_mock.delete.assert_called_once_with(
+        self.volume_sdk_client.delete_attachment.assert_called_once_with(
             self.volume_attachment.id,
         )
         self.assertIsNone(result)
 
     def test_volume_attachment_delete_pre_v327(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.26')
+        self.set_volume_api_version('3.26')
 
         arglist = [
             self.volume_attachment.id,
@@ -317,14 +313,14 @@ class TestVolumeAttachmentSet(TestVolumeAttachment):
     def setUp(self):
         super().setUp()
 
-        self.volume_attachments_mock.update.return_value = (
+        self.volume_sdk_client.update_attachment.return_value = (
             self.volume_attachment
         )
 
         self.cmd = volume_attachment.SetVolumeAttachment(self.app, None)
 
     def test_volume_attachment_set(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.27')
+        self.set_volume_api_version('3.27')
 
         arglist = [
             self.volume_attachment.id,
@@ -368,15 +364,15 @@ class TestVolumeAttachmentSet(TestVolumeAttachment):
             ]
         )
 
-        self.volume_attachments_mock.update.assert_called_once_with(
+        self.volume_sdk_client.update_attachment.assert_called_once_with(
             self.volume_attachment.id,
-            connect_info,
+            connector=connect_info,
         )
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_volume_attachment_set_pre_v327(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.26')
+        self.set_volume_api_version('3.26')
 
         arglist = [
             self.volume_attachment.id,
@@ -403,12 +399,12 @@ class TestVolumeAttachmentComplete(TestVolumeAttachment):
     def setUp(self):
         super().setUp()
 
-        self.volume_attachments_mock.complete.return_value = None
+        self.volume_sdk_client.complete_attachment.return_value = None
 
         self.cmd = volume_attachment.CompleteVolumeAttachment(self.app, None)
 
     def test_volume_attachment_complete(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.44')
+        self.set_volume_api_version('3.44')
 
         arglist = [
             self.volume_attachment.id,
@@ -420,13 +416,13 @@ class TestVolumeAttachmentComplete(TestVolumeAttachment):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.volume_attachments_mock.complete.assert_called_once_with(
+        self.volume_sdk_client.complete_attachment.assert_called_once_with(
             self.volume_attachment.id,
         )
         self.assertIsNone(result)
 
     def test_volume_attachment_complete_pre_v344(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.43')
+        self.set_volume_api_version('3.43')
 
         arglist = [
             self.volume_attachment.id,
@@ -468,14 +464,14 @@ class TestVolumeAttachmentList(TestVolumeAttachment):
         super().setUp()
 
         self.projects_mock.get.return_value = self.project
-        self.volume_attachments_mock.list.return_value = (
+        self.volume_sdk_client.attachments.return_value = (
             self.volume_attachments
         )
 
         self.cmd = volume_attachment.ListVolumeAttachment(self.app, None)
 
     def test_volume_attachment_list(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.27')
+        self.set_volume_api_version('3.27')
 
         arglist = []
         verifylist = [
@@ -490,7 +486,7 @@ class TestVolumeAttachmentList(TestVolumeAttachment):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.volume_attachments_mock.list.assert_called_once_with(
+        self.volume_sdk_client.attachments.assert_called_once_with(
             search_opts={
                 'all_tenants': False,
                 'project_id': None,
@@ -504,7 +500,7 @@ class TestVolumeAttachmentList(TestVolumeAttachment):
         self.assertCountEqual(tuple(self.data), data)
 
     def test_volume_attachment_list_with_options(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.27')
+        self.set_volume_api_version('3.27')
 
         arglist = [
             '--project',
@@ -530,7 +526,7 @@ class TestVolumeAttachmentList(TestVolumeAttachment):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.volume_attachments_mock.list.assert_called_once_with(
+        self.volume_sdk_client.attachments.assert_called_once_with(
             search_opts={
                 'all_tenants': True,
                 'project_id': self.project.id,
@@ -544,7 +540,7 @@ class TestVolumeAttachmentList(TestVolumeAttachment):
         self.assertCountEqual(tuple(self.data), data)
 
     def test_volume_attachment_list_pre_v327(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.26')
+        self.set_volume_api_version('3.26')
 
         arglist = []
         verifylist = [