Author: tomaz
Date: Tue May 21 21:47:54 2013
New Revision: 1484981
URL: http://svn.apache.org/r1484981
Log:
More assertions for osac class.
Modified:
libcloud/trunk/libcloud/common/openstack.py
libcloud/trunk/libcloud/test/compute/test_openstack.py
Modified: libcloud/trunk/libcloud/common/openstack.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/common/openstack.py?rev=1484981&r1=1484980&r2=1484981&view=diff
==============================================================================
--- libcloud/trunk/libcloud/common/openstack.py (original)
+++ libcloud/trunk/libcloud/common/openstack.py Tue May 21 21:47:54 2013
@@ -98,6 +98,7 @@ class OpenStackAuthConnection(Connection
self.urls = {}
self.auth_token = None
+ self.auth_token_expires = None
self.auth_user_info = None
def morph_action_hook(self, action):
Modified: libcloud/trunk/libcloud/test/compute/test_openstack.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_openstack.py?rev=1484981&r1=1484980&r2=1484981&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_openstack.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_openstack.py Tue May 21 21:47:54
2013
@@ -124,6 +124,12 @@ class OpenStackAuthConnectionTests(unitt
self.assertTrue(len(osa.urls) >= 1)
self.assertTrue(osa.auth_token is not None)
+ if auth_version in ['1.1', '2.0', '2.0_apikey', '2.0_password']:
+ self.assertTrue(osa.auth_token_expires is not None)
+
+ if auth_version in ['2.0', '2.0_apikey', '2.0_password']:
+ self.assertTrue(osa.auth_user_info is not None)
+
def test_token_expiration_and_force_reuath(self):
# TODO
pass
