From 97c3aa4e5d55618ac5136a12b504cfac59f2c983 Mon Sep 17 00:00:00 2001
From: Yushiro FURUKAWA <y.furukawa_2@jp.fujitsu.com>
Date: Mon, 12 Oct 2015 23:37:04 +0900
Subject: [PATCH] Change the type of some param into "xsd:list"

The type of following response parameters are actually "xsd:list":
  * "networks"
  * "subnets"
  * "ports"
  * "routers"
  * "floatingips"
  * "security_groups"
  * "security_group_rules"
  * "metering_labels"
  * "vips"
  * "health_monitors"
  * "members"
  * "subnetpools"

Nit bugfix:
  * "securityGroupParameter" -> "securityGroupsParameter"
  * "metering label"         -> "metering_label"
  * "metering label rule"    -> "metering_label_rule"

Change-Id: I74fcfa7b9e3c4cd04feb22191f95ae97ea3788b7
Closes-Bug: 1505040
---
 api-ref/src/wadls/netconn-api/src/common.ent  | 60 +++++++++----------
 .../netconn-api/src/security-groups.wadl      |  2 +-
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/api-ref/src/wadls/netconn-api/src/common.ent b/api-ref/src/wadls/netconn-api/src/common.ent
index 27c84645e..dfa0e6043 100644
--- a/api-ref/src/wadls/netconn-api/src/common.ent
+++ b/api-ref/src/wadls/netconn-api/src/common.ent
@@ -150,11 +150,11 @@
 </param> '>
 <!ENTITY networksObject '
 <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"
         xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
         <para>
-          A <code>networks</code> object.
+          A list of <code>network</code> object.
         </para>
     </wadl:doc>
 </param> '>
@@ -412,11 +412,11 @@
 '>
 <!ENTITY portsObject '
     <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"
             xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
             <para>
-                A <code>ports</code> object.
+                A list of <code>port</code> object.
             </para>
         </wadl:doc>
     </param>
@@ -1026,11 +1026,11 @@
 </param> '>
 <!ENTITY subnetsObject '
 <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"
         xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
         <para>
-          A <code>subnets</code> object.
+          A list of <code>subnet</code> object.
         </para>
     </wadl:doc>
 </param> '>
@@ -1589,11 +1589,11 @@ router.</para>
 </param>'>
 <!ENTITY routersParameter '
 <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"
         xmlns:wadl="http://wadl.dev.java.net/2009/02"
         xml:lang="EN">
-        <para>A <code>routers</code> object.</para>
+        <para>A list of <code>router</code> object.</para>
     </wadl:doc>
 </param>'>
 <!ENTITY portParameter '
@@ -1689,11 +1689,11 @@ router.</para>
 </param>'>
 <!ENTITY floating-ipsParameter '
 <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"
         xmlns:wadl="http://wadl.dev.java.net/2009/02"
         xml:lang="EN">
-        <para>A <code>floatingips</code> object.</para>
+        <para>A list of <code>floatingip</code> object.</para>
     </wadl:doc>
 </param>'>
 <!ENTITY floating-ipParameter '
@@ -1834,11 +1834,11 @@ router.</para>
 '>
 <!ENTITY vipsObject '
 <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"
         xmlns:wadl="http://wadl.dev.java.net/2009/02"
         xml:lang="EN">
-        <para>A <code>vips</code> object.</para>
+        <para>A list of <code>vip</code> object.</para>
     </wadl:doc>
 </param>
 '>
@@ -2000,7 +2000,7 @@ router.</para>
     <wadl:doc xmlns="http://docbook.org/ns/docbook"
         xmlns:wadl="http://wadl.dev.java.net/2009/02"
         xml:lang="EN">
-        <para>A <code>pools</code> object.</para>
+        <para>A list of <code>pool</code> object.</para>
     </wadl:doc>
 </param>
 ' >
@@ -2415,17 +2415,17 @@ router.</para>
     <wadl:doc xmlns="http://docbook.org/ns/docbook"
         xmlns:wadl="http://wadl.dev.java.net/2009/02"
         xml:lang="EN">
