summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2011-09-22 16:38:54 +0000
committerGerrit Code Review <review@openstack.org>2011-09-22 16:38:54 +0000
commitbe05e312176bb06c8c8ed6b360c8c8af36b0a064 (patch)
tree1f970d6aaab06e792dc695bd080eea40b3bada55
parentfffde80d0c1a5d5bb4cf501c08aa03d5c4cd3701 (diff)
parent79722cf0cb1496ccddff71540ab1b82bedda26f2 (diff)
Merge "Minor Changes to extension WADL."
-rw-r--r--keystone/content/admin/OS-KSADM-admin.wadl17
1 files changed, 10 insertions, 7 deletions
diff --git a/keystone/content/admin/OS-KSADM-admin.wadl b/keystone/content/admin/OS-KSADM-admin.wadl
index f0cf6e98..183774c6 100644
--- a/keystone/content/admin/OS-KSADM-admin.wadl
+++ b/keystone/content/admin/OS-KSADM-admin.wadl
@@ -46,13 +46,10 @@
<resource id="userById" path="{userId}">
<method href="#updateUser"/>
<method href="#deleteUser"/>
- <resource id="user-OS-KSADM" path="OS-KSADM">
- <resource id="enabled" path="enabled">
- <method href="#setUserEnabled"/>
- </resource>
-
- <resource id="userRoles" path="roles">
- <method href="#listUserRoles"/>
+
+ <resource id="userRoles" path="roles">
+ <method href="#listUserRoles"/>
+ <resource id="user-roles-OS-KSADM" path="OS-KSADM">
<resource id="userRoleById" path="{roleId}">
<param name="roleId" style="template" type="xsd:int"/>
<method href="#addUserRole"/>
@@ -60,6 +57,12 @@
<method href="#deleteUserRole"/>
</resource>
</resource>
+ </resource>
+
+ <resource id="user-OS-KSADM" path="OS-KSADM">
+ <resource id="enabled" path="enabled">
+ <method href="#setUserEnabled"/>
+ </resource>
<resource id="userCredentials" path="credentials">
<method href="#addUserCredential"/>