Merge ~thedac/simplestreams:bug/1790904 into simplestreams:master

[David Ames]

glance: Support Glance version 2.

OpenStack at Rocky has removed glance v1 entirely. V2 has been around
for some time.

This change updates simplestreams to use glance v2 when "non-legacy"
versions of the clients are used.

LP: #1790904

Use Glance v2

OpenStack at Rocky has removed glance v1 entirely. V2 has been around
for some time.

This change updates simplestreams to use glance v2 when "non-legacy"
versions of the clients are used.

I am open to other solutions, this change represents what needs to
be updated for v2.

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:e5b90bdef2688a0c654bd41ee340077263aa7357
https://jenkins.ubuntu.com/server/job/simplestreams-ci/68/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/68/console
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/68/console
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/68/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/68/rebuild

review: Needs Fixing (continuous-integration)

[Scott Moser (smoser)]

it seems some of your changes are probably better suited to 'prepare_glance_arguments'. read its function docstring:

  Returns a dict to use as keyword arguments passed directly to GlanceClient.images.create

other comments inline.

obviously you have to make the c-i bot happy too. some test changes needed, and we'd want some tests on the new path.

[Scott Moser (smoser)]

review: Needs Fixing

[Ryan Beisner (1chb1n)]

This MP is more an illustration as to what we think would need to change. Can we have #ubuntu-server run with the bug?

review: Needs Resubmitting

[David Ames (thedac)]

Addressing the comments.

Specifically moving what can be moved to 'prepare_glance_arguments'.

And using self.glance_api_version for version checking.

I'll have an update as soon as I get unit tests working properly.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:9e96362337360eac48ac706c04586b0e92005087
https://jenkins.ubuntu.com/server/job/simplestreams-ci/69/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/69
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/69
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/69

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/69/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

@thedac,
please comment on the size/hash. Doesnt that seem just wrong to you?
The only way to test if something went wrong in the upload is to launch it?

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:53fe151e8498b551b30fcd7bef73abf782e2e46b
https://jenkins.ubuntu.com/server/job/simplestreams-ci/70/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/70
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/70
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/70

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/70/rebuild

review: Approve (continuous-integration)

[David Ames (thedac)]

> @thedac,
> please comment on the size/hash. Doesnt that seem just wrong to you?
> The only way to test if something went wrong in the upload is to launch it?

@smoser

I have scoured the glance v2 api documentation [0]. The API has changed such
that we cannot send the expected checksum during the creation/upload process.

For instance the glanceclient.images.data method is for downloading an image.
None of the create, upload or update methods take a checksum.

What we can do is validate the checksum *after* we upload it. Let me know if
something like [1] will work for you or please suggest/implement a validation.

[0] https://docs.openstack.org/python-glanceclient/latest/reference/api/glanceclient.v2.images.html
[1] https://pastebin.ubuntu.com/p/jH8fNWj5jJ/

[Scott Moser (smoser)]

David,
If that works, then I guess it is generally ok.

More than just "silently" deleting the image, we should probably raise an error of some kind. I guess IOError would make sense.

I think its worth checking size also and updating the message to provide expected and found size and checksum. I realize its probably very unlikely that size matches but checksum does not.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:f9cd45f43bb45c47f1cf31ca81010edb195ee4d5
https://jenkins.ubuntu.com/server/job/simplestreams-ci/71/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/71
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/71
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/71

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/71/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

David,
Several cleanups at
 https://git.launchpad.net/~smoser/simplestreams/commit/?id=0c1fff74b3f56804dea1f0abea61d31c597e0679

Can you grab that ?

then i think we're pretty good and i'm willing to pull this and put it into dingo.

[David Ames (thedac)]

Scott,

I have merged your changes and pushed up to my branch. However, strangely LP does not seem to notice.

When you grab my branch from LP it has your commit in it.
git clone -b bug/1790904 https://git.launchpad.net/~thedac/simplestreams

Not sure what we need to do to kick LP.

