From 506e54aae7a4ad1807faea922891ce6c5338d323 Mon Sep 17 00:00:00 2001
From: Diane Fleming <diflemin@cisco.com>
Date: Thu, 21 May 2015 21:03:21 -0500
Subject: [PATCH] Add reactivate and deactivate methods for Image v2

Also, fix file permissions on some sample files for Image v2

Change-Id: I71c005baba9408dfae6e4365e5c7a4cea91dab0e
Closes-Bug: #1432342
---
 api-ref/src/docbkx/ch_images-v2.xml           |  8 +++
 .../wadls/image-api/src/v2/os-image-v2.wadl   | 67 +++++++++++++++++++
 .../image-details-deactivate-response.json    | 21 ++++++
 .../v2/samples/metadef-tag-add-response.json  |  0
 .../v2/samples/metadef-tag-create-req.json    |  0
 .../samples/metadef-tag-create-response.json  |  0
 .../samples/metadef-tag-details-response.json |  0
 .../v2/samples/metadef-tag-list-response.json |  0
 .../v2/samples/metadef-tag-update-req.json    |  0
 .../samples/metadef-tag-update-response.json  |  0
 .../schema-metadef-tag-get-response.json      |  0
 .../schema-metadef-tags-get-response.json     |  0
 12 files changed, 96 insertions(+)
 create mode 100644 api-ref/src/wadls/image-api/src/v2/samples/image-details-deactivate-response.json
 mode change 100755 => 100644 api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-add-response.json
 mode change 100755 => 100644 api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-create-req.json
 mode change 100755 => 100644 api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-create-response.json
 mode change 100755 => 100644 api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-details-response.json
 mode change 100755 => 100644 api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-list-response.json
 mode change 100755 => 100644 api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-update-req.json
 mode change 100755 => 100644 api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-update-response.json
 mode change 100755 => 100644 api-ref/src/wadls/image-api/src/v2/samples/schema-metadef-tag-get-response.json
 mode change 100755 => 100644 api-ref/src/wadls/image-api/src/v2/samples/schema-metadef-tags-get-response.json

diff --git a/api-ref/src/docbkx/ch_images-v2.xml b/api-ref/src/docbkx/ch_images-v2.xml
index 18056c8bb..13602043e 100644
--- a/api-ref/src/docbkx/ch_images-v2.xml
+++ b/api-ref/src/docbkx/ch_images-v2.xml
@@ -45,6 +45,14 @@
                 <wadl:method href="#updateImage-v2"/>
                 <wadl:method href="#deleteImage-v2"/>
             </wadl:resource>
+            <wadl:resource
+                href="../wadls/image-api/src/v2/os-image-v2.wadl#reactivate">
+                <wadl:method href="#reactivateImage-v2"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/image-api/src/v2/os-image-v2.wadl#deactivate">
+                <wadl:method href="#deactivateImage-v2"/>
+            </wadl:resource>
         </wadl:resources>
     </section>
     <section xml:id="image-data-v2">
diff --git a/api-ref/src/wadls/image-api/src/v2/os-image-v2.wadl b/api-ref/src/wadls/image-api/src/v2/os-image-v2.wadl
index 49f2e4dbf..9ebe1bc71 100644
--- a/api-ref/src/wadls/image-api/src/v2/os-image-v2.wadl
+++ b/api-ref/src/wadls/image-api/src/v2/os-image-v2.wadl
@@ -42,6 +42,14 @@
                <method href="#getImage-v2"/>
                <method href="#updateImage-v2"/>
                <method href="#deleteImage-v2"/>
+               <resource id="actions" path="actions">
+                  <resource id="reactivate" path="reactivate">
+                     <method href="#reactivateImage-v2"/>
+                  </resource>
+                  <resource id="deactivate" path="deactivate">
+                     <method href="#deactivateImage-v2"/>
+                  </resource>
+               </resource>
                <resource id="file" path="file">
                   <method href="#storeImageFile-v2"/>
                   <method href="#getImageFile-v2"/>
@@ -429,6 +437,65 @@
          </representation>
       </response>
    </method>
