openstack/nova
Code Issues Proposed changes

Cleanup in admin_actions(v2.1api)

Browse Source 
Cleanup in admin_actions, in v2.1 admin_actions api,
it only contains resetNetwork, injectNetworkInfo, os-resetState.
correct the doc string of extension class.

Pulled from gate because of upstream bug with oslo.concurrency

Partially implements blueprint v2-on-v3-api
Change-Id: Ide0a53993849828fe60c2fe6e6f22d5c67d2bb5a
This commit is contained in:
Eli Qiao 2014-12-15 12:53:56 +08:00 committed by Sean Dague
parent ebbb56e297
commit 89c57a1c91
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/v3/api_samples/all_extensions/extensions-list-resp.json
View File

@ -90,7 +90,7 @@
},
{
"alias": "os-admin-actions",
"description": "Enable admin-only server actions\n\n Actions include: pause, unpause, suspend, resume, migrate,\n reset_network, inject_network_info, lock, unlock, create_backup\n ",
"description": "Enable admin-only server actions\n\n Actions include: resetNetwork, injectNetworkInfo, os-resetState\n ",
"links": [],
"name": "AdminActions",
"namespace": "http://docs.openstack.org/compute/ext/fake_xml",

3
nova/api/openstack/compute/plugins/v3/admin_actions.py
View File

@ -91,8 +91,7 @@ class AdminActionsController(wsgi.Controller):
class AdminActions(extensions.V3APIExtensionBase):
"""Enable admin-only server actions
Actions include: pause, unpause, suspend, resume, migrate,
reset_network, inject_network_info, lock, unlock, create_backup
Actions include: resetNetwork, injectNetworkInfo, os-resetState
"""
name = "AdminActions"

2
nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl
View File

@ -90,7 +90,7 @@
},
{
"alias": "os-admin-actions",
"description": "Enable admin-only server actions\n\n Actions include: pause, unpause, suspend, resume, migrate,\n reset_network, inject_network_info, lock, unlock, create_backup\n ",
"description": "Enable admin-only server actions\n\n Actions include: resetNetwork, injectNetworkInfo, os-resetState\n ",
"links": [],
"name": "AdminActions",
"namespace": "http://docs.openstack.org/compute/ext/fake_xml",