From 6108350bb035e726fbca337201059f03d52e361a Mon Sep 17 00:00:00 2001
From: Danny Choi <dannchoi@cisco.com>
Date: Fri, 31 Jul 2015 18:38:42 -0400
Subject: [PATCH] Replace the create user REQ and RESP JSON files

Create new REQ and RESP JSON files to incldue "tenantId" in
the REQ JSON body, and "username" in the RESP JSON body.

Also add the "username" in the RESP parameters table.

Change-Id: I47f9b89cd28f9a7ebe8b7d5b52919249705351ef
Closes-Bug: 1391532
---
 .../src/v2.0/samples/user-create-request.json      |  9 +++++++++
 .../src/v2.0/samples/user-create-response.json     |  9 +++++++++
 .../identity-api/src/v2.0/wadl/identity-admin.wadl | 14 ++++++++++++--
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 api-ref/src/wadls/identity-api/src/v2.0/samples/user-create-request.json
 create mode 100644 api-ref/src/wadls/identity-api/src/v2.0/samples/user-create-response.json

diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/user-create-request.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/user-create-request.json
new file mode 100644
index 000000000..9e86e5fca
--- /dev/null
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/user-create-request.json
@@ -0,0 +1,9 @@
+{
+    "user": {
+        "tenantId": "null",
+        "name": "jqsmith",
+        "email": "john.smith@example.org",
+        "password": "null",
+        "enabled": true
+    }
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/user-create-response.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/user-create-response.json
new file mode 100644
index 000000000..ced78a205
--- /dev/null
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/user-create-response.json
@@ -0,0 +1,9 @@
+{
+    "user": {
+        "id": "u1000",
+        "name": "jqsmith",
+        "email": "john.smith@example.org",
+        "enabled": true,
+        "username": "jqsmith"
+    }
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl
index f2f807e85..b37cdf9bb 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl
@@ -461,7 +461,7 @@
         <request>
             <representation mediaType="application/json" element="identity:user">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="../samples/user.json"/>
+                    <xsdxt:code href="../samples/user-create-request.json"/>
                 </wadl:doc>
                 <param xmlns="http://wadl.dev.java.net/2009/02" name="X-Auth-Token" style="header"
                     type="xsd:string" required="true">
@@ -484,6 +484,11 @@
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">The user
                         email.</wadl:doc>
                 </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02" name="password" style="plain"
+                    type="xsd:string" required="true">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">The user
+                        password.</wadl:doc>
+                </param>
                 <param xmlns="http://wadl.dev.java.net/2009/02" name="enabled" style="plain"
                     type="xsd:bool" required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">Indicates whether
@@ -494,7 +499,7 @@
         <response status="201">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="../samples/user.json"/>
+                    <xsdxt:code href="../samples/user-create-response.json"/>
                 </wadl:doc>
                 <param xmlns="http://wadl.dev.java.net/2009/02" name="id" style="plain"
                     type="xsd:string" required="true">
@@ -511,6 +516,11 @@
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">The user
                         email.</wadl:doc>
                 </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02" name="username" style="plain"
+                    type="xsd:string" required="true">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">The user
+                        username.</wadl:doc>
+                </param>
                 <param xmlns="http://wadl.dev.java.net/2009/02" name="enabled" style="plain"
                     type="xsd:bool" required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">Indicates whether