From 994cc4a72d7b909cc771435c3b87d87e79b2c43a Mon Sep 17 00:00:00 2001
From: Anh Tran <anhtt@vn.fujitsu.com>
Date: Mon, 1 Feb 2016 17:04:30 +0700
Subject: [PATCH] [Telemetry API v2] Duplicate row in some Response parameters
 tables

This patch does correct Response parameters tables of Telemetry API v2:
  - List samples: remove "user_id" parameter
  - Show sample details:  remove "user_id" parameter
  - List capabilities: remove "storage:production_ready" parameter

Change-Id: I821563fa00a562536b775fe6857bac76dc179cdb
Closes-Bug: #1540257
---
 api-ref/src/wadls/telemetry-api/src/v2/common.ent     | 11 -----------
 .../src/v2/wadl/os-telemetry-api-2.0.wadl             |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/api-ref/src/wadls/telemetry-api/src/v2/common.ent b/api-ref/src/wadls/telemetry-api/src/v2/common.ent
index e4dc59935..6fd2b6960 100644
--- a/api-ref/src/wadls/telemetry-api/src/v2/common.ent
+++ b/api-ref/src/wadls/telemetry-api/src/v2/common.ent
@@ -391,17 +391,6 @@
         </para>
     </wadl:doc>
 </param>
-<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="storage:production_ready" style="plain"
-        type="xsd:boolean" path="$.api.storage:production_ready">
-    <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-        <para>
-            If <code>true</code>, the database back end is ready to use in a
-            production environment.
-        </para>
-    </wadl:doc>
-</param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
     name="event_storage" style="plain" type="xsd:dict" path="$.event_storage">
     <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
diff --git a/api-ref/src/wadls/telemetry-api/src/v2/wadl/os-telemetry-api-2.0.wadl b/api-ref/src/wadls/telemetry-api/src/v2/wadl/os-telemetry-api-2.0.wadl
index 4d2eb0512..0cfd30630 100644
--- a/api-ref/src/wadls/telemetry-api/src/v2/wadl/os-telemetry-api-2.0.wadl
+++ b/api-ref/src/wadls/telemetry-api/src/v2/wadl/os-telemetry-api-2.0.wadl
@@ -547,7 +547,7 @@
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code href="../samples/samples-list-response.json"/>
                 </wadl:doc>
-                &meterSamplesParameters; &userIdParameter;
+                &meterSamplesParameters;
             </representation>
             <representation mediaType="application/xml">
                 <wadl:doc xml:lang="EN"
@@ -570,7 +570,7 @@
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code href="../samples/sample-show-response.json"/>
                 </wadl:doc>
-                &meterSamplesParameters; &userIdParameter;
+                &meterSamplesParameters;
             </representation>
             <representation mediaType="application/xml">
                 <wadl:doc xml:lang="EN"