From e33929d8078ca16b1823dda55c0131064685208a Mon Sep 17 00:00:00 2001
From: Nam Nguyen Hoai <namnh@vn.fujitsu.com>
Date: Thu, 28 Jan 2016 19:54:49 +0700
Subject: [PATCH] Image "list images" show wrong parameters

This patch set modified the response parameter tables of list
of list image  in image api version 2

Closes-Bug #1539013

Change-Id: Ic009e249894106c29e5871f3232b8e2cd5355352
---
 api-ref/src/wadls/image-api/src/v2/common.ent | 22 ++++++++++++++++++-
 .../image-api/src/v2/wadl/images-v2.wadl      |  6 ++---
 2 files changed, 23 insertions(+), 5 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 15952cf00..59aecad01 100644
--- a/api-ref/src/wadls/image-api/src/v2/common.ent
+++ b/api-ref/src/wadls/image-api/src/v2/common.ent
@@ -1513,6 +1513,26 @@
       </para>
    </wadl:doc>
 </param>'>
+<!ENTITY ramdisk_idResponseParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02" name="ramdisk_id"
+   style="plain" required="true" type="csapi:UUID">
+   <wadl:doc xmlns="http://docbook.org/ns/docbook"
+      xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
+      <para>
+         The UUID of the ramdisk.
+      </para>
+   </wadl:doc>
+</param>'>
+<!ENTITY kernel_idResponseParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02" name="kernel_id"
+   style="plain" required="true" type="csapi:UUID">
+   <wadl:doc xmlns="http://docbook.org/ns/docbook"
+      xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
+      <para>
+         The UUID of the kernel.
+      </para>
+   </wadl:doc>
+</param>'>
 <!ENTITY property-nameResponseParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" name="name"
    style="plain" required="true" type="xsd:string">
@@ -1574,7 +1594,7 @@
    </wadl:doc>
 </param>'>
 <!ENTITY owner_idResponseParameter '
-<param xmlns="http://wadl.dev.java.net/2009/02" name="owner_id"
+<param xmlns="http://wadl.dev.java.net/2009/02" name="owner"
    style="plain" required="true" type="xsd:string">
    <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
diff --git a/api-ref/src/wadls/image-api/src/v2/wadl/images-v2.wadl b/api-ref/src/wadls/image-api/src/v2/wadl/images-v2.wadl
index 2fd8c1552..c43b4bf6b 100644
--- a/api-ref/src/wadls/image-api/src/v2/wadl/images-v2.wadl
+++ b/api-ref/src/wadls/image-api/src/v2/wadl/images-v2.wadl
@@ -208,21 +208,19 @@
             &tagsObjectParameter;
             &container_formatResponseParameter;
             &created_at-ResponseParameter;
+            &kernel_idResponseParameter;
             &disk_formatResponseParameter;
             &updated_at-ResponseParameter;
             &min_diskResponseParameter;
             &image-protectedResponseParameter;
             &idResponseParameter;
+            &ramdisk_idResponseParameter;
             &min_ramResponseParameter;
             &checksumResponseParameter;
             &owner_idResponseParameter;
             &image-visibilityResponseParameter;
             &virtual_sizeResponseParameter;
             &sizeResponseParameter;
-            &image-propertiesResponseParameter;
-            &locationsResponseParameter;
-            &metadataResponseParameter;
-            &direct_urlResponseParameter;
             &selfResponseParameter;
             &fileResponseParameter;
             &image-schemaResponseParameter;