Skip to content

Commit

Permalink
Merge "Refactoring image and server metadata api tests"
Browse files Browse the repository at this point in the history
  • Loading branch information
@openstack-gerrit
Jenkins authored and openstack-gerrit committed Oct 18, 2011
2 parents 0001744 + 7f37543 commit e92494e
Show file tree
Hide file tree
Showing 3 changed files with 202 additions and 282 deletions.
6 changes: 5 additions & 1 deletion nova/api/openstack/server_metadata.py
View file
Expand Up @@ -146,7 +146,11 @@ def delete(self, req, server_id, id):
msg = _("Metadata item was not found")
raise exc.HTTPNotFound(explanation=msg)

self.compute_api.delete_instance_metadata(context, server_id, id)
try:
self.compute_api.delete_instance_metadata(context, server_id, id)
except exception.InstanceNotFound:
msg = _('Server does not exist')
raise exc.HTTPNotFound(explanation=msg)

def _handle_quota_error(self, error):
"""Reraise quota errors as api-specific http exceptions."""
Expand Down
173 changes: 85 additions & 88 deletions nova/tests/api/openstack/test_image_metadata.py
View file
Expand Up @@ -19,10 +19,10 @@
import webob


from nova.tests.api.openstack import fakes
from nova.api.openstack import image_metadata
from nova import flags
from nova.api import openstack
from nova import test
from nova.tests.api.openstack import fakes


FLAGS = flags.FLAGS
Expand All @@ -33,172 +33,169 @@ class ImageMetaDataTest(test.TestCase):
def setUp(self):
super(ImageMetaDataTest, self).setUp()
fakes.stub_out_glance(self.stubs)
self.controller = image_metadata.Controller()

def test_index(self):
req = webob.Request.blank('/v1.1/123/images/123/metadata')
res = req.get_response(fakes.wsgi_app())
res_dict = json.loads(res.body)
self.assertEqual(200, res.status_int)
req = fakes.HTTPRequest.blank('/v1.1/123/images/123/metadata')
res_dict = self.controller.index(req, '123')
expected = {'metadata': {'key1': 'value1'}}
self.assertEqual(res_dict, expected)

def test_show(self):
req = webob.Request.blank('/v1.1/fake/images/123/metadata/key1')
res = req.get_response(fakes.wsgi_app())
res_dict = json.loads(res.body)
self.assertEqual(200, res.status_int)
req = fakes.HTTPRequest.blank('/v1.1/fake/images/123/metadata/key1')
res_dict = self.controller.show(req, '123', 'key1')
self.assertTrue('meta' in res_dict)
self.assertEqual(len(res_dict['meta']), 1)
self.assertEqual('value1', res_dict['meta']['key1'])

def test_show_not_found(self):
req = webob.Request.blank('/v1.1/fake/images/123/metadata/key9')
res = req.get_response(fakes.wsgi_app())
self.assertEqual(404, res.status_int)
req = fakes.HTTPRequest.blank('/v1.1/fake/images/123/metadata/key9')
self.assertRaises(webob.exc.HTTPNotFound,
self.controller.show, req, '123', 'key9')

def test_show_image_not_found(self):
req = webob.Request.blank('/v1.1/fake/images/100/metadata/key1')
res = req.get_response(fakes.wsgi_app())
self.assertEqual(404, res.status_int)
req = fakes.HTTPRequest.blank('/v1.1/fake/images/100/metadata/key1')
self.assertRaises(webob.exc.HTTPNotFound,
self.controller.show, req, '100', 'key9')

def test_create(self):
req = webob.Request.blank('/v1.1/fake/images/123/metadata')
req = fakes.HTTPRequest.blank('/v1.1/fake/images/123/metadata')
req.method = 'POST'
req.body = '{"metadata": {"key7": "value7"}}'
body = {"metadata": {"key7": "value7"}}
req.body = json.dumps(body)
req.headers["content-type"] = "application/json"
res = req.get_response(fakes.wsgi_app())
res = self.controller.create(req, '123', body)

self.assertEqual(200, res.status_int)
actual_output = json.loads(res.body)
expected_output = {'metadata': {'key1': 'value1', 'key7': 'value7'}}
self.assertEqual(expected_output, actual_output)
self.assertEqual(expected_output, res)

