From 56dfbb59f9ad61d7f45d97f233db5d1cf0a46879 Mon Sep 17 00:00:00 2001
From: Unmesh Gurjar <unmesh.gurjar@vertex.co.in>
Date: Mon, 2 Apr 2012 11:52:37 +0530
Subject: Fixed metadata validation err. Fixes bug 965102.

1. Fixed the error message on specifying invalid server metadata key/value.
2. Added check to disallow specifying blank metadata key.
3. Added unit test coverage.

Addressed review comments.

Change-Id: I1f0002971dc236045d6e622641f46a4a30249d54
---
 .../api/openstack/compute/test_server_metadata.py  | 54 ++++++++++++++++++++++
 1 file changed, 54 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/compute/test_server_metadata.py b/nova/tests/api/openstack/compute/test_server_metadata.py
index 61bf4fc47..aa4e47706 100644
--- a/nova/tests/api/openstack/compute/test_server_metadata.py
+++ b/nova/tests/api/openstack/compute/test_server_metadata.py
@@ -346,6 +346,31 @@ class ServerMetaDataTest(test.TestCase):
         self.assertRaises(webob.exc.HTTPRequestEntityTooLarge,
                           self.controller.create, req, self.uuid, data)
 
+    def test_invalid_metadata_items_on_create(self):
+        self.stubs.Set(nova.db, 'instance_metadata_update',
+                       return_create_instance_metadata)
+        req = fakes.HTTPRequest.blank(self.url)
+        req.method = 'POST'
+        req.headers["content-type"] = "application/json"
+
+        #test for long key
+        data = {"metadata": {"a" * 260: "value1"}}
+        req.body = json.dumps(data)
+        self.assertRaises(webob.exc.HTTPRequestEntityTooLarge,
+                          self.controller.create, req, self.uuid, data)
+
+        #test for long value
+        data = {"metadata": {"key": "v" * 260}}
+        req.body = json.dumps(data)
+        self.assertRaises(webob.exc.HTTPRequestEntityTooLarge,
+                          self.controller.create, req, self.uuid, data)
+
+        #test for empty key.
+        data = {"metadata": {"": "value1"}}
+        req.body = json.dumps(data)
+        self.assertRaises(webob.exc.HTTPRequestEntityTooLarge,
+                          self.controller.create, req, self.uuid, data)
+
     def test_too_many_metadata_items_on_update_item(self):
         self.stubs.Set(nova.db, 'instance_metadata_update',
                        return_create_instance_metadata)
@@ -359,3 +384,32 @@ class ServerMetaDataTest(test.TestCase):
 
         self.assertRaises(webob.exc.HTTPRequestEntityTooLarge,
                           self.controller.update_all, req, self.uuid, data)
+
+    def test_invalid_metadata_items_on_update_item(self):
+        self.stubs.Set(nova.db, 'instance_metadata_update',
+                       return_create_instance_metadata)
+        data = {"metadata": {}}
+        for num in range(FLAGS.quota_metadata_items + 1):
+            data['metadata']['key%i' % num] = "blah"
+        req = fakes.HTTPRequest.blank(self.url)
+        req.method = 'PUT'
+        req.body = json.dumps(data)
+        req.headers["content-type"] = "application/json"
+
+        #test for long key
+        data = {"metadata": {"a" * 260: "value1"}}
+        req.body = json.dumps(data)
+        self.assertRaises(webob.exc.HTTPRequestEntityTooLarge,
+                          self.controller.update_all, req, self.uuid, data)
+
+        #test for long value
+        data = {"metadata": {"key": "v" * 260}}
+        req.body = json.dumps(data)
+        self.assertRaises(webob.exc.HTTPRequestEntityTooLarge,
+                          self.controller.update_all, req, self.uuid, data)
+
+        #test for empty key.
+        data = {"metadata": {"": "value1"}}
+        req.body = json.dumps(data)
+        self.assertRaises(webob.exc.HTTPRequestEntityTooLarge,
+                          self.controller.update_all, req, self.uuid, data)
-- 
cgit