Merge lp:~citrix-openstack/glance/iso-boot into lp:~hudson-openstack/glance/trunk

[Donal Lafferty]

Added new disk_format type of 'iso'. Nova can use this information to identify images that have to be booted from a CDROM.

Updated unittests so that next available image id is no longer a magic number. Previously, it was not possible to add new records into the image database stub without breaking many, many tests.

[Jay Pipes (jaypipes)]

Nice work, Donal! Thanks for your work in refactoring the unit tests to make them more flexible.

One tiny thing, though. Please update the documentation for disk_formats for both these places:

http://glance.openstack.org/formats.html
http://glance.openstack.org/glanceapi.html

You can find these in the source tree under /doc/source/formats.rst and /doc/source/glanceapi.rst.

Thanks!
jay

review: Needs Fixing

[Donal Lafferty (donal-lafferty)]

Updated docs in three locations where 'raw' disk format was expalined. However, no examples of 'iso' were in headers or API calls added.

[lp:~citrix-openstack/glance/iso-boot]

122. By Donal Lafferty on 2011-05-26

Sync with trunk.

123. By Donal Lafferty on 2011-05-26

Remove additions to FIXTURES in test/stubs.py, which requried changes elsewhere.

124. By Donal Lafferty on 2011-05-26

Fix accidental delete.

125. By Donal Lafferty on 2011-05-27

Remove changes to stub database.

126. By Donal Lafferty on 2011-05-27

Correct documentation.

Unmerged revisions

=== modified file 'doc/source/formats.rst'
--- doc/source/formats.rst	2011-03-05 17:04:43 +0000
+++ doc/source/formats.rst	2011-05-19 09:49:15 +0000
@@ -49,6 +49,10 @@
   A disk format supported by VirtualBox virtual machine monitor and the QEMU
   emulator
 
+* **iso**
+
+  An archive format for the data contents of an optical disc (e.g. CDROM). 
+
 * **qcow2**
 
   A disk format supported by the QEMU emulator that can expand dynamically and

=== modified file 'doc/source/glanceapi.rst'
--- doc/source/glanceapi.rst	2011-04-12 21:45:16 +0000
+++ doc/source/glanceapi.rst	2011-05-19 09:49:15 +0000
@@ -272,7 +272,7 @@
 * ``x-image-meta-disk-format``
 
   This header is optional. Valid values are one of ``aki``, ``ari``, ``ami``,
-  ``raw``, ``vhd``, ``vdi``, ``qcow2``, or ``vmdk``.
+  ``raw``, ``iso``, ``vhd``, ``vdi``, ``qcow2``, or ``vmdk``.
 
   For more information, see :doc:`About Disk and Container Formats <formats>`
 

=== modified file 'doc/source/registries.rst'
--- doc/source/registries.rst	2011-02-25 14:55:26 +0000
+++ doc/source/registries.rst	2011-05-19 09:49:15 +0000
@@ -69,7 +69,7 @@
   **queued**, or **killed**
 
 * ``disk_format`` must be non-empty, and must be one of **ari**, **aki**,
-  **ami**, **raw**, **vhd**, **vdi**, **qcow2**, or **vmdk**
+  **ami**, **raw**, **iso**, **vhd**, **vdi**, **qcow2**, or **vmdk**
 
 * ``container_format`` must be non-empty, and must be on of **ari**,
   **aki**, **ami**, **bare**, or **ovf**

=== modified file 'glance/registry/db/api.py'
--- glance/registry/db/api.py	2011-05-16 13:20:53 +0000
+++ glance/registry/db/api.py	2011-05-19 09:49:15 +0000
@@ -47,7 +47,8 @@
                                       'is_public', 'location', 'checksum'])
 
 CONTAINER_FORMATS = ['ami', 'ari', 'aki', 'bare', 'ovf']
-DISK_FORMATS = ['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2', 'vdi']
+DISK_FORMATS = ['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2', 'vdi',
+               'iso']
 STATUSES = ['active', 'saving', 'queued', 'killed']
 
 

=== modified file 'tests/stubs.py'
--- tests/stubs.py	2011-05-16 13:20:53 +0000
+++ tests/stubs.py	2011-05-19 09:49:15 +0000
@@ -267,7 +267,7 @@
     The "datastore" always starts with this set of image fixtures.
 
     :param stubs: Set of stubout stubs
