Changes to support /tokens on docbook and minor roleref changes

7 files changed, 24 insertions, 24 deletions

diff --git a/docs/guide/src/docbkx/identitydevguide.xml b/docs/guide/src/docbkx/identitydevguide.xml
index 4418ce42..23af253a 100644
--- a/docs/guide/src/docbkx/identitydevguide.xml
+++ b/docs/guide/src/docbkx/identitydevguide.xml
@@ -748,7 +748,7 @@ Host: identity.api.openstack.org/v1.1/
           <tbody>
             <tr>
               <td colspan="1"> &POST; </td>
-              <td colspan="1">/token</td>
+              <td colspan="1">/tokens</td>
               <td colspan="4">Authenticate to generate a token.</td>
             </tr>
           </tbody>
@@ -795,7 +795,7 @@ Host: identity.api.openstack.org/v1.1/
             <tr>
               <td colspan="1"> &GET; </td>
               <td colspan="4"
-                  >/token/<parameter>tokenId</parameter>?belongsTo=<parameter>tenantId</parameter></td>
+                  >/tokens/<parameter>tokenId</parameter>?belongsTo=<parameter>tenantId</parameter></td>
               <td colspan="3">Check that a token is valid and that it belongs to a particular user
                 and return the permissions relevant to a particular client.</td>
             </tr>
@@ -810,7 +810,7 @@ Host: identity.api.openstack.org/v1.1/
         &NO_REQUEST;
         <para>
             Valid tokens will exist in the
-            /token/<parameter>tokenId</parameter> path and invalid
+            /tokens/<parameter>tokenId</parameter> path and invalid
             tokens will not.  In other words, a user should expect an
             itemNotFound (<errorcode>404</errorcode>) fault for an
             invalid token.
@@ -835,7 +835,7 @@ Host: identity.api.openstack.org/v1.1/
           <tbody>
             <tr>
               <td colspan="1"> &DELETE; </td>
-              <td colspan="4">/token/<parameter>tokenId</parameter></td>
+              <td colspan="4">/tokens/<parameter>tokenId</parameter></td>
               <td colspan="3"> Revoke an existing token.</td>
             </tr>
           </tbody>
@@ -1423,7 +1423,7 @@ Host: identity.api.openstack.org/v1.1/
                         <tr>
                             <td colspan="1">&DELETE;
                             </td>
-                            <td colspan="4">/users/<parameter>userId</parameter>/roleRefs/<parameter>roleId</parameter></td>
+                            <td colspan="4">/users/<parameter>userId</parameter>/roleRefs/<parameter>roleRefId</parameter></td>
                             <td colspan="3">
                                 Remove a role from a user.
                             </td>
diff --git a/docs/guide/src/docbkx/samples/roleRef.json b/docs/guide/src/docbkx/samples/roleRef.json
index 99d7b3b8..83f4ae4b 100644
--- a/docs/guide/src/docbkx/samples/roleRef.json
+++ b/docs/guide/src/docbkx/samples/roleRef.json
@@ -1,7 +1,7 @@
 {
    "roleRef" : {
   		"id" : 1,
-  		"href" : "https://.openstack.org/identity/v1.1/roles/admin",
+  		"roleId" : "admin",
   		"tenantId" : "one"
   }
 }
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/roleRef.xml b/docs/guide/src/docbkx/samples/roleRef.xml
index e5eb30f7..29115ee2 100644
--- a/docs/guide/src/docbkx/samples/roleRef.xml
+++ b/docs/guide/src/docbkx/samples/roleRef.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <roleRef xmlns="http://docs.openstack.org/identity/api/v2.0"
-            id="1" tenantId="tenantId"/>
+            id="1" roleId="Admin" tenantId="tenantId"/>
diff --git a/docs/guide/src/docbkx/samples/roleRefs.json b/docs/guide/src/docbkx/samples/roleRefs.json
index 77819d44..51573f74 100644
--- a/docs/guide/src/docbkx/samples/roleRefs.json
+++ b/docs/guide/src/docbkx/samples/roleRefs.json
@@ -2,12 +2,12 @@
  "roleRefs" : [
   {
   	"id" : 1,
-  	"href" : "https://.openstack.org/identity/v2.0/roles/admin",
+  	"roleId" : "admin",
   	"tenantId" : "one"
   },
   {
   	"id" : 2,
-  	"href" : "https://.openstack.org/identity/v2.0/roles/test",
+  	"roleId" : "test",
   	"tenantId" : "two"
   }
  ]
