From 162712a41111a110cb53c04c42929b0d960020e9 Mon Sep 17 00:00:00 2001
From: Atsushi SAKAI <sakaia@jp.fujitsu.com>
Date: Fri, 9 Oct 2015 20:28:25 +0900
Subject: [PATCH] Add v2 to method id for separating LBaaS v1/v2 method URL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  separate Method URL for v1/v2
  by adding v2 in method.

　for v1
　http://developer.openstack.org/api-ref-networking-v2-ext.html#createPool
  for v2 (changed)
  http://developer.openstack.org/api-ref-networking-v2-ext.html#createPoolv2

Closes-Bug: #1504511
Change-Id: I4e347be2de662718be18465d0843dcf78ae09407
---
 .../netconn-api/src/os-lbaasv2.0-ext.wadl     | 98 +++++++++----------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/api-ref/src/wadls/netconn-api/src/os-lbaasv2.0-ext.wadl b/api-ref/src/wadls/netconn-api/src/os-lbaasv2.0-ext.wadl
index ee8963d43..806f8dc56 100644
--- a/api-ref/src/wadls/netconn-api/src/os-lbaasv2.0-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-lbaasv2.0-ext.wadl
@@ -24,48 +24,48 @@
     <resources base="https://neutron.example.com/" xml:id="os-lbaas-v2.0">
         <resource id="version" path="//v2.0/lbaas">
             <resource id="loadbalancers" path="loadbalancers">
-                <method href="#listLoadBalancers"/>
-                <method href="#createLoadBalancer"/>
+                <method href="#listLoadBalancersv2"/>
+                <method href="#createLoadBalancerv2"/>
                 <resource id="lb_id" path="{loadbalancer_id}">
-                    <method href="#showLoadBalancer"/>
-                    <method href="#updateLoadBalancer"/>
-                    <method href="#deleteLoadBalancer"/>
+                    <method href="#showLoadBalancerv2"/>
+                    <method href="#updateLoadBalancerv2"/>
+                    <method href="#deleteLoadBalancerv2"/>
                 </resource>
             </resource>
             <resource id="Listeners" path="listeners">
-                <method href="#listListeners"/>
-                <method href="#createListener"/>
+                <method href="#listListenersv2"/>
+                <method href="#createListenerv2"/>
                 <resource id="listener_id" path="{listener_id}">
-                    <method href="#showListener"/>
-                    <method href="#updateListener"/>
-                    <method href="#deleteListener"/>
+                    <method href="#showListenerv2"/>
+                    <method href="#updateListenerv2"/>
+                    <method href="#deleteListenerv2"/>
                 </resource>
             </resource>
             <resource id="lb-pools" path="pools">
-                <method href="#listPools"/>
-                <method href="#createPool"/>
+                <method href="#listPoolsv2"/>
+                <method href="#createPoolv2"/>
                 <resource id="pool_id" path="{pool_id}">
-                    <method href="#showPool"/>
-                    <method href="#updatePool"/>
-                    <method href="#deletePool"/>
+                    <method href="#showPoolv2"/>
+                    <method href="#updatePoolv2"/>
+                    <method href="#deletePoolv2"/>
                     <resource id="lb-members" path="members">
-                        <method href="#listMembers"/>
-                        <method href="#createMember"/>
+                        <method href="#listMembersv2"/>
+                        <method href="#createMemberv2"/>
                         <resource id="member_id" path="{member_id}">
-                            <method href="#showMember"/>
-                            <method href="#updateMember"/>
-                            <method href="#deleteMember"/>
+                            <method href="#showMemberv2"/>
+                            <method href="#updateMemberv2"/>
+                            <method href="#deleteMemberv2"/>
                         </resource>
                     </resource>
                 </resource>
             </resource>
             <resource id="lb-health_monitors" path="health_monitors">
-                <method href="#createHealthMonitor"/>
-                <method href="#listHealthMonitors"/>
+                <method href="#createHealthMonitorv2"/>
+                <method href="#listHealthMonitorsv2"/>
                 <resource id="health_monitor_id_hm" path="{health_monitor_id}">
-                    <method href="#showHealthMonitor"/>
-                    <method href="#updateHealthMonitor"/>
-                    <method href="#deleteHealthMonitor"/>
+                    <method href="#showHealthMonitorv2"/>
+                    <method href="#updateHealthMonitorv2"/>
+                    <method href="#deleteHealthMonitorv2"/>
                 </resource>
             </resource>
         </resource>
@@ -75,7 +75,7 @@
     <!--               All Methods                             -->
     <!--*******************************************************-->
     <!-- load balancer -->
-    <method name="GET" id="listLoadBalancers">
+    <method name="GET" id="listLoadBalancersv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="List load balancers">
             <para role="shortdesc">Lists load balancers.</para>
             <para>
