Merge "volume: Replace remaining use of keystoneclient"

Author: Zuul

openstackclient/tests/unit/volume/v2/test_volume.py

@@ -18,13 +18,14 @@
 from openstack.block_storage.v2 import type as _type
 from openstack.block_storage.v2 import volume as _volume
 from openstack import exceptions as sdk_exceptions
+from openstack.identity.v3 import project as _project
+from openstack.identity.v3 import user as _user
 from openstack.test import fakes as sdk_fakes
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 from osc_lib import utils
 
 from openstackclient.api import volume_v2
-from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.unit.image.v2 import fakes as image_fakes
 from openstackclient.tests.unit import utils as test_utils
 from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes
@@ -749,6 +750,9 @@ def test_volume_delete_with_force(self):
 
 
 class TestVolumeList(volume_fakes.TestVolume):
+    project = sdk_fakes.generate_fake_resource(_project.Project)
+    user = sdk_fakes.generate_fake_resource(_user.User)
+
     columns = (
         'ID',
         'Name',
@@ -763,13 +767,8 @@ def setUp(self):
         self.volume = sdk_fakes.generate_fake_resource(_volume.Volume)
         self.volume_sdk_client.volumes.return_value = [self.volume]
 
-        self.user = identity_fakes.FakeUser.create_one_user()
-        self.users_mock = self.identity_client.users
-        self.users_mock.get.return_value = self.user
-
-        self.project = identity_fakes.FakeProject.create_one_project()
-        self.projects_mock = self.identity_client.projects
-        self.projects_mock.get.return_value = self.project
+        self.identity_sdk_client.find_user.return_value = self.user
+        self.identity_sdk_client.find_project.return_value = self.project
 
         self.cmd = volume.ListVolume(self.app, None)
 

openstackclient/tests/unit/volume/v2/test_volume_snapshot.py

@@ -16,11 +16,11 @@
 from openstack.block_storage.v2 import snapshot as _snapshot
 from openstack.block_storage.v3 import volume as _volume
 from openstack import exceptions as sdk_exceptions
+from openstack.identity.v3 import project as _project
 from openstack.test import fakes as sdk_fakes
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 
-from openstackclient.tests.unit.identity.v3 import fakes as project_fakes
 from openstackclient.tests.unit import utils as test_utils
 from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes
 from openstackclient.volume.v2 import volume_snapshot
@@ -289,12 +289,9 @@ def setUp(self):
                 _snapshot.Snapshot, attrs={'volume_id': self.volume.name}
             )
         )
-        self.project = project_fakes.FakeProject.create_one_project()
         self.volume_sdk_client.volumes.return_value = [self.volume]
         self.volume_sdk_client.find_volume.return_value = self.volume
         self.volume_sdk_client.snapshots.return_value = self.snapshots