diff --git a/docs/guide/src/docbkx/samples/roleRefs.xml b/docs/guide/src/docbkx/samples/roleRefs.xml
index 284154ce..bd7ee983 100644
--- a/docs/guide/src/docbkx/samples/roleRefs.xml
+++ b/docs/guide/src/docbkx/samples/roleRefs.xml
@@ -3,7 +3,7 @@
 <roleRefs
     xmlns="http://docs.openstack.org/identity/api/v2.0">
     <roleRef xmlns="http://docs.openstack.org/identity/api/v2.0"
-                href="https://.openstack.org/identity/v2.0/roles/admin" id="3" tenantId="tenantId"/>
+                roleId="admin" id="3" tenantId="tenantId"/>
     <roleRef xmlns="http://docs.openstack.org/identity/api/v2.0"
-                href="https://.openstack.org/identity/v2.0/roles/test" id="4" tenantId="tenantId"/>
+                roleId="test" id="4" tenantId="tenantId"/>
 </roleRefs>                
diff --git a/keystone/logic/types/role.py b/keystone/logic/types/role.py
index 531ed56d..a88b9faf 100644
--- a/keystone/logic/types/role.py
+++ b/keystone/logic/types/role.py
@@ -121,8 +121,8 @@ class RoleRef(object):
                             "roleRef")
             if root == None:
                 raise fault.BadRequestFault("Expecting RoleRef")
-            role_id = root.get("role_id")
-            tenant_id = root.get("tenant_id")
+            role_id = root.get("roleId")
+            tenant_id = root.get("tenantId")
             if role_id == None:
                 raise fault.BadRequestFault("Expecting Role")
             elif tenant_id == None:
@@ -138,16 +138,16 @@ class RoleRef(object):
             if not "roleRef" in obj:
                 raise fault.BadRequestFault("Expecting Role Ref")
             roleRef = obj["roleRef"]
-            if not "role_id" in roleRef:
+            if not "roleId" in roleRef:
                 role_id = None
             else:
-                role_id = roleRef["role_id"]
+                role_id = roleRef["roleId"]
             if role_id == None:
                 raise fault.BadRequestFault("Expecting Role")
-            if not "tenant_id" in roleRef:
+            if not "tenantId" in roleRef:
                 tenant_id = None
             else:
-                tenant_id = roleRef["tenant_id"]
+                tenant_id = roleRef["tenantId"]
             if tenant_id == None:
                 raise fault.BadRequestFault("Expecting Tenant")    
             return RoleRef('',role_id, tenant_id)
@@ -160,9 +160,9 @@ class RoleRef(object):
         if self.role_ref_id:
             dom.set("id", str(self.role_ref_id))
         if self.role_id:
-            dom.set("role_id", self.role_id)
+            dom.set("roleId", self.role_id)
         if self.tenant_id:
-            dom.set("tenant_id", self.tenant_id)
+            dom.set("tenantId", self.tenant_id)
         return dom
 
     def to_xml(self):
@@ -173,9 +173,9 @@ class RoleRef(object):
         if self.role_ref_id:
             roleRef["id"] = self.role_ref_id
         if self.role_id:
-            roleRef["role_id"] = self.role_id
+            roleRef["roleId"] = self.role_id
         if self.tenant_id:
-            roleRef["tenant_id"] = self.tenant_id
+            roleRef["tenantId"] = self.tenant_id
         return {'roleRef': roleRef}
 
     def to_json(self):
diff --git a/test/unit/test_common.py b/test/unit/test_common.py
index 2e7e11bb..126a3f62 100644
--- a/test/unit/test_common.py
+++ b/test/unit/test_common.py
@@ -720,8 +720,8 @@ def create_role_ref(user_id, role_id, tenant_id, auth_token):
     header = httplib2.Http(".cache")
 
     url = '%susers/%s/roleRefs' % (URL, user_id)
-    body = {"roleRef": {"tenant_id": tenant_id,
-                       "role_id": role_id}}
+    body = {"roleRef": {"tenantId": tenant_id,
+                       "roleId": role_id}}
     resp, content = header.request(url, "POST", body=json.dumps(body),
                               headers={"Content-Type": "application/json",
                                        "X-Auth-Token": auth_token})
@@ -733,7 +733,7 @@ def create_role_ref_xml(user_id, role_id, tenant_id, auth_token):
     url = '%susers/%s/roleRefs' % (URL, user_id)
     body = '<?xml version="1.0" encoding="UTF-8"?>\
             <roleRef xmlns="http://docs.openstack.org/identity/api/v2.0" \
-            tenant_id="%s" role_id="%s"/>\
+            tenantId="%s" roleId="%s"/>\
                     ' % (tenant_id, role_id)
     resp, content = header.request(url, "POST", body=body,
                               headers={"Content-Type": "application/xml",