diff options
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/v2/contrib/console_output.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nova/api/openstack/v2/contrib/console_output.py b/nova/api/openstack/v2/contrib/console_output.py index 3d75d5d6b..9aae769a3 100644 --- a/nova/api/openstack/v2/contrib/console_output.py +++ b/nova/api/openstack/v2/contrib/console_output.py @@ -54,14 +54,16 @@ class Console_output(extensions.ExtensionDescriptor): raise webob.exc.HTTPBadRequest(_('Malformed request body')) try: - return self.compute_api.get_console_output(context, - instance, - length) + output = self.compute_api.get_console_output(context, + instance, + length) except exception.ApiError, e: raise webob.exc.HTTPBadRequest(explanation=e.message) except exception.NotAuthorized, e: raise webob.exc.HTTPUnauthorized() + return {'output': output} + def get_actions(self): """Return the actions the extension adds, as required by contract.""" actions = [extensions.ActionExtension("servers", "os-getConsoleOutput", |