From 2edd11a9a99e4584321a56fe536a060ea191852a Mon Sep 17 00:00:00 2001
From: Atsushi SAKAI <sakaia@jp.fujitsu.com>
Date: Thu, 13 Aug 2015 17:21:54 +0900
Subject: [PATCH] Add "locked" information in server details

    Add "locked" description and
    Add "locked" in  sample response.

Change-Id: I1b9c085c783bd3965d1419fd0b996245b78c5bf1
Closes-Bug: #1480379
---
 api-ref/src/docbkx/ch_compute-v2.1.xml                |  4 ++--
 .../api_samples/os-server-usage/server-get-resp.json  |  3 ++-
 .../os-server-usage/servers-detail-resp.json          |  3 ++-
 api-ref/src/wadls/compute-api/src/v2.1/common.ent     | 11 +++++++++++
 .../src/v2.1/wadl/os-server-usage-v2.1.wadl           |  8 ++++++--
 .../api_samples/os-server-usage/server-get-resp.json  |  4 ++--
 .../os-server-usage/servers-detail-resp.json          |  4 ++--
 7 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/api-ref/src/docbkx/ch_compute-v2.1.xml b/api-ref/src/docbkx/ch_compute-v2.1.xml
index e7375bb60..91572b27a 100644
--- a/api-ref/src/docbkx/ch_compute-v2.1.xml
+++ b/api-ref/src/docbkx/ch_compute-v2.1.xml
@@ -60,8 +60,8 @@
          Shows server usage for a specified server.
       </para>
       <para>
-         Shows <code>os-server-usage:launched_at</code> and
-         <code>os-server-usage:terminated_at</code> attributes in server responses.
+         Shows <code>OS-SRV-USG:launched_at</code> and
+         <code>OS-SRV-USG:terminated_at</code> attributes in server responses.
       </para>
       <wadl:resources
          href="../wadls/compute-api/src/v2.1/wadl/os-server-usage-v2.1.wadl"
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-usage/server-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-usage/server-get-resp.json
index 4a1d890c1..0ba3adae5 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-usage/server-get-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-usage/server-get-resp.json
@@ -52,6 +52,7 @@
         "status": "ACTIVE",
         "tenant_id": "openstack",
         "updated": "2013-08-15T08:12:40Z",
-        "user_id": "fake"
+        "user_id": "fake",
+        "locked": false
     }
 }
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-usage/servers-detail-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-usage/servers-detail-resp.json
index cb163690c..04ede60cf 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-usage/servers-detail-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-usage/servers-detail-resp.json
@@ -53,7 +53,8 @@
             "status": "ACTIVE",
             "tenant_id": "openstack",
             "updated": "2013-08-15T12:04:05Z",
-            "user_id": "fake"
+            "user_id": "fake",
+            "locked": false
         }
     ]
 }
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 2a8349bb4..1d83817e8 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
@@ -537,6 +537,17 @@
   </para>
 </wadl:doc>
 </param>'>
+<!ENTITY serverListDetailsResponseParameters '
+<param xmlns="http://wadl.dev.java.net/2009/02" name="locked"
+   style="plain" required="true" type="xsd:boolean" default="ALL">
+   <wadl:doc xmlns="http://docbook.org/ns/docbook"
+   xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
+   <para>
+      Indicates whether the server is locked (<code>true</code>) or unlocked
+      (<code>false</code>).
+   </para>
+</wadl:doc>
+</param>'>
 <!-- Servers Extended Attributes Parameters -->
 <!ENTITY GetListServersDetailQueryParameters '
 <param xmlns="http://wadl.dev.java.net/2009/02"
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-usage-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-usage-v2.1.wadl
index 8ff5b35a7..acff54422 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-usage-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-usage-v2.1.wadl
@@ -70,7 +70,9 @@
                     <xsdxt:code
                         href="../api_samples/os-server-usage/server-get-resp.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc>
+                &x-openstack-request-idHeader;
+                &serverListDetailsResponseParameters;
             </representation>
         </response>
     </method>
@@ -92,7 +94,9 @@
                     <xsdxt:code
                         href="../api_samples/os-server-usage/servers-detail-resp.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc>
+                &x-openstack-request-idHeader;
+                &serverListDetailsResponseParameters;
             </representation>
         </response>
     </method>
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-server-usage/server-get-resp.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-server-usage/server-get-resp.json
index 276f9b37c..20759e0d9 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-server-usage/server-get-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-server-usage/server-get-resp.json
@@ -46,8 +46,8 @@
             "My Server Name": "Apache1"
         },
         "name": "new-server-test",
-        "os-server-usage:launched_at": "2013-08-15T08:12:40.108903",
-        "os-server-usage:terminated_at": null,
+        "OS-SRV-USG:launched_at": "2013-08-15T08:12:40.108903",
+        "OS-SRV-USG:terminated_at": null,
         "progress": 0,
         "status": "ACTIVE",
         "tenant_id": "openstack",
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-server-usage/servers-detail-resp.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-server-usage/servers-detail-resp.json
index 97df450c1..96eafe344 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-server-usage/servers-detail-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-server-usage/servers-detail-resp.json
@@ -47,8 +47,8 @@
                 "My Server Name": "Apache1"
             },
             "name": "new-server-test",
-            "os-server-usage:launched_at": "2013-08-15T12:04:05.368766",
-            "os-server-usage:terminated_at": null,
+            "OS-SRV-USG:launched_at": "2013-08-15T12:04:05.368766",
+            "OS-SRV-USG:terminated_at": null,
             "progress": 0,
             "status": "ACTIVE",
             "tenant_id": "openstack",