Merge "image: Remove FakeImage test helper"

11 files changed, 187 insertions, 222 deletions

diff --git a/openstackclient/tests/unit/common/test_project_purge.py b/openstackclient/tests/unit/common/test_project_purge.py
index adc48ce2..5199093c 100644
--- a/openstackclient/tests/unit/common/test_project_purge.py
+++ b/openstackclient/tests/unit/common/test_project_purge.py
@@ -70,7 +70,7 @@ class TestProjectPurge(TestProjectPurgeInit):
 
     project = identity_fakes.FakeProject.create_one_project()
     server = compute_fakes.FakeServer.create_one_server()
-    image = image_fakes.FakeImage.create_one_image()
+    image = image_fakes.create_one_image()
     volume = volume_fakes.FakeVolume.create_one_volume()
     backup = volume_fakes.FakeBackup.create_one_backup()
     snapshot = volume_fakes.FakeSnapshot.create_one_snapshot()
diff --git a/openstackclient/tests/unit/compute/v2/test_aggregate.py b/openstackclient/tests/unit/compute/v2/test_aggregate.py
index cad85e4d..3a7a81cb 100644
--- a/openstackclient/tests/unit/compute/v2/test_aggregate.py
+++ b/openstackclient/tests/unit/compute/v2/test_aggregate.py
@@ -554,7 +554,7 @@ class TestAggregateUnset(TestAggregate):
 
 class TestAggregateCacheImage(TestAggregate):
 
-    images = image_fakes.FakeImage.create_images(count=2)
+    images = image_fakes.create_images(count=2)
 
     def setUp(self):
         super(TestAggregateCacheImage, self).setUp()
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
index 50fdef28..480dcfe1 100644
--- a/openstackclient/tests/unit/compute/v2/test_server.py
+++ b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -1430,7 +1430,7 @@ class TestServerCreate(TestServer):
 
         self.servers_mock.create.return_value = self.new_server
 
-        self.image = image_fakes.FakeImage.create_one_image()
+        self.image = image_fakes.create_one_image()
         self.find_image_mock.return_value = self.image
         self.get_image_mock.return_value = self.image
 
@@ -3180,7 +3180,7 @@ class TestServerCreate(TestServer):
             'hypervisor_type': 'qemu',
         }
 
-        _image = image_fakes.FakeImage.create_one_image(image_info)
+        _image = image_fakes.create_one_image(image_info)
         self.images_mock.return_value = [_image]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -3236,7 +3236,7 @@ class TestServerCreate(TestServer):
             'hypervisor_type': 'qemu',
             'hw_disk_bus': 'ide',
         }
-        _image = image_fakes.FakeImage.create_one_image(image_info)
+        _image = image_fakes.create_one_image(image_info)
         self.images_mock.return_value = [_image]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -3293,7 +3293,7 @@ class TestServerCreate(TestServer):
             'hw_disk_bus': 'ide',
         }
 
-        _image = image_fakes.FakeImage.create_one_image(image_info)
+        _image = image_fakes.create_one_image(image_info)
         self.images_mock.return_value = [_image]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -3325,8 +3325,8 @@ class TestServerCreate(TestServer):
             }
         }
 
-        target_image = image_fakes.FakeImage.create_one_image(image_info)
-        another_image = image_fakes.FakeImage.create_one_image({})
+        target_image = image_fakes.create_one_image(image_info)
+        another_image = image_fakes.create_one_image({})
         self.images_mock.return_value = [target_image, another_image]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -4364,7 +4364,7 @@ class _TestServerList(TestServer):
         self.servers = self.setup_servers_mock(3)
         self.servers_mock.list.return_value = self.servers
 
-        self.image = image_fakes.FakeImage.create_one_image()
+        self.image = image_fakes.create_one_image()
 
         # self.images_mock.return_value = [self.image]
         self.find_image_mock.return_value = self.image
@@ -6361,7 +6361,7 @@ class TestServerRebuild(TestServer):
         super(TestServerRebuild, self).setUp()
 
         # Return value for utils.find_resource for image
-        self.image = image_fakes.FakeImage.create_one_image()
+        self.image = image_fakes.create_one_image()
         self.get_image_mock.return_value = self.image
 
         # Fake the rebuilt new server.
@@ -6391,7 +6391,7 @@ class TestServerRebuild(TestServer):
 
     def test_rebuild_with_image_name(self):
         image_name = 'my-custom-image'
