From 56f5e6c0d4b93b7b6811d14f15fd32309b6483aa Mon Sep 17 00:00:00 2001
From: Diane Fleming <diane.fleming@rackspace.com>
Date: Thu, 17 Apr 2014 15:36:15 -0400
Subject: [PATCH] Fix problem with duplicate names (createNetwork)

Change-Id: I1e252ec18012d858bbcd05f048bcc0ad6079e6cd
author: diane fleming
---
 api-ref/src/docbkx/ch_netconn-ext-v2.xml      |  3 +-
 .../src/os-networks-multi-provider-ext.wadl   | 97 ++-----------------
 2 files changed, 7 insertions(+), 93 deletions(-)

diff --git a/api-ref/src/docbkx/ch_netconn-ext-v2.xml b/api-ref/src/docbkx/ch_netconn-ext-v2.xml
index 7c423d3ff..e8d385ab5 100644
--- a/api-ref/src/docbkx/ch_netconn-ext-v2.xml
+++ b/api-ref/src/docbkx/ch_netconn-ext-v2.xml
@@ -48,8 +48,7 @@
         <para>You cannot update any <literal>provider</literal>
             attributes. If you try to do so, an error occurs.</para>
         <para>To delete a network with multiple physical bindings,
-            issue a normal delete network request, as follows:</para>
-        <screen><uri>DELETE v2.0/networks/​{network_id}</uri>​</screen>
+            issue a normal delete network request.</para>
         <para>To define multiple physical bindings for a network,
             include a <literal>segments</literal> list in the request
             body of a <code>POST /v2.0/networks</code> request. Each
diff --git a/api-ref/src/wadls/netconn-api/src/os-networks-multi-provider-ext.wadl b/api-ref/src/wadls/netconn-api/src/os-networks-multi-provider-ext.wadl
index 238687fe1..155e6b3b9 100644
--- a/api-ref/src/wadls/netconn-api/src/os-networks-multi-provider-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-networks-multi-provider-ext.wadl
@@ -23,8 +23,8 @@
         xml:id="os-networks-multi-provider-ext-v2.0">
         <resource id="version" path="v2.0/">
             <resource id="Networks" path="networks">
-                <method href="#listNetworks"/>
-                <method href="#createNetwork"/>
+                <method href="#listMultiNetworks"/>
+                <method href="#createMultiNetwork"/>
                 <resource path="{network_id}" id="network_id">
                     <param name="network_id" style="template"
                         type="csapi:UUID">
@@ -34,9 +34,7 @@
                                 network of interest to
                             you.</para></wadl:doc>
                     </param>
-                    <method href="#showNetwork"/>
-                    <!-- <method href="#updateNetwork"/>-->
-                    <!--<method href="#deleteNetwork"/>-->
+                    <method href="#showMultiNetwork"/>
                 </resource>
             </resource>
         </resource>
@@ -44,7 +42,7 @@
     <!--*******************************************************-->
     <!--               All Methods                             -->
     <!--*******************************************************-->
-    <method name="GET" id="listNetworks">
+    <method name="GET" id="listMultiNetworks">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="List networks">
             <para role="shortdesc">Lists networks that are accessible
@@ -62,17 +60,9 @@
                     />
                 </wadl:doc>
             </representation>
-            <!--<representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/networks-multi-get-detail-resp.xml"
-                    />
-                </wadl:doc>
-            </representation>-->
         </response>
     </method>
-    <method name="POST" id="createNetwork">
+    <method name="POST" id="createMultiNetwork">
         <wadl:doc xmlns="http://docbook.org/ns/docbook"
             title="Create network with multiple segment mappings"
             xml:lang="EN">
@@ -89,14 +79,6 @@
                     />
                 </wadl:doc>
             </representation>
-            <!--  <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/network-multi-post-req.xml"
-                    />
-                </wadl:doc>
-            </representation>-->
         </request>
         <response status="201"> &networkListParameters;
             &networkProviderParameters; <representation
@@ -108,17 +90,9 @@
                     />
                 </wadl:doc>
             </representation>
-            <!--<representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/network-multi-post-resp.xml"
-                    />
-                </wadl:doc>
-            </representation>-->
         </response>
     </method>
-    <method name="GET" id="showNetwork">
+    <method name="GET" id="showMultiNetwork">
         <wadl:doc xmlns="http://docbook.org/ns/docbook"
             title="Show details for a network with multiple segments">
             <para role="shortdesc">Shows details for a specified
@@ -134,65 +108,6 @@
                     />
                 </wadl:doc>
             </representation>
-            <!--<representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/networks-multi-get-detail-resp.xml"
-                    />
-                </wadl:doc>
-            </representation>-->
         </response>
     </method>
-    <!--<method name="PUT" id="updateNetwork">
-        <wadl:doc xmlns="http://docbook.org/ns/docbook"
-            title="Update network with multiple segments">
-            <para role="shortdesc">Updates a specified network with
-                multiple segments.</para>
-        </wadl:doc>
-        <request> &networkCreateParameters; &networkSegmentParameter;
-            &networkProviderParameters; <representation
-                mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/network-multi-put-update.req.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <!-\-  <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/network-multi-put-update.req.xml"
-                    />
-                </wadl:doc>
-            </representation>-\->
-        </request>
-        <response status="201"> &networkListParameters;
-            &networkSegmentParameter; &networkProviderParameters;
-                <representation mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/network-multi-put-update-resp.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <!-\-   <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/network-multi-put-update-resp.xml"
-                    />
-                </wadl:doc>
-            </representation>-\->
-        </response>
-    </method>-->
-    <!--<method name="DELETE" id="deleteNetwork">
-        <wadl:doc xmlns="http://docbook.org/ns/docbook"
-            title="Delete network">
-            <para role="shortdesc">Deletes a specified network.</para>
-        </wadl:doc>
-    </method>-->
 </application>