-
+    :return: count of items in the "datastore"
     """
     class FakeDatastore(object):
 
@@ -301,11 +301,25 @@
                 'checksum': None,
                 'size': 19,
                 'location': "file:///tmp/glance-tests/2",
-                'properties': []}]
+                'properties': []},
+            {'id': 3,
+                'name': 'fake iso image',
+                'status': 'active',
+                'disk_format': 'iso',
+                'container_format': 'bare',
+                'is_public': False,
+                'created_at': datetime.datetime.utcnow(),
+                'updated_at': datetime.datetime.utcnow(),
+                'deleted_at': None,
+                'deleted': False,
+                'checksum': None,
+                'size': 19,
+                'location': "file:///tmp/glance-tests/3",
+                'properties': {}}]
 
         def __init__(self):
             self.images = FakeDatastore.FIXTURES
-            self.next_id = 3
+            self.next_id = 4
 
         def image_create(self, _context, values):
 
@@ -424,3 +438,4 @@
               fake_datastore.image_get)
     stubs.Set(glance.registry.db.api, 'image_get_all_public',
               fake_datastore.image_get_all_public)
+    return fake_datastore.next_id

=== modified file 'tests/unit/test_api.py'
--- tests/unit/test_api.py	2011-05-16 02:16:49 +0000
+++ tests/unit/test_api.py	2011-05-19 09:49:15 +0000
@@ -38,7 +38,7 @@
         """Establish a clean test environment"""
         self.stubs = stubout.StubOutForTesting()
         stubs.stub_out_registry_and_store_server(self.stubs)
-        stubs.stub_out_registry_db_image_api(self.stubs)
+        self.next_image_id = stubs.stub_out_registry_db_image_api(self.stubs)
         stubs.stub_out_filesystem_backend()
         self.api = rserver.API({'verbose': VERBOSE,
                                 'debug': DEBUG})
@@ -99,7 +99,7 @@
                    'size': 19,
                    'checksum': None}
 
-        extra_fixture = {'id': 3,
+        extra_fixture = {'id': self.next_image_id,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -110,7 +110,7 @@
 
         glance.registry.db.api.image_create(None, extra_fixture)
 
-        extra_fixture = {'id': 4,
+        extra_fixture = {'id': self.next_image_id + 1,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -162,7 +162,7 @@
         public images that have a specific name
 
         """
