openstack/api-site
Code Issues Proposed changes

Merge "Fix some error in Cinder v2"

Browse Source
This commit is contained in:
Jenkins 2016-02-13 17:59:36 +00:00 committed by Gerrit Code Review
commit 4f88f32967
2 changed files with 51 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
api-ref/src/wadls/volume-api/src/common.ent
View File

@ -2344,9 +2344,55 @@
The UUID of the consistency group. The UUID of the consistency group.
</para> </para>
</wadl:doc> </wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02"
name="scheduler_hints" style="plain" type="xsd:dict"
required="false">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
The dictionary of data to send to the scheduler.
</para>
</wadl:doc>
</param>'>
<!ENTITY updateVolumeRequestParameters '
<param xmlns="http://wadl.dev.java.net/2009/02"
name="name" style="plain"
type="xsd:string" required="false">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
The volume name.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02"
name="description" style="plain"
type="xsd:string" required="false">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
The volume description.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02"
name="metadata" style="plain" type="xsd:dict"
required="false">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
One or more metadata key and value pairs that are associated with the
volume.
</para>
</wadl:doc>
</param>'> </param>'>
<!-- **************************************** --> <!-- **************************************** -->
<!-- VOLUME REQUEST PARAMETERS --> <!-- VOLUME RESPONSE PARAMETERS -->
<!-- **************************************** --> <!-- **************************************** -->
<!ENTITY createVolumeResponseParameters ' <!ENTITY createVolumeResponseParameters '
<param xmlns="http://wadl.dev.java.net/2009/02" <param xmlns="http://wadl.dev.java.net/2009/02"
@ -2507,8 +2553,7 @@
</para> </para>
</wadl:doc> </wadl:doc>
</param> </param>
&created_at-ResponseParameter; <param xmlns="http://wadl.dev.java.net/2009/02" name="links" style="plain" type="dict"
<param xmlns="http://wadl.dev.java.net/2009/02" name="metadata" style="plain" type="dict"
required="true"> required="true">
<wadl:doc xmlns="http://docbook.org/ns/docbook" <wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:wadl="http://wadl.dev.java.net/2009/02"

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

@ -416,6 +416,8 @@
<xsdxt:code <xsdxt:code
href="../samples/volumes/volume-update-request.xml"/> href="../samples/volumes/volume-update-request.xml"/>
</wadl:doc> </wadl:doc>
&volumeObjectParameter;
&updateVolumeRequestParameters;
</representation> </representation>
<representation mediaType="application/json" <representation mediaType="application/json"
json:ref="http://docs.openstack.org/api/openstack-block-storage/v2/volumes#put/volume"> json:ref="http://docs.openstack.org/api/openstack-block-storage/v2/volumes#put/volume">
@ -425,8 +427,6 @@
href="../samples/volumes/volume-update-request.json" href="../samples/volumes/volume-update-request.json"
/> />
</wadl:doc> </wadl:doc>
&volumeObjectParameter;
&createVolumeRequestParameters;
</representation> </representation>
</request> </request>
<response status="200"> <response status="200">
@ -1188,17 +1188,8 @@
</para> </para>
</wadl:doc> </wadl:doc>
</param> </param>
<param name="new_size" style="plain"
type="xsd:int" required="false">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<para>
The size for the volume, in gibibytes (GiB).
</para>
</wadl:doc>
</param>
<param name="volume_id" style="plain" type="csapi:UUID" <param name="volume_id" style="plain" type="csapi:UUID"
required="false"> required="true">
<wadl:doc xmlns="http://docbook.org/ns/docbook" <wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN"> xml:lang="EN">
<para> <para>
@ -1430,15 +1421,6 @@
</para> </para>
</wadl:doc> </wadl:doc>
</param> </param>
<param name="new_size" style="plain"
type="xsd:int" required="false">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<para>
The size for the volume, in gibibytes (GiB).
</para>
</wadl:doc>
</param>
</representation> </representation>
</request> </request>
<response status="200"> <response status="200">