def test_create_image_not_found(self):
req = webob.Request.blank('/v1.1/fake/images/100/metadata')
req = fakes.HTTPRequest.blank('/v1.1/fake/images/100/metadata')
req.method = 'POST'
req.body = '{"metadata": {"key7": "value7"}}'
body = {"metadata": {"key7": "value7"}}
req.body = json.dumps(body)
req.headers["content-type"] = "application/json"
res = req.get_response(fakes.wsgi_app())

self.assertEqual(404, res.status_int)
self.assertRaises(webob.exc.HTTPNotFound,
self.controller.create, req, '100', body)

def test_update_all(self):
req = webob.Request.blank('/v1.1/fake/images/123/metadata')
req = fakes.HTTPRequest.blank('/v1.1/fake/images/123/metadata')
req.method = 'PUT'
req.body = '{"metadata": {"key9": "value9"}}'
body = {"metadata": {"key9": "value9"}}
req.body = json.dumps(body)
req.headers["content-type"] = "application/json"
res = req.get_response(fakes.wsgi_app())
res = self.controller.update_all(req, '123', body)

self.assertEqual(200, res.status_int)
actual_output = json.loads(res.body)
expected_output = {'metadata': {'key9': 'value9'}}
self.assertEqual(expected_output, actual_output)
self.assertEqual(expected_output, res)

def test_update_all_image_not_found(self):
req = webob.Request.blank('/v1.1/fake/images/100/metadata')
req = fakes.HTTPRequest.blank('/v1.1/fake/images/100/metadata')
req.method = 'PUT'
req.body = '{"metadata": {"key9": "value9"}}'
body = {"metadata": {"key9": "value9"}}
req.body = json.dumps(body)
req.headers["content-type"] = "application/json"
res = req.get_response(fakes.wsgi_app())

self.assertEqual(404, res.status_int)
self.assertRaises(webob.exc.HTTPNotFound,
self.controller.update_all, req, '100', body)

def test_update_item(self):
req = webob.Request.blank('/v1.1/fake/images/123/metadata/key1')
req = fakes.HTTPRequest.blank('/v1.1/fake/images/123/metadata/key1')
req.method = 'PUT'
req.body = '{"meta": {"key1": "zz"}}'
body = {"meta": {"key1": "zz"}}
req.body = json.dumps(body)
req.headers["content-type"] = "application/json"
res = req.get_response(fakes.wsgi_app())
res = self.controller.update(req, '123', 'key1', body)

self.assertEqual(200, res.status_int)
actual_output = json.loads(res.body)
expected_output = {'meta': {'key1': 'zz'}}
self.assertEqual(actual_output, expected_output)
self.assertEqual(res, expected_output)

def test_update_item_image_not_found(self):
req = webob.Request.blank('/v1.1/fake/images/100/metadata/key1')
req = fakes.HTTPRequest.blank('/v1.1/fake/images/100/metadata/key1')
req.method = 'PUT'
req.body = '{"meta": {"key1": "zz"}}'
body = {"meta": {"key1": "zz"}}
req.body = json.dumps(body)
req.headers["content-type"] = "application/json"
res = req.get_response(fakes.wsgi_app())

self.assertEqual(404, res.status_int)
self.assertRaises(webob.exc.HTTPNotFound,
self.controller.update, req, '100', 'key1', body)

def test_update_item_bad_body(self):
req = webob.Request.blank('/v1.1/fake/images/123/metadata/key1')
req = fakes.HTTPRequest.blank('/v1.1/fake/images/123/metadata/key1')
req.method = 'PUT'
req.body = '{"key1": "zz"}'
body = {"key1": "zz"}
req.body = ''
req.headers["content-type"] = "application/json"
res = req.get_response(fakes.wsgi_app())
self.assertEqual(400, res.status_int)

self.assertRaises(webob.exc.HTTPBadRequest,
self.controller.update, req, '123', 'key1', body)

def test_update_item_too_many_keys(self):
req = webob.Request.blank('/v1.1/fake/images/123/metadata/key1')
req = fakes.HTTPRequest.blank('/v1.1/fake/images/123/metadata/key1')
req.method = 'PUT'
overload = {}
for num in range(FLAGS.quota_metadata_items + 1):
overload['key%s' % num] = 'value%s' % num
req.body = json.dumps({'meta': overload})
body = {'meta': overload}
req.body = json.dumps(body)
req.headers["content-type"] = "application/json"
res = req.get_response(fakes.wsgi_app())
self.assertEqual(400, res.status_int)

