openstack/nova
Code Issues Proposed changes

Fix JSON format of server_concepts

Browse Source 
server_concepts.rst contains some invalid JSON formats as samples.
This patch fixes them and improves the readability by adding some
spaces.

Change-Id: Ib51f9e1351fca51c15ffdcb98f42311b999f22f5
This commit is contained in:
Ken'ichi Ohmichi
2016-03-21 10:22:15 -07:00
parent f03bbbab68
commit 6ee7d4413a
1 changed files with 120 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

238
api-guide/source/server_concepts.rst
View File

@@ -154,17 +154,18 @@ be used and interpreted by nova.
Precondition: Precondition:
there are 2 servers existing in cloud with following info: there are 2 servers existing in cloud with following info:
"servers":[ "servers": [
{ {
"name": "t1", "name": "t1",
"locked": "true", "locked": "true",
... ...
} },
{ {
"name":"t2", "name": "t2",
"locked": "false", "locked": "false",
... ...
} }
]
**Example: General user query server with administrator only options** **Example: General user query server with administrator only options**
@@ -176,15 +177,15 @@ be used and interpreted by nova.
Response: Response:
{ {
"servers":[ "servers": [
{ {
"name": "t1", "name": "t1",
... ...
} },
{ {
"name":"t2", "name": "t2",
... ...
} }
] ]
} }
@@ -197,11 +198,11 @@ be used and interpreted by nova.
Response: Response:
{ {
"servers":[ "servers": [
{ {
"name": "t1", "name": "t1",
... ...
} }
] ]
} }
@@ -224,17 +225,17 @@ be used and interpreted by nova.
Response: Response:
{ {
"servers":[ "servers": [
{ {
"name": "t1", "name": "t1",
"OS-EXT-SRV-ATTR:host": "devstack" "OS-EXT-SRV-ATTR:host": "devstack"
... ...
} },
{ {
"name": "t2", "name": "t2",
"OS-EXT-SRV-ATTR:host": "devstack1" "OS-EXT-SRV-ATTR:host": "devstack1"
... ...
} }
] ]
} }
@@ -244,12 +245,12 @@ be used and interpreted by nova.
Response: Response:
{ {
"servers":[ "servers": [
{ {
"name": "t1", "name": "t1",
"OS-EXT-SRV-ATTR:host": "devstack" "OS-EXT-SRV-ATTR:host": "devstack"
... ...
} }
] ]
} }
@@ -264,23 +265,23 @@ be used and interpreted by nova.
Response: Response:
{ {
"servers":[ "servers": [
{ {
"name": "test11", "name": "test11",
... ...
} },
{ {
"name": "test21", "name": "test21",
... ...
} },
{ {
"name": "t1", "name": "t1",
... ...
} },
{ {
"name": "t14", "name": "t14",
... ...
} }
] ]
} }
@@ -290,19 +291,19 @@ be used and interpreted by nova.
Response: Response:
{ {
"servers":[ "servers": [
{ {
"name": "test11", "name": "test11",
... ...
} },
{ {
"name": "t1", "name": "t1",
... ...
} },
{ {
"name": "t14", "name": "t14",
... ...
} }
] ]
} }
@@ -318,22 +319,22 @@ be used and interpreted by nova.
Response: Response:
{ {
"servers":[ "servers": [
{ {
"name": "test1", "name": "test1",
"OS-EXT-SRV-ATTR:host": "devstack" "OS-EXT-SRV-ATTR:host": "devstack"
... ...
} },
{ {
"name": "t2", "name": "t2",
"OS-EXT-SRV-ATTR:host": "devstack1" "OS-EXT-SRV-ATTR:host": "devstack1"
... ...
} },
{ {
"name": "test3", "name": "test3",
"OS-EXT-SRV-ATTR:host": "devstack1" "OS-EXT-SRV-ATTR:host": "devstack1"
... ...
} }
] ]
} }
@@ -343,12 +344,12 @@ be used and interpreted by nova.
Response: Response:
{ {
"servers":[ "servers": [
{ {
"name": "test3", "name": "test3",
"OS-EXT-SRV-ATTR:host": "devstack1" "OS-EXT-SRV-ATTR:host": "devstack1"
... ...
} }
] ]
} }
@@ -367,17 +368,18 @@ be used and interpreted by nova.
Response: Response:
{ {
"servers":[ "servers": [
{ {
"name": "t1" "name": "t1"
"updated": "2015-12-15T15:55:52Z" "updated": "2015-12-15T15:55:52Z"
... ...
} },
{ {
"name": "t2", "name": "t2",
"updated": "2015-12-17T15:55:52Z" "updated": "2015-12-17T15:55:52Z"
... ...
} }
]
} }
GET /servers/detail?changes-since='2015-12-16T15:55:52Z' GET /servers/detail?changes-since='2015-12-16T15:55:52Z'
@@ -657,12 +659,12 @@ assigned at creation time.
.. code:: .. code::
{ {
"server":{ "server": {
"name":"new-server-test", "name": "new-server-test",
"imageRef":"52415800-8b69-11e0-9b19-734f6f006e54", "imageRef": "52415800-8b69-11e0-9b19-734f6f006e54",
"flavorRef":"52415800-8b69-11e0-9b19-734f1195ff37", "flavorRef": "52415800-8b69-11e0-9b19-734f1195ff37",
"accessIPv4":"67.23.10.132" "accessIPv4": "67.23.10.132"
} }
} }
.. note:: Both IPv4 and IPv6 addresses may be used as access addresses and both .. note:: Both IPv4 and IPv6 addresses may be used as access addresses and both
@@ -675,13 +677,13 @@ assigned at creation time.
.. code:: .. code::
{ {
"server":{ "server": {
"name":"new-server-test", "name": "new-server-test",
"imageRef":"52415800-8b69-11e0-9b19-734f6f006e54", "imageRef": "52415800-8b69-11e0-9b19-734f6f006e54",
"flavorRef":"52415800-8b69-11e0-9b19-734f1195ff37", "flavorRef": "52415800-8b69-11e0-9b19-734f1195ff37",
"accessIPv4":"67.23.10.132", "accessIPv4": "67.23.10.132",
"accessIPv6":"::babe:67.23.10.132" "accessIPv6": "::babe:67.23.10.132"
} }
} }
Moving servers Moving servers