From c4d648d3e52096995096439d6e5bb0056e9372e7 Mon Sep 17 00:00:00 2001
From: Anne Gentle <annegentle@justwriteclick.com>
Date: Mon, 4 Apr 2016 15:39:55 -0500
Subject: [PATCH] Edits to fix makeswagger error "WARNING No tags for method
 listVersions"

Also updates the tools/build-api-ref-swagger.sh script so that
the errant WADL file name is output.

Change-Id: I312c0be565983950a9fce0f6d653eacdcef2695c
---
 api-ref/src/docbkx/ch_share-v2.xml                       | 8 +++++---
 api-ref/src/wadls/share-api/src/v2/wadl/os-share-v2.wadl | 5 ++---
 tools/build-api-ref-swagger.sh                           | 7 +++++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/api-ref/src/docbkx/ch_share-v2.xml b/api-ref/src/docbkx/ch_share-v2.xml
index 7500fab48..c2681ed69 100644
--- a/api-ref/src/docbkx/ch_share-v2.xml
+++ b/api-ref/src/docbkx/ch_share-v2.xml
@@ -45,16 +45,18 @@
             History of all Manila API changes.
         </link>
     </para>
-    <!-- <section xml:id="share-versions">
+    <section xml:id="share-versions">
         <title>API versions</title>
         <para>
             Lists information for all Shared File Systems API versions.
         </para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
             <wadl:resource href="../wadls/share-api/src/v2/wadl/os-share-v2.wadl#share-versions-v2"/>
-            <wadl:resource href="../wadls/share-api/src/v2/wadl/os-share-v2.wadl#share-version-v2"/>
+            <wadl:resource href="../wadls/share-api/src/v2/wadl/os-share-v2.wadl#share-version">
+                <wadl:method href="#listVersions" />
+            </wadl:resource>
         </wadl:resources>
-    </section> -->
+    </section>
     <section xml:id="share-extensions">
         <title>API extensions</title>
         <para>
diff --git a/api-ref/src/wadls/share-api/src/v2/wadl/os-share-v2.wadl b/api-ref/src/wadls/share-api/src/v2/wadl/os-share-v2.wadl
index ee31fcf03..37800ce26 100644
--- a/api-ref/src/wadls/share-api/src/v2/wadl/os-share-v2.wadl
+++ b/api-ref/src/wadls/share-api/src/v2/wadl/os-share-v2.wadl
@@ -20,13 +20,12 @@
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
           <para>
             The HTTP header to specify a valid Shared File Systems API
-            micro-version. For example, <code>"X-Openstack-Manila-Api-Version:
-            2.15"</code>. If you omit this header, the default micro- version is
+            microversion. For example, <code>"X-Openstack-Manila-Api-Version:
+            2.6"</code>. If you omit this header, the default microversion is
             2.0.
           </para>
         </wadl:doc>
       </param>
-      <method href="#listVersions"/>
       <resource id="share-version" path="v2">
         <resource id="tenant_id" path="{tenant_id}">
           &tenant_idTemplateParameter;
diff --git a/tools/build-api-ref-swagger.sh b/tools/build-api-ref-swagger.sh
index c35e53a33..9bcd6b982 100755
--- a/tools/build-api-ref-swagger.sh
+++ b/tools/build-api-ref-swagger.sh
@@ -25,8 +25,11 @@ function convert_to_swagger {
     find api-ref/src/docbkx/ -name api-ref-\* -type f -exec fairy-slipper-docbkx-to-json -o swagger {} \;
 
     # Generate Swagger
-    find swagger -name api-ref\*json -type f -exec fairy-slipper-wadl-to-swagger-valid -o swagger {} \;
-
+    for file in swagger/*.json
+      do
+      echo $file
+      fairy-slipper-wadl-to-swagger-valid $file -o swagger
+      done
     # Remove interim JSON files
     rm -r swagger/api-ref*