Bug #888210: Changes to fix calls to use the right path.

Change-Id: Ie9f1a6a088c8f00979ee5b70190544763709442c
openstack · Nov 9, 2011 · e2f4e8d · e2f4e8d
1 parent 009f2c9
commit e2f4e8d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/keystone/contrib/extensions/admin/osksadm/__init__.py b/keystone/contrib/extensions/admin/osksadm/__init__.py
@@ -73,16 +73,16 @@ def map_extension_methods(self, mapper, options):
                     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
@@ -325,19 +325,19 @@ def post_user_for_update(self, user_id, **kwargs):
             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}"""