From 1f5711bf13535c6890e349a7da2b52822b10ae8b Mon Sep 17 00:00:00 2001
From: jichenjc <jichenjc@cn.ibm.com>
Date: Thu, 10 Dec 2015 21:11:32 +0800
Subject: [PATCH] Add detailed info to instance and server name

Instance and server name is different from nova perspective, but
end user might don't know it, add more into to both of the fields.

Change-Id: Id9068dd49a97b282466242f06e765b532f150a72
Partial-Bug: #1515222
---
 .../src/wadls/compute-api/src/v2.1/common.ent | 71 ++++++++++---------
 1 file changed, 39 insertions(+), 32 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 0def39de3..0c5fb4f84 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
@@ -1356,18 +1356,22 @@
 <wadl:doc xmlns="http://docbook.org/ns/docbook"
    xmlns:wadl="http://wadl.dev.java.net/2009/02"
    xml:lang="EN">
-   <para>The server name.</para>
+   <para>
+      The server name. The user sets the server name.
+   </para>
 </wadl:doc>
 </param>'>
 <!ENTITY diskConfigResponseParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02"
- name="OS-DCF:diskConfig" style="plain" type="csapi:string" required="true">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-   xmlns:wadl="http://wadl.dev.java.net/2009/02"
-   xml:lang="EN">
-        <para>Disk configuration, which is <code>AUTO</code> or
-           <code>MANUAL</code>.</para>
-    </wadl:doc>
+   name="OS-DCF:diskConfig" style="plain" type="csapi:string" required="true">
+   <wadl:doc xmlns="http://docbook.org/ns/docbook"
+      xmlns:wadl="http://wadl.dev.java.net/2009/02"
+      xml:lang="EN">
+      <para>
+         Disk configuration, which is <code>AUTO</code> or
+         <code>MANUAL</code>.
+      </para>
+   </wadl:doc>
 </param>'>
 <!ENTITY availability_zoneResponseParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02"
@@ -1400,10 +1404,13 @@
 <param xmlns="http://wadl.dev.java.net/2009/02"
    name="OS-EXT-SRV-ATTR:instance_name" style="plain"
    type="csapi:string" required="true">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
-        <para>The instance name.</para>
+      <para>
+         The instance name. The Compute API generates the instance name from
+         the instance name template.
+      </para>
     </wadl:doc>
 </param>'>
 <!ENTITY power_stateResponseParameter '
@@ -1450,28 +1457,28 @@
 <param xmlns="http://wadl.dev.java.net/2009/02"
    name="OS-SRV-USG:launched_at" style="plain" required="true"
    type="xsd:dateTime">
-<wadl:doc xmlns="http://docbook.org/ns/docbook"
-          xmlns:wadl="http://wadl.dev.java.net/2009/02"
-          xml:lang="EN">
-    <para>
-        The date and time when the server was launched.
-    </para>
-    <para>
-        The date and time stamp format is <link
-        xlink:href="https://en.wikipedia.org/wiki/ISO_8601">ISO 8601</link>:
-    </para>
-    <programlisting>CCYY-MM-DDThh:mm:ss±hh:mm</programlisting>
-    <para>
-        For example, <code>2015-08-27T09:49:58-05:00</code>.
-    </para>
-    <para>
-        The <code>±hh:mm</code> value, if included, is the time zone as an offset from UTC.
-    </para>
-    <para>
-        If the <code>deleted_at</code> date and time stamp is not set, its value is
-        <code>null</code>.
-    </para>
-</wadl:doc>
+   <wadl:doc xmlns="http://docbook.org/ns/docbook"
+      xmlns:wadl="http://wadl.dev.java.net/2009/02"
+      xml:lang="EN">
+      <para>
+         The date and time when the server was launched.
+      </para>
+      <para>
+         The date and time stamp format is <link
+         xlink:href="https://en.wikipedia.org/wiki/ISO_8601">ISO 8601</link>:
+      </para>
+      <programlisting>CCYY-MM-DDThh:mm:ss±hh:mm</programlisting>
+      <para>
+         For example, <code>2015-08-27T09:49:58-05:00</code>.
+      </para>
+      <para>
+         The <code>±hh:mm</code> value, if included, is the time zone as an offset from UTC.
+      </para>
+      <para>
+         If the <code>deleted_at</code> date and time stamp is not set, its value is
+         <code>null</code>.
+      </para>
+   </wadl:doc>
 </param>'>
 <!ENTITY terminated_at-ResponseParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02"