-        self.project_mock = self.identity_client.projects
-        self.project_mock.get.return_value = self.project
 
         self.columns = ("ID", "Name", "Description", "Status", "Size")
         self.columns_long = (
@@ -354,19 +351,22 @@ def test_snapshot_list_without_options(self):
         self.assertEqual(self.data, list(data))
 
     def test_snapshot_list_with_options(self):
+        project = sdk_fakes.generate_fake_resource(_project.Project)
+        self.identity_sdk_client.find_project.return_value = project
+
         arglist = [
             "--long",
             "--limit",
             "2",
             "--project",
-            self.project.id,
+            project.id,
             "--marker",
             self.snapshots[0].id,
         ]
         verifylist = [
             ("long", True),
             ("limit", 2),
-            ("project", self.project.id),
+            ("project", project.id),
             ("marker", self.snapshots[0].id),
             ('all_projects', False),
         ]
@@ -379,7 +379,7 @@ def test_snapshot_list_with_options(self):
             marker=self.snapshots[0].id,
             max_items=None,
             all_projects=True,
-            project_id=self.project.id,
+            project_id=project.id,
             name=None,
             status=None,
             volume_id=None,

openstackclient/tests/unit/volume/v2/test_volume_type.py

@@ -14,12 +14,12 @@
 from unittest.mock import call
 
 from openstack.block_storage.v3 import type as _type
+from openstack.identity.v3 import project as _project
 from openstack.test import fakes as sdk_fakes
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 from osc_lib import utils
 
-from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.unit import utils as tests_utils
 from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes
 from openstackclient.volume.v2 import volume_type
@@ -30,7 +30,7 @@ def setUp(self):
         super().setUp()
 
         self.new_volume_type = sdk_fakes.generate_fake_resource(_type.Type)
-        self.project = identity_fakes.FakeProject.create_one_project()
+        self.project = sdk_fakes.generate_fake_resource(_project.Project)
         self.columns = (
             'description',
             'id',
@@ -47,9 +47,7 @@ def setUp(self):
         )
 
         self.volume_sdk_client.create_type.return_value = self.new_volume_type
-
-        self.projects_mock = self.identity_client.projects
-        self.projects_mock.get.return_value = self.project
+        self.identity_sdk_client.find_project.return_value = self.project
 
         self.cmd = volume_type.CreateVolumeType(self.app, None)
 
@@ -490,9 +488,8 @@ class TestTypeSet(volume_fakes.TestVolume):
     def setUp(self):
         super().setUp()
 
-        self.project = identity_fakes.FakeProject.create_one_project()
-        self.projects_mock = self.identity_client.projects
-        self.projects_mock.get.return_value = self.project
+        self.project = sdk_fakes.generate_fake_resource(_project.Project)
+        self.identity_sdk_client.find_project.return_value = self.project
 
         self.volume_type = sdk_fakes.generate_fake_resource(_type.Type)
         self.volume_sdk_client.find_type.return_value = self.volume_type
@@ -897,16 +894,15 @@ def test_type_show_with_encryption(self):
 
 
 class TestTypeUnset(volume_fakes.TestVolume):
-    project = identity_fakes.FakeProject.create_one_project()
     volume_type = sdk_fakes.generate_fake_resource(_type.Type)
 
     def setUp(self):
         super().setUp()
 
         self.volume_sdk_client.find_type.return_value = self.volume_type
 
-        self.projects_mock = self.identity_client.projects
-        self.projects_mock.get.return_value = self.project
+        self.project = sdk_fakes.generate_fake_resource(_project.Project)
+        self.identity_sdk_client.find_project.return_value = self.project
 
         self.cmd = volume_type.UnsetVolumeType(self.app, None)
 
@@ -973,10 +969,10 @@ def test_type_unset_not_called_without_project_argument(self):
     def test_type_unset_failed_with_missing_volume_type_argument(self):
         arglist = [
             '--project',
-            'identity_fakes.project_id',
+            'foo',
         ]
         verifylist = [
-            ('project', 'identity_fakes.project_id'),
+            ('project', 'foo'),
         ]
 
         self.assertRaises(

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

@@ -21,13 +21,14 @@
 from openstack.block_storage.v3 import type as _type
 from openstack.block_storage.v3 import volume as _volume
 from openstack import exceptions as sdk_exceptions
+from openstack.identity.v3 import project as _project
+from openstack.identity.v3 import user as _user
 from openstack.test import fakes as sdk_fakes
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 from osc_lib import utils
 
 from openstackclient.api import volume_v3
-from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.unit.image.v2 import fakes as image_fakes
 from openstackclient.tests.unit import utils as test_utils
 from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
@@ -1146,6 +1147,9 @@ def test_volume_delete_remote_with_force(self):
 
 
 class TestVolumeList(volume_fakes.TestVolume):
+    project = sdk_fakes.generate_fake_resource(_project.Project)
+    user = sdk_fakes.generate_fake_resource(_user.User)
+
     columns = (
         'ID',
         'Name',
@@ -1160,11 +1164,8 @@ def setUp(self):
         self.volume = sdk_fakes.generate_fake_resource(_volume.Volume)
         self.volume_sdk_client.volumes.return_value = [self.volume]
 
-        self.user = identity_fakes.FakeUser.create_one_user()
-        self.identity_client.users.get.return_value = self.user
-
-        self.project = identity_fakes.FakeProject.create_one_project()
-        self.identity_client.projects.get.return_value = self.project
+        self.identity_sdk_client.find_project.return_value = self.project
+        self.identity_sdk_client.find_user.return_value = self.user
 
         self.cmd = volume.ListVolume(self.app, None)
 

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

@@ -10,23 +10,17 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from openstack.identity.v3 import project as _project
+from openstack.test import fakes as sdk_fakes
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
-from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
 from openstackclient.volume.v3 import volume_attachment
 
 
-class TestVolumeAttachment(volume_fakes.TestVolume):
-    def setUp(self):
-        super().setUp()
-
-        self.projects_mock = self.identity_client.projects
-
-
-class TestVolumeAttachmentCreate(TestVolumeAttachment):
+class TestVolumeAttachmentCreate(volume_fakes.TestVolume):
     volume = volume_fakes.create_one_volume()
     server = compute_fakes.create_one_server()
     volume_attachment = volume_fakes.create_one_volume_attachment(
@@ -239,7 +233,7 @@ def test_volume_attachment_create_with_connect_missing_arg(self):
         )
 
 
-class TestVolumeAttachmentDelete(TestVolumeAttachment):
+class TestVolumeAttachmentDelete(volume_fakes.TestVolume):
     volume_attachment = volume_fakes.create_one_volume_attachment()
 
     def setUp(self):
@@ -286,7 +280,7 @@ def test_volume_attachment_delete_pre_v327(self):
         )
 
 
-class TestVolumeAttachmentSet(TestVolumeAttachment):
+class TestVolumeAttachmentSet(volume_fakes.TestVolume):
     volume_attachment = volume_fakes.create_one_volume_attachment()
 
     columns = (
@@ -393,7 +387,7 @@ def test_volume_attachment_set_pre_v327(self):
         )
 
 
-class TestVolumeAttachmentComplete(TestVolumeAttachment):
+class TestVolumeAttachmentComplete(volume_fakes.TestVolume):
     volume_attachment = volume_fakes.create_one_volume_attachment()
 
     def setUp(self):
@@ -440,8 +434,8 @@ def test_volume_attachment_complete_pre_v344(self):
         )
 
 
-class TestVolumeAttachmentList(TestVolumeAttachment):
-    project = identity_fakes.FakeProject.create_one_project()
+class TestVolumeAttachmentList(volume_fakes.TestVolume):
+    project = sdk_fakes.generate_fake_resource(_project.Project)
     volume_attachments = volume_fakes.create_volume_attachments()
 
     columns = (
@@ -463,7 +457,7 @@ class TestVolumeAttachmentList(TestVolumeAttachment):
     def setUp(self):
         super().setUp()
 
-        self.projects_mock.get.return_value = self.project
+        self.identity_sdk_client.find_project.return_value = self.project
         self.volume_sdk_client.attachments.return_value = (
             self.volume_attachments
         )

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

@@ -13,10 +13,10 @@
 from unittest.mock import call
 
 from openstack.block_storage.v3 import message as _message
+from openstack.identity.v3 import project as _project
 from openstack.test import fakes as sdk_fakes
 from osc_lib import exceptions
 
-from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
 from openstackclient.volume.v3 import volume_message
 
@@ -124,7 +124,6 @@ def test_message_delete_pre_v33(self):
 
 
 class TestVolumeMessageList(volume_fakes.TestVolume):
-    fake_project = identity_fakes.FakeProject.create_one_project()
     fake_messages = list(
         sdk_fakes.generate_fake_resources(_message.Message, count=3)
     )
@@ -159,7 +158,8 @@ class TestVolumeMessageList(volume_fakes.TestVolume):
     def setUp(self):
         super().setUp()
 
-        self.identity_client.projects.get.return_value = self.fake_project
+        self.project = sdk_fakes.generate_fake_resource(_project.Project)
+        self.identity_sdk_client.find_project.return_value = self.project
         self.volume_sdk_client.messages.return_value = self.fake_messages
         # Get the command to test
         self.cmd = volume_message.ListMessages(self.app, None)
@@ -190,14 +190,14 @@ def test_message_list_with_options(self):
 
         arglist = [
             '--project',
-            self.fake_project.name,
+            self.project.name,
             '--marker',
             self.fake_messages[0].id,
             '--limit',
             '3',
         ]
         verifylist = [
-            ('project', self.fake_project.name),
+            ('project', self.project.name),
             ('marker', self.fake_messages[0].id),
             ('limit', 3),
         ]
@@ -206,7 +206,7 @@ def test_message_list_with_options(self):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.volume_sdk_client.messages.assert_called_once_with(
-            project_id=self.fake_project.id,
+            project_id=self.project.id,
             marker=self.fake_messages[0].id,
             limit=3,
         )