From cab514de1f21c39dfa3f0b3a29a2fd3933a1f98c Mon Sep 17 00:00:00 2001
From: Steve Martinelli <s.martinelli@gmail.com>
Date: Fri, 15 Jul 2016 12:47:30 -0700
Subject: [PATCH] v2 api: correct user list

The GET /v2.0/users route is unnecessarily in the OS-KSADM APIs, it's
not part of that extension. It is already defined correctly in the
v2-admin APIs.

Further, the sample response shows a single user, not a list, so fix
that while we're at it.

Route link: https://github.com/openstack/keystone/blob/master/keystone/v2_crud/admin_crud.py#L81-L86

Change-Id: I4131b955a6986a1311c1e100a54ab18f8622b2ff
---
 api-ref/source/v2-admin/admin-users.inc       |  2 +-
 .../samples/admin/users-list-response.json    | 19 +++++++++++++
 api-ref/source/v2-ext/ksadm-admin.inc         | 28 -------------------
 3 files changed, 20 insertions(+), 29 deletions(-)
 create mode 100644 api-ref/source/v2-admin/samples/admin/users-list-response.json

diff --git a/api-ref/source/v2-admin/admin-users.inc b/api-ref/source/v2-admin/admin-users.inc
index 7bc8fb20ef..1fd572c84e 100644
--- a/api-ref/source/v2-admin/admin-users.inc
+++ b/api-ref/source/v2-admin/admin-users.inc
@@ -108,7 +108,7 @@ Response Parameters
 Response Example
 ----------------
 
-.. literalinclude:: samples/admin/user-show-response.json
+.. literalinclude:: samples/admin/users-list-response.json
    :language: javascript
 
 
diff --git a/api-ref/source/v2-admin/samples/admin/users-list-response.json b/api-ref/source/v2-admin/samples/admin/users-list-response.json
new file mode 100644
index 0000000000..ebb5faa997
--- /dev/null
+++ b/api-ref/source/v2-admin/samples/admin/users-list-response.json
@@ -0,0 +1,19 @@
+{
+    "users": [
+        {
+            "id": "3c9530e",
+            "name": "admin",
+            "email": "admin@example.org",
+            "username": "admin",
+            "enabled": true
+        },
+        {
+            "id": "a0ae37b",
+            "name": "demo",
+            "email": "demo@example.org",
+            "username": "demo",
+            "enabled": true
+        }
+    ],
+    "users_links": []
+}
diff --git a/api-ref/source/v2-ext/ksadm-admin.inc b/api-ref/source/v2-ext/ksadm-admin.inc
index 3fc7abdb5d..58f971c41b 100644
--- a/api-ref/source/v2-ext/ksadm-admin.inc
+++ b/api-ref/source/v2-ext/ksadm-admin.inc
@@ -193,34 +193,6 @@ Response Example
    :language: javascript
 
 
-List users (admin extension)
-============================
-
-.. rest_method::  GET /v2.0/users
-
-Lists all users.
-
-Normal response codes: 200,203
-Error response codes: 413,405,404,403,401,400,503
-
-Response Parameters
--------------------
-
-.. rest_parameters:: parameters.yaml
-
-   - users: users
-   - enabled: enabled
-   - email: email
-   - name: name
-   - id: id
-
-Response Example
-----------------
-
-.. literalinclude:: samples/OS-KSADM/users-list-response.json
-   :language: javascript
-
-
 Create user (admin extension)
 =============================