From 68a0dd1c56c10ab4240a10b3b89806263589a61d Mon Sep 17 00:00:00 2001
From: Yushiro FURUKAWA <y.furukawa_2@jp.fujitsu.com>
Date: Fri, 12 Feb 2016 16:08:39 +0900
Subject: [PATCH] Insert "tenant_id" into os-simple-tenant-usage-v2.1 again

This commit fixes the same contents https://review.openstack.org/#/c/251125/.
Because the above commit has regressed.

Change-Id: I1ee14f42c8e326db450b7a916f895f252739b203
Closes-Bug: 1519558
---
 api-ref/src/wadls/compute-api/src/v2.1/common.ent | 10 ++++++++++
 .../v2.1/wadl/os-simple-tenant-usage-v2.1.wadl    | 15 +++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/api-ref/src/wadls/compute-api/src/v2.1/common.ent b/api-ref/src/wadls/compute-api/src/v2.1/common.ent
index 2d33644c2..c36107af1 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/common.ent
+++ b/api-ref/src/wadls/compute-api/src/v2.1/common.ent
@@ -2010,6 +2010,16 @@
       The server status.</para>
   </wadl:doc>
 </param>'>
+<!ENTITY tenantIdRequestParameter '
+<param name="tenant_id" style="template" type="csapi:UUID" required="true"
+  xmlns="http://wadl.dev.java.net/2009/02">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02">
+    <para>
+      The UUID of the tenant in a multi-tenancy cloud.
+    </para>
+  </wadl:doc>
+</param>'>
 <!ENTITY tenantIdResponseParameter '
 <param name="tenant_id" style="plain" type="csapi:UUID"
   required="true"
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-simple-tenant-usage-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-simple-tenant-usage-v2.1.wadl
index 37f4d627c..a89671af0 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-simple-tenant-usage-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-simple-tenant-usage-v2.1.wadl
@@ -14,12 +14,15 @@
     <resources base="https://servers.api.openstack.com"
         xml:id="os-simple-tenant-usage-v2.1">
         <resource id="v2.1" path="//v2.1">
-            <resource id="os-simple-tenant-usage"
-                path="os-simple-tenant-usage">
-                <method href="#listUsageInformation"/>
-                <resource id="tenant_id" path="{tenant_id}">
-                    &tenant_idTemplateParameter;
-                    <method href="#listUsageSpecific"/>
+            <resource id="tenant_id" path="{tenant_id}">
+                &tenantIdRequestParameter;
+                <resource id="os-simple-tenant-usage"
+                    path="os-simple-tenant-usage">
+                    <method href="#listUsageInformation"/>
+                    <resource id="tenant_id2" path="{tenant_id}">
+                        &tenantIdRequestParameter;
+                        <method href="#listUsageSpecific"/>
+                    </resource>
                 </resource>
             </resource>
         </resource>