[Scott Moser (smoser)]

review: Approve

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:0c1fff74b3f56804dea1f0abea61d31c597e0679
https://jenkins.ubuntu.com/server/job/simplestreams-ci/72/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/72
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/72
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/72

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/72/rebuild

review: Approve (continuous-integration)

[Server Team CI bot (server-team-bot)]

FAILED: Autolanding.
Unapproved changes made after approval.
https://jenkins.ubuntu.com/server/job/simplestreams-autoland-test/7/
Executed test runs:
    None: https://jenkins.ubuntu.com/server/job/admin-lp-git-autoland/148/console

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:f9cd45f43bb45c47f1cf31ca81010edb195ee4d5
https://jenkins.ubuntu.com/server/job/simplestreams-ci/73/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/73
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/73
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/73

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/73/rebuild

review: Approve (continuous-integration)

[Server Team CI bot (server-team-bot)]

FAILED: Autolanding.
Unapproved changes made after approval.
https://jenkins.ubuntu.com/server/job/simplestreams-autoland-test/8/
Executed test runs:
    None: https://jenkins.ubuntu.com/server/job/admin-lp-git-autoland/149/console

review: Needs Fixing (continuous-integration)

[Scott Moser (smoser)]

not sure why launchpad/the autolander doesnt like this branch.
so i put the same content at
 https://code.launchpad.net/~smoser/simplestreams/+git/simplestreams/+merge/358091

diff --git a/simplestreams/mirrors/glance.py b/simplestreams/mirrors/glance.py
index 0e694f2..297db27 100644
--- a/simplestreams/mirrors/glance.py
+++ b/simplestreams/mirrors/glance.py
@@ -151,7 +151,9 @@ class GlanceMirror(mirrors.BasicMirrorWriter):
 
         conn_info = client.get_service_conn_info(
             'image', **self.keystone_creds)
-        self.gclient = get_glanceclient(**conn_info)
+        self.glance_api_version = conn_info['glance_version']
+        self.gclient = get_glanceclient(version=self.glance_api_version,
+                                        **conn_info)
         self.tenant_id = conn_info['tenant_id']
 
         self.region = self.keystone_creds.get('region_name', 'nullregion')
@@ -195,12 +197,15 @@ class GlanceMirror(mirrors.BasicMirrorWriter):
 
         images = self.gclient.images.list()
         for image in images:
-            image = image.to_dict()
+            if self.glance_api_version == "1":
+                image = image.to_dict()
+                props = image['properties']
+            else:
+                props = copy.deepcopy(image)
 
             if image['owner'] != self.tenant_id:
                 continue
 
-            props = image['properties']
             if props.get('content_id') != my_cid:
                 continue
 
@@ -321,15 +326,22 @@ class GlanceMirror(mirrors.BasicMirrorWriter):
             'properties': image_properties,
         }
 
-        if 'size' in image_metadata:
-            create_kwargs['size'] = image_metadata.get('size')
-        if 'md5' in image_metadata:
-            create_kwargs['checksum'] = image_metadata.get('md5')
-        if image_md5_hash and image_size:
-            create_kwargs.update({
-                'checksum': image_md5_hash,
-                'size': image_size,
-            })
+        # In v2 is_public=True is visibility='public'
+        if self.glance_api_version == "2":
+            del create_kwargs['is_public']
+            create_kwargs['visibility'] = 'public'
+
+        # v2 automatically calculates size and checksum
+        if self.glance_api_version == "1":
+            if 'size' in image_metadata:
+                create_kwargs['size'] = image_metadata.get('size')
+            if 'md5' in image_metadata:
+                create_kwargs['checksum'] = image_metadata.get('md5')
+            if image_md5_hash and image_size:
+                create_kwargs.update({
+                    'checksum': image_md5_hash,
+                    'size': image_size,
+                })
 
         if 'ftype' in image_metadata:
             create_kwargs['disk_format'] = (
@@ -459,9 +471,28 @@ class GlanceMirror(mirrors.BasicMirrorWriter):
             new_size)
 
         try:
