Merging changes from trunk.

5 files changed, 15 insertions, 15 deletions

diff --git a/bin/keystone-manage b/bin/keystone-manage
index 86f14c21..37bd77c0 100755
--- a/bin/keystone-manage
+++ b/bin/keystone-manage
@@ -344,7 +344,7 @@ def Main():
                              ', tenant, and expiration')
             try:
                 object = db_models.Token()
-                object.token_id = object_id
+                object.id = object_id
                 object.user_id = args[3]
                 object.tenant_id = args[4]
                 tuple_time = datetime.datetime.strptime(args[5]
@@ -352,7 +352,7 @@ def Main():
                                                         "%Y%m%dT%H:%M")
                 object.expires = tuple_time
                 db_api.token.create(object)
-                print "SUCCESS: Token %s created." % object.token_id
+                print "SUCCESS: Token %s created." % object.id
                 return
             except Exception as exc:
                 print "ERROR: Failed to create token %s: %s" % (object_id, exc)
@@ -365,7 +365,7 @@ def Main():
                 print 'token', 'user', 'expiration', 'tenant'
                 print '-' * 20
                 for row in objects:
-                    print row.token_id, row.user_id, row.expires, row.tenant_id
+                    print row.id, row.user_id, row.expires, row.tenant_id
             except Exception, e:
                 print 'Error getting all tokens:', str(e)
             return
diff --git a/keystone/db/sqlalchemy/api/token.py b/keystone/db/sqlalchemy/api/token.py
index 1863292f..0c43af67 100644
--- a/keystone/db/sqlalchemy/api/token.py
+++ b/keystone/db/sqlalchemy/api/token.py
@@ -27,7 +27,7 @@ def create(values):
 def get(id, session=None):
     if not session:
         session = get_session()
-    result = session.query(models.Token).filter_by(token_id=id).first()
+    result = session.query(models.Token).filter_by(id=id).first()
     return result
 
 
diff --git a/keystone/db/sqlalchemy/models.py b/keystone/db/sqlalchemy/models.py
index d7055ed3..bbf02aa7 100755
--- a/keystone/db/sqlalchemy/models.py
+++ b/keystone/db/sqlalchemy/models.py
@@ -153,7 +153,7 @@ class Group(Base, KeystoneBase):
 class Token(Base, KeystoneBase):
     __tablename__ = 'token'
 
-    token_id = Column(String(255), primary_key=True, unique=True)
+    id = Column(String(255), primary_key=True, unique=True)
     user_id = Column(String(255))
     tenant_id = Column(String(255))
     expires = Column(DateTime)
diff --git a/keystone/logic/service.py b/keystone/logic/service.py
index 86e23366..17c9c0bb 100755
--- a/keystone/logic/service.py
+++ b/keystone/logic/service.py
@@ -73,7 +73,7 @@ class IdentityService(object):
         if not dtoken or dtoken.expires < datetime.now():
             # Create new token
             dtoken = db_models.Token()
-            dtoken.token_id = str(uuid.uuid4())
+            dtoken.id = str(uuid.uuid4())
             dtoken.user_id = duser.id
             if credentials.tenant_id:
                 dtoken.tenant_id = credentials.tenant_id
@@ -850,16 +850,16 @@ class IdentityService(object):
 
     def __get_auth_data(self, dtoken, tenant_id):
         """return AuthData object for a token"""
-        base_urls = None
+        endpoints = None
         if tenant_id != None:
-            base_urls = db_api.tenant.get_all_endpoints(tenant_id)
+            endpoints = db_api.tenant.get_all_endpoints(tenant_id)
         token = auth.Token(dtoken.expires, dtoken.token_id, tenant_id)
-        return auth.AuthData(token, base_urls)
+        return auth.AuthData(token, endpoints)
 
     def __get_validate_data(self, dtoken, duser):
         """return ValidateData object for a token/user pair"""
 
-        token = auth.Token(dtoken.expires, dtoken.token_id, dtoken.tenant_id)
+        token = auth.Token(dtoken.expires, dtoken.id, dtoken.tenant_id)
         ts = []
         if dtoken.tenant_id:
             droleRefs = db_api.role.ref_get_all_tenant_roles(duser.id,
diff --git a/keystone/logic/types/auth.py b/keystone/logic/types/auth.py
index c52c66da..fe2d7a0c 100755
--- a/keystone/logic/types/auth.py
+++ b/keystone/logic/types/auth.py
@@ -87,7 +87,7 @@ class Token(object):
 
     def __init__(self, expires, token_id, tenant_id=None):
         self.expires = expires
-        self.token_id = token_id
+        self.id = token_id
         self.tenant_id = tenant_id
 
 
@@ -132,7 +132,7 @@ class AuthData(object):
             xmlns="http://docs.openstack.org/identity/api/v2.0")
         token = etree.Element("token",
                              expires=self.token.expires.isoformat())
-        token.set("id", self.token.token_id)
+        token.set("id", self.token.id)
         dom.append(token)
         if self.base_urls != None:
             service_catalog = etree.Element("serviceCatalog")
@@ -168,7 +168,7 @@ class AuthData(object):
 
     def to_json(self):
         token = {}
-        token["id"] = self.token.token_id
+        token["id"] = self.token.id
         token["expires"] = self.token.expires.isoformat()
         auth = {}
         auth["token"] = token
@@ -209,7 +209,7 @@ class ValidateData(object):
                         xmlns="http://docs.openstack.org/identity/api/v2.0")
         token = etree.Element("token",
                              expires=self.token.expires.isoformat())
-        token.set("id", self.token.token_id)
+        token.set("id", self.token.id)
         if self.token.tenant_id:
             token.set("tenantId", self.token.tenant_id)
         user = etree.Element("user",
@@ -231,7 +231,7 @@ class ValidateData(object):
 
     def to_json(self):
         token = {}
-        token["id"] = self.token.token_id
+        token["id"] = self.token.id
         token["expires"] = self.token.expires.isoformat()
         if self.token.tenant_id:
             token["tenantId"] = self.token.tenant_id