openstack
/
nova
Code Issues Proposed changes

Merge "Cleanup in admin_actions(v2.1api)"

This commit is contained in:
Jenkins 2015-01-15 05:59:51 +00:00 committed by Gerrit Code Review
parent ab88fc890b 89c57a1c91
commit 6ccf12c8c0
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",