openstack/api-site
Code Issues Proposed changes

Merge "Allow deprecated volume update keys in v2"

Browse Source
This commit is contained in:
Jenkins 2014-10-29 13:54:01 +00:00 committed by Gerrit Code Review
commit c6d2afdd8d
13 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_request.json
View File

@ -1,6 +1,6 @@
{ {
"snapshot": { "snapshot": {
"display_name": "snap-002", "name": "snap-002",
"display_description": "This is yet, another snapshot." "description": "This is yet, another snapshot."
} }
} }

2
api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_request.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<snapshot <snapshot
xmlns="http://docs.openstack.org/openstack-block-storage/2.0/content" xmlns="http://docs.openstack.org/openstack-block-storage/2.0/content"
display_name="snap-002" display_description="This is yet, another snapshot."/> name="snap-002" description="This is yet, another snapshot."/>

6
api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_response.json
View File

@ -1,11 +1,11 @@
{ {
"snapshot": { "snapshot": {
"created_at": "2013-02-20T08:11:34.000000", "created_at": "2013-02-20T08:11:34.000000",
"display_description": "This is yet, another snapshot", "description": "This is yet, another snapshot",
"display_name": "vol-002", "name": "vol-002",
"id": "4b502fcb-1f26-45f8-9fe5-3b9a0a52eaf2", "id": "4b502fcb-1f26-45f8-9fe5-3b9a0a52eaf2",
"size": 1, "size": 1,
"status": "available", "status": "available",
"volume_id": "2402b902-0b7a-458c-9c07-7435a826f794" "volume_id": "2402b902-0b7a-458c-9c07-7435a826f794"
} }
} }

4
api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_response.xml
View File

@ -2,12 +2,12 @@
<snapshot <snapshot
xmlns:os-extended-snapshot-attributes="http://docs.openstack.org/openstack-block-storage/2.0/content/Extended_Snapshot_Attributes.html" xmlns:os-extended-snapshot-attributes="http://docs.openstack.org/openstack-block-storage/2.0/content/Extended_Snapshot_Attributes.html"
status="available" status="available"
display_description="This is yet, another snapshot" description="This is yet, another snapshot"
created_at="2013-02-20T08:11:34.000000" created_at="2013-02-20T08:11:34.000000"
volume_id="2402b902-0b7a-458c-9c07-7435a826f794" volume_id="2402b902-0b7a-458c-9c07-7435a826f794"
size="1" size="1"
id="4b502fcb-1f26-45f8-9fe5-3b9a0a52eaf2" id="4b502fcb-1f26-45f8-9fe5-3b9a0a52eaf2"
display_name="vol-002" name="vol-002"
os-extended-snapshot-attributes:project_id="0c2eba2c5af04d3f9e9d0d410b371fde" os-extended-snapshot-attributes:project_id="0c2eba2c5af04d3f9e9d0d410b371fde"
os-extended-snapshot-attributes:progress="100%"> os-extended-snapshot-attributes:progress="100%">
<metadata/> <metadata/>

6
api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_request.json
View File

@ -2,12 +2,12 @@
"volume": { "volume": {
"availability_zone": null, "availability_zone": null,
"source_volid": null, "source_volid": null,
"display_description": null, "description": null,
"snapshot_id": null, "snapshot_id": null,
"size": 10, "size": 10,
"display_name": "my_volume", "name": "my_volume",
"imageRef": null, "imageRef": null,
"volume_type": null, "volume_type": null,
"metadata": {} "metadata": {}
} }
} }

4
api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_request.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<volume <volume
xmlns="http://docs.openstack.org/openstack-block-storage/2.0/content" xmlns="http://docs.openstack.org/openstack-block-storage/2.0/content"
display_name="vol-001" display_description="Another volume." name="vol-001" description="Another volume."
size="2"/> size="2"/>

6
api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_response.json
View File