+   <method name="POST" id="reactivateImage-v2">
+      <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+         title="Reactivate image">
+         <para role="shortdesc">Reactivates a specified image.
+            (Since Image API v2.0.)
+         </para>
+         <para>
+            The reactivate operation returns an error if the image status is
+            not <code>active</code> or <code>deactivated</code>.
+         </para>
+         <para>Preconditions</para>
+         <itemizedlist>
+            <listitem>
+               <para>The specified image must exist.</para>
+            </listitem>
+         </itemizedlist>
+      </wadl:doc>
+      <response status="200">
+         <representation mediaType="application/json">
+            <wadl:doc xml:lang="EN"
+               xmlns="http://docbook.org/ns/docbook">
+               <xsdxt:code
+                  href="samples/image-details-response.json"/>
+            </wadl:doc>
+         </representation>
+      </response>
+   </method>
+   <method name="POST" id="deactivateImage-v2">
+      <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+         title="Deactivate image">
+         <para role="shortdesc">Deactivates a specified image.
+            (Since Image API v2.0.)
+         </para>
+         <para>
+            If you try to download a deactivated image, the 403 Forbidden
+            error is returned. Also, image locations are not visible for
+            deactivated images unless the user is an administrative user.
+         </para>
+         <para>
+            The deactivate operation returns an error if the image status is
+            not <code>active</code> or <code>deactivated</code>.
+         </para>
+         <para>Preconditions</para>
+         <itemizedlist>
+            <listitem>
+               <para>The specified image must exist.</para>
+            </listitem>
+         </itemizedlist>
+      </wadl:doc>
+      <response status="200">
+         <representation mediaType="application/json">
+            <wadl:doc xml:lang="EN"
+               xmlns="http://docbook.org/ns/docbook">
+               <xsdxt:code
+                  href="samples/image-details-deactivate-response.json"/>
+            </wadl:doc>
+         </representation>
+      </response>
+   </method>
    <method name="DELETE" id="deleteImage-v2">
       <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
          title="Delete image">
diff --git a/api-ref/src/wadls/image-api/src/v2/samples/image-details-deactivate-response.json b/api-ref/src/wadls/image-api/src/v2/samples/image-details-deactivate-response.json
new file mode 100644
index 000000000..1180fd363
--- /dev/null
+++ b/api-ref/src/wadls/image-api/src/v2/samples/image-details-deactivate-response.json
@@ -0,0 +1,21 @@
+{
+    "status": "deactivated",
+    "name": "cirros-0.3.2-x86_64-disk",
+    "tags": [],
+    "container_format": "bare",
+    "created_at": "2014-05-05T17:15:10Z",
+    "disk_format": "qcow2",
+    "updated_at": "2014-05-05T17:15:11Z",
+    "visibility": "public",
+    "self": "/v2/images/1bea47ed-f6a9-463b-b423-14b9cca9ad27",
+    "min_disk": 0,
+    "protected": false,
+    "id": "1bea47ed-f6a9-463b-b423-14b9cca9ad27",
+    "file": "/v2/images/1bea47ed-f6a9-463b-b423-14b9cca9ad27/file",
+    "checksum": "64d7c1cd2b6f60c92c14662941cb7913",
+    "owner": "5ef70662f8b34079a6eddb8da9d75fe8",
+    "size": 13167616,
+    "min_ram": 0,
+    "schema": "/v2/schemas/image",
+    "virtual_size": "None"
+}
diff --git a/api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-add-response.json b/api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-add-response.json
old mode 100755
new mode 100644
diff --git a/api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-create-req.json b/api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-create-req.json
old mode 100755
new mode 100644
diff --git a/api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-create-response.json b/api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-create-response.json
old mode 100755
new mode 100644
diff --git a/api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-details-response.json b/api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-details-response.json
old mode 100755
new mode 100644
diff --git a/api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-list-response.json b/api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-list-response.json
old mode 100755
new mode 100644
diff --git a/api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-update-req.json b/api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-update-req.json
old mode 100755
new mode 100644
diff --git a/api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-update-response.json b/api-ref/src/wadls/image-api/src/v2/samples/metadef-tag-update-response.json
old mode 100755
new mode 100644
diff --git a/api-ref/src/wadls/image-api/src/v2/samples/schema-metadef-tag-get-response.json b/api-ref/src/wadls/image-api/src/v2/samples/schema-metadef-tag-get-response.json
old mode 100755
new mode 100644
diff --git a/api-ref/src/wadls/image-api/src/v2/samples/schema-metadef-tags-get-response.json b/api-ref/src/wadls/image-api/src/v2/samples/schema-metadef-tags-get-response.json
old mode 100755
new mode 100644