self.assertRaises(webob.exc.HTTPBadRequest,
self.controller.update, req, '123', 'key1', body)

def test_update_item_body_uri_mismatch(self):
req = webob.Request.blank('/v1.1/fake/images/123/metadata/bad')
req = fakes.HTTPRequest.blank('/v1.1/fake/images/123/metadata/bad')
req.method = 'PUT'
req.body = '{"meta": {"key1": "value1"}}'
body = {"meta": {"key1": "value1"}}
req.body = json.dumps(body)
req.headers["content-type"] = "application/json"
res = req.get_response(fakes.wsgi_app())
self.assertEqual(400, res.status_int)

def test_update_item_xml(self):
req = webob.Request.blank('/v1.1/fake/images/123/metadata/key1')
req.method = 'PUT'
req.body = '<meta key="key1">five</meta>'
req.headers["content-type"] = "application/xml"
res = req.get_response(fakes.wsgi_app())

self.assertEqual(200, res.status_int)
actual_output = json.loads(res.body)
expected_output = {'meta': {'key1': 'five'}}
self.assertEqual(actual_output, expected_output)
self.assertRaises(webob.exc.HTTPBadRequest,
self.controller.update, req, '123', 'bad', body)

def test_delete(self):
req = webob.Request.blank('/v1.1/fake/images/123/metadata/key1')
req = fakes.HTTPRequest.blank('/v1.1/fake/images/123/metadata/key1')
req.method = 'DELETE'
res = req.get_response(fakes.wsgi_app())
self.assertEqual(204, res.status_int)
self.assertEqual('', res.body)
res = self.controller.delete(req, '123', 'key1')

self.assertEqual(None, res)

def test_delete_not_found(self):
req = webob.Request.blank('/v1.1/fake/images/123/metadata/blah')
req = fakes.HTTPRequest.blank('/v1.1/fake/images/123/metadata/blah')
req.method = 'DELETE'
res = req.get_response(fakes.wsgi_app())
self.assertEqual(404, res.status_int)

self.assertRaises(webob.exc.HTTPNotFound,
self.controller.delete, req, '123', 'blah')

def test_delete_image_not_found(self):
req = webob.Request.blank('/v1.1/fake/images/100/metadata/key1')
req = fakes.HTTPRequest.blank('/v1.1/fake/images/100/metadata/key1')
req.method = 'DELETE'
res = req.get_response(fakes.wsgi_app())
self.assertEqual(404, res.status_int)

self.assertRaises(webob.exc.HTTPNotFound,
self.controller.delete, req, '100', 'key1')

def test_too_many_metadata_items_on_create(self):
data = {"metadata": {}}
for num in range(FLAGS.quota_metadata_items + 1):
data['metadata']['key%i' % num] = "blah"
json_string = str(data).replace("\'", "\"")
req = webob.Request.blank('/v1.1/fake/images/123/metadata')
req = fakes.HTTPRequest.blank('/v1.1/fake/images/123/metadata')
req.method = 'POST'
req.body = json_string
req.body = json.dumps(data)
req.headers["content-type"] = "application/json"
res = req.get_response(fakes.wsgi_app())
self.assertEqual(413, res.status_int)

self.assertRaises(webob.exc.HTTPRequestEntityTooLarge,
self.controller.create, req, '123', data)
self.assertRaises(webob.exc.HTTPRequestEntityTooLarge,
self.controller.create, req, '123', data)

def test_too_many_metadata_items_on_put(self):
FLAGS.quota_metadata_items = 1
req = webob.Request.blank('/v1.1/fake/images/123/metadata/blah')
req = fakes.HTTPRequest.blank('/v1.1/fake/images/123/metadata/blah')
req.method = 'PUT'
req.body = '{"meta": {"blah": "blah"}}'
body = {"meta": {"blah": "blah"}}
req.body = json.dumps(body)
req.headers["content-type"] = "application/json"
res = req.get_response(fakes.wsgi_app())
self.assertEqual(413, res.status_int)

self.assertRaises(webob.exc.HTTPRequestEntityTooLarge,
self.controller.update, req, '123', 'blah', body)

0 comments on commit e92494e

Please sign in to comment.