From cbaa587d6233f5a7a4327196a6224bba4c85cba3 Mon Sep 17 00:00:00 2001 From: Gabriel Hurley Date: Thu, 27 Oct 2011 13:23:41 -0700 Subject: [PATCH] Cleans up the data returned for a token a little. --- keystoneclient/v2_0/tokens.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/keystoneclient/v2_0/tokens.py b/keystoneclient/v2_0/tokens.py index 3aa165ffe..1e45f68df 100644 --- a/keystoneclient/v2_0/tokens.py +++ b/keystoneclient/v2_0/tokens.py @@ -9,13 +9,12 @@ class Token(base.Resource): return self._info['token']['id'] @property - def username(self): - return self._info['user'].get('username', None) + def expires(self): + return self._info['token']['expires'] @property - def tenant_id(self): - return self._info['user'].get('tenantId', None) - + def tenant(self): + return self._info['token'].get('tenant', None) class TokenManager(base.ManagerWithFind): resource_class = Token