Merge "Add token expiration" into redux

3 files changed, 26 insertions, 0 deletions

diff --git a/keystone/common/sql/core.py b/keystone/common/sql/core.py
index 2bd24f48..cb621865 100644
--- a/keystone/common/sql/core.py
+++ b/keystone/common/sql/core.py
@@ -26,6 +26,7 @@ ModelBase = declarative.declarative_base()
 Column = sql.Column
 String = sql.String
 ForeignKey = sql.ForeignKey
+DateTime = sql.DateTime
 
 
 # Special Fields
diff --git a/keystone/common/sql/migrate_repo/versions/001_add_initial_tables.py b/keystone/common/sql/migrate_repo/versions/001_add_initial_tables.py
index 5875817e..ae54b476 100644
--- a/keystone/common/sql/migrate_repo/versions/001_add_initial_tables.py
+++ b/keystone/common/sql/migrate_repo/versions/001_add_initial_tables.py
@@ -5,6 +5,7 @@ from keystone.common import sql
 
 # these are to make sure all the models we care about are defined
 import keystone.identity.backends.sql
+import keystone.token.backends.sql
 import keystone.contrib.ec2.backends.sql
 
 
diff --git a/keystone/common/utils.py b/keystone/common/utils.py
index b5269bed..96e595bb 100644
--- a/keystone/common/utils.py
+++ b/keystone/common/utils.py
@@ -23,6 +23,7 @@ import hmac
 import json
 import subprocess
 import sys
+import time
 import urllib
 
 import passlib.hash
@@ -35,6 +36,9 @@ CONF = config.CONF
 config.register_int('crypt_strength', default=40000)
 
 
+ISO_TIME_FORMAT = '%Y-%m-%dT%H:%M:%SZ'
+
+
 def import_class(import_str):
     """Returns a class from a string including module and class."""
     mod_str, _sep, class_str = import_str.rpartition('.')
@@ -201,3 +205,23 @@ def check_output(*popenargs, **kwargs):
 
 def git(*args):
     return check_output(['git'] + list(args))
+
+
+def isotime(dt_obj):
+    """Format datetime object as ISO compliant string.
+
+    :param dt_obj: datetime.datetime object
+    :returns: string representation of datetime object
+
+    """
+    return dt_obj.strftime(ISO_TIME_FORMAT)
+
+
+def unixtime(dt_obj):
+    """Format datetime object as unix timestamp
+
+    :param dt_obj: datetime.datetime object
+    :returns: float
+
+    """
+    return time.mktime(dt_obj.utctimetuple())