@ -1,12 +1,12 @@
{ {
"volume": { "volume": {
"status": "creating", "status": "creating",
"display_name": "my_volume", "name": "my_volume",
"attachments": [], "attachments": [],
"availability_zone": "nova", "availability_zone": "nova",
"bootable": "false", "bootable": "false",
"created_at": "2014-02-21T19:52:04.949734", "created_at": "2014-02-21T19:52:04.949734",
"display_description": null, "description": null,
"volume_type": "None", "volume_type": "None",
"snapshot_id": null, "snapshot_id": null,
"source_volid": null, "source_volid": null,
@ -14,4 +14,4 @@
"id": "93c2e2aa-7744-4fd6-a31a-80c4726b08d7", "id": "93c2e2aa-7744-4fd6-a31a-80c4726b08d7",
"size": 10 "size": 10
} }
} }

4
api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_response.xml
View File

@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<volume xmlns:atom="http://www.w3.org/2005/Atom" <volume xmlns:atom="http://www.w3.org/2005/Atom"
xmlns="http://docs.openstack.org/volume/api/v1" status="creating" xmlns="http://docs.openstack.org/volume/api/v1" status="creating"
display_name="vol-001" availability_zone="nova" bootable="false" name="vol-001" availability_zone="nova" bootable="false"
created_at="2014-02-21 20:18:33.122452" created_at="2014-02-21 20:18:33.122452"
display_description="Another volume." volume_type="None" description="Another volume." volume_type="None"
snapshot_id="None" source_volid="None" snapshot_id="None" source_volid="None"
id="83960a54-8dad-4fd8-bc41-33c71e098e04" size="2"> id="83960a54-8dad-4fd8-bc41-33c71e098e04" size="2">
<attachments/> <attachments/>

6
api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_request.json
View File

@ -1,6 +1,6 @@
{ {
"volume": { "volume": {
"display_name": "vol-003", "name": "vol-003",
"display_description": "This is yet, another volume." "description": "This is yet, another volume."
} }
} }

2
api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_request.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<snapshot <snapshot
xmlns="http://docs.openstack.org/openstack-block-storage/2.0/content" xmlns="http://docs.openstack.org/openstack-block-storage/2.0/content"
display_name="vol-003" display_description="This is yet, another volume."/> name="vol-003" description="This is yet, another volume."/>

6
api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_response.json
View File

@ -16,8 +16,8 @@
"source_volid": null, "source_volid": null,
"snapshot_id": null, "snapshot_id": null,
"id": "5aa119a8-d25b-45a7-8d1b-88e127885635", "id": "5aa119a8-d25b-45a7-8d1b-88e127885635",
"display_description": "This is yet, another volume.", "description": "This is yet, another volume.",
"display_name": "vol-003", "name": "vol-003",
"created_at": "2013-02-25T02:40:21.000000", "created_at": "2013-02-25T02:40:21.000000",
"volume_type": "None", "volume_type": "None",
"size": 1, "size": 1,
@ -25,4 +25,4 @@
"contents": "not junk" "contents": "not junk"
} }
} }
} }

4
api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_response.xml
View File

@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<volume xmlns:atom="http://www.w3.org/2005/Atom" <volume xmlns:atom="http://www.w3.org/2005/Atom"
xmlns="http://docs.openstack.org/api/openstack-block-storage/2.0/content" xmlns="http://docs.openstack.org/api/openstack-block-storage/2.0/content"
status="available" display_name="vol-003" availability_zone="nova" status="available" name="vol-003" availability_zone="nova"
created_at="2013-02-25 02:40:21" created_at="2013-02-25 02:40:21"
display_description="This is yet, another volume." volume_type="None" description="This is yet, another volume." volume_type="None"
source_volid="None" snapshot_id="None" source_volid="None" snapshot_id="None"
id="5aa119a8-d25b-45a7-8d1b-88e127885635" size="1"> id="5aa119a8-d25b-45a7-8d1b-88e127885635" size="1">
<attachments/> <attachments/>

20
api-ref/src/wadls/volume-api/src/v2/volume-api-v2.wadl
View File

