Merge "Change the type of some param into "xsd:list""

This commit is contained in:
Jenkins 2015-10-13 15:27:19 +00:00 committed by Gerrit Code Review
commit 7ceede0952
2 changed files with 31 additions and 31 deletions

View File

@ -150,11 +150,11 @@
</param> '> </param> '>
<!ENTITY networksObject ' <!ENTITY networksObject '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true" <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="networks" style="plain" type="xsd:dict"> name="networks" style="plain" type="xsd:list">
<wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02" <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
xmlns="http://docbook.org/ns/docbook" xml:lang="EN"> xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
<para> <para>
A <code>networks</code> object. A list of <code>network</code> object.
</para> </para>
</wadl:doc> </wadl:doc>
</param> '> </param> '>
@ -412,11 +412,11 @@
'> '>
<!ENTITY portsObject ' <!ENTITY portsObject '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true" <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="ports" style="plain" type="xsd:dict"> name="ports" style="plain" type="xsd:list">
<wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02" <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
xmlns="http://docbook.org/ns/docbook" xml:lang="EN"> xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
<para> <para>
A <code>ports</code> object. A list of <code>port</code> object.
</para> </para>
</wadl:doc> </wadl:doc>
</param> </param>
@ -1026,11 +1026,11 @@
</param> '> </param> '>
<!ENTITY subnetsObject ' <!ENTITY subnetsObject '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true" <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="subnets" style="plain" type="xsd:dict"> name="subnets" style="plain" type="xsd:list">
<wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02" <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
xmlns="http://docbook.org/ns/docbook" xml:lang="EN"> xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
<para> <para>
A <code>subnets</code> object. A list of <code>subnet</code> object.
</para> </para>
</wadl:doc> </wadl:doc>
</param> '> </param> '>
@ -1589,11 +1589,11 @@ router.</para>
</param>'> </param>'>
<!ENTITY routersParameter ' <!ENTITY routersParameter '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true" <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="routers" style="plain" type="xsd:string"> name="routers" style="plain" type="xsd:list">
<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"
xml:lang="EN"> xml:lang="EN">
<para>A <code>routers</code> object.</para> <para>A list of <code>router</code> object.</para>
</wadl:doc> </wadl:doc>
</param>'> </param>'>
<!ENTITY portParameter ' <!ENTITY portParameter '
@ -1689,11 +1689,11 @@ router.</para>
</param>'> </param>'>
<!ENTITY floating-ipsParameter ' <!ENTITY floating-ipsParameter '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true" <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="floatingips" style="plain" type="xsd:dict"> name="floatingips" style="plain" type="xsd:list">
<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"
xml:lang="EN"> xml:lang="EN">
<para>A <code>floatingips</code> object.</para> <para>A list of <code>floatingip</code> object.</para>
</wadl:doc> </wadl:doc>
</param>'> </param>'>
<!ENTITY floating-ipParameter ' <!ENTITY floating-ipParameter '
@ -1834,11 +1834,11 @@ router.</para>
'> '>
<!ENTITY vipsObject ' <!ENTITY vipsObject '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true" <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="vips" style="plain" type="xsd:dict"> name="vips" style="plain" type="xsd:list">
<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"
xml:lang="EN"> xml:lang="EN">
<para>A <code>vips</code> object.</para> <para>A list of <code>vip</code> object.</para>
</wadl:doc> </wadl:doc>
</param> </param>
'> '>
@ -2000,7 +2000,7 @@ router.</para>
<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"
xml:lang="EN"> xml:lang="EN">
<para>A <code>pools</code> object.</para> <para>A list of <code>pool</code> object.</para>
</wadl:doc> </wadl:doc>
</param> </param>
' > ' >
@ -2415,17 +2415,17 @@ router.</para>
<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"
xml:lang="EN"> xml:lang="EN">
<para>The <code>metering label</code> object.</para> <para>A <code>metering_label</code> object.</para>
</wadl:doc> </wadl:doc>
</param> </param>
'> '>
<!ENTITY meteringlabelsObject ' <!ENTITY meteringlabelsObject '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true" <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="metering_labels" style="plain" type="xsd:dict"> name="metering_labels" style="plain" type="xsd:list">
<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"
xml:lang="EN"> xml:lang="EN">
<para>The <code>metering labels</code> object.</para> <para>A list of <code>metering_label</code> object.</para>
</wadl:doc> </wadl:doc>
</param> </param>
'> '>
@ -2516,7 +2516,7 @@ router.</para>
xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN"> xml:lang="EN">
<para> <para>
The <code>metering label rule</code> object. A <code>metering_label_rule</code> object.
</para> </para>
</wadl:doc> </wadl:doc>
</param> </param>
@ -2573,7 +2573,7 @@ router.</para>
xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN"> xml:lang="EN">
<para> <para>
The <code>metering label rule</code> object. A <code>metering_label_rule</code> object.
</para> </para>
</wadl:doc> </wadl:doc>
</param> </param>
@ -2642,11 +2642,11 @@ router.</para>
'> '>
<!ENTITY hmsObject ' <!ENTITY hmsObject '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true" <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="health_monitors" style="plain" type="xsd:dict"> name="health_monitors" style="plain" type="xsd:list">
<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"
xml:lang="EN"> xml:lang="EN">
<para>A <code>health_monitors</code> object.</para> <para>A list of <code>health_monitor</code> object.</para>
</wadl:doc> </wadl:doc>
</param> </param>
'> '>
@ -3347,11 +3347,11 @@ router.</para>
'> '>
<!ENTITY membersObject ' <!ENTITY membersObject '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true" <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="members" style="plain" type="xsd:dict"> name="members" style="plain" type="xsd:list">
<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"
xml:lang="EN"> xml:lang="EN">
<para>A <code>members</code> object.</para> <para>A list of <code>member</code> object.</para>
</wadl:doc> </wadl:doc>
</param> </param>
'> '>
@ -3520,11 +3520,11 @@ router.</para>
'> '>
<!ENTITY securityGroupsParameter ' <!ENTITY securityGroupsParameter '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true" <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="security_groups" style="plain" type="xsd:dict"> name="security_groups" style="plain" type="xsd:list">
<wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02" <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
xmlns="http://docbook.org/ns/docbook" xml:lang="EN"> xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
<para> <para>
A <code>security_groups</code> object. A list of <code>security_group</code> object.
</para> </para>
</wadl:doc> </wadl:doc>
</param> </param>
@ -3630,11 +3630,11 @@ router.</para>
</param>'> </param>'>
<!ENTITY securityGroupRulesParameter ' <!ENTITY securityGroupRulesParameter '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true" <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="security_group_rules" style="plain" type="xsd:dict"> name="security_group_rules" style="plain" type="xsd:list">
<wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02" <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
xmlns="http://docbook.org/ns/docbook" xml:lang="EN"> xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
<para> <para>
A <code>security_group_rules</code> object. A list of <code>security_group_rule</code> object.
</para> </para>
</wadl:doc> </wadl:doc>
</param>'> </param>'>
@ -5566,12 +5566,12 @@ router.</para>
</param>'> </param>'>
<!ENTITY subnetpoolsObjectParameter ' <!ENTITY subnetpoolsObjectParameter '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true" <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="subnetpools" style="plain" type="xsd:string"> name="subnetpools" style="plain" type="xsd:list">
<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"
xml:lang="EN"> xml:lang="EN">
<para> <para>
A <code>subnetpools</code> object. A list of <code>subnetpool</code> object.
</para> </para>
</wadl:doc> </wadl:doc>
</param>'> </param>'>
@ -5717,11 +5717,11 @@ router.</para>
</param>'> </param>'>
<!ENTITY securityGroupsObjectParameter ' <!ENTITY securityGroupsObjectParameter '
<param xmlns="http://wadl.dev.java.net/2009/02" <param xmlns="http://wadl.dev.java.net/2009/02"
name="security_groups" style="plain" type="xsd:string" required="true"> name="security_groups" style="plain" type="xsd:list" 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"
xml:lang="EN" title="Security groups object"> xml:lang="EN" title="Security groups object">
<para>Security groups object.</para> <para>A list of <code>security_group</code> object.</para>
</wadl:doc> </wadl:doc>
</param>'> </param>'>
<!ENTITY securityGroupResponseParameters ' <!ENTITY securityGroupResponseParameters '

View File

@ -75,7 +75,7 @@
/></wadl:doc> /></wadl:doc>
</representation> </representation>
</request> </request>
<response status="200"> &securityGroupParameter; <response status="200"> &securityGroupsParameter;
&securityGroupCommonResponseParams; &securityGroupCommonResponseParams;
<representation <representation
mediaType="application/json"> mediaType="application/json">