Merge "image: Remove FakeImage test helper"

Author: Zuul

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

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

@@ -554,7 +554,7 @@ def test_aggregate_unset_no_option(self):
 
 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()

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

@@ -1430,7 +1430,7 @@ def setUp(self):
 
         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 @@ def test_server_create_image_property(self):
             '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 @@ def test_server_create_image_property_multi(self):
             '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 @@ def test_server_create_image_property_missed(self):
             '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 @@ def test_server_create_image_property_with_image_list(self):
             }
         }
 
-        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 @@ def setUp(self):
         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 @@ def setUp(self):
         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 @@ def setUp(self):
 
     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 @@ def setUp(self):
         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 @@ def test_rescue_with_current_image(self):
         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 @@ def test_prep_server_detail(self, find_resource):
         # - 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},

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

@@ -91,15 +91,15 @@ def setUp(self):
 
     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',
                 },
                 count=count,
             )
         else:
-            images = image_fakes.FakeImage.create_images(
+            images = image_fakes.create_images(
                 attrs={
                     'status': 'active',
                 },
@@ -178,15 +178,6 @@ def test_server_backup_create_options(self):
     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],
         )

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

@@ -89,15 +89,15 @@ def setUp(self):
 
     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',
                 },
                 count=count,
             )
         else:
-            images = image_fakes.FakeImage.create_images(
+            images = image_fakes.create_images(
                 attrs={
                     'status': 'active',
                 },

openstackclient/tests/unit/image/v1/fakes.py

@@ -22,10 +22,6 @@
 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 @@ def setUp(self):
         )
 
 
-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)

openstackclient/tests/unit/image/v1/test_image.py

@@ -34,7 +34,7 @@ def setUp(self):
 
 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 @@ def test_image_create_file(self, mock_open):
 
 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 @@ def test_image_delete_no_options(self):
 
 class TestImageList(TestImage):
 
-    _image = image_fakes.FakeImage.create_one_image()
+    _image = image_fakes.create_one_image()
 
     columns = (
         'ID',
@@ -443,7 +443,7 @@ def test_image_list_sort_option(self, si_mock):
 
 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 @@ def test_image_set_numeric_options_to_zero(self):
 
 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',