openstack/nova
Code Issues Proposed changes

Merge "Fix API doc for os-console-auth-tokens"

Browse Source
This commit is contained in:
Jenkins 2016-10-10 12:38:49 +00:00 committed by Gerrit Code Review
commit 26fd2eabb0
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api-ref/source/os-consoles.inc
View File

@ -1,7 +1,7 @@
.. -*- rst -*- .. -*- rst -*-
=============================================================== ===============================================================
Server consoles (servers, os-consoles, os-console-auth-token) Server consoles (servers, os-consoles, os-console-auth-tokens)
=============================================================== ===============================================================
Manages server consoles. Manages server consoles.
@ -138,10 +138,10 @@ Response
There is no body content for the response of a successful DELETE query There is no body content for the response of a successful DELETE query
Show Console Authentication Token Show Console Connection Information
================================= ===================================
.. rest_method:: GET /servers/{server_id}/os-console-auth-token .. rest_method:: GET /os-console-auth-tokens/{console_token}
Given the console authentication token for a server instance, Given the console authentication token for a server instance,
shows the related connection information. shows the related connection information.
@ -159,7 +159,7 @@ Request
.. rest_parameters:: parameters.yaml .. rest_parameters:: parameters.yaml
- server_id: server_id - console_token: console_token
| |
@ -169,9 +169,9 @@ Response
.. rest_parameters:: parameters.yaml .. rest_parameters:: parameters.yaml
- console: console - console: console
- instance_uuid: instance_id - instance_uuid: instance_id_body
- host: console_host - host: console_host
- port: port - port: port_number
- internal_access_path: internal_access_path - internal_access_path: internal_access_path
| |

12
api-ref/source/parameters.yaml
View File

@ -85,6 +85,12 @@ console_id:
in: path in: path
required: true required: true
type: string type: string
console_token:
description: |
Console authentication token.
in: path
required: true
type: string
disabled_reason: disabled_reason:
description: | description: |
The reason for disabling a service. The reason for disabling a service.
@ -3409,6 +3415,12 @@ port_id_resp:
in: body in: body
required: true required: true
type: string type: string
port_number:
description: |
The port number.
in: body
required: true
type: integer
port_state: port_state:
description: | description: |
The port state. The port state.