@ -239,7 +239,7 @@
volume, specify the ID of the existing volume, specify the ID of the existing
volume.</para></wadl:doc> volume.</para></wadl:doc>
</param> </param>
<param name="display_description" style="plain" <param name="description" style="plain"
type="xsd:string" required="false"> type="xsd:string" required="false">
<wadl:doc xmlns="http://docbook.org/ns/docbook" <wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN"> xml:lang="EN">
@ -261,7 +261,7 @@
<para>The size of the volume, in <para>The size of the volume, in
GBs.</para></wadl:doc> GBs.</para></wadl:doc>
</param> </param>
<param name="display_name" style="plain" <param name="name" style="plain"
type="xsd:string" required="false"> type="xsd:string" required="false">
<wadl:doc xmlns="http://docbook.org/ns/docbook" <wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN"> xml:lang="EN">
@ -322,7 +322,7 @@
xml:lang="EN"> xml:lang="EN">
<para>The volume status.</para></wadl:doc> <para>The volume status.</para></wadl:doc>
</param> </param>
<param name="display_name" style="plain" <param name="name" style="plain"
type="xsd:string" required="true"> type="xsd:string" required="true">
<wadl:doc xmlns="http://docbook.org/ns/docbook" <wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN"> xml:lang="EN">
@ -356,7 +356,7 @@
<para>Date and time when the volume was <para>Date and time when the volume was
created.</para></wadl:doc> created.</para></wadl:doc>
</param> </param>
<param name="display_description" style="plain" <param name="description" style="plain"
type="xsd:string" required="true"> type="xsd:string" required="true">
<wadl:doc xmlns="http://docbook.org/ns/docbook" <wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN"> xml:lang="EN">
@ -507,13 +507,13 @@
href="api_samples/volume_update_request.json" href="api_samples/volume_update_request.json"
/> />
</wadl:doc> </wadl:doc>
<param name="display_description" style="query" <param name="description" style="query"
type="string" required="false"> type="string" required="false">
<wadl:doc xmlns="http://docbook.org/ns/docbook" <wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN"><para>A description of the xml:lang="EN"><para>A description of the
volume.</para></wadl:doc> volume.</para></wadl:doc>
</param> </param>
<param name="display_name" style="query" type="string" <param name="name" style="query" type="string"
required="false"> required="false">
<wadl:doc xmlns="http://docbook.org/ns/docbook" <wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN"><para>The name of the xml:lang="EN"><para>The name of the
@ -688,7 +688,7 @@
attached. Default==False.</para> attached. Default==False.</para>
</wadl:doc> </wadl:doc>
</param> </param>
<param name="display_name" style="query" type="string" <param name="name" style="query" type="string"
required="false"> required="false">
<wadl:doc xmlns="http://docbook.org/ns/docbook" <wadl:doc xmlns="http://docbook.org/ns/docbook"
@ -696,7 +696,7 @@
Default==None.</para> Default==None.</para>
</wadl:doc> </wadl:doc>
</param> </param>
<param name="display_description" style="query" <param name="description" style="query"
type="string" required="false"> type="string" required="false">
<wadl:doc xmlns="http://docbook.org/ns/docbook" <wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN"><para>Description of snapshot. xml:lang="EN"><para>Description of snapshot.
@ -839,13 +839,13 @@
href="api_samples/snapshot_update_request.json" href="api_samples/snapshot_update_request.json"
/> />
</wadl:doc> </wadl:doc>
<param name="display_description" style="query" <param name="description" style="query"
type="string" required="false"> type="string" required="false">
<wadl:doc xmlns="http://docbook.org/ns/docbook" <wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN"><para>Describes the xml:lang="EN"><para>Describes the
snapshot.</para></wadl:doc> snapshot.</para></wadl:doc>
</param> </param>
<param name="display_name" style="query" type="string" <param name="name" style="query" type="string"
required="false"> required="false">
<wadl:doc xmlns="http://docbook.org/ns/docbook" <wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN"><para>The name of the xml:lang="EN"><para>The name of the