diff options
| -rw-r--r-- | keystone/contrib/extensions/admin/osksadm/__init__.py | 6 | ||||
| -rw-r--r-- | keystone/test/functional/common.py | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/keystone/contrib/extensions/admin/osksadm/__init__.py b/keystone/contrib/extensions/admin/osksadm/__init__.py index 4a2073fa..6a5abdb7 100644 --- a/keystone/contrib/extensions/admin/osksadm/__init__.py +++ b/keystone/contrib/extensions/admin/osksadm/__init__.py @@ -73,16 +73,16 @@ class ExtensionHandler(BaseExtensionHandler): action="delete_user", conditions=dict(method=["DELETE"])) #API doesn't have any of the shorthand updates as of now. - mapper.connect("/users/{user_id}/password", + mapper.connect("/users/{user_id}/OS-KSADM/password", controller=user_controller, action="set_user_password", conditions=dict(method=["PUT"])) - mapper.connect("/users/{user_id}/tenant", + mapper.connect("/users/{user_id}/OS-KSADM/tenant", controller=user_controller, action="update_user_tenant", conditions=dict(method=["PUT"])) # Test this, test failed - mapper.connect("/users/{user_id}/enabled", + mapper.connect("/users/{user_id}/OS-KSADM/enabled", controller=user_controller, action="set_user_enabled", conditions=dict(method=["PUT"])) diff --git a/keystone/test/functional/common.py b/keystone/test/functional/common.py index b759c2ec..13557040 100644 --- a/keystone/test/functional/common.py +++ b/keystone/test/functional/common.py @@ -325,19 +325,19 @@ class ApiTestCase(RestfulTestCase): path='/users/%s' % (user_id,), **kwargs) def put_user_password(self, user_id, **kwargs): - """PUT /users/{user_id}/password""" + """PUT /users/{user_id}/OS-KSADM/password""" return self.admin_request(method='PUT', - path='/users/%s/password' % (user_id,), **kwargs) + path='/users/%s/OS-KSADM/password' % (user_id,), **kwargs) def put_user_tenant(self, user_id, **kwargs): - """PUT /users/{user_id}/tenant""" + """PUT /users/{user_id}/OS-KSADM/tenant""" return self.admin_request(method='PUT', - path='/users/%s/tenant' % (user_id,), **kwargs) + path='/users/%s/OS-KSADM/tenant' % (user_id,), **kwargs) def put_user_enabled(self, user_id, **kwargs): - """PUT /users/{user_id}/enabled""" + """PUT /users/{user_id}/OS-KSADM/enabled""" return self.admin_request(method='PUT', - path='/users/%s/enabled' % (user_id,), **kwargs) + path='/users/%s/OS-KSADM/enabled' % (user_id,), **kwargs) def delete_user(self, user_id, **kwargs): """DELETE /users/{user_id}""" |