Merge "Fix incorrect parameters for "create floatingip""

This commit is contained in:
Jenkins 2015-03-09 14:00:38 +00:00 committed by Gerrit Code Review
commit 6de263da33
2 changed files with 31 additions and 3 deletions

View File

@ -837,7 +837,7 @@
</wadl:doc>
</param>'>
<!ENTITY floating-network-idParameter '
<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="floating_network_id" style="plain" type="csapi:uuid">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
@ -861,6 +861,33 @@
a specific IP.</para>
</wadl:doc>
</param>'>
<!ENTITY floating-ip-addressResponseParameter '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="floating_ip_address" style="plain" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>The floating IP address.</para>
</wadl:doc>
</param>'>
<!ENTITY fixed-ip-addressResponseParameter '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="fixed_ip_address" style="plain" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>The fixed IP address associated with the floating IP.</para>
</wadl:doc>
</param>'>
<!ENTITY router-idParameter '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="router_id" style="plain" type="csapi:uuid">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>The router ID.</para>
</wadl:doc>
</param>'>
<!ENTITY lbLoadbalancersParam '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="loadbalancers" style="plain" type="xsd:string">

View File

@ -487,7 +487,7 @@ Accept: application/json</programlisting>
<request> &floating-ipParameter; &tenant-idParameter;
&floating-network-idParameter; &fixed-ip-addressParameter;
&floating-ip-addressParameter; &port-idParameter;
&idParameter; <representation mediaType="application/json"
<representation mediaType="application/json"
element="csapi:floatingip">
<wadl:doc
xmlns:wadl="http://wadl.dev.java.net/2009/02"
@ -500,7 +500,8 @@ Accept: application/json</programlisting>
</request>
<response status="201"> &floating-ipParameter;
&tenant-idParameter; &floating-network-idParameter;
&fixed-ip-addressParameter; &floating-ip-addressParameter;
&router-idParameter; &fixed-ip-addressResponseParameter;
&floating-ip-addressResponseParameter; &statusParameter;
&port-idParameter; &idParameter; <representation
mediaType="application/json"
element="csapi:floatingip">