-        extra_fixture = {'id': 3,
+        extra_fixture = {'id': self.next_image_id,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -173,7 +173,7 @@
 
         glance.registry.db.api.image_create(None, extra_fixture)
 
-        extra_fixture = {'id': 4,
+        extra_fixture = {'id': self.next_image_id + 1,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -200,7 +200,7 @@
         public images that have a specific status
 
         """
-        extra_fixture = {'id': 3,
+        extra_fixture = {'id': self.next_image_id,
                          'status': 'saving',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -211,7 +211,7 @@
 
         glance.registry.db.api.image_create(None, extra_fixture)
 
-        extra_fixture = {'id': 4,
+        extra_fixture = {'id': self.next_image_id + 1,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -238,7 +238,7 @@
         public images that have a specific container_format
 
         """
-        extra_fixture = {'id': 3,
+        extra_fixture = {'id': self.next_image_id,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'vdi',
@@ -249,7 +249,7 @@
 
         glance.registry.db.api.image_create(None, extra_fixture)
 
-        extra_fixture = {'id': 4,
+        extra_fixture = {'id': self.next_image_id + 1,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'ami',
@@ -276,7 +276,7 @@
         public images that have a specific disk_format
 
         """
-        extra_fixture = {'id': 3,
+        extra_fixture = {'id': self.next_image_id,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -287,7 +287,7 @@
 
         glance.registry.db.api.image_create(None, extra_fixture)
 
-        extra_fixture = {'id': 4,
+        extra_fixture = {'id': self.next_image_id + 1,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'ami',
@@ -314,7 +314,7 @@
         public images that have a size greater than or equal to size_min
 
         """
-        extra_fixture = {'id': 3,
+        extra_fixture = {'id': self.next_image_id,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -325,7 +325,7 @@
 
         glance.registry.db.api.image_create(None, extra_fixture)
 
-        extra_fixture = {'id': 4,
+        extra_fixture = {'id': self.next_image_id + 1,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'ami',
@@ -352,7 +352,7 @@
         public images that have a size less than or equal to size_max
 
         """
-        extra_fixture = {'id': 3,
+        extra_fixture = {'id': self.next_image_id,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -363,7 +363,7 @@
 
         glance.registry.db.api.image_create(None, extra_fixture)
 
-        extra_fixture = {'id': 4,
+        extra_fixture = {'id': self.next_image_id + 1,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'ami',
@@ -391,7 +391,7 @@
         and greater than or equal to size_min
 
         """
-        extra_fixture = {'id': 3,
+        extra_fixture = {'id': self.next_image_id,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -402,7 +402,7 @@
 
         glance.registry.db.api.image_create(None, extra_fixture)
 
-        extra_fixture = {'id': 4,
+        extra_fixture = {'id': self.next_image_id + 1,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'ami',
@@ -413,7 +413,7 @@
 
         glance.registry.db.api.image_create(None, extra_fixture)
 
-        extra_fixture = {'id': 5,
+        extra_fixture = {'id': self.next_image_id + 2,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'ami',
@@ -440,7 +440,7 @@
         public images that have a specific custom property
 
         """
-        extra_fixture = {'id': 3,
+        extra_fixture = {'id': self.next_image_id,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -452,7 +452,7 @@
 
         glance.registry.db.api.image_create(None, extra_fixture)
 
-        extra_fixture = {'id': 4,
+        extra_fixture = {'id': self.next_image_id + 1,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'ami',
@@ -497,14 +497,14 @@
             self.assertEquals(v, res_dict['image'][k])
 
         # Test ID auto-assigned properly
-        self.assertEquals(3, res_dict['image']['id'])
+        self.assertEquals(self.next_image_id, res_dict['image']['id'])
 
         # Test status was updated properly
         self.assertEquals('active', res_dict['image']['status'])
 
     def test_create_image_with_bad_container_format(self):
         """Tests proper exception is raised if a bad disk_format is set"""
-        fixture = {'id': 3,
+        fixture = {'id': self.next_image_id,
                    'name': 'fake public image',
                    'is_public': True,
                    'disk_format': 'vhd',
@@ -521,7 +521,7 @@
 
     def test_create_image_with_bad_disk_format(self):
         """Tests proper exception is raised if a bad disk_format is set"""
-        fixture = {'id': 3,
+        fixture = {'id': self.next_image_id,
                    'name': 'fake public image',
                    'is_public': True,
                    'disk_format': 'invalid',
@@ -555,7 +555,7 @@
 
     def test_create_image_with_bad_status(self):
         """Tests proper exception is raised if a bad status is set"""
-        fixture = {'id': 3,
+        fixture = {'id': self.next_image_id,
                    'name': 'fake public image',
                    'is_public': True,
                    'disk_format': 'vhd',
@@ -595,7 +595,7 @@
         image"""
         fixture = {'status': 'killed'}
 
-        req = webob.Request.blank('/images/3')
+        req = webob.Request.blank('/images/' + str(self.next_image_id))
 
         req.method = 'PUT'
         req.body = json.dumps(dict(image=fixture))
@@ -691,7 +691,7 @@
         """Tests proper exception is raised if attempt to delete non-existing
         image"""
 
-        req = webob.Request.blank('/images/3')
+        req = webob.Request.blank('/images/' + str(self.next_image_id))
 
         req.method = 'DELETE'
 
@@ -705,7 +705,7 @@
         """Establish a clean test environment"""
         self.stubs = stubout.StubOutForTesting()
         stubs.stub_out_registry_and_store_server(self.stubs)
-        stubs.stub_out_registry_db_image_api(self.stubs)
+        self.next_image_id = stubs.stub_out_registry_db_image_api(self.stubs)
         stubs.stub_out_filesystem_backend()
         sql_connection = os.environ.get('GLANCE_SQL_CONNECTION', "sqlite://")
         options = {'verbose': VERBOSE,
@@ -805,7 +805,7 @@
 
         res_body = json.loads(res.body)['image']
         self.assertEquals(res_body['location'],
-                          'file:///tmp/glance-tests/3')
+                    'file:///tmp/glance-tests/' + str(self.next_image_id))
 
         # Test that the Location: header is set to the URI to
         # edit the newly-created image, as required by APP.
@@ -813,7 +813,8 @@
         self.assertTrue('location' in res.headers,
                         "'location' not in response headers.\n"
                         "res.headerlist = %r" % res.headerlist)
-        self.assertTrue('/images/3' in res.headers['location'])
+        self.assertTrue('/images/' + str(self.next_image_id)
+                        in res.headers['location'])
 
     def test_image_is_checksummed(self):
         """Test that the image contents are checksummed properly"""
@@ -836,9 +837,9 @@
 
         res_body = json.loads(res.body)['image']
         self.assertEquals(res_body['location'],
-                          'file:///tmp/glance-tests/3')
+                      'file:///tmp/glance-tests/' + str(self.next_image_id))
         self.assertEquals(image_checksum, res_body['checksum'],
-                          "Mismatched checksum. Expected %s, got %s" %
+                      "Mismatched checksum. Expected %s, got %s" %
                           (image_checksum, res_body['checksum']))
 
     def test_etag_equals_checksum_header(self):
@@ -863,7 +864,7 @@
         # HEAD the image and check the ETag equals the checksum header...
         expected_headers = {'x-image-meta-checksum': image_checksum,
                             'etag': image_checksum}
-        req = webob.Request.blank("/images/3")
+        req = webob.Request.blank("/images/" + str(self.next_image_id))
         req.method = 'HEAD'
         res = req.get_response(self.api)
         self.assertEquals(res.status_int, 200)
@@ -896,9 +897,9 @@
         self.assertEquals(res.status_int, webob.exc.HTTPBadRequest.code)
 
         # Test the image was killed...
-        expected_headers = {'x-image-meta-id': '3',
+        expected_headers = {'x-image-meta-id': str(self.next_image_id),
                             'x-image-meta-status': 'killed'}
-        req = webob.Request.blank("/images/3")
+        req = webob.Request.blank("/images/" + str(self.next_image_id))
         req.method = 'HEAD'
         res = req.get_response(self.api)
         self.assertEquals(res.status_int, 200)

=== modified file 'tests/unit/test_clients.py'
--- tests/unit/test_clients.py	2011-05-16 02:16:49 +0000
+++ tests/unit/test_clients.py	2011-05-19 09:49:15 +0000
@@ -52,7 +52,7 @@
     def setUp(self):
         """Establish a clean test environment"""
         self.stubs = stubout.StubOutForTesting()
-        stubs.stub_out_registry_db_image_api(self.stubs)
+        self.next_image_id = stubs.stub_out_registry_db_image_api(self.stubs)
         stubs.stub_out_registry_and_store_server(self.stubs)
         self.client = rclient.RegistryClient("0.0.0.0")
 
@@ -73,7 +73,7 @@
     def test_get_image_index_by_name(self):
         """Test correct set of public, name-filtered image returned. This
         is just a sanity check, we test the details call more in-depth."""
-        extra_fixture = {'id': 3,
+        extra_fixture = {'id': self.next_image_id,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -110,7 +110,7 @@
 
     def test_get_image_details_by_name(self):
         """Tests that a detailed call can be filtered by name"""
-        extra_fixture = {'id': 3,
+        extra_fixture = {'id': self.next_image_id,
                          'status': 'active',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -129,7 +129,7 @@
 
     def test_get_image_details_by_status(self):
         """Tests that a detailed call can be filtered by status"""
-        extra_fixture = {'id': 3,
+        extra_fixture = {'id': self.next_image_id,
                          'status': 'saving',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -148,7 +148,7 @@
 
     def test_get_image_details_by_container_format(self):
         """Tests that a detailed call can be filtered by container_format"""
-        extra_fixture = {'id': 3,
+        extra_fixture = {'id': self.next_image_id,
                          'status': 'saving',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -167,7 +167,7 @@
 
     def test_get_image_details_by_disk_format(self):
         """Tests that a detailed call can be filtered by disk_format"""
-        extra_fixture = {'id': 3,
+        extra_fixture = {'id': self.next_image_id,
                          'status': 'saving',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -186,7 +186,7 @@
 
     def test_get_image_details_with_maximum_size(self):
         """Tests that a detailed call can be filtered by size_max"""
-        extra_fixture = {'id': 3,
+        extra_fixture = {'id': self.next_image_id,
                          'status': 'saving',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -205,7 +205,7 @@
 
     def test_get_image_details_with_minimum_size(self):
         """Tests that a detailed call can be filtered by size_min"""
-        extra_fixture = {'id': 3,
+        extra_fixture = {'id': self.next_image_id,
                          'status': 'saving',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -224,7 +224,7 @@
 
     def test_get_image_details_by_property(self):
         """Tests that a detailed call can be filtered by a property"""
-        extra_fixture = {'id': 3,
+        extra_fixture = {'id': self.next_image_id,
                          'status': 'saving',
                          'is_public': True,
                          'disk_format': 'vhd',
@@ -282,10 +282,10 @@
         new_image = self.client.add_image(fixture)
 
         # Test ID auto-assigned properly
-        self.assertEquals(3, new_image['id'])
+        self.assertEquals(self.next_image_id, new_image['id'])
 
         # Test all other attributes set
-        data = self.client.get_image(3)
+        data = self.client.get_image(self.next_image_id)
 
         for k, v in fixture.items():
             self.assertEquals(v, data[k])
@@ -307,7 +307,7 @@
         new_image = self.client.add_image(fixture)
 
         # Test ID auto-assigned properly
-        self.assertEquals(3, new_image['id'])
+        self.assertEquals(self.next_image_id, new_image['id'])
 
         for k, v in fixture.items():
             self.assertEquals(v, new_image[k])
@@ -334,7 +334,7 @@
 
     def test_add_image_with_bad_status(self):
         """Tests proper exception is raised if a bad status is set"""
-        fixture = {'id': 3,
+        fixture = {'id': self.next_image_id,
                    'name': 'fake public image',
                    'is_public': True,
                    'disk_format': 'vmdk',
@@ -363,7 +363,7 @@
 
     def test_update_image_not_existing(self):
         """Tests non existing image update doesn't work"""
-        fixture = {'id': 3,
+        fixture = {'id': self.next_image_id,
                    'name': 'fake public image',
                    'is_public': True,
                    'disk_format': 'vmdk',
@@ -373,7 +373,7 @@
 
         self.assertRaises(exception.NotFound,
                           self.client.update_image,
-                          3,
+                          self.next_image_id,
                           fixture)
 
     def test_delete_image(self):
@@ -395,7 +395,7 @@
 
         self.assertRaises(exception.NotFound,
                           self.client.delete_image,
-                          3)
+                          self.next_image_id)
 
 
 class TestClient(unittest.TestCase):
@@ -408,7 +408,7 @@
     def setUp(self):
         """Establish a clean test environment"""
         self.stubs = stubout.StubOutForTesting()
-        stubs.stub_out_registry_db_image_api(self.stubs)
+        self.next_image_id = stubs.stub_out_registry_db_image_api(self.stubs)
         stubs.stub_out_registry_and_store_server(self.stubs)
         stubs.stub_out_filesystem_backend()
         self.client = client.Client("0.0.0.0", doc_root="")
@@ -445,7 +445,7 @@
 
         self.assertRaises(exception.NotFound,
                           self.client.get_image,
-                          3)
+                          self.next_image_id)
 
     def test_get_image_index(self):
         """Test correct set of public image returned"""
@@ -502,6 +502,23 @@
         for k, v in fixture.items():
             self.assertEquals(v, data[k])
 
+    def test_get_image_iso_meta(self):
+        """Tests that the detailed info about an iso image is returned"""
+        fixture = {'id': 3,
+                   'name': 'fake iso image',
+                   'is_public': False,
+                   'disk_format': 'iso',
+                   'container_format': 'bare',
+                   'status': 'active',
+                   'size': 19,
+                   'location': "file:///tmp/glance-tests/3",
+                   'properties': {}}
+
+        data = self.client.get_image_meta(3)
+
+        for k, v in fixture.items():
+            self.assertEquals(v, data[k])
+
     def test_get_image_non_existing(self):
         """Tests that NotFound is raised when getting a non-existing image"""
 
@@ -533,10 +550,10 @@
         new_image_id = new_image['id']
 
         # Test ID auto-assigned properly
-        self.assertEquals(3, new_image_id)
+        self.assertEquals(self.next_image_id, new_image_id)
 
         # Test all other attributes set
-        data = self.client.get_image_meta(3)
+        data = self.client.get_image_meta(self.next_image_id)
 
         for k, v in fixture.items():
             self.assertEquals(v, data[k])
@@ -559,17 +576,59 @@
         new_image_id = new_image['id']
 
         # Test ID auto-assigned properly
-        self.assertEquals(3, new_image_id)
-
-        # Test all other attributes set
-        data = self.client.get_image_meta(3)
-
-        for k, v in fixture.items():
-            self.assertEquals(v, data[k])
-
-        # Test status was updated properly
-        self.assertTrue('status' in data)
-        self.assertEquals('active', data['status'])
+        self.assertEquals(self.next_image_id, new_image_id)
+
+        # Test all other attributes set
+        data = self.client.get_image_meta(self.next_image_id)
+
+        for k, v in fixture.items():
+            self.assertEquals(v, data[k])
+
+        # Test status was updated properly
+        self.assertTrue('status' in data)
+        self.assertEquals('active', data['status'])
+
+    def test_add_image_with_iso_properties(self):
+        """Tests that we can add image metadata with iso disk format"""
+        fixture = {'name': 'fake public iso',
+                   'is_public': True,
+                   'disk_format': 'iso',
+                   'container_format': 'bare',
+                   'size': 19,
+                   'location': "file:///tmp/glance-tests/2",
+                   'properties': {'install': 'Bindows Heaven'},
+                  }
+        new_image = self.client.add_image(fixture)
+        new_image_id = new_image['id']
+
+        # Test ID auto-assigned properly
+        self.assertEquals(self.next_image_id, new_image_id)
+
+        # Test all other attributes set
+        data = self.client.get_image_meta(self.next_image_id)
+
+        for k, v in fixture.items():
+            self.assertEquals(v, data[k])
+
+        # Test status was updated properly
+        self.assertTrue('status' in data)
+        self.assertEquals('active', data['status'])
+
+    def test_add_image_with_bad_iso_properties(self):
+        """Tests that we can add image metadata with iso disk format"""
+        fixture = {'name': 'fake public iso',
+                   'is_public': True,
+                   'disk_format': 'iso',
+                   'container_format': 'vhd',
+                   'size': 19,
+                   'location': "file:///tmp/glance-tests/"
+                               + str(self.next_image_id),
+                   'properties': {'install': 'Bindows Heaven'},
+                  }
+
+        self.assertRaises(exception.Invalid,
+            self.client.add_image,
+            fixture)
 
     def test_add_image_already_exists(self):
         """Tests proper exception is raised if image with ID already exists"""
@@ -615,9 +674,9 @@
 
         new_image = self.client.add_image(fixture, image_data_fixture)
         new_image_id = new_image['id']
-        self.assertEquals(3, new_image_id)
+        self.assertEquals(self.next_image_id, new_image_id)
 
-        new_meta, new_image_chunks = self.client.get_image(3)
+        new_meta, new_image_chunks = self.client.get_image(self.next_image_id)
 
         new_image_data = ""
         for image_chunk in new_image_chunks:
@@ -650,12 +709,12 @@
 
         new_image = self.client.add_image(fixture, open(tmp_image_filepath))
         new_image_id = new_image['id']
-        self.assertEquals(3, new_image_id)
+        self.assertEquals(self.next_image_id, new_image_id)
 
         if os.path.exists(tmp_image_filepath):
             os.unlink(tmp_image_filepath)
 
-        new_meta, new_image_chunks = self.client.get_image(3)
+        new_meta, new_image_chunks = self.client.get_image(self.next_image_id)
 
         new_image_data = ""
         for image_chunk in new_image_chunks:
@@ -678,9 +737,9 @@
 
         new_image = self.client.add_image(fixture, image_data_fixture)
         new_image_id = new_image['id']
-        self.assertEquals(3, new_image_id)
+        self.assertEquals(self.next_image_id, new_image_id)
 
-        new_meta, new_image_chunks = self.client.get_image(3)
+        new_meta, new_image_chunks = self.client.get_image(self.next_image_id)
 
         new_image_data = ""
         for image_chunk in new_image_chunks:
@@ -725,7 +784,7 @@
 
     def test_update_image_not_existing(self):
         """Tests non existing image update doesn't work"""
-        fixture = {'id': 3,
+        fixture = {'id': self.next_image_id,
                    'name': 'fake public image',
                    'is_public': True,
                    'disk_format': 'vhd',
@@ -735,7 +794,7 @@
 
         self.assertRaises(exception.NotFound,
                           self.client.update_image,
-                          3,
+                          self.next_image_id,
                           fixture)
 
     def test_delete_image(self):
@@ -757,4 +816,4 @@
 
         self.assertRaises(exception.NotFound,
                           self.client.delete_image,
-                          3)
+                          self.next_image_id)