summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2011-02-24 21:59:36 -0500
committerTodd Willey <todd@ansolabs.com>2011-02-24 21:59:36 -0500
commit2218cb025adca1ded3e6596acc182b88742e3a51 (patch)
treeb04fec30c75d606ec4e59779117f627f86436cd4 /nova/api
parented7c71f56c5f5e2ba71273cf0099393fb986ebf9 (diff)
downloadnova-2218cb025adca1ded3e6596acc182b88742e3a51.tar.gz
nova-2218cb025adca1ded3e6596acc182b88742e3a51.tar.xz
nova-2218cb025adca1ded3e6596acc182b88742e3a51.zip
Rename auth_token db methods to follow standard.
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/auth.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/api/openstack/auth.py b/nova/api/openstack/auth.py
index 1dfdd5318..c844c6231 100644
--- a/nova/api/openstack/auth.py
+++ b/nova/api/openstack/auth.py
@@ -103,11 +103,11 @@ class AuthMiddleware(wsgi.Middleware):
2 days ago.
"""
ctxt = context.get_admin_context()
- token = self.db.auth_get_token(ctxt, token_hash)
+ token = self.db.auth_token_get(ctxt, token_hash)
if token:
delta = datetime.datetime.now() - token.created_at
if delta.days >= 2:
- self.db.auth_destroy_token(ctxt, token)
+ self.db.auth_token_destroy(ctxt, token)
else:
return self.auth.get_user(token.user_id)
return None
@@ -131,6 +131,6 @@ class AuthMiddleware(wsgi.Middleware):
token_dict['server_management_url'] = req.url
token_dict['storage_url'] = ''
token_dict['user_id'] = user.id
- token = self.db.auth_create_token(ctxt, token_dict)
+ token = self.db.auth_token_create(ctxt, token_dict)
return token, user
return None, None