diff --git a/api-ref/src/wadls/netconn-api/src/common.ent b/api-ref/src/wadls/netconn-api/src/common.ent
index 3ef166bbe..2ad3c6dba 100644
--- a/api-ref/src/wadls/netconn-api/src/common.ent
+++ b/api-ref/src/wadls/netconn-api/src/common.ent
@@ -2470,6 +2470,123 @@
     </wadl:doc>
 </param>
 ' >
+<!ENTITY securityGroupListParameters '
+<param xmlns="http://wadl.dev.java.net/2009/02" name="security_group"
+    type="xsd:string" required="true">
+    <wadl:doc xml:lang="EN"
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"><para>Security
+            group object.</para></wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02" name="description"
+    type="xsd:string" required="true">
+    <wadl:doc xml:lang="EN"
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"><para>The
+            security group description.</para></wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02" name="id"
+    type="csapi:uuid" required="true">
+    <wadl:doc xml:lang="EN"
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"><para>The
+            UUID for the security group.</para></wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02" name="name"
+    type="xsd:string" required="true">
+    <wadl:doc xml:lang="EN"
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"><para>The
+            security group name.</para></wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02" name="tenant_id"
+    type="csapi:uuid" required="true">
+    <wadl:doc xml:lang="EN"
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"><para>
+            The tenant ID associated with the security group.</para></wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02" name="remote_group_id"
+    type="csapi:uuid" required="true">
+    <wadl:doc xml:lang="EN"
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"><para>The remote
+            group ID to be associated with this security group
+            rule. You can specify either remote_group_id or
+            remote_ip_prefix in the request
+            body.</para></wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02" name="direction"
+     type="xsd:string" required="true">
+    <wadl:doc xml:lang="EN"
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"><para>Ingress or
+            egress: the direction in which the security group
+            rule is applied. For a compute instance, an
+            ingress security group rule is applied to incoming
+            (ingress) traffic for that instance. An egress
+            rule is applied to traffic leaving the
+            instance.</para></wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02" name="remote_ip_prefix"
+    type="xsd:string" required="true">
+    <wadl:doc xml:lang="EN"
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"><para>The remote
+            IP prefix to be associated with this security
+            group rule. You can specify either remote_group_id
+            or remote_ip_prefix in the request body. This
+            attribute matches the specified IP prefix as the
+            source IP address of the IP packet.</para></wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02" name="protocol"
+    type="xsd:string" required="true">
+    <wadl:doc xml:lang="EN"
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"><para>The protocol
+            that is matched by the security group rule. Valid
+            values are null, tcp, udp, and icmp.</para></wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02" name="ethertype"
+    type="xsd:string" required="true">
+    <wadl:doc xml:lang="EN"
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"><para>Must be
+            IPv4 or IPv6, and addresses represented in CIDR
+            must match the ingress or egress
+            rules.</para></wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02" name="port_range_max"
+    type="xsd:int" required="true">
+    <wadl:doc xml:lang="EN"
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"><para>The maximum
+            port number in the range that is matched by the
+            security group rule. The port_range_min attribute
+            constrains the port_range_max attribute. If the
+            protocol is ICMP, this value must be an ICMP
+            type.</para></wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02" name="port_range_min"
+    type="xsd:int" required="true">
+    <wadl:doc xml:lang="EN"
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"><para>The minimum
+            port number in the range that is matched by the
+            security group rule. If the protocol is TCP or
+            UDP, this value must be less than or equal to the
+            value of the port_range_max attribute. If the
+            protocol is ICMP, this value must be an ICMP
+            type.</para></wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02" name="id"
+    type="csapi:uuid" required="true">
+    <wadl:doc xml:lang="EN"
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"><para>security
+            group rule ID</para></wadl:doc>
+</param>
+' >
 <!-- Useful for describing APIs -->
 <!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
 <!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
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..434efb047 100644
--- a/api-ref/src/wadls/netconn-api/src/security-groups.wadl
+++ b/api-ref/src/wadls/netconn-api/src/security-groups.wadl
@@ -60,6 +60,58 @@
                 group.</para>
         </wadl:doc>
         <request>
