Merge lp:~rackspace-titan/glance/filters-None into lp:~hudson-openstack/glance/trunk

[Brian Waldon]

Prevent query params from being set to None instead of a dict

[lp:~rackspace-titan/glance/filters-None]

149. By Brian Waldon on 2011-06-28

removing rogue print

[Brian Lamar (blamar)]

Approved the one for D2, this is the same fix and same approval for trunk.

[Brian Lamar (blamar)]

review: Approve

[Rick Harris (rconradharris)]

lgtm

review: Approve

=== modified file 'glance/common/client.py'
--- glance/common/client.py	2011-06-28 18:12:26 +0000
+++ glance/common/client.py	2011-06-28 23:21:49 +0000
@@ -168,8 +168,14 @@
                                reduced to
         :retval subset of 'params' dict
         """
-        result = actual_params.get('filters', {})
+        try:
+            # expect 'filters' param to be a dict here
+            result = dict(actual_params.get('filters'))
+        except TypeError:
+            result = {}
+
         for allowed_param in allowed_params:
             if allowed_param in actual_params:
                 result[allowed_param] = actual_params[allowed_param]
+
         return result

=== modified file 'tests/unit/test_clients.py'
--- tests/unit/test_clients.py	2011-06-28 18:12:26 +0000
+++ tests/unit/test_clients.py	2011-06-28 23:21:49 +0000
@@ -1191,6 +1191,23 @@
         for image in images:
             self.assertEquals('v a', image['properties']['p a'])
 
+    def test_get_image_bad_filters_with_other_params(self):
+        """Tests that a detailed call can be filtered by a property"""
+        extra_fixture = {'id': 3,
+                         'status': 'saving',
+                         'is_public': True,
+                         'disk_format': 'vhd',
+                         'container_format': 'ovf',
+                         'name': 'new name! #123',
+                         'size': 19,
+                         'checksum': None,
+                         'properties': {'p a': 'v a'}}
+
+        glance.registry.db.api.image_create(None, extra_fixture)
+
+        images = self.client.get_images_detailed(filters=None, limit=1)
+        self.assertEquals(len(images), 1)
+
     def test_get_image_meta(self):
         """Tests that the detailed info about an image returned"""
         fixture = {'id': 2,