Merge "Add volume unmanage to cinder v2 API"

api-ref/src/docbkx/ch_blockstorage-api-v2.xml

@@ -169,6 +169,7 @@
                 <wadl:method href="#setVolumeimagemetadata"/>
                 <wadl:method href="#unsetVolumeimagemetadata"/>
                 <wadl:method href="#attachVolume"/>
+                <wadl:method href="#unmanageVolume"/>
             </wadl:resource>
         </wadl:resources>
     </section>

api-ref/src/wadls/volume-api/src/v2/api_samples/os-unmanage/os-unmanage-request.json

@@ -0,0 +1,3 @@
+{
+    "os-unmanage": {}
+}

api-ref/src/wadls/volume-api/src/v2/common.ent

@@ -733,6 +733,17 @@
         </para>
     </wadl:doc>
 </param>'>
+<!ENTITY unmanageVolumeReqParameters '
+<param xmlns="http://wadl.dev.java.net/2009/02" name="os-unmanage" style="plain"
+    type="xsd:string" required="true">
+    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+       xmlns:wadl="http://wadl.dev.java.net/2009/02"
+       xml:lang="EN">
+        <para>
+            The <code>os-unmanage</code> action.
+        </para>
+    </wadl:doc>
+</param>'>
 <!ENTITY backendParametersResponse '
 <param name="namespace" style="plain" required="true"
    xmlns="http://wadl.dev.java.net/2009/02"

api-ref/src/wadls/volume-api/src/v2/volume-api-v2.wadl

@@ -68,6 +68,7 @@
                             <method href="#setVolumeimagemetadata"/>
                             <method href="#unsetVolumeimagemetadata"/>
                             <method href="#attachVolume"/>
+                            <method href="#unmanageVolume"/>
                         </resource>
                     </resource>
                 </resource>
@@ -644,6 +645,36 @@
         </request>
         <response status="202"/>
     </method>
+    <method name="POST" id="unmanageVolume">
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Unmanage volume">
+            <para role="shortdesc">
+                Unmanages the specified volume.
+                Specify the <code>os-unmanage</code> action in the request body.
+            </para>
+            <para>
+                This calls removes the volume from Block Storage management
+                without actually removing the back-end storage object
+                associated with it.
+            </para>
+            <para>Preconditions</para>
+            <itemizedlist>
+                <listitem><para>Volume status must be <code>available</code>.</para></listitem>
+            </itemizedlist>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="api_samples/os-unmanage/os-unmanage-request.json"
+                    />
+                </wadl:doc>
+                &unmanageVolumeReqParameters;
+            </representation>
+        </request>
+        <response status="202"/>
+    </method>
     <method name="GET" id="getVolumeTypes">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="List volume types">