+            <param name="marker" type="csapi:uuid" required="false" style="query">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"><para>UUID
+                        of the Security group at which you
+                        want to set a marker</para></wadl:doc>
+            </param>
+            <param name="limit" type="xsd:int" required="false" style="query">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"><para>
+                        Integer value for the limit of
+                        values to return</para></wadl:doc>
+            </param>
+            <param name="sort_dir" type="xsd:string" required="false" style="query">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"><para>asc/desc
+                        of specified sort key</para></wadl:doc>
+            </param>
+            <param name="sort_key" type="xsd:string" required="false" style="query">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"><para>The
+                        key you want to sort</para></wadl:doc>
+            </param>
+            <param name="verbose" type="xsd:bool" required="false" style="query">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"><para>
+                        Show detailed information</para></wadl:doc>
+            </param>
+            <param name="fields" type="xsd:string" required="false" style="query">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"><para>
+                        Specify the field(s) to be returned by server</para></wadl:doc>
+            </param>
+            <param name="id" type="csapi:uuid" required="false" style="query">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"><para>
+                        Security group ID</para></wadl:doc>
+            </param>
+            <param name="name" type="xsd:string" required="false" style="query">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"><para>Name
+                        </para></wadl:doc>
+            </param>
+            <param name="description" type="xsd:string" required="false"
+                style="query"><wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"><para>
+                        Description</para></wadl:doc>
+            </param>
+            <param name="tenant_id" type="csapi:uuid" required="false"
+                style="query"><wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"><para>
+                        tenant ID</para></wadl:doc>
+            </param>
             <representation mediaType="application/json">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
@@ -68,30 +120,7 @@
                     /></wadl:doc>
             </representation>
         </request>
-        <response status="200">
-            <param name="security_group" type="xsd:string"
-                required="true">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook"
-                        ><para>Security group
-                    object.</para></wadl:doc>
-            </param>
-            <param name="description" type="xsd:string"
-                required="true">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook"><para>The
-                        security group description.</para></wadl:doc>
-            </param>
-            <param name="id" type="csapi:uuid" required="true">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook"><para>The
-                        UUID for the security group.</para></wadl:doc>
-            </param>
-            <param name="name" type="xsd:string" required="true">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook"><para>The
-                        security group name.</para></wadl:doc>
-            </param>
+        <response status="200"> &securityGroupListParameters;
             <representation
                 mediaType="application/json">
                 <wadl:doc xml:lang="EN"
@@ -132,6 +161,12 @@
                         ><para>Describes the security
                     group.</para></wadl:doc>
             </param>
+            <param name="tenant_id" type="csapi:uuid"
+                required="false">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                        ><para>tenant ID</para></wadl:doc>
+            </param>
             <representation mediaType="application/json">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
@@ -141,30 +176,7 @@
                 </wadl:doc>
             </representation>
         </request>
-        <response status="201">
-            <param name="security_group" type="xsd:string"
-                required="true">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook"
-                        ><para>Security group
-                    object.</para></wadl:doc>
-            </param>
-            <param name="description" type="xsd:string"
-                required="true">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook"><para>The
-                        security group description.</para></wadl:doc>
-            </param>
-            <param name="id" type="csapi:uuid" required="true">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook"><para>The
-                        UUID for the security group.</para></wadl:doc>
-            </param>
-            <param name="name" type="xsd:string" required="true">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook"><para>The
-                        security group name.</para></wadl:doc>
-            </param>
+        <response status="201"> &securityGroupListParameters;
             <representation
                 mediaType="application/json">
                 <wadl:doc xml:lang="EN"
@@ -199,6 +211,16 @@
                 tenant ID.</para>
         </wadl:doc>
         <request>
+            <param name="verbose" type="xsd:bool" required="false" style="query">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"><para>
+                        Show detailed information</para></wadl:doc>
+            </param>
+            <param name="fields" type="xsd:string" required="false" style="query">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"><para>
+                        Specify the field(s) to be returned by server</para></wadl:doc>
+            </param>
             <representation mediaType="application/json">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
@@ -208,30 +230,7 @@
                 </wadl:doc>
             </representation>
         </request>
-        <response status="200">
-            <param name="security_group" type="xsd:string"
-                required="true">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook"
-                        ><para>Security group
-                    object.</para></wadl:doc>
-            </param>
-            <param name="description" type="xsd:string"
-                required="true">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook"><para>The
-                        security group description.</para></wadl:doc>
-            </param>
-            <param name="id" type="csapi:uuid" required="true">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook"><para>The
-                        UUID for the security group.</para></wadl:doc>
-            </param>
-            <param name="name" type="xsd:string" required="true">
-                <wadl:doc xml:lang="EN"
-                    xmlns="http://docbook.org/ns/docbook"><para>The
-                        security group name.</para></wadl:doc>
-            </param>
+        <response status="200"> &securityGroupListParameters;
             <representation
                 mediaType="application/json">
                 <wadl:doc xml:lang="EN"