-        user_image = image_fakes.FakeImage.create_one_image(
+        user_image = image_fakes.create_one_image(
             attrs={'name': image_name})
         self.find_image_mock.return_value = user_image
 
@@ -6940,7 +6940,7 @@ class TestEvacuateServer(TestServer):
     def setUp(self):
         super(TestEvacuateServer, self).setUp()
         # Return value for utils.find_resource for image
-        self.image = image_fakes.FakeImage.create_one_image()
+        self.image = image_fakes.create_one_image()
         self.images_mock.get.return_value = self.image
 
         # Fake the rebuilt new server.
@@ -7134,7 +7134,7 @@ class TestServerRescue(TestServer):
         super(TestServerRescue, self).setUp()
 
         # Return value for utils.find_resource for image
-        self.image = image_fakes.FakeImage.create_one_image()
+        self.image = image_fakes.create_one_image()
         self.get_image_mock.return_value = self.image
 
         new_server = compute_fakes.FakeServer.create_one_server()
@@ -7175,7 +7175,7 @@ class TestServerRescue(TestServer):
         self.server.rescue.assert_called_with(image=None, password=None)
 
     def test_rescue_with_new_image(self):
-        new_image = image_fakes.FakeImage.create_one_image()
+        new_image = image_fakes.create_one_image()
         self.find_image_mock.return_value = new_image
         arglist = [
             '--image', new_image.id,
@@ -8293,7 +8293,7 @@ class TestServerShow(TestServer):
     def setUp(self):
         super(TestServerShow, self).setUp()
 
-        self.image = image_fakes.FakeImage.create_one_image()
+        self.image = image_fakes.create_one_image()
         self.flavor = compute_fakes.FakeFlavor.create_one_flavor()
         self.topology = {
             'nodes': [{'vcpu_set': [0, 1]}, {'vcpu_set': [2, 3]}],
@@ -9000,7 +9000,7 @@ class TestServerGeneral(TestServer):
         # - The first time, return server info.
         # - The second time, return image info.
         # - The third time, return flavor info.
-        _image = image_fakes.FakeImage.create_one_image()
+        _image = image_fakes.create_one_image()
         _flavor = compute_fakes.FakeFlavor.create_one_flavor()
         server_info = {
             'image': {u'id': _image.id},
diff --git a/openstackclient/tests/unit/compute/v2/test_server_backup.py b/openstackclient/tests/unit/compute/v2/test_server_backup.py
index 1644baae..1a5e0a12 100644
--- a/openstackclient/tests/unit/compute/v2/test_server_backup.py
+++ b/openstackclient/tests/unit/compute/v2/test_server_backup.py
@@ -91,7 +91,7 @@ class TestServerBackupCreate(TestServerBackup):
 
     def setup_images_mock(self, count, servers=None):
         if servers:
-            images = image_fakes.FakeImage.create_images(
+            images = image_fakes.create_images(
                 attrs={
                     'name': servers[0].name,
                     'status': 'active',
@@ -99,7 +99,7 @@ class TestServerBackupCreate(TestServerBackup):
                 count=count,
             )
         else:
-            images = image_fakes.FakeImage.create_images(
+            images = image_fakes.create_images(
                 attrs={
                     'status': 'active',
                 },
@@ -178,15 +178,6 @@ class TestServerBackupCreate(TestServerBackup):
     def test_server_backup_wait_fail(self, mock_wait_for_status):
         servers = self.setup_servers_mock(count=1)
         images = self.setup_images_mock(count=1, servers=servers)
-#         images = image_fakes.FakeImage.create_images(
-#             attrs={
-#                 'name': servers[0].name,
-#                 'status': 'active',
-#             },
-#             count=1,
-#         )
-#
-#         self.images_mock.find_image.return_value = images[0]
         self.images_mock.get_image = mock.Mock(
             side_effect=images[0],
         )
diff --git a/openstackclient/tests/unit/compute/v2/test_server_image.py b/openstackclient/tests/unit/compute/v2/test_server_image.py
index b73cc763..db0e1d9e 100644
--- a/openstackclient/tests/unit/compute/v2/test_server_image.py
+++ b/openstackclient/tests/unit/compute/v2/test_server_image.py
@@ -89,7 +89,7 @@ class TestServerImageCreate(TestServerImage):
 
     def setup_images_mock(self, count, servers=None):
         if servers:
-            images = image_fakes.FakeImage.create_images(
+            images = image_fakes.create_images(
                 attrs={
                     'name': servers[0].name,
                     'status': 'active',
@@ -97,7 +97,7 @@ class TestServerImageCreate(TestServerImage):
                 count=count,
             )
         else:
-            images = image_fakes.FakeImage.create_images(
+            images = image_fakes.create_images(
                 attrs={
                     'status': 'active',
                 },
diff --git a/openstackclient/tests/unit/image/v1/fakes.py b/openstackclient/tests/unit/image/v1/fakes.py
index 59ae5f7a..3097a42f 100644
--- a/openstackclient/tests/unit/image/v1/fakes.py
+++ b/openstackclient/tests/unit/image/v1/fakes.py
@@ -22,10 +22,6 @@ from openstackclient.tests.unit import utils
 from openstackclient.tests.unit.volume.v1 import fakes as volume_fakes
 
 
-image_id = 'im1'
-image_name = 'graven'
-
-
 class FakeImagev1Client(object):
 
     def __init__(self, **kwargs):
@@ -51,40 +47,36 @@ class TestImagev1(utils.TestCommand):
         )
 
 
-class FakeImage(object):
-    """Fake one or more images."""
-
-    @staticmethod
-    def create_one_image(attrs=None):
-        """Create a fake image.
-
-        :param Dictionary attrs:
-            A dictionary with all attrbutes of image
-        :return:
-            A FakeResource object with id, name, owner, protected,
-            visibility and tags attrs
-        """
-        attrs = attrs or {}
-
-        # Set default attribute
-        image_info = {
-            'id': str(uuid.uuid4()),
-            'name': 'image-name' + uuid.uuid4().hex,
-            'owner': 'image-owner' + uuid.uuid4().hex,
-            'container_format': '',
-            'disk_format': '',
-            'min_disk': 0,
-            'min_ram': 0,
-            'is_public': True,
-            'protected': False,
-            'properties': {
-                'Alpha': 'a',
-                'Beta': 'b',
-                'Gamma': 'g'},
-            'status': 'status' + uuid.uuid4().hex
-        }
-
-        # Overwrite default attributes if there are some attributes set
-        image_info.update(attrs)
-
-        return image.Image(**image_info)
+def create_one_image(attrs=None):
+    """Create a fake image.
+
+    :param Dictionary attrs:
+        A dictionary with all attrbutes of image
+    :return:
+        A FakeResource object with id, name, owner, protected,
+        visibility and tags attrs
+    """
+    attrs = attrs or {}
+
+    # Set default attribute
+    image_info = {
+        'id': str(uuid.uuid4()),
+        'name': 'image-name' + uuid.uuid4().hex,
+        'owner': 'image-owner' + uuid.uuid4().hex,
+        'container_format': '',
+        'disk_format': '',
+        'min_disk': 0,
+        'min_ram': 0,
+        'is_public': True,
+        'protected': False,
+        'properties': {
+            'Alpha': 'a',
+            'Beta': 'b',
+            'Gamma': 'g'},
+        'status': 'status' + uuid.uuid4().hex
+    }
+
+    # Overwrite default attributes if there are some attributes set
+    image_info.update(attrs)
+
+    return image.Image(**image_info)
diff --git a/openstackclient/tests/unit/image/v1/test_image.py b/openstackclient/tests/unit/image/v1/test_image.py
index 5c69bf0f..06519800 100644
--- a/openstackclient/tests/unit/image/v1/test_image.py
+++ b/openstackclient/tests/unit/image/v1/test_image.py
@@ -34,7 +34,7 @@ class TestImage(image_fakes.TestImagev1):
 
 class TestImageCreate(TestImage):
 
-    new_image = image_fakes.FakeImage.create_one_image()
+    new_image = image_fakes.create_one_image()
     columns = (
         'container_format',
         'disk_format',
@@ -210,7 +210,7 @@ class TestImageCreate(TestImage):
 
 class TestImageDelete(TestImage):
 
-    _image = image_fakes.FakeImage.create_one_image()
+    _image = image_fakes.create_one_image()
 
     def setUp(self):
         super(TestImageDelete, self).setUp()
@@ -239,7 +239,7 @@ class TestImageDelete(TestImage):
 
 class TestImageList(TestImage):
 
-    _image = image_fakes.FakeImage.create_one_image()
+    _image = image_fakes.create_one_image()
 
     columns = (
         'ID',
@@ -443,7 +443,7 @@ class TestImageList(TestImage):
 
 class TestImageSet(TestImage):
 
-    _image = image_fakes.FakeImage.create_one_image()
+    _image = image_fakes.create_one_image()
 
     def setUp(self):
         super(TestImageSet, self).setUp()
@@ -682,8 +682,7 @@ class TestImageSet(TestImage):
 
 class TestImageShow(TestImage):
 
-    _image = image_fakes.FakeImage.create_one_image(
-        attrs={'size': 2000})
+    _image = image_fakes.create_one_image(attrs={'size': 2000})
     columns = (
         'container_format',
         'disk_format',
diff --git a/openstackclient/tests/unit/image/v2/fakes.py b/openstackclient/tests/unit/image/v2/fakes.py
index 49ce400d..910bd726 100644
--- a/openstackclient/tests/unit/image/v2/fakes.py
+++ b/openstackclient/tests/unit/image/v2/fakes.py
@@ -23,9 +23,6 @@ from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.unit import utils
 
-image_id = '0f41529e-7c12-4de8-be2d-181abb825b3c'
-image_name = 'graven'
-
 
 class FakeImagev2Client(object):
 
@@ -63,75 +60,67 @@ class TestImagev2(utils.TestCommand):
         )
 
 
-class FakeImage(object):
-    """Fake one or more images.
+def create_one_image(attrs=None):
+    """Create a fake image.
+
+    :param attrs: A dictionary with all attributes of image
+    :type attrs: dict
+    :return: A fake Image object.
+    :rtype: `openstack.image.v2.image.Image`
+    """
+    attrs = attrs or {}
+
+    # Set default attribute
+    image_info = {
+        'id': str(uuid.uuid4()),
+        'name': 'image-name' + uuid.uuid4().hex,
+        'owner_id': 'image-owner' + uuid.uuid4().hex,
+        'is_protected': bool(random.choice([0, 1])),
+        'visibility': random.choice(['public', 'private']),
+        'tags': [uuid.uuid4().hex for r in range(2)],
+    }
+
+    # Overwrite default attributes if there are some attributes set
+    image_info.update(attrs)
+
+    return image.Image(**image_info)
+
+
+def create_images(attrs=None, count=2):
+    """Create multiple fake images.
 
-    TODO(xiexs): Currently, only image API v2 is supported by this class.
+    :param attrs: A dictionary with all attributes of image
+    :type attrs: dict
+    :param count: The number of images to be faked
+    :type count: int
+    :return: A list of fake Image objects
+    :rtype: list
     """
+    images = []
+    for n in range(0, count):
+        images.append(create_one_image(attrs))
+
+    return images
+
+
+def create_one_image_member(attrs=None):
+    """Create a fake image member.
+
+    :param attrs: A dictionary with all attributes of image member
+    :type attrs: dict
+    :return: A fake Member object.
+    :rtype: `openstack.image.v2.member.Member`
+    """
+    attrs = attrs or {}
+
+    # Set default attribute
+    image_member_info = {
+        'member_id': 'member-id-' + uuid.uuid4().hex,
+        'image_id': 'image-id-' + uuid.uuid4().hex,
+        'status': 'pending',
+    }
+
+    # Overwrite default attributes if there are some attributes set
+    image_member_info.update(attrs)
 
-    @staticmethod
-    def create_one_image(attrs=None):
-        """Create a fake image.
-
-        :param Dictionary attrs:
-            A dictionary with all attrbutes of image
-        :return:
-            A FakeResource object with id, name, owner, protected,
-            visibility, tags and size attrs
-        """
-        attrs = attrs or {}
-
-        # Set default attribute
-        image_info = {
-            'id': str(uuid.uuid4()),
-            'name': 'image-name' + uuid.uuid4().hex,
-            'owner_id': 'image-owner' + uuid.uuid4().hex,
-            'is_protected': bool(random.choice([0, 1])),
-            'visibility': random.choice(['public', 'private']),
-            'tags': [uuid.uuid4().hex for r in range(2)],
-        }
-
-        # Overwrite default attributes if there are some attributes set
-        image_info.update(attrs)
-
-        return image.Image(**image_info)
-
-    @staticmethod
-    def create_images(attrs=None, count=2):
-        """Create multiple fake images.
-
-        :param Dictionary attrs:
-            A dictionary with all attributes of image
-        :param Integer count:
-            The number of images to be faked
-        :return:
-            A list of FakeResource objects
-        """
-        images = []
-        for n in range(0, count):
-            images.append(FakeImage.create_one_image(attrs))
-
-        return images
-
-    @staticmethod
-    def create_one_image_member(attrs=None):
-        """Create a fake image member.
-
-        :param Dictionary attrs:
-            A dictionary with all attributes of image member
-        :return:
-            A FakeResource object with member_id, image_id and so on
-        """
-        attrs = attrs or {}
-
-        # Set default attribute
-        image_member_info = {
-            'member_id': 'member-id-' + uuid.uuid4().hex,
-            'image_id': 'image-id-' + uuid.uuid4().hex,
-            'status': 'pending',
-        }
-
-        # Overwrite default attributes if there are some attributes set
-        image_member_info.update(attrs)
-
-        return member.Member(**image_member_info)
+    return member.Member(**image_member_info)
diff --git a/openstackclient/tests/unit/image/v2/test_image.py b/openstackclient/tests/unit/image/v2/test_image.py
index 35af6799..f1546373 100644
--- a/openstackclient/tests/unit/image/v2/test_image.py
+++ b/openstackclient/tests/unit/image/v2/test_image.py
@@ -11,7 +11,6 @@
 #   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 copy
 import io
@@ -52,7 +51,7 @@ class TestImage(image_fakes.TestImagev2):
         self.domain_mock.reset_mock()
 
     def setup_images_mock(self, count):
-        images = image_fakes.FakeImage.create_images(count=count)
+        images = image_fakes.create_images(count=count)
 
         return images
 
@@ -65,7 +64,7 @@ class TestImageCreate(TestImage):
     def setUp(self):
         super(TestImageCreate, self).setUp()
 
-        self.new_image = image_fakes.FakeImage.create_one_image()
+        self.new_image = image_fakes.create_one_image()
         self.client.create_image.return_value = self.new_image
 
         self.project_mock.get.return_value = self.project
@@ -182,7 +181,7 @@ class TestImageCreate(TestImage):
             '--protected',
             '--private',
             '--project', 'unexist_owner',
-            image_fakes.image_name,
+            'graven',
         ]
         verifylist = [
             ('container_format', 'ovf'),
@@ -194,7 +193,7 @@ class TestImageCreate(TestImage):
             ('public', False),
             ('private', True),
             ('project', 'unexist_owner'),
-            ('name', image_fakes.image_name),
+            ('name', 'graven'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -302,8 +301,8 @@ class TestAddProjectToImage(TestImage):
 
     project = identity_fakes.FakeProject.create_one_project()
     domain = identity_fakes.FakeDomain.create_one_domain()
-    _image = image_fakes.FakeImage.create_one_image()
-    new_member = image_fakes.FakeImage.create_one_image_member(
+    _image = image_fakes.create_one_image()
+    new_member = image_fakes.create_one_image_member(
         attrs={'image_id': _image.id,
                'member_id': project.id}
     )
@@ -435,7 +434,7 @@ class TestImageDelete(TestImage):
 
     def test_image_delete_multi_images_exception(self):
 
-        images = image_fakes.FakeImage.create_images(count=2)
+        images = image_fakes.create_images(count=2)
         arglist = [
             images[0].id,
             images[1].id,
@@ -467,7 +466,7 @@ class TestImageDelete(TestImage):
 
 class TestImageList(TestImage):
 
-    _image = image_fakes.FakeImage.create_one_image()
+    _image = image_fakes.create_one_image()
 
     columns = (
         'ID',
@@ -786,18 +785,13 @@ class TestImageList(TestImage):
 
     @mock.patch('osc_lib.utils.find_resource')
     def test_image_list_marker_option(self, fr_mock):
-        # tangchen: Since image_fakes.IMAGE is a dict, it cannot offer a .id
-        #           operation. Will fix this by using FakeImage class instead
-        #           of IMAGE dict.
         self.client.find_image = mock.Mock(return_value=self._image)
-#         fr_mock.return_value = mock.Mock()
-#         fr_mock.return_value.id = image_fakes.image_id
 
         arglist = [
-            '--marker', image_fakes.image_name,
+            '--marker', 'graven',
         ]
         verifylist = [
-            ('marker', image_fakes.image_name),
+            ('marker', 'graven'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -806,7 +800,7 @@ class TestImageList(TestImage):
             marker=self._image.id,
         )
 
-        self.client.find_image.assert_called_with(image_fakes.image_name)
+        self.client.find_image.assert_called_with('graven')
 
     def test_image_list_name_option(self):
         arglist = [
@@ -869,8 +863,8 @@ class TestImageList(TestImage):
 class TestListImageProjects(TestImage):
 
     project = identity_fakes.FakeProject.create_one_project()
-    _image = image_fakes.FakeImage.create_one_image()
-    member = image_fakes.FakeImage.create_one_image_member(
+    _image = image_fakes.create_one_image()
+    member = image_fakes.create_one_image_member(
         attrs={'image_id': _image.id,
                'member_id': project.id}
     )
@@ -920,7 +914,7 @@ class TestRemoveProjectImage(TestImage):
     def setUp(self):
         super(TestRemoveProjectImage, self).setUp()
 
-        self._image = image_fakes.FakeImage.create_one_image()
+        self._image = image_fakes.create_one_image()
         # This is the return value for utils.find_resource()
         self.client.find_image.return_value = self._image
 
@@ -979,7 +973,7 @@ class TestImageSet(TestImage):
 
     project = identity_fakes.FakeProject.create_one_project()
     domain = identity_fakes.FakeDomain.create_one_domain()
-    _image = image_fakes.FakeImage.create_one_image({'tags': []})
+    _image = image_fakes.create_one_image({'tags': []})
 
     def setUp(self):
         super(TestImageSet, self).setUp()
@@ -999,10 +993,10 @@ class TestImageSet(TestImage):
 
     def test_image_set_no_options(self):
         arglist = [
-            image_fakes.image_id,
+            '0f41529e-7c12-4de8-be2d-181abb825b3c',
         ]
         verifylist = [
-            ('image', image_fakes.image_id)
+            ('image', '0f41529e-7c12-4de8-be2d-181abb825b3c')
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1013,8 +1007,8 @@ class TestImageSet(TestImage):
         self.image_members_mock.update.assert_not_called()
 
     def test_image_set_membership_option_accept(self):
-        membership = image_fakes.FakeImage.create_one_image_member(
-            attrs={'image_id': image_fakes.image_id,
+        membership = image_fakes.create_one_image_member(
+            attrs={'image_id': '0f41529e-7c12-4de8-be2d-181abb825b3c',
                    'member_id': self.project.id}
         )
         self.client.update_member.return_value = membership
@@ -1044,21 +1038,21 @@ class TestImageSet(TestImage):
         self.client.update_image.assert_called_with(self._image.id)
 
     def test_image_set_membership_option_reject(self):
-        membership = image_fakes.FakeImage.create_one_image_member(
-            attrs={'image_id': image_fakes.image_id,
+        membership = image_fakes.create_one_image_member(
+            attrs={'image_id': '0f41529e-7c12-4de8-be2d-181abb825b3c',
                    'member_id': self.project.id}
         )
         self.client.update_member.return_value = membership
 
         arglist = [
             '--reject',
-            image_fakes.image_id,
+            '0f41529e-7c12-4de8-be2d-181abb825b3c',
         ]
         verifylist = [
             ('accept', False),
             ('reject', True),
             ('pending', False),
-            ('image', image_fakes.image_id)
+            ('image', '0f41529e-7c12-4de8-be2d-181abb825b3c')
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1075,21 +1069,21 @@ class TestImageSet(TestImage):
         self.client.update_image.assert_called_with(self._image.id)
 
     def test_image_set_membership_option_pending(self):
-        membership = image_fakes.FakeImage.create_one_image_member(
-            attrs={'image_id': image_fakes.image_id,
+        membership = image_fakes.create_one_image_member(
+            attrs={'image_id': '0f41529e-7c12-4de8-be2d-181abb825b3c',
                    'member_id': self.project.id}
         )
         self.client.update_member.return_value = membership
 
         arglist = [
             '--pending',
-            image_fakes.image_id,
+            '0f41529e-7c12-4de8-be2d-181abb825b3c',
         ]
         verifylist = [
             ('accept', False),
             ('reject', False),
             ('pending', True),
-            ('image', image_fakes.image_id)
+            ('image', '0f41529e-7c12-4de8-be2d-181abb825b3c')
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1149,11 +1143,11 @@ class TestImageSet(TestImage):
 
         arglist = [
             '--project', 'unexist_owner',
-            image_fakes.image_id,
+            '0f41529e-7c12-4de8-be2d-181abb825b3c',
         ]
         verifylist = [
             ('project', 'unexist_owner'),
-            ('image', image_fakes.image_id),
+            ('image', '0f41529e-7c12-4de8-be2d-181abb825b3c'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1165,14 +1159,14 @@ class TestImageSet(TestImage):
         arglist = [
             '--protected',
             '--private',
-            image_fakes.image_name,
+            'graven',
         ]
         verifylist = [
             ('protected', True),
             ('unprotected', False),
             ('public', False),
             ('private', True),
-            ('image', image_fakes.image_name),
+            ('image', 'graven'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1193,14 +1187,14 @@ class TestImageSet(TestImage):
         arglist = [
             '--unprotected',
             '--public',
-            image_fakes.image_name,
+            'graven',
         ]
         verifylist = [
             ('protected', False),
             ('unprotected', True),
             ('public', True),
             ('private', False),
-            ('image', image_fakes.image_name),
+            ('image', 'graven'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1221,11 +1215,11 @@ class TestImageSet(TestImage):
         arglist = [
             '--property', 'Alpha=1',
             '--property', 'Beta=2',
-            image_fakes.image_name,
+            'graven',
         ]
         verifylist = [
             ('properties', {'Alpha': '1', 'Beta': '2'}),
-            ('image', image_fakes.image_name),
+            ('image', 'graven'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1250,7 +1244,7 @@ class TestImageSet(TestImage):
             '--os-distro', 'cpm',
             '--os-version', '2.2H',
             '--ramdisk-id', 'xyzpdq',
-            image_fakes.image_name,
+            'graven',
         ]
         verifylist = [
             ('architecture', 'z80'),
@@ -1259,7 +1253,7 @@ class TestImageSet(TestImage):
             ('os_distro', 'cpm'),
             ('os_version', '2.2H'),
             ('ramdisk_id', 'xyzpdq'),
-            ('image', image_fakes.image_name),
+            ('image', 'graven'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1283,11 +1277,11 @@ class TestImageSet(TestImage):
     def test_image_set_tag(self):
         arglist = [
             '--tag', 'test-tag',
-            image_fakes.image_name,
+            'graven',
         ]
         verifylist = [
             ('tags', ['test-tag']),
-            ('image', image_fakes.image_name),
+            ('image', 'graven'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1307,11 +1301,11 @@ class TestImageSet(TestImage):
         arglist = [
             '--tag', 'test-tag',
             '--activate',
-            image_fakes.image_name,
+            'graven',
         ]
         verifylist = [
             ('tags', ['test-tag']),
-            ('image', image_fakes.image_name),
+            ('image', 'graven'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1335,11 +1329,11 @@ class TestImageSet(TestImage):
         arglist = [
             '--tag', 'test-tag',
             '--deactivate',
-            image_fakes.image_name,
+            'graven',
         ]
         verifylist = [
             ('tags', ['test-tag']),
-            ('image', image_fakes.image_name),
+            ('image', 'graven'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1365,11 +1359,11 @@ class TestImageSet(TestImage):
         self.client.find_image.return_value = old_image
         arglist = [
             '--tag', 'test-tag',
-            image_fakes.image_name,
+            'graven',
         ]
         verifylist = [
             ('tags', ['test-tag']),
-            ('image', image_fakes.image_name),
+            ('image', 'graven'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1391,11 +1385,11 @@ class TestImageSet(TestImage):
         self.client.find_image.return_value = old_image
         arglist = [
             '--tag', 'old1',
-            image_fakes.image_name,
+            'graven',
         ]
         verifylist = [
             ('tags', ['old1']),
-            ('image', image_fakes.image_name),
+            ('image', 'graven'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1415,11 +1409,11 @@ class TestImageSet(TestImage):
 
         arglist = [
             '--visibility', '1-mile',
-            image_fakes.image_name,
+            'graven',
         ]
         verifylist = [
             ('visibility', '1-mile'),
-            ('image', image_fakes.image_name),
+            ('image', 'graven'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1431,12 +1425,12 @@ class TestImageSet(TestImage):
         arglist = [
             '--min-disk', '0',
             '--min-ram', '0',
-            image_fakes.image_name,
+            'graven',
         ]
         verifylist = [
             ('min_disk', 0),
             ('min_ram', 0),
-            ('image', image_fakes.image_name),
+            ('image', 'graven'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1457,13 +1451,13 @@ class TestImageSet(TestImage):
         arglist = [
             '--hidden',
             '--public',
-            image_fakes.image_name,
+            'graven',
         ]
         verifylist = [
             ('hidden', True),
             ('public', True),
             ('private', False),
-            ('image', image_fakes.image_name),
+            ('image', 'graven'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1484,13 +1478,13 @@ class TestImageSet(TestImage):
         arglist = [
             '--unhidden',
             '--public',
-            image_fakes.image_name,
+            'graven',
         ]
         verifylist = [
             ('hidden', False),
             ('public', True),
             ('private', False),
-            ('image', image_fakes.image_name),
+            ('image', 'graven'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1510,10 +1504,10 @@ class TestImageSet(TestImage):
 
 class TestImageShow(TestImage):
 
-    new_image = image_fakes.FakeImage.create_one_image(
+    new_image = image_fakes.create_one_image(
         attrs={'size': 1000})
 
-    _data = image_fakes.FakeImage.create_one_image()
+    _data = image_fakes.create_one_image()
 
     columns = (
         'id', 'name', 'owner', 'protected', 'tags', 'visibility'
@@ -1538,10 +1532,10 @@ class TestImageShow(TestImage):
 
     def test_image_show(self):
         arglist = [
-            image_fakes.image_id,
+            '0f41529e-7c12-4de8-be2d-181abb825b3c',
         ]
         verifylist = [
-            ('image', image_fakes.image_id),
+            ('image', '0f41529e-7c12-4de8-be2d-181abb825b3c'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1550,7 +1544,7 @@ class TestImageShow(TestImage):
         # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
         self.client.find_image.assert_called_with(
-            image_fakes.image_id,
+            '0f41529e-7c12-4de8-be2d-181abb825b3c',
             ignore_missing=False
         )
 
@@ -1592,7 +1586,7 @@ class TestImageUnset(TestImage):
         attrs['hw_rng_model'] = 'virtio'
         attrs['prop'] = 'test'
         attrs['prop2'] = 'fake'
-        self.image = image_fakes.FakeImage.create_one_image(attrs)
+        self.image = image_fakes.create_one_image(attrs)
 
         self.client.find_image.return_value = self.image
         self.client.remove_tag.return_value = self.image
@@ -1603,10 +1597,10 @@ class TestImageUnset(TestImage):
 
     def test_image_unset_no_options(self):
         arglist = [
-            image_fakes.image_id,
+            '0f41529e-7c12-4de8-be2d-181abb825b3c',
         ]
         verifylist = [
-            ('image', image_fakes.image_id)
+            ('image', '0f41529e-7c12-4de8-be2d-181abb825b3c')
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1681,7 +1675,7 @@ class TestImageUnset(TestImage):
 
 class TestImageSave(TestImage):
 
-    image = image_fakes.FakeImage.create_one_image({})
+    image = image_fakes.create_one_image({})
 
     def setUp(self):
         super(TestImageSave, self).setUp()
diff --git a/openstackclient/tests/unit/volume/v1/test_volume.py b/openstackclient/tests/unit/volume/v1/test_volume.py
index 702f79ed..584eca2a 100644
--- a/openstackclient/tests/unit/volume/v1/test_volume.py
+++ b/openstackclient/tests/unit/volume/v1/test_volume.py
@@ -317,7 +317,7 @@ class TestVolumeCreate(TestVolume):
         self.assertCountEqual(self.datalist, data)
 
     def test_volume_create_image_id(self):
-        image = image_fakes.FakeImage.create_one_image()
+        image = image_fakes.create_one_image()
         self.images_mock.get.return_value = image
 
         arglist = [
@@ -360,7 +360,7 @@ class TestVolumeCreate(TestVolume):
         self.assertCountEqual(self.datalist, data)
 
     def test_volume_create_image_name(self):
-        image = image_fakes.FakeImage.create_one_image()
+        image = image_fakes.create_one_image()
         self.images_mock.get.return_value = image
 
         arglist = [
diff --git a/openstackclient/tests/unit/volume/v2/test_volume.py b/openstackclient/tests/unit/volume/v2/test_volume.py
index 4aa6f906..ec82e674 100644
--- a/openstackclient/tests/unit/volume/v2/test_volume.py
+++ b/openstackclient/tests/unit/volume/v2/test_volume.py
@@ -221,7 +221,7 @@ class TestVolumeCreate(TestVolume):
         self.assertCountEqual(self.datalist, data)
 
     def test_volume_create_image_id(self):
-        image = image_fakes.FakeImage.create_one_image()
+        image = image_fakes.create_one_image()
         self.find_image_mock.return_value = image
 
         arglist = [
@@ -259,7 +259,7 @@ class TestVolumeCreate(TestVolume):
         self.assertCountEqual(self.datalist, data)
 
     def test_volume_create_image_name(self):
-        image = image_fakes.FakeImage.create_one_image()
+        image = image_fakes.create_one_image()
         self.find_image_mock.return_value = image
 
         arglist = [