Merge lp:~soren/nova/image-tests into lp:~hudson-openstack/nova/trunk

[Soren Hansen]

Make fake image driver support get() call (with tests)

Make the fake image driver support get() and make it return an empty string for images with no data.

I'm not completely convinced this is what we actually want to happen (the returning an empty string when no blob is present) but as far as I can tell, this is what the Glance backend does as well.

[Brian Lamar (blamar)]

Can you update the docstring on BaseImageService.get? Other than that this looks good to me.

review: Needs Fixing

[Brian Waldon (bcwaldon)]

Cool stuff. Good to go once you fix that docstring.

I would love to get rid of our several different fake image services at some point. Have you had a chance to look into that?

review: Approve

Unmerged revisions

1439. By Soren Hansen on 2011-08-26

Make fake image driver return an empty string for images with no data. Add a test for this.

1438. By Soren Hansen on 2011-08-26

Merge trunk

1437. By Soren Hansen on 2011-08-19

pep8

1436. By Soren Hansen on 2011-08-19

Merge trunk

1435. By Soren Hansen on 2011-08-15

Add a test to make sure we can write image data and read it back again.

1434. By Soren Hansen on 2011-08-15

Merge trunk

=== modified file 'nova/image/fake.py'
--- nova/image/fake.py	2011-08-05 13:37:36 +0000
+++ nova/image/fake.py	2011-08-26 23:06:25 +0000
@@ -112,6 +112,7 @@
         self.create(None, image3)
         self.create(None, image4)
         self.create(None, image5)
+        self._imagedata = {}
         super(_FakeImageService, self).__init__()
 
     def index(self, context, filters=None, marker=None, limit=None):
@@ -126,6 +127,11 @@
         """Return list of detailed image information."""
         return copy.deepcopy(self.images.values())
 
+    def get(self, context, image_id, data):
+        metadata = self.show(context, image_id)
+        data.write(self._imagedata.get(image_id, ''))
+        return metadata
+
     def show(self, context, image_id):
         """Get data about specified image.
 
@@ -168,6 +174,8 @@
 
         metadata['id'] = image_id
         self.images[image_id] = copy.deepcopy(metadata)
+        if data:
+            self._imagedata[image_id] = data.read()
         return self.images[image_id]
 
     def update(self, context, image_id, metadata, data=None):

=== modified file 'nova/image/service.py'
--- nova/image/service.py	2011-05-25 21:28:10 +0000
+++ nova/image/service.py	2011-08-26 23:06:25 +0000
@@ -97,7 +97,7 @@
         """
         raise NotImplementedError
 
-    def get(self, context, data):
+    def get(self, context, image_id, data):
         """Get an image.
 
         :param data: a file-like object to hold binary image data

=== modified file 'nova/tests/test_image.py'
--- nova/tests/test_image.py	2011-08-05 19:28:22 +0000
+++ nova/tests/test_image.py	2011-08-26 23:06:25 +0000
@@ -16,6 +16,7 @@
 #    under the License.
 
 import datetime
+import StringIO
 
 from nova import context
 from nova import exception
@@ -127,6 +128,23 @@
         index = self.image_service.index(self.context)
         self.assertEquals(len(index), 0)
 
+    def test_create_then_get(self):
+        blob = 'some data'
+        s1 = StringIO.StringIO(blob)
+        self.image_service.create(self.context,
+                                  {'id': '32', 'foo': 'bar'},
+                                  data=s1)
+        s2 = StringIO.StringIO()
+        self.image_service.get(self.context, '32', data=s2)
+        self.assertEquals(s2.getvalue(), blob, 'Did not get blob back intact')
+
+    def test_get_non_existent_content(self):
+        self.image_service.create(self.context,
+                                  {'id': '32', 'foo': 'bar'})
+        s2 = StringIO.StringIO()
+        self.image_service.get(self.context, '32', data=s2)
+        self.assertEquals(s2.getvalue(), '', 'Did not get empty blob back')
+
 
 class FakeImageTestCase(_ImageTestCase):
     def setUp(self):