From 1d6cd1277b5740ece00f022ea38905c2a12f27ee Mon Sep 17 00:00:00 2001 From: ghanshyam Date: Wed, 20 Apr 2016 12:03:04 +0900 Subject: [PATCH] Fix content and sample file for keypair, migration, networks This fix some content and sample file path for: -os-keypairs -os-migrations -os-networks Part of bp:api-ref-in-rst Change-Id: I6ae6d38207c5a9552bab9a42b2800449e4ad040a --- api-ref/source/os-keypairs.inc | 10 +++++----- api-ref/source/os-migrations.inc | 2 +- api-ref/source/os-networks.inc | 16 ++++++++++++---- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/api-ref/source/os-keypairs.inc b/api-ref/source/os-keypairs.inc index 2349601383..578bc6a9c5 100644 --- a/api-ref/source/os-keypairs.inc +++ b/api-ref/source/os-keypairs.inc @@ -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 diff --git a/api-ref/source/os-migrations.inc b/api-ref/source/os-migrations.inc index 5dc657bde9..3d0e38dee1 100644 --- a/api-ref/source/os-migrations.inc +++ b/api-ref/source/os-migrations.inc @@ -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 diff --git a/api-ref/source/os-networks.inc b/api-ref/source/os-networks.inc index c0c61759ef..3f3be133bd 100644 --- a/api-ref/source/os-networks.inc +++ b/api-ref/source/os-networks.inc @@ -165,6 +165,8 @@ Associate Host Associates a network with a host. +Specify the ``associate_host`` 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 @@ -182,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 @@ -195,6 +197,8 @@ Disassociate Host Disassociates a host from a network. +Specify the ``disassociate_host`` 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 @@ -212,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 @@ -225,6 +229,8 @@ Disassociate Network Disassociates a network from a project. You can then reuse the network. +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 @@ -242,7 +248,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 @@ -255,6 +261,8 @@ Disassociate Project Disassociates a project from a network. +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 @@ -272,7 +280,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