-        <para>The <code>metering label</code> object.</para>
+        <para>A <code>metering_label</code> object.</para>
     </wadl:doc>
 </param>
 '>
 <!ENTITY meteringlabelsObject '
 <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"
         xmlns:wadl="http://wadl.dev.java.net/2009/02"
         xml:lang="EN">
-        <para>The <code>metering labels</code> object.</para>
+        <para>A list of <code>metering_label</code> object.</para>
     </wadl:doc>
 </param>
 '>
@@ -2516,7 +2516,7 @@ router.</para>
         xmlns:wadl="http://wadl.dev.java.net/2009/02"
         xml:lang="EN">
         <para>
-            The <code>metering label rule</code> object.
+            A <code>metering_label_rule</code> object.
         </para>
     </wadl:doc>
 </param>
@@ -2573,7 +2573,7 @@ router.</para>
         xmlns:wadl="http://wadl.dev.java.net/2009/02"
         xml:lang="EN">
         <para>
-            The <code>metering label rule</code> object.
+            A <code>metering_label_rule</code> object.
         </para>
     </wadl:doc>
 </param>
@@ -2642,11 +2642,11 @@ router.</para>
 '>
 <!ENTITY hmsObject '
 <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"
         xmlns:wadl="http://wadl.dev.java.net/2009/02"
         xml:lang="EN">
-        <para>A <code>health_monitors</code> object.</para>
+        <para>A list of <code>health_monitor</code> object.</para>
     </wadl:doc>
 </param>
 '>
@@ -3347,11 +3347,11 @@ router.</para>
 '>
 <!ENTITY membersObject '
 <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"
         xmlns:wadl="http://wadl.dev.java.net/2009/02"
         xml:lang="EN">
-        <para>A <code>members</code> object.</para>
+        <para>A list of <code>member</code> object.</para>
     </wadl:doc>
 </param>
 '>
@@ -3520,11 +3520,11 @@ router.</para>
 '>
 <!ENTITY securityGroupsParameter '
     <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"
             xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
             <para>
-              A <code>security_groups</code> object.
+              A list of <code>security_group</code> object.
             </para>
         </wadl:doc>
     </param>
@@ -3630,11 +3630,11 @@ router.</para>
     </param>'>
 <!ENTITY securityGroupRulesParameter '
     <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"
             xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
             <para>
-              A <code>security_group_rules</code> object.
+              A list of <code>security_group_rule</code> object.
             </para>
         </wadl:doc>
     </param>'>
@@ -5566,12 +5566,12 @@ router.</para>
 </param>'>
 <!ENTITY subnetpoolsObjectParameter '
 <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"
         xmlns:wadl="http://wadl.dev.java.net/2009/02"
         xml:lang="EN">
       <para>
-        A <code>subnetpools</code> object.
+        A list of <code>subnetpool</code> object.
       </para>
   </wadl:doc>
 </param>'>
@@ -5717,11 +5717,11 @@ router.</para>
 </param>'>
 <!ENTITY securityGroupsObjectParameter '
 <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"
         xmlns:wadl="http://wadl.dev.java.net/2009/02"
         xml:lang="EN" title="Security groups object">
-    <para>Security groups object.</para>
+        <para>A list of <code>security_group</code> object.</para>
  </wadl:doc>
 </param>'>
 <!ENTITY securityGroupResponseParameters '
diff --git a/api-ref/src/wadls/netconn-api/src/security-groups.wadl b/api-ref/src/wadls/netconn-api/src/security-groups.wadl
index 327dda823..53b16bb75 100644
--- a/api-ref/src/wadls/netconn-api/src/security-groups.wadl
+++ b/api-ref/src/wadls/netconn-api/src/security-groups.wadl
@@ -75,7 +75,7 @@
                     /></wadl:doc>
             </representation>
         </request>
-        <response status="200"> &securityGroupParameter;
+        <response status="200"> &securityGroupsParameter;
             &securityGroupCommonResponseParams;
             <representation
                 mediaType="application/json">