diff options
| author | Ed Leafe <ed@leafe.com> | 2011-01-03 09:56:49 -0600 |
|---|---|---|
| committer | Ed Leafe <ed@leafe.com> | 2011-01-03 09:56:49 -0600 |
| commit | 5b240fe5d963e195525c42bf097d79b3f003c8d4 (patch) | |
| tree | 6da1ba783f3d713d5fad37d0ed693e0dc1086a60 /nova/api | |
| parent | 108352d5c132f6accc79974d8c646a2bc7d4f127 (diff) | |
| parent | 0e88a58cf95bf9298a52d132cd1eb02f29c6bfe1 (diff) | |
| download | nova-5b240fe5d963e195525c42bf097d79b3f003c8d4.tar.gz nova-5b240fe5d963e195525c42bf097d79b3f003c8d4.tar.xz nova-5b240fe5d963e195525c42bf097d79b3f003c8d4.zip | |
merged latest trunk
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/__init__.py | 2 | ||||
| -rw-r--r-- | nova/api/openstack/servers.py | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py index 66aceee2d..ea6dff004 100644 --- a/nova/api/openstack/__init__.py +++ b/nova/api/openstack/__init__.py @@ -93,6 +93,8 @@ class APIRouter(wsgi.Router): logging.debug("Including admin operations in API.") server_members['pause'] = 'POST' server_members['unpause'] = 'POST' + server_members["diagnostics"] = "GET" + server_members["actions"] = "GET" server_members['suspend'] = 'POST' server_members['resume'] = 'POST' diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 845183258..c5cbe21ef 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -218,3 +218,13 @@ class Controller(wsgi.Controller): logging.error(_("compute.api::resume %s"), readable) return faults.Fault(exc.HTTPUnprocessableEntity()) return exc.HTTPAccepted() + + def diagnostics(self, req, id): + """Permit Admins to retrieve server diagnostics.""" + ctxt = req.environ["nova.context"] + return self.compute_api.get_diagnostics(ctxt, id) + + def actions(self, req, id): + """Permit Admins to retrieve server actions.""" + ctxt = req.environ["nova.context"] + return self.compute_api.get_actions(ctxt, id) |