diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-02-25 08:39:12 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-02-25 08:39:12 +0000 |
| commit | 645bc7a7dea6ba01d76589632200636e243641ec (patch) | |
| tree | 338ff9f558524636918fa584e2f757df62000367 /nova/api | |
| parent | 460475cbb6397bc294a55dee94040447d889949c (diff) | |
| parent | 865c3d57f8b84dfcc493ecead12816874b160e35 (diff) | |
| download | nova-645bc7a7dea6ba01d76589632200636e243641ec.tar.gz nova-645bc7a7dea6ba01d76589632200636e243641ec.tar.xz nova-645bc7a7dea6ba01d76589632200636e243641ec.zip | |
Cleanup db method names for dealing with auth_tokens to follow standard naming pattern.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/auth.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/api/openstack/auth.py b/nova/api/openstack/auth.py index 1dfdd5318..dff69a7f2 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.id) 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 |