openstack
/
keystone
Code Issues Proposed changes

Merge "v2 api: list user roles is defined twice"

This commit is contained in:
Jenkins 2016-07-16 18:40:02 +00:00 committed by Gerrit Code Review
parent e4954034d9 139dc8ddcc
commit a0a05168cd
3 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
api-ref/source/v2-ext/ksadm-admin.inc
View File

@ -136,7 +136,7 @@ Response Parameters
Response Example
----------------
.. literalinclude:: samples/OS-KSADM/user-show-response.json
.. literalinclude:: samples/OS-KSADM/userwithenabledonly-show-response.json
:language: javascript
@ -378,30 +378,6 @@ Response Parameters
- Location: Location
List global roles for user
==========================
.. rest_method:: GET /v2.0/users/{userId}/roles
Lists global roles for a user.
Normal response codes: 200,203
Error response codes: 413,405,404,403,401,400,503
Request
-------
.. rest_parameters:: parameters.yaml
- userId: userId
Response Example
----------------
.. literalinclude:: samples/OS-KSADM/user-roles-list-response.json
:language: javascript
Show role details, by ID
========================

12
api-ref/source/v2-ext/samples/OS-KSADM/user-roles-list-response.json
View File

@ -1,12 +0,0 @@
{
"roles": [
{
"id": "8341d3603a1d4d5985bff09f10704d4d",
"name": "service"
},
{
"id": "2e66d57df76946fdbe034bc4da6fdec0",
"name": "admin"
}
]
}

8
api-ref/source/v2-ext/samples/OS-KSADM/user-show-response.json
View File

@ -1,8 +0,0 @@
{
"user": {
"id": "u1000",
"name": "jqsmith",
"email": "john.smith@example.org",
"enabled": true
}
}