@@ -105,7 +105,7 @@
                     <xsdxt:code href="api_samples/loadbalancer-list-resp.json"/>
                 </wadl:doc> &lbLoadbalancersParam; &lbLoadbalancerParam; &lbResponseParams;</representation>
         </response> &fault401; &fault500; &fault503;</method>
-    <method name="GET" id="showLoadBalancer">
+    <method name="GET" id="showLoadBalancerv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Show load balancer details">
             <para role="shortdesc">Shows details for a specified load
@@ -184,7 +184,7 @@
                     <xsdxt:code href="api_samples/loadbalancer-get-detail-resp.json"/>
                 </wadl:doc> &lbLoadbalancerParam; &lbResponseParams; </representation>
         </response> &fault401; &fault403; &fault404; &fault409; &fault413; &fault500; &fault503; </method>
-    <method name="POST" id="createLoadBalancer">
+    <method name="POST" id="createLoadBalancerv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Create load balancer">
             <para role="shortdesc">Creates a load balancer.</para>
             <para>
@@ -289,7 +289,7 @@
                 </wadl:doc> &lbLoadbalancerParam; &lbResponseParams; </representation>
         </response> &fault401; &fault404; &fault409; &fault413; &fault500; &fault503;
     </method>
-    <method name="PUT" id="updateLoadBalancer">
+    <method name="PUT" id="updateLoadBalancerv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Update load balancer">
             <para role="shortdesc">Updates a specified load balancer.</para>
             <para>
@@ -331,7 +331,7 @@
                 <xsdxt:code href="api_samples/loadbalancer-put-resp.json"/>
             </wadl:doc> &lbResponseParams; </representation>
         </response> &fault400; &fault401; &fault413; &fault500; &fault503; </method>
-    <method name="DELETE" id="deleteLoadBalancer">
+    <method name="DELETE" id="deleteLoadBalancerv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Remove load balancer">
             <para role="shortdesc">Removes a specified load balancer.</para>
             <para>
@@ -344,7 +344,7 @@
         </wadl:doc>
         <response status="204"/> &fault400; &fault401; &fault413; &fault500; &fault503; </method>
     <!--Listeners-->
-    <method name="POST" id="createListener">
+    <method name="POST" id="createListenerv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Create listener">
             <para role="shortdesc">Creates a listener.</para>
             <para>
@@ -472,7 +472,7 @@
                 </wadl:doc>
             </representation>
         </response> &fault401; &fault404; &fault409; &fault413; &fault500; &fault503; </method>
-    <method name="GET" id="listListeners">
+    <method name="GET" id="listListenersv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="List listeners">
             <para role="shortdesc">Lists listeners.</para>
             <para>
@@ -506,7 +506,7 @@
                 </wadl:doc>
             </representation>
         </response> &fault401; &fault500; &fault503; </method>
-    <method name="GET" id="showListener">
+    <method name="GET" id="showListenerv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Show listener details">
             <para role="shortdesc">Shows details for a specified listener.</para>
@@ -543,7 +543,7 @@
                 </wadl:doc>
             </representation>
         </response> &fault401; &fault403; &fault404; &fault409; &fault413; &fault500; &fault503;</method>
-    <method name="PUT" id="updateListener">
+    <method name="PUT" id="updateListenerv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Update listener">
             <para role="shortdesc">Updates a specified listener.</para>
             <para>
@@ -591,7 +591,7 @@
                 </wadl:doc>
             </representation>
         </response> &fault500; &fault503; &fault401; &fault400;&fault413;</method>
-    <method name="DELETE" id="deleteListener">
+    <method name="DELETE" id="deleteListenerv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Remove listener">
             <para role="shortdesc">Removes a specified listener.</para>
             <para>
@@ -609,7 +609,7 @@
         </wadl:doc>
         <response status="204"/> &fault400; &fault401; &fault409; &fault413; &fault500; &fault503; </method>
     <!-- pool -->
-    <method name="POST" id="createPool">
+    <method name="POST" id="createPoolv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Create pool">
             <para role="shortdesc">Creates a pool.</para>
@@ -707,7 +707,7 @@
                     <xsdxt:code href="api_samples/pool-post-resp.json"/>
                 </wadl:doc> &poolcreateResponseParams; </representation>
         </response> &fault401; &fault404; &fault409; &fault413; &fault500; &fault503; </method>
-    <method name="GET" id="listPools">
+    <method name="GET" id="listPoolsv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="List pools">
             <para role="shortdesc">Lists pools.</para>
             <para>
@@ -740,7 +740,7 @@
                     <xsdxt:code href="api_samples/pool-list-resp.json"/>
                 </wadl:doc> &poolResponseParams; </representation>
         </response> &fault401; &fault500; &fault503;</method>
