Merge "return 400 Bad Request when empty string resources"

nova/api/openstack/placement/util.py

@@ -220,6 +220,12 @@ def normalize_resources_qs_param(qs):
     :raises `webob.exc.HTTPBadRequest` if the parameter's value isn't in the
             expected format.
     """
+    if qs.strip() == "":
+        msg = _('Badly formed resources parameter. Expected resources '
+                'query string parameter in form: '
+                '?resources=VCPU:2,MEMORY_MB:1024. Got: empty string.')
+        raise webob.exc.HTTPBadRequest(msg)
+
     result = {}
     resource_tuples = qs.split(',')
     for rt in resource_tuples:

nova/tests/unit/api/openstack/placement/test_util.py

@@ -335,6 +335,14 @@ class TestNormalizeResourceQsParam(test.NoDBTestCase):
         }
         self.assertEqual(expected, resources)
 
+    def test_400_empty_string(self):
+        qs = ""
+        self.assertRaises(
+            webob.exc.HTTPBadRequest,
+            util.normalize_resources_qs_param,
+            qs,
+        )
+
     def test_400_bad_int(self):
         qs = "VCPU:foo"
         self.assertRaises(