openstack/nova
Code Issues Proposed changes

Merge "Fix content and sample file for keypair, migration, networks"

Browse Source
This commit is contained in:
Jenkins
2016-04-20 11:14:38 +00:00
committed by Gerrit Code Review
parent 99ad35a621 1d6cd1277b
commit d6426141d2
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api-ref/source/os-keypairs.inc
View File

@@ -30,7 +30,7 @@ Response
**Example List Keypairs: JSON response**
.. literalinclude:: ../../doc/api_samples/os-keypairs/keypairs-list-resp.json
.. literalinclude:: ../../doc/api_samples/keypairs/keypairs-list-resp.json
:language: javascript
Create Or Import Keypair
@@ -56,7 +56,7 @@ Request
**Example Create Or Import Keypair: JSON request**
.. literalinclude:: ../../doc/api_samples/os-keypairs/keypair-import-req.json
.. literalinclude:: ../../doc/api_samples/keypairs/keypairs-import-post-req.json
:language: javascript
Response
@@ -64,7 +64,7 @@ Response
**Example Create Or Import Keypair: JSON response**
.. literalinclude:: ../../doc/api_samples/os-keypairs/keypair-import-resp.json
.. literalinclude:: ../../doc/api_samples/keypairs/keypairs-import-post-resp.json
:language: javascript
Delete Keypair
@@ -74,7 +74,7 @@ Delete Keypair
Deletes a keypair.
Normal response codes: 204
Normal response codes: 202
Error response codes: computeFault(400, 500), serviceUnavailable(503), badRequest(400),
unauthorized(401), forbidden(403), badMethod(405), itemNotFound(404)
@@ -115,6 +115,6 @@ Response
**Example Show Keypair Details: JSON response**
.. literalinclude:: ../../doc/api_samples/os-keypairs/keypair-show-resp.json
.. literalinclude:: ../../doc/api_samples/keypairs/keypairs-get-resp.json
:language: javascript

2
api-ref/source/os-migrations.inc
View File

@@ -32,6 +32,6 @@ Response
**Example List Migrations: JSON response**
.. literalinclude:: ../../doc/api_samples/os-migrations/migrations-list-resp.json
.. literalinclude:: ../../doc/api_samples/os-migrations/migrations-get.json
:language: javascript

12
api-ref/source/os-networks.inc
View File

@@ -184,7 +184,7 @@ Request
**Example Associate Host: JSON request**
.. literalinclude:: ../../doc/api_samples/os-networks/network-associate-host-req.json
.. literalinclude:: ../../doc/api_samples/os-networks-associate/network-associate-host-req.json
:language: javascript
Response
@@ -216,7 +216,7 @@ Request
**Example Disassociate Host: JSON request**
.. literalinclude:: ../../doc/api_samples/os-networks/network-disassociate-host-req.json
.. literalinclude:: ../../doc/api_samples/os-networks-associate/network-disassociate-host-req.json
:language: javascript
Response
@@ -231,6 +231,8 @@ Disassociates a network from a project. You can then reuse the network.
Specify the ``disassociate`` action in the request body.
Specify the ``disassociate`` action in the request body.
Policy defaults enable only users with the administrative role or the owner of the server to perform this operation. Cloud providers can change these permissions through the ``policy.json`` file.
Normal response codes: 202
@@ -248,7 +250,7 @@ Request
**Example Disassociate Network: JSON request**
.. literalinclude:: ../../doc/api_samples/os-networks/network-disassociate-req.json
.. literalinclude:: ../../doc/api_samples/os-networks/networks-disassociate-req.json
:language: javascript
Response
@@ -263,6 +265,8 @@ Disassociates a project from a network.
Specify the ``disassociate_project`` action in the request body.
Specify the ``disassociate_project`` action in the request body.
Policy defaults enable only users with the administrative role or the owner of the server to perform this operation. Cloud providers can change these permissions through the ``policy.json`` file.
Normal response codes: 202
@@ -280,7 +284,7 @@ Request
**Example Disassociate Project: JSON request**
.. literalinclude:: ../../doc/api_samples/os-networks/network-disassociate-project-req.json
.. literalinclude:: ../../doc/api_samples/os-networks-associate/network-disassociate-project-req.json
:language: javascript
Response