-            create_kwargs['data'] = open(tmp_path, 'rb')
+            if self.glance_api_version == "1":
+                # Set data as string if v1
+                create_kwargs['data'] = open(tmp_path, 'rb')
+            else:
+                # Keep properties for v2 update call
+                _properties = create_kwargs['properties']
+                del create_kwargs['properties']
+
             glance_image = self.gclient.images.create(**create_kwargs)
             target_sstream_item['id'] = glance_image.id
+
+            if self.glance_api_version == "2":
+                # Upload for v2
+                self.gclient.images.upload(glance_image.id,
+                                           open(tmp_path, 'rb'))
+                # Update properties for v2
+                self.gclient.images.update(glance_image.id, **_properties)
+
+            # Validate the image checksum and size. This will throw an
+            # IOError if they do not match.
+            self.validate_image(glance_image.id, new_md5, new_size)
+
             print("created %s: %s" % (glance_image.id, full_image_name))
 
         finally:
@@ -473,6 +504,37 @@ class GlanceMirror(mirrors.BasicMirrorWriter):
         # unused in insert_products below.
         self.insert_products(None, target, None)
 
+    def validate_image(self, image_id, checksum, size):
+        """Validate an image's checksum and size after upload.
+
+        Check for expected checksum and size.
+        Throw an IOError if they do not match.
+
+        :param image_id: str Glance Image ID
+        :param checksum: str Expected MD5 sum of the image
+        :param size: str Expected size in bytes of the image
+        :returns: None
+        """
+        _image = self.gclient.images.get(image_id)
+        # Validate checksum
+        if not checksum == _image.checksum:
+            # If we do not delete the image, the next run will
+            # be unaware the image is invalid.
+            self.gclient.images.delete(image_id)
+            raise IOError(
+                "Invalid glance image: %s: Checksum mismatch: "
+                "expected checksum: %s actual: %s. Deleting the image."
+                % (image_id, checksum, _image.checksum))
+        # Validate size
+        if not size == _image.size:
+            # If we do not delete the image, the next run will
+            # be unaware the image is invalid.
+            self.gclient.images.delete(image_id)
+            raise IOError(
+                "Invalid glance image: %s: Size mismatch: "
+                "expected size: %s actual: %s. Deleting the image."
+                % (image_id, size, _image.size))
+
     def insert_item(self, data, src, target, pedigree, contentsource):
         """Queue item to be inserted in subsequent call to insert_version
 
diff --git a/simplestreams/openstack.py b/simplestreams/openstack.py
index 525f423..4899df7 100644
--- a/simplestreams/openstack.py
+++ b/simplestreams/openstack.py
@@ -188,6 +188,9 @@ def get_service_conn_info(service='image', client=None, **kwargs):
             'tenant_id': tenant_id}
     if not _LEGACY_CLIENTS:
         info['session'] = client.session
+        info['glance_version'] = '2'
+    else:
+        info['glance_version'] = '1'
 
     return info
 
diff --git a/tests/unittests/test_glancemirror.py b/tests/unittests/test_glancemirror.py
index eb537d8..5fba5ed 100644
--- a/tests/unittests/test_glancemirror.py
+++ b/tests/unittests/test_glancemirror.py
@@ -98,7 +98,8 @@ class FakeOpenstack(object):
 
     def get_service_conn_info(self, url, region_name=None, auth_url=None):
         return {"endpoint": "http://objectstore/api/",
-                "tenant_id": "bar456"}
+                "tenant_id": "bar456",
+                "glance_version": "1"}
 
 
 class FakeImage(object):
@@ -106,16 +107,45 @@ class FakeImage(object):
     def __init__(self, identifier):
         self.id = identifier
 
+    @property
+    def checksum(self):
+        # Using None and None as self.mirror.download_image gets this value
+        # from the fake setup.
+        return None
+
+    @property
+    def size(self):
+        # Using None and None as self.mirror.download_image gets this value
+        # from the fake setup.
+        return None
+
 
 class FakeImages(object):
-    """Fake GlanceClient.images implementation to track create() calls."""
+    """Fake GlanceClient.images implementation to track method calls."""
     def __init__(self):
         self.create_calls = []
+        self.delete_calls = []
+        self.get_calls = []
+        self.update_calls = []
+        self.upload_calls = []
 
     def create(self, **kwargs):
         self.create_calls.append(kwargs)
         return FakeImage('image-%d' % len(self.create_calls))
 
+    def delete(self, *args, **kwargs):
+        self.delete_calls.append(kwargs)
+
+    def get(self, *args, **kwargs):
+        self.get_calls.append(kwargs)
+        return FakeImage('image-%d' % len(self.get_calls))
+
+    def update(self, *args, **kwargs):
+        self.update_calls.append(kwargs)
+
+    def upload(self, *args, **kwargs):
+        self.upload_calls.append(kwargs)
+
 
 class FakeGlanceClient(object):
     """Fake GlanceClient implementation to track images.create() calls."""
@@ -306,9 +336,10 @@ class TestGlanceMirror(TestCase):
             '{"os": "ubuntu", "version": "16.04"}',
             properties["simplestreams_metadata"])
 
-    def test_prepare_glance_arguments(self):
+    def test_prepare_glance_arguments_v1(self):
         # Prepares arguments to pass to GlanceClient.images.create()
         # based on image metadata from the simplestreams source.
+        self.mirror.glance_api_version = "1"
         source_entry = {}
         create_arguments = self.mirror.prepare_glance_arguments(
             "foobuntu-X", source_entry, image_md5_hash=None, image_size=None,
@@ -324,6 +355,25 @@ class TestGlanceMirror(TestCase):
              "properties": None},
             create_arguments)
 
+    def test_prepare_glance_arguments_v2(self):
+        # Prepares arguments to pass to GlanceClient.images.create()
+        # based on image metadata from the simplestreams source.
+        self.mirror.glance_api_version = "2"
+        source_entry = {}
+        create_arguments = self.mirror.prepare_glance_arguments(
+            "foobuntu-X", source_entry, image_md5_hash=None, image_size=None,
+            image_properties=None)
+
+        # Arguments to always pass in contain the image name, container format,
+        # disk format, whether image is public, and any passed-in properties.
+        self.assertEqual(
+            {"name": "foobuntu-X",
+             "container_format": 'bare',
+             "disk_format": "qcow2",
+             "visibility": "public",
+             "properties": None},
+            create_arguments)
+
     def test_prepare_glance_arguments_disk_format(self):
         # Disk format is based on the image 'ftype' (if defined).
         source_entry = {"ftype": "root.tar.gz"}
@@ -342,8 +392,9 @@ class TestGlanceMirror(TestCase):
 
         self.assertEqual("squashfs", create_arguments["disk_format"])
 
-    def test_prepare_glance_arguments_size(self):
+    def test_prepare_glance_arguments_size_v1(self):
         # Size is read from image metadata if defined.
+        self.mirror.glance_api_version = "1"
         source_entry = {"size": 5}
         create_arguments = self.mirror.prepare_glance_arguments(
             "foobuntu-X", source_entry, image_md5_hash=None, image_size=None,
@@ -351,8 +402,19 @@ class TestGlanceMirror(TestCase):
 
         self.assertEqual(5, create_arguments["size"])
 
-    def test_prepare_glance_arguments_checksum(self):
+    def test_prepare_glance_arguments_size_v2(self):
+        # Size is read from image metadata if defined.
+        self.mirror.glance_api_version = "2"
+        source_entry = {"size": 5}
+        create_arguments = self.mirror.prepare_glance_arguments(
+            "foobuntu-X", source_entry, image_md5_hash=None, image_size=None,
+            image_properties=None)
+
+        self.assertEqual(None, create_arguments.get("size"))
+
+    def test_prepare_glance_arguments_checksum_v1(self):
         # Checksum is based on the source entry 'md5' value, if defined.
+        self.mirror.glance_api_version = "1"
         source_entry = {"md5": "foo123"}
         create_arguments = self.mirror.prepare_glance_arguments(
             "foobuntu-X", source_entry, image_md5_hash=None, image_size=None,
@@ -360,7 +422,7 @@ class TestGlanceMirror(TestCase):
 
         self.assertEqual("foo123", create_arguments["checksum"])
 
-    def test_prepare_glance_arguments_size_and_md5_override(self):
+    def test_prepare_glance_arguments_size_and_md5_override_v1(self):
         # Size and md5 hash are overridden from the passed-in values even if
         # defined on the source entry.
         source_entry = {"size": 5, "md5": "foo123"}
@@ -371,7 +433,7 @@ class TestGlanceMirror(TestCase):
         self.assertEqual(10, create_arguments["size"])
         self.assertEqual("bar456", create_arguments["checksum"])
 
-    def test_prepare_glance_arguments_size_and_md5_no_override_hash(self):
+    def test_prepare_glance_arguments_size_and_md5_no_override_hash_v1(self):
         # If only one of image_md5_hash or image_size is passed directly in,
         # the other value is not overridden either.
         source_entry = {"size": 5, "md5": "foo123"}
@@ -382,7 +444,7 @@ class TestGlanceMirror(TestCase):
         self.assertEqual(5, create_arguments["size"])
         self.assertEqual("foo123", create_arguments["checksum"])
 
-    def test_prepare_glance_arguments_size_and_md5_no_override_size(self):
+    def test_prepare_glance_arguments_size_and_md5_no_override_size_v1(self):
         # If only one of image_md5_hash or image_size is passed directly in,
         # the other value is not overridden either.
         source_entry = {"size": 5, "md5": "foo123"}
@@ -393,6 +455,16 @@ class TestGlanceMirror(TestCase):
         self.assertEqual(5, create_arguments["size"])
         self.assertEqual("foo123", create_arguments["checksum"])
 
+    def test_prepare_glance_arguments_checksum_v2(self):
+        # Checksum is based on the source entry 'md5' value, if defined.
+        self.mirror.glance_api_version = "2"
+        source_entry = {"md5": "foo123"}
+        create_arguments = self.mirror.prepare_glance_arguments(
+            "foobuntu-X", source_entry, image_md5_hash=None, image_size=None,
+            image_properties=None)
+
+        self.assertEqual(None, create_arguments.get("checksum"))
+
     def test_download_image(self):
         # Downloads image from a contentsource.
         content = "foo bazes the bar"
@@ -538,10 +610,11 @@ class TestGlanceMirror(TestCase):
             pedigree[2])
         self.assertEqual(u"http://keystone/api/", target_image["endpoint"])
 
-    def test_insert_item_full(self):
+    def test_insert_item_full_v1(self):
         # This test uses the full sample entries from the source simplestreams
         # index from cloud-images.u.c and resulting local simplestreams index
         # files.
+        self.mirror.glance_api_version = "1"
         source_index = copy.deepcopy(TEST_SOURCE_INDEX_ENTRY)
 
         # "Pedigree" is basically a "path" to get to the image data in
@@ -655,3 +728,100 @@ class TestGlanceMirror(TestCase):
         del stored_index[u"updated"]
 
         self.assertEqual(EXPECTED_OUTPUT_INDEX, stored_index)
+
+    def test_insert_item_full_v2(self):
+        # This test uses the full sample entries from the source simplestreams
+        # index from cloud-images.u.c and resulting local simplestreams index
+        # files.
+        self.mirror.glance_api_version = "2"
+        source_index = copy.deepcopy(TEST_SOURCE_INDEX_ENTRY)
+
+        # "Pedigree" is basically a "path" to get to the image data in
+        # simplestreams index, going through "products", their "versions",
+        # and nested "items".
+        pedigree = (
+            u'com.ubuntu.cloud:server:14.04:amd64', u'20160602', u'disk1.img')
+        product = source_index[u'products'][pedigree[0]]
+        ver_data = product[u'versions'][pedigree[1]]
+        image_data = ver_data[u'items'][pedigree[2]]
+
+        content_source = MemoryContentSource(
+            url="http://image-store/fooubuntu-X-disk1.img",
+            content="image-data")
+
+        # Use a fake GlanceClient to track arguments passed into
+        # GlanceClient.images.create().
+        self.addCleanup(setattr, self.mirror, "gclient", self.mirror.gclient)
+        self.mirror.gclient = FakeGlanceClient()
+
+        target = {
+            'content_id': 'auto.sync',
+            'datatype': 'image-ids',
+            'format': 'products:1.0',
+        }
+
+        self.mirror.insert_item(
+            image_data, source_index, target, pedigree, content_source)
+        self.mirror.insert_version(
+            image_data, source_index, target, pedigree[0:2])
+
+        passed_create_kwargs = self.mirror.gclient.images.create_calls[0]
+        passed_update_kwargs = self.mirror.gclient.images.update_calls[0]
+
+        expected_create_kwargs = {
+            'name': ('auto-sync/'
+                     'ubuntu-trusty-14.04-amd64-server-20160602-disk1.img'),
+            'disk_format': 'qcow2',
+            'container_format': 'bare',
+            'visibility': "public"}
+
+        expected_update_kwargs = {
+            'os_distro': u'ubuntu',
+            'item_name': u'disk1.img',
+            'os_version': u'14.04',
+            'architecture': 'x86_64',
+            'version_name': u'20160602',
+            'content_id': 'auto.sync',
+            'product_name': u'com.ubuntu.cloud:server:14.04:amd64',
+            'simplestreams_metadata': (
+                '{"aliases": "14.04,default,lts,t,trusty", '
+                '"arch": "amd64", "ftype": "disk1.img", '
+                '"label": "release", "md5": '
+                '"e5436cd36ae6cc298f081bf0f6b413f1", "os": "ubuntu", '
+                '"pubname": "ubuntu-trusty-14.04-amd64-server-20160602", '
+                '"release": "trusty", "release_codename": "Trusty Tahr", '
+                '"release_title": "14.04 LTS", "sha256": '
+                '"5b982d7d4dd1a03e88ae5f35f02ed44f'
+                '579e2711f3e0f27ea2bff20aef8c8d9e", "size": "259850752", '
+                '"support_eol": "2019-04-17", "supported": "True", '
+                '"version": "14.04"}'),
+            'source_content_id': u'com.ubuntu.cloud:released:download'}
+
+        self.assertEqual(expected_create_kwargs, passed_create_kwargs)
+        self.assertEqual(expected_update_kwargs, passed_update_kwargs)
+
+        # Apply the condensing as done in GlanceMirror.insert_products()
+        # to ensure we compare with the desired resulting simplestreams data.
+        sticky = ['ftype', 'md5', 'sha256', 'size', 'name', 'id', 'endpoint',
+                  'region']
+        simplestreams.util.products_condense(target, sticky)
+
+        self.assertEqual(EXPECTED_OUTPUT_INDEX, target)
+
+    def test_validate_image(self):
+        # Ensure validate_image throws IOError when expected.
+
+        # Successful validation. Using None and None as
+        # self.mirror.download_image gets these values from the fake setup.
+        self.mirror.gclient = FakeGlanceClient()
+        self.assertEqual(
+            None,
+            self.mirror.validate_image("image-id", None, None))
+
+        # Mismatched checksum
+        with self.assertRaises(IOError):
+            self.mirror.validate_image("image-id", "Wrong-checksum", None)
+
+        # Mismatched size
+        with self.assertRaises(IOError):
+            self.mirror.validate_image("image-id", None, "Wrong-size")