Merge "Added img metadata validation. Fixes bug 962117."

1 files changed, 29 insertions, 0 deletions

diff --git a/nova/tests/api/openstack/test_common.py b/nova/tests/api/openstack/test_common.py
index f36a530c1..5e1e6e0ba 100644
--- a/nova/tests/api/openstack/test_common.py
+++ b/nova/tests/api/openstack/test_common.py
@@ -28,6 +28,7 @@ from nova import exception
 from nova import test
 from nova.api.openstack import common
 from nova.api.openstack import xmlutil
+from nova.tests import utils as test_utils
 
 
 NS = "{http://docs.openstack.org/compute/api/v1.1}"
@@ -328,6 +329,34 @@ class MiscFunctionsTest(test.TestCase):
         else:
             self.fail("webob.exc.HTTPConflict was not raised")
 
+    def test_check_img_metadata_properties_quota_valid_metadata(self):
+        ctxt = test_utils.get_test_admin_context()
+        metadata1 = {"key": "value"}
+        actual = common.check_img_metadata_properties_quota(ctxt, metadata1)
+        self.assertEqual(actual, None)
+
+        metadata2 = {"key": "v" * 260}
+        actual = common.check_img_metadata_properties_quota(ctxt, metadata2)
+        self.assertEqual(actual, None)
+
+        metadata3 = {"key": ""}
+        actual = common.check_img_metadata_properties_quota(ctxt, metadata3)
+        self.assertEqual(actual, None)
+
+    def test_check_img_metadata_properties_quota_inv_metadata(self):
+        ctxt = test_utils.get_test_admin_context()
+        metadata1 = {"a" * 260: "value"}
+        self.assertRaises(webob.exc.HTTPBadRequest,
+                common.check_img_metadata_properties_quota, ctxt, metadata1)
+
+        metadata2 = {"": "value"}
+        self.assertRaises(webob.exc.HTTPBadRequest,
+                common.check_img_metadata_properties_quota, ctxt, metadata2)
+
+        metadata3 = "invalid metadata"
+        self.assertRaises(webob.exc.HTTPBadRequest,
+                common.check_img_metadata_properties_quota, ctxt, metadata3)
+
 
 class MetadataXMLDeserializationTest(test.TestCase):