Merge "Make some response codes optional for "Create floating IP" method"

api-ref/src/wadls/netconn-api/src/common.ent

@@ -1400,6 +1400,28 @@ router.</para>
         <para>A <code>loadbalancer</code> object.</para>
     </wadl:doc>
 </param>'>
+<!ENTITY floatingipCreateRequestParams '
+&floating-ipParameter;
+<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
+    name="tenant_id" style="plain" type="csapi:uuid">
+    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+        xmlns:wadl="http://wadl.dev.java.net/2009/02">
+        <para>
+          The tenant ID.  Only administrative users can specify a
+          tenant ID other than their own.
+        </para>
+    </wadl:doc>
+</param>
+&floating-network-idParameter;
+&fixed-ip-addressParameter;
+&floating-ip-addressParameter;
+<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
+    name="port_id" style="plain" type="csapi:uuid">
+    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+        xmlns:wadl="http://wadl.dev.java.net/2009/02">
+        <para>The port ID.</para>
+    </wadl:doc>
+</param>'>
 <!ENTITY lbResponseParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
     name="id" style="plain" type="csapi:uuid">

api-ref/src/wadls/netconn-api/src/os-layer3-ext.wadl

@@ -564,9 +564,7 @@ Accept: application/json</programlisting>
                </listitem>
             </itemizedlist>
         </wadl:doc>
-        <request> &floating-ipParameter; &tenant-idParameter;
+        <request> &floatingipCreateRequestParams;
-            &floating-network-idParameter; &fixed-ip-addressParameter;
-            &floating-ip-addressParameter; &port-idParameter;
             <representation mediaType="application/json"
                 element="csapi:floatingip">
                 <wadl:doc