openstack/nova
Code Issues Proposed changes

Merge "Explicitly handle exception ConsoleTypeUnavailable for v2 consoles"

Browse Source
This commit is contained in:
Jenkins
2014-09-01 01:32:06 +00:00
committed by Gerrit Code Review
parent 921e01cd21 562f98594e
commit 680c4430e6
2 changed files with 57 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/api/openstack/compute/contrib/consoles.py
View File

@@ -48,6 +48,8 @@ class ConsolesController(wsgi.Controller):
except exception.InstanceNotReady as e:
raise webob.exc.HTTPConflict(
explanation=_('Instance not yet ready'))
except exception.ConsoleTypeUnavailable as e:
raise webob.exc.HTTPBadRequest(explanation=e.format_message())
except NotImplementedError:
msg = _("Unable to get vnc console, functionality not implemented")
raise webob.exc.HTTPNotImplemented(explanation=msg)
@@ -68,6 +70,8 @@ class ConsolesController(wsgi.Controller):
output = self.compute_api.get_spice_console(context,
instance,
console_type)
except exception.ConsoleTypeUnavailable as e:
raise webob.exc.HTTPBadRequest(explanation=e.format_message())
except exception.InstanceNotFound as e:
raise webob.exc.HTTPNotFound(explanation=e.format_message())
except exception.InstanceNotReady as e:
@@ -93,6 +97,8 @@ class ConsolesController(wsgi.Controller):
output = self.compute_api.get_rdp_console(context,
instance,
console_type)
except exception.ConsoleTypeUnavailable as e:
raise webob.exc.HTTPBadRequest(explanation=e.format_message())
except exception.InstanceNotFound as e:
raise webob.exc.HTTPNotFound(explanation=e.format_message())
except exception.InstanceNotReady as e:

51
nova/tests/api/openstack/compute/contrib/test_consoles.py
View File

@@ -49,6 +49,21 @@ def fake_get_rdp_console_invalid_type(self, _context,
raise exception.ConsoleTypeInvalid(console_type=_console_type)
def fake_get_vnc_console_type_unavailable(self, _context,
_instance, _console_type):
raise exception.ConsoleTypeUnavailable(console_type=_console_type)
def fake_get_spice_console_type_unavailable(self, _context,
_instance, _console_type):
raise exception.ConsoleTypeUnavailable(console_type=_console_type)
def fake_get_rdp_console_type_unavailable(self, _context,
_instance, _console_type):
raise exception.ConsoleTypeUnavailable(console_type=_console_type)
def fake_get_vnc_console_not_ready(self, _context, instance, _console_type):
raise exception.InstanceNotReady(instance_id=instance["uuid"])
@@ -171,6 +186,18 @@ class ConsolesExtensionTest(test.NoDBTestCase):
res = req.get_response(self.app)
self.assertEqual(res.status_int, 400)
def test_get_vnc_console_type_unavailable(self):
body = {'get_vnc_console': {'type': 'unavailable'}}
self.stubs.Set(compute_api.API, 'get_vnc_console',
fake_get_vnc_console_type_unavailable)
req = webob.Request.blank('/v2/fake/servers/1/action')
req.method = "POST"
req.body = jsonutils.dumps(body)
req.headers["content-type"] = "application/json"
res = req.get_response(self.app)
self.assertEqual(400, res.status_int)
def test_get_vnc_console_not_implemented(self):
self.stubs.Set(compute_api.API, 'get_vnc_console',
fakes.fake_not_implemented)
@@ -269,6 +296,18 @@ class ConsolesExtensionTest(test.NoDBTestCase):
res = req.get_response(self.app)
self.assertEqual(res.status_int, 501)
def test_get_spice_console_type_unavailable(self):
body = {'get_spice_console': {'type': 'unavailable'}}
self.stubs.Set(compute_api.API, 'get_spice_console',
fake_get_spice_console_type_unavailable)
req = webob.Request.blank('/v2/fake/servers/1/action')
req.method = "POST"
req.body = jsonutils.dumps(body)
req.headers["content-type"] = "application/json"
res = req.get_response(self.app)
self.assertEqual(400, res.status_int)
def test_get_rdp_console(self):
body = {'os-getRDPConsole': {'type': 'rdp-html5'}}
req = webob.Request.blank('/v2/fake/servers/1/action')
@@ -341,3 +380,15 @@ class ConsolesExtensionTest(test.NoDBTestCase):
res = req.get_response(self.app)
self.assertEqual(res.status_int, 400)
def test_get_rdp_console_type_unavailable(self):
body = {'get_rdp_console': {'type': 'unavailable'}}
self.stubs.Set(compute_api.API, 'get_rdp_console',
fake_get_rdp_console_type_unavailable)
req = webob.Request.blank('/v2/fake/servers/1/action')
req.method = "POST"
req.body = jsonutils.dumps(body)
req.headers["content-type"] = "application/json"
res = req.get_response(self.app)
self.assertEqual(400, res.status_int)