diff options
| -rwxr-xr-x | keystone/backends/memcache/api/token.py | 33 | ||||
| -rw-r--r-- | keystone/manage/api.py | 2 | ||||
| -rwxr-xr-x | keystone/test/functional/test_roles.py | 3 | ||||
| -rwxr-xr-x | run_tests.py | 4 |
4 files changed, 23 insertions, 19 deletions
diff --git a/keystone/backends/memcache/api/token.py b/keystone/backends/memcache/api/token.py index 76e977ae..9f1fafec 100755 --- a/keystone/backends/memcache/api/token.py +++ b/keystone/backends/memcache/api/token.py @@ -22,44 +22,45 @@ class TokenAPI(BaseTokenAPI): def create(self, token): if not hasattr(token, 'tenant_id'): token.tenant_id = None - if token.tenant_id != None: - tenant_user_key = token.tenant_id + "::" + token.user_id + if token.tenant_id is not None: + tenant_user_key = "%s::%s" % (token.tenant_id, token.user_id) else: - tenant_user_key = token.user_id + tenant_user_key = "U%s" % token.user_id MEMCACHE_SERVER.set(token.id, token) MEMCACHE_SERVER.set(tenant_user_key, token) def get(self, id): token = MEMCACHE_SERVER.get(id) - if token != None and not hasattr(token, 'tenant_id'): + if token is not None and not hasattr(token, 'tenant_id'): token.tenant_id = None - return token + return token def delete(self, id): token = self.get(id) - if token != None: + if token is not None: MEMCACHE_SERVER.delete(id) - if token != None and not hasattr(token, 'tenant_id'): + if token is not None and not hasattr(token, 'tenant_id'): token.tenant_id = None - if token.tenant_id != None: - MEMCACHE_SERVER.delete(token.tenant_id + "::" + token.user_id) + if token.tenant_id is not None: + MEMCACHE_SERVER.delete("%s::%s" % (token.tenant_id, + token.user_id)) else: MEMCACHE_SERVER.delete(token.id) - MEMCACHE_SERVER.delete(token.user_id) + MEMCACHE_SERVER.delete("U%s" % token.user_id) def get_for_user(self, user_id): - token = MEMCACHE_SERVER.get(user_id) - if token != None and not hasattr(token, 'tenant_id'): + token = MEMCACHE_SERVER.get("U%s" % user_id) + if token is not None and not hasattr(token, 'tenant_id'): token.tenant_id = None return token def get_for_user_by_tenant(self, user_id, tenant_id): - if tenant_id != None: - token = MEMCACHE_SERVER.get(tenant_id + "::" + user_id) + if tenant_id is not None: + token = MEMCACHE_SERVER.get("%s::%s" % (tenant_id, user_id)) else: - token = MEMCACHE_SERVER.get(user_id) - if token != None and not hasattr(token, 'tenant_id'): + token = MEMCACHE_SERVER.get("U%s" % user_id) + if token is not None and not hasattr(token, 'tenant_id'): token.tenant_id = None return token diff --git a/keystone/manage/api.py b/keystone/manage/api.py index a822cdd2..98ab2474 100644 --- a/keystone/manage/api.py +++ b/keystone/manage/api.py @@ -191,7 +191,7 @@ def add_credentials(user, type, key, secrete, tenant=None): if tenant: tenant = db_api.TENANT.get_by_name(tenant).id - obj = db_models.Token() + obj = db_models.Credentials() obj.user_id = user obj.type = type obj.key = key diff --git a/keystone/test/functional/test_roles.py b/keystone/test/functional/test_roles.py index 874bc27d..a422d312 100755 --- a/keystone/test/functional/test_roles.py +++ b/keystone/test/functional/test_roles.py @@ -37,7 +37,8 @@ class CreateRolesTest(RolesTest): def test_create_role_using_service_token(self): user = self.create_user_with_known_password().json['user'] - self.admin_token = self.authenticate(user['name'], user['password']) + self.admin_token = self.authenticate(user['name'], + user['password']).json['access']['token']['id'] self.create_role(assert_status=401) def test_create_roles_using_disabled_token(self): diff --git a/run_tests.py b/run_tests.py index a8060e74..ae8f1f60 100755 --- a/run_tests.py +++ b/run_tests.py @@ -30,7 +30,9 @@ class LDAPTest(KeystoneTest): TESTS = [ SQLTest, - # currently failing, and has yet to pass in jenkins: MemcacheTest, + # Waiting on instructions on how to start memcached in jenkins: + # But tests pass + # MemcacheTest, LDAPTest, SSLTest, ] |