libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject [2/2] libcloud git commit: Update Cloudwatt driver so it works with the latest OpenStack auth refactoring changes.
Date Sun, 17 May 2015 16:33:04 GMT
Update Cloudwatt driver so it works with the latest OpenStack auth refactoring
changes.


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/8aa3e275
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/8aa3e275
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/8aa3e275

Branch: refs/heads/trunk
Commit: 8aa3e27563970decd851ca84672562a41e53ef0a
Parents: c661cb5
Author: Tomaz Muraus <tomaz@tomaz.me>
Authored: Sun May 17 18:25:09 2015 +0200
Committer: Tomaz Muraus <tomaz@tomaz.me>
Committed: Sun May 17 18:25:09 2015 +0200

----------------------------------------------------------------------
 libcloud/compute/drivers/cloudwatt.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/8aa3e275/libcloud/compute/drivers/cloudwatt.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/cloudwatt.py b/libcloud/compute/drivers/cloudwatt.py
index a6f098d..2fd93c8 100644
--- a/libcloud/compute/drivers/cloudwatt.py
+++ b/libcloud/compute/drivers/cloudwatt.py
@@ -25,7 +25,7 @@ from libcloud.utils.py3 import httplib
 from libcloud.compute.types import Provider
 from libcloud.compute.drivers.openstack import OpenStack_1_1_Connection
 from libcloud.compute.drivers.openstack import OpenStack_1_1_NodeDriver
-from libcloud.common.openstack import OpenStackAuthConnection
+from libcloud.common.openstack_identity import OpenStackIdentityConnection
 from libcloud.utils.iso8601 import parse_date
 
 from libcloud.compute.types import InvalidCredsError, MalformedResponseError
@@ -39,7 +39,7 @@ BASE_URL = 'https://identity.fr1.cloudwatt.com/v2.0'
 AUTH_URL = BASE_URL + '/tokens'
 
 
-class CloudwattAuthConnection(OpenStackAuthConnection):
+class CloudwattAuthConnection(OpenStackIdentityConnection):
     """
     AuthConnection class for the Cloudwatt driver.
     """
@@ -101,14 +101,13 @@ class CloudwattConnection(OpenStack_1_1_Connection):
         self.ex_tenant_id = kwargs.pop('ex_tenant_id')
         super(CloudwattConnection, self).__init__(*args, **kwargs)
         osa = CloudwattAuthConnection(
-            self,
-            AUTH_URL,
-            self._auth_version,
-            self.user_id,
-            self.key,
+            auth_url=AUTH_URL,
+            user_id=self.user_id,
+            key=self.key,
             tenant_name=self._ex_tenant_name,
             timeout=self.timeout,
-            ex_tenant_id=self.ex_tenant_id
+            ex_tenant_id=self.ex_tenant_id,
+            parent_conn=self
         )
         self._osa = osa
         self._auth_version = '2.0'


Mime
View raw message