From f96e8cffafc3f6f0171d0ff9ddecb53b8ec18c8d Mon Sep 17 00:00:00 2001
From: Takanori Miyagishi <miyagishi.t@jp.fujitsu.com>
Date: Wed, 25 Feb 2015 16:37:47 +0900
Subject: [PATCH] Fix response parameters table of "List/Show security group
 rule"

(1) Add following parameters to these tables.
    "id", "tenant_id"

(2) Moved "List security group rules" parameters that are listed
    in request parameters table to response parameter table.

Change-Id: Ifb9f6117b8c09642c002587588b201ffaf8e5e24
Closes-Bug: #1425022
---
 .../netconn-api/src/security-groups.wadl      | 60 ++++++++++++++-----
 1 file changed, 45 insertions(+), 15 deletions(-)

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 891d03bf2..5eb3a74c7 100644
--- a/api-ref/src/wadls/netconn-api/src/security-groups.wadl
+++ b/api-ref/src/wadls/netconn-api/src/security-groups.wadl
@@ -310,6 +310,16 @@
                 group rule.</para>
         </wadl:doc>
         <request>
+            <representation mediaType="application/json">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook">
+                    <xsdxt:code
+                        href="api_samples/rules-security-groups-list-get-req-json-http.txt"
+                        />
+                </wadl:doc>
+            </representation>
+        </request>
+        <response status="200">
             <param required="true" name="direction" style="plain"
                 type="xsd:string">
                 <wadl:doc xml:lang="EN"
@@ -328,6 +338,12 @@
                     and addresses represented in CIDR must match the ingress or
                     egress rules.</wadl:doc>
             </param>
+            <param required="true" name="id"
+                style="plain" type="csapi:uuid">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook">The security
+                    group rule ID.</wadl:doc>
+            </param>
             <param required="true" name="security_group_id"
                 style="plain" type="csapi:uuid">
                 <wadl:doc xml:lang="EN"
@@ -335,7 +351,7 @@
                     group ID to associate with this security group
                     rule.</wadl:doc>
             </param>
-            <param required="false" name="port_range_min"
+            <param required="true" name="port_range_min"
                 style="plain" type="xsd:int">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">The minimum
@@ -346,7 +362,7 @@
                     protocol is ICMP, this value must be an ICMP
                     type.</wadl:doc>
             </param>
-            <param required="false" name="port_range_max"
+            <param required="true" name="port_range_max"
                 style="plain" type="xsd:int">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">The maximum
@@ -356,14 +372,14 @@
                     protocol is ICMP, this value must be an ICMP
                     type.</wadl:doc>
             </param>
-            <param required="false" name="protocol" style="plain"
+            <param required="true" name="protocol" style="plain"
                 type="xsd:string">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">The protocol
                     that is matched by the security group rule. Valid
                     values are null, tcp, udp, and icmp.</wadl:doc>
             </param>
-            <param required="false" name="remote_group_id"
+            <param required="true" name="remote_group_id"
                 style="plain" type="csapi:uuid">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">The remote
@@ -371,7 +387,7 @@
                     rule. You can specify either remote_group_id or
                     remote_ip_prefix in the request body.</wadl:doc>
             </param>
-            <param required="false" name="remote_ip_prefix"
+            <param required="true" name="remote_ip_prefix"
                 style="plain" type="csapi:uuid">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">The remote
@@ -381,16 +397,15 @@
                     attribute matches the specified IP prefix as the
                     source IP address of the IP packet.</wadl:doc>
             </param>
-            <representation mediaType="application/json">
+            <param required="true" name="tenant_id"
+                style="plain" type="csapi:uuid">
                 <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:code
-                        href="api_samples/rules-security-groups-list-get-req-json-http.txt"
-                    />
-                </wadl:doc>
-            </representation>
-        </request>
-        <response status="200"> <representation
+                    xmlns="http://docbook.org/ns/docbook">The
+                    ID of the tenant who owns the security group rule.
+                    Only administrative users can specify a tenant ID other
+                    than their own.</wadl:doc>
+            </param>
+            <representation
                 mediaType="application/json">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
@@ -589,6 +604,12 @@
                         and addresses represented in CIDR must match the ingress or
                         egress rules.</wadl:doc>
                 </param>
+                <param required="true" name="id"
+                    style="plain" type="csapi:uuid">
+                    <wadl:doc xml:lang="EN"
+                        xmlns="http://docbook.org/ns/docbook">The security
+                        group rule ID.</wadl:doc>
+                </param>
                 <param required="true" name="security_group_id"
                     style="plain" type="csapi:uuid">
                     <wadl:doc xml:lang="EN"
@@ -641,7 +662,16 @@
                         or remote_ip_prefix in the request body. This
                         attribute matches the specified IP prefix as the
                         source IP address of the IP packet.</wadl:doc>
-                </param><representation
+                </param>
+                <param required="false" name="tenant_id"
+                    style="plain" type="csapi:uuid">
+                    <wadl:doc xml:lang="EN"
+                        xmlns="http://docbook.org/ns/docbook">The
+                        ID of the tenant who owns the security group rule.
+                        Only administrative users can specify a tenant ID other
+                        than their own.</wadl:doc>
+                </param>
+                <representation
                 mediaType="application/json">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">