fixed QuotaTestCases

4 files changed, 18 insertions, 8 deletions

diff --git a/nova/flags.py b/nova/flags.py
index 2481a10af..d3f72d412 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -362,7 +362,7 @@ DEFINE_string('scheduler_manager', 'nova.scheduler.manager.SchedulerManager',
 # The service to use for image search and retrieval
 DEFINE_string('image_service', 'nova.image.local.LocalImageService',
               'The service to use for retrieving and searching for images.')
-DEFINE_string('glance_image_service', 'nova.image.local.LocalImageService',
+DEFINE_string('glance_image_service', 'nova.image.glance.GlanceImageService',
               'The service to use for retrieving and searching for ' + 
               'glance images.')
 
diff --git a/nova/image/fake.py b/nova/image/fake.py
index 8918c0c14..3ada0d8d0 100644
--- a/nova/image/fake.py
+++ b/nova/image/fake.py
@@ -40,7 +40,7 @@ class FakeImageService(service.BaseImageService):
         # NOTE(justinsb): The OpenStack API can't upload an image?
         # So, make sure we've got one..
         timestamp = datetime.datetime(2011, 01, 01, 01, 02, 03)
-        image = {'id': '123456',
+        image1 = {'id': '123456',
                  'name': 'fakeimage123456',
                  'created_at': timestamp,
                  'updated_at': timestamp,
@@ -49,7 +49,18 @@ class FakeImageService(service.BaseImageService):
                  'disk_format': 'raw',
                  'properties': {'kernel_id': FLAGS.null_kernel,
                                 'ramdisk_id': FLAGS.null_kernel}}
-        self.create(None, image)
+
+        image2 = {'id': 'fake',
+                 'name': 'fakeimage123456',
+                 'created_at': timestamp,
+                 'updated_at': timestamp,
+                 'status': 'active',
+                 'container_format': 'ami',
+                 'disk_format': 'raw',
+                 'properties': {'kernel_id': FLAGS.null_kernel,
+                                'ramdisk_id': FLAGS.null_kernel}}
+        self.create(None, image1)
+        self.create(None, image2)
         super(FakeImageService, self).__init__()
 
     def index(self, context):
@@ -66,7 +77,6 @@ class FakeImageService(service.BaseImageService):
         Returns a dict containing image data for the given opaque image id.
 
         """
-        image_id = int(image_id)
         image = self.images.get(image_id)
         if image:
             return copy.deepcopy(image)
@@ -80,7 +90,7 @@ class FakeImageService(service.BaseImageService):
         :raises: Duplicate if the image already exist.
 
         """
-        image_id = int(data['id'])
+        image_id = data['id']
         if self.images.get(image_id):
             raise exception.Duplicate()
 
diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py
index 7ace2ad7d..9ede0786f 100644
--- a/nova/tests/test_quota.py
+++ b/nova/tests/test_quota.py
@@ -280,6 +280,7 @@ class QuotaTestCase(test.TestCase):
                 FLAGS.quota_max_injected_files)
 
     def _create_with_injected_files(self, files):
+        FLAGS.glance_image_service = 'nova.image.fake.FakeImageService'
         api = compute.API(image_service=self.StubImageService())
         inst_type = instance_types.get_instance_type_by_name('m1.small')
         api.create(self.context, min_count=1, max_count=1,
@@ -287,6 +288,7 @@ class QuotaTestCase(test.TestCase):
                 injected_files=files)
 
     def test_no_injected_files(self):
+        FLAGS.glance_image_service = 'nova.image.fake.FakeImageService'
         api = compute.API(image_service=self.StubImageService())
         inst_type = instance_types.get_instance_type_by_name('m1.small')
         api.create(self.context, instance_type=inst_type, image_id='fake')
diff --git a/nova/utils.py b/nova/utils.py
index dcaaab602..252f5e9a6 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -749,11 +749,9 @@ def parse_image_ref(image_ref):
     port = o.port
     host = o.netloc.split(':', 1)[0]
     image_id = o.path.split('/')[-1]
+
     if is_int(image_id):
         image_id = int(image_id)
-    else:
-        raise exception.ImageNotFound(
-            _('image_ref [%s] is missing a proper id') % image_ref)
 
     return (image_id, host, port)