Merge lp:~ttx/glance/d2-lp803055 into lp:~hudson-openstack/glance/milestone-proposed

[Thierry Carrez]

Backport for bug 803055

Backport for bug 803055, which was unfortunately pushed to trunk first.

[Brian Waldon (bcwaldon)]

Sorry, I wasn't sure how to handle the merge prop for it. This looks good, Thierry.

review: Approve

=== modified file 'glance/common/client.py'
--- glance/common/client.py	2011-06-26 20:45:46 +0000
+++ glance/common/client.py	2011-06-28 19:53:23 +0000
@@ -88,6 +88,12 @@
         body in memory.
         """
         if type(params) is dict:
+
+            # remove any params that are None
+            for (key, value) in params.items():
+                if value is None:
+                    del params[key]
+
             action += '?' + urllib.urlencode(params)
 
         try:

=== modified file 'tests/unit/test_clients.py'
--- tests/unit/test_clients.py	2011-06-28 13:41:50 +0000
+++ tests/unit/test_clients.py	2011-06-28 19:53:23 +0000
@@ -449,6 +449,33 @@
 
         self.assertEquals(images[0]['id'], 2)
 
+    def test_get_image_index_limit_None(self):
+        """Test correct set of images returned with limit param == None."""
+        extra_fixture = {'id': 3,
+                         'status': 'saving',
+                         'is_public': True,
+                         'disk_format': 'vhd',
+                         'container_format': 'ovf',
+                         'name': 'new name! #123',
+                         'size': 19,
+                         'checksum': None}
+
+        glance.registry.db.api.image_create(None, extra_fixture)
+
+        extra_fixture = {'id': 4,
+                         'status': 'saving',
+                         'is_public': True,
+                         'disk_format': 'vhd',
+                         'container_format': 'ovf',
+                         'name': 'new name! #125',
+                         'size': 19,
+                         'checksum': None}
+
+        glance.registry.db.api.image_create(None, extra_fixture)
+
+        images = self.client.get_images(limit=None)
+        self.assertEquals(len(images), 3)
+
     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."""