image: Remove dead test helper methods

These haven't been used since we switched the image commands from
glanceclient to openstacksdk. There's more cleanup to be done here but
that can be done later.

Change-Id: I3de1f24323886b122b3a30660fb3de18eb7014e9
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>

Author: stephenfin

openstackclient/tests/unit/image/v1/fakes.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.
-#
 
 from unittest import mock
 import uuid
@@ -25,36 +24,6 @@
 
 image_id = 'im1'
 image_name = 'graven'
-image_owner = 'baal'
-image_protected = False
-image_public = True
-image_properties = {
-    'Alpha': 'a',
-    'Beta': 'b',
-    'Gamma': 'g',
-}
-image_properties_str = "Alpha='a', Beta='b', Gamma='g'"
-image_data = 'line 1\nline 2\n'
-image_size = 0
-
-IMAGE = {
-    'id': image_id,
-    'name': image_name,
-    'container_format': '',
-    'disk_format': '',
-    'owner': image_owner,
-    'min_disk': 0,
-    'min_ram': 0,
-    'is_public': image_public,
-    'protected': image_protected,
-    'properties': image_properties,
-    'size': image_size,
-}
-
-IMAGE_columns = tuple(sorted(IMAGE))
-IMAGE_output = dict(IMAGE)
-IMAGE_output['properties'] = image_properties_str
-IMAGE_data = tuple((IMAGE_output[x] for x in sorted(IMAGE_output)))
 
 
 class FakeImagev1Client(object):

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

@@ -11,138 +11,20 @@
 #   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 random
 from unittest import mock
 import uuid
 
 from openstack.image.v2 import image
 from openstack.image.v2 import member
-from osc_lib.cli import format_columns
 
 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'
-image_owner = 'baal'
-image_protected = False
-image_visibility = 'public'
-image_tags = []
-image_size = 0
-
-IMAGE = {
-    'id': image_id,
-    'name': image_name,
-    'owner': image_owner,
-    'protected': image_protected,
-    'visibility': image_visibility,
-    'tags': image_tags,
-    'size': image_size
-}
-
-IMAGE_columns = tuple(sorted(IMAGE))
-IMAGE_data = tuple((IMAGE[x] for x in sorted(IMAGE)))
-
-IMAGE_SHOW = copy.copy(IMAGE)
-IMAGE_SHOW['tags'] = format_columns.ListColumn(IMAGE_SHOW['tags'])
-IMAGE_SHOW_data = tuple((IMAGE_SHOW[x] for x in sorted(IMAGE_SHOW)))
-
-# Just enough v2 schema to do some testing
-IMAGE_schema = {
-    "additionalProperties": {
-        "type": "string"
-    },
-    "name": "image",
-    "links": [
-        {
-            "href": "{self}",
-            "rel": "self"
-        },
-        {
-            "href": "{file}",
-            "rel": "enclosure"
-        },
-        {
-            "href": "{schema}",
-            "rel": "describedby"
-        }
-    ],
-    "properties": {
-        "id": {
-            "pattern": "^([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}$",  # noqa
-            "type": "string",
-            "description": "An identifier for the image"
-        },
-        "name": {
-            "type": [
-                "null",
-                "string"
-            ],
-            "description": "Descriptive name for the image",
-            "maxLength": 255
-        },
-        "owner": {
-            "type": [
-                "null",
-                "string"
-            ],
-            "description": "Owner of the image",
-            "maxLength": 255
-        },
-        "protected": {
-            "type": "boolean",
-            "description": "If true, image will not be deletable."
-        },
-        "self": {
-            "type": "string",
-            "description": "(READ-ONLY)"
-        },
-        "schema": {
-            "type": "string",
-            "description": "(READ-ONLY)"
-        },
-        "size": {
-            "type": [
-                "null",
-                "integer",
-                "string"
-            ],
-            "description": "Size of image file in bytes (READ-ONLY)"
-        },
-        "status": {
-            "enum": [
-                "queued",
-                "saving",
-                "active",
-                "killed",
-                "deleted",
-                "pending_delete"
-            ],
-            "type": "string",
-            "description": "Status of the image (READ-ONLY)"
-        },
-        "tags": {
-            "items": {
-                "type": "string",
-                "maxLength": 255
-            },
-            "type": "array",
-            "description": "List of strings related to the image"
-        },
-        "visibility": {
-            "enum": [
-                "public",
-                "private"
-            ],
-            "type": "string",
-            "description": "Scope of image accessibility"
-        },
-    }
-}
 
 
 class FakeImagev2Client(object):
@@ -231,61 +113,6 @@ def create_images(attrs=None, count=2):
 
         return images
 
-    @staticmethod
-    def get_images(images=None, count=2):
-        """Get an iterable MagicMock object with a list of faked images.
-
-        If images list is provided, then initialize the Mock object with the
-        list. Otherwise create one.
-
-        :param List images:
-            A list of FakeResource objects faking images
-        :param Integer count:
-            The number of images to be faked
-        :return:
-            An iterable Mock object with side_effect set to a list of faked
-            images
-        """
-        if images is None:
-            images = FakeImage.create_images(count)
-
-        return mock.Mock(side_effect=images)
-
-    @staticmethod
-    def get_image_columns(image=None):
-        """Get the image columns from a faked image object.
-
-        :param image:
-            A FakeResource objects faking image
-        :return:
-            A tuple which may include the following keys:
-            ('id', 'name', 'owner', 'protected', 'visibility', 'tags')
-        """
-        if image is not None:
-            return tuple(sorted(image))
-        return IMAGE_columns
-
-    @staticmethod
-    def get_image_data(image=None):
-        """Get the image data from a faked image object.
-
-        :param image:
-            A FakeResource objects faking image
-        :return:
-            A tuple which may include the following values:
-            ('image-123', 'image-foo', 'admin', False, 'public', 'bar, baz')
-        """
-        data_list = []
-        if image is not None:
-            for x in sorted(image.keys()):
-                if x == 'tags':
-                    # The 'tags' should be format_list
-                    data_list.append(
-                        format_columns.ListColumn(getattr(image, x)))
-                else:
-                    data_list.append(getattr(image, x))
-        return tuple(data_list)
-
     @staticmethod
     def create_one_image_member(attrs=None):
         """Create a fake image member.