diff options
| author | Josh Kearney <josh.kearney@rackspace.com> | 2010-12-22 17:09:46 -0600 |
|---|---|---|
| committer | Josh Kearney <josh.kearney@rackspace.com> | 2010-12-22 17:09:46 -0600 |
| commit | 749af384c0b7ca36bdd8c511f02b819a65e5dae0 (patch) | |
| tree | ff777280d28cb59c303eeef895e4abbf5dc1c995 /nova/api | |
| parent | 876e01a7efb669e76b011e04178b662677de3fc2 (diff) | |
| download | nova-749af384c0b7ca36bdd8c511f02b819a65e5dae0.tar.gz nova-749af384c0b7ca36bdd8c511f02b819a65e5dae0.tar.xz nova-749af384c0b7ca36bdd8c511f02b819a65e5dae0.zip | |
Modified InstanceDiagnostics and truncate action
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/__init__.py | 1 | ||||
| -rw-r--r-- | nova/api/openstack/servers.py | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py index de95ee548..d8cd86116 100644 --- a/nova/api/openstack/__init__.py +++ b/nova/api/openstack/__init__.py @@ -176,6 +176,7 @@ class APIRouter(wsgi.Router): logging.debug("Including admin operations in API.") server_members['pause'] = 'POST' server_members['unpause'] = 'POST' + server_members["diagnostics"] = "GET" mapper.resource("server", "servers", controller=servers.Controller(), collection={'detail': 'GET'}, diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 5c3322f7c..65e371a90 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -195,3 +195,7 @@ class Controller(wsgi.Controller): logging.error("Compute.api::unpause %s", readable) return faults.Fault(exc.HTTPUnprocessableEntity()) return exc.HTTPAccepted() + + def diagnostics(self, req, id): + """Permit Admins to retrieve server diagnostics.""" + return {} |