From d10ba1cd7b1d706416738abfb1357d2765904da0 Mon Sep 17 00:00:00 2001
From: Yushiro FURUKAWA <y.furukawa_2@jp.fujitsu.com>
Date: Mon, 23 Nov 2015 23:24:39 +0900
Subject: [PATCH] Add response params for GET image members

This commit adds following params into response parameter for
GET v2/images{image_id}/members:
  * members
  * created_at
  * image_id
  * member_id
  * status
  * updated_at
  * schema(member)

Change-Id: Iad31516e70f4ae2ab4f2a82eea79042b6ab453a3
Closes-Bug: #1518880
---
 api-ref/src/wadls/image-api/src/v2/common.ent | 31 +++++++++++++++++++
 .../wadls/image-api/src/v2/os-image-v2.wadl   | 17 +++-------
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/api-ref/src/wadls/image-api/src/v2/common.ent b/api-ref/src/wadls/image-api/src/v2/common.ent
index 1513e0b18..2cb4558da 100644
--- a/api-ref/src/wadls/image-api/src/v2/common.ent
+++ b/api-ref/src/wadls/image-api/src/v2/common.ent
@@ -647,6 +647,37 @@
        </para>
     </wadl:doc>
 </param>'>
+<!ENTITY membersParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02" name="members"
+    style="plain" type="xsd:list" required="true">
+    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+        xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
+        <para>
+            A list of <code>member</code> objects. Each <code>member</code>
+            object describes a member with whom this image is being shared.
+        </para>
+    </wadl:doc>
+</param>'>
+<!ENTITY member_schemaParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02" name="schema"
+    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 URL for schema of the member.
+      </para>
+    </wadl:doc>
+</param>'>
+<!ENTITY members_schemaParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02" name="schema"
+    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 URL for schema of the members.
+      </para>
+    </wadl:doc>
+</param>'>
 <!ENTITY metadefNamespaceListReqParameters '
 <param xmlns="http://wadl.dev.java.net/2009/02" name="visibility"
    style="query" required="false" type="imageapi:string">
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 6bbe1cd50..616a52d09 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
@@ -918,18 +918,11 @@
                   href="samples/image-members-list-response.json"
                   />
             </wadl:doc>
-           <!--  &memberListParameter; -->
-            <param xmlns="http://wadl.dev.java.net/2009/02"
-               required="true" name="schema" style="plain"
-               type="xsd:string">
-            <wadl:doc xmlns="http://docbook.org/ns/docbook"
-               xmlns:wadl="http://wadl.dev.java.net/2009/02"
-               xml:lang="EN">
-               <para>The URL for schema of the
-                  members.
-               </para>
-            </wadl:doc>
-            </param>
+            <!--  &memberListParameter; -->
+            &membersParameter; &statusParameter;
+            &created_at-ResponseParameter; &updated_at-ResponseParameter;
+            &image_idParameter; &member_idParameter;
+            &member_schemaParameter; &members_schemaParameter;
          </representation>
       </response>
       <response status="404"/>