-    <method name="GET" id="showPool">
+    <method name="GET" id="showPoolv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Show pool details">
             <para role="shortdesc">Shows details for a specified pool.</para>
@@ -777,7 +777,7 @@
                 </wadl:doc> &poolResponseParams; </representation>
         </response> &fault401; &fault403; &fault404; &fault409; &fault413; &fault500; &fault503;
     </method>
-    <method name="PUT" id="updatePool">
+    <method name="PUT" id="updatePoolv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Update pool">
             <para role="shortdesc">Updates a specified pool.</para>
             <para>
@@ -823,7 +823,7 @@
                     <xsdxt:code href="api_samples/pool-put-resp.json"/>
                 </wadl:doc> &poolResponseParams; </representation>
         </response>  &fault400; &fault401; &fault413; &fault500; &fault503;</method>
-    <method name="DELETE" id="deletePool">
+    <method name="DELETE" id="deletePoolv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Remove pool">
             <para role="shortdesc">Removes a specified pool.</para>
             <para>
@@ -840,7 +840,7 @@
         </wadl:doc>
         <response status="204"/> &fault400; &fault401; &fault409; &fault413; &fault500; &fault503; </method>
     <!-- member -->
-    <method name="POST" id="createMember">
+    <method name="POST" id="createMemberv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Add member to pool">
             <para role="shortdesc">Adds a member to a pool.</para>
@@ -916,7 +916,7 @@
                     <xsdxt:code href="api_samples/Member-post-resp.json"/>
                 </wadl:doc> &membercreateResponseParams; </representation>
         </response> &fault401; &fault404; &fault409; &fault413; &fault500; &fault503; </method>
-    <method name="GET" id="listMembers">
+    <method name="GET" id="listMembersv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="List pool members">
             <para role="shortdesc">Lists members of a specified pool.</para>
             <para>
@@ -947,7 +947,7 @@
                     <xsdxt:code href="api_samples/member-list-resp.json"/>
                 </wadl:doc> &memberResponseParams; </representation></response> &fault401;
         &fault503; &fault500;</method>
-    <method name="GET" id="showMember">
+    <method name="GET" id="showMemberv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Show pool member details">
             <para role="shortdesc">Shows details for a specified pool member.</para>
@@ -981,7 +981,7 @@
                 </wadl:doc> &memberResponseParams; </representation>
         </response>&fault401; &fault403; &fault404;&fault409;&fault413;&fault500;&fault503;
     </method>
-    <method name="PUT" id="updateMember">
+    <method name="PUT" id="updateMemberv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Update pool member">
             <para role="shortdesc">Updates a specified member of a pool.</para>
@@ -1023,7 +1023,7 @@
                     <xsdxt:code href="api_samples/member-put-resp.json"/>
                 </wadl:doc> &memberResponseParams; </representation>
         </response> &fault400; &fault401;  &fault413; &fault500; &fault503; </method>
-    <method name="DELETE" id="deleteMember">
+    <method name="DELETE" id="deleteMemberv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Remove member from pool">
             <para role="shortdesc">Removes a member from a pool.</para>
             <para>
@@ -1040,7 +1040,7 @@
         </wadl:doc>
         <response status="204"/> &fault400; &fault401; &fault409; &fault413; &fault500; &fault503; </method>
     <!-- health Monitor -->
-    <method name="POST" id="createHealthMonitor">
+    <method name="POST" id="createHealthMonitorv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Create health monitor">
             <para role="shortdesc">Creates a health monitor.</para>
@@ -1130,7 +1130,7 @@
                     <xsdxt:code href="api_samples/healthmonitor-list-resp.json"/>
                 </wadl:doc> &hmResponseParams; </representation>
         </response> &fault401; &fault500; &fault503;</method>
-    <method name="GET" id="showHealthMonitor">
+    <method name="GET" id="showHealthMonitorv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Show health monitor details">
             <para role="shortdesc">Shows details for a specified health monitor.</para>
@@ -1168,7 +1168,7 @@
                 </wadl:doc> &hmResponseParams; </representation>
         </response> &fault401; &fault403; &fault404; &fault409; &fault413; &fault500; &fault503;
     </method>
-    <method name="PUT" id="updateHealthMonitor">
+    <method name="PUT" id="updateHealthMonitorv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Update health monitor">
             <para role="shortdesc">Updates a specified health monitor.</para>
             <para>
@@ -1209,7 +1209,7 @@
                     <xsdxt:code href="api_samples/healthmonitor-put-resp.json"/>
                 </wadl:doc> &hmResponseParams; </representation>
         </response> &fault400; &fault401; &fault413; &fault500; &fault503; </method>
-    <method name="DELETE" id="deleteHealthMonitor">
+    <method name="DELETE" id="deleteHealthMonitorv2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Remove health monitor">
             <para role="shortdesc">Removes a specified health monitor.</para>
             <para>