diff --git a/libcloud/compute/drivers/openstack.py b/libcloud/compute/drivers/openstack.py index ab96b15..2a4a24a 100644 --- a/libcloud/compute/drivers/openstack.py +++ b/libcloud/compute/drivers/openstack.py @@ -225,6 +225,8 @@ def _ex_connection_class_kwargs(self): rv = {} if self._ex_force_base_url: rv['ex_force_base_url'] = self._ex_force_base_url + if self._ex_force_auth_token: + rv['ex_force_auth_token'] = self._ex_force_auth_token if self._ex_force_auth_url: rv['ex_force_auth_url'] = self._ex_force_auth_url if self._ex_force_auth_version: @@ -287,6 +289,7 @@ def __init__(self, *args, **kwargs): self._ex_force_base_url = kwargs.pop('ex_force_base_url', None) self._ex_force_auth_url = kwargs.pop('ex_force_auth_url', None) self._ex_force_auth_version = kwargs.pop('ex_force_auth_version', None) + self._ex_force_auth_token = kwargs.pop('ex_force_auth_token', None) self._ex_force_api_version = str(kwargs.pop('ex_force_api_version', None)) self.XML_NAMESPACE = self.connectionCls.XML_NAMESPACE @@ -806,6 +809,7 @@ def __init__(self, *args, **kwargs): self._ex_force_auth_url = kwargs.pop('ex_force_auth_url', None) self._ex_force_auth_version = kwargs.pop('ex_force_auth_version', None) + self._ex_force_auth_token = kwargs.pop('ex_force_auth_token', None) self._ex_force_api_version = str(kwargs.pop('ex_force_api_version', None)) super(OpenStack_1_1_NodeDriver, self).__init__(*args, **kwargs) diff --git a/libcloud/dns/drivers/rackspace.py b/libcloud/dns/drivers/rackspace.py index cc7311e..5bfd456 100644 --- a/libcloud/dns/drivers/rackspace.py +++ b/libcloud/dns/drivers/rackspace.py @@ -120,6 +120,25 @@ class RackspaceUKDNSConnection(RackspaceDNSConnection): class RackspaceDNSDriver(DNSDriver): + def __init__(self, *args, **kwargs): + self._ex_force_base_url = kwargs.pop('ex_force_base_url', None) + self._ex_force_auth_url = kwargs.pop('ex_force_auth_url', None) + self._ex_force_auth_version = kwargs.pop('ex_force_auth_version', None) + self._ex_force_auth_token = kwargs.pop('ex_force_auth_token', None) + super(RackspaceDNSDriver, self).__init__(*args, **kwargs) + + def _ex_connection_class_kwargs(self): + rv = {} + if self._ex_force_base_url: + rv['ex_force_base_url'] = self._ex_force_base_url + if self._ex_force_auth_token: + rv['ex_force_auth_token'] = self._ex_force_auth_token + if self._ex_force_auth_url: + rv['ex_force_auth_url'] = self._ex_force_auth_url + if self._ex_force_auth_version: + rv['ex_force_auth_version'] = self._ex_force_auth_version + return rv + RECORD_TYPE_MAP = { RecordType.A: 'A', RecordType.AAAA: 'AAAA', diff --git a/libcloud/loadbalancer/drivers/rackspace.py b/libcloud/loadbalancer/drivers/rackspace.py index 5071767..9b42a9f 100644 --- a/libcloud/loadbalancer/drivers/rackspace.py +++ b/libcloud/loadbalancer/drivers/rackspace.py @@ -318,6 +318,25 @@ class RackspaceLBDriver(Driver): _ALGORITHM_TO_VALUE_MAP = reverse_dict(_VALUE_TO_ALGORITHM_MAP) + def __init__(self, *args, **kwargs): + self._ex_force_base_url = kwargs.pop('ex_force_base_url', None) + self._ex_force_auth_url = kwargs.pop('ex_force_auth_url', None) + self._ex_force_auth_version = kwargs.pop('ex_force_auth_version', None) + self._ex_force_auth_token = kwargs.pop('ex_force_auth_token', None) + super(RackspaceLBDriver, self).__init__(*args, **kwargs) + + def _ex_connection_class_kwargs(self): + rv = {} + if self._ex_force_base_url: + rv['ex_force_base_url'] = self._ex_force_base_url + if self._ex_force_auth_token: + rv['ex_force_auth_token'] = self._ex_force_auth_token + if self._ex_force_auth_url: + rv['ex_force_auth_url'] = self._ex_force_auth_url + if self._ex_force_auth_version: + rv['ex_force_auth_version'] = self._ex_force_auth_version + return rv + def list_protocols(self): return self._to_protocols( self.connection.request('/loadbalancers/protocols').object) diff --git a/libcloud/storage/drivers/cloudfiles.py b/libcloud/storage/drivers/cloudfiles.py index dbce463..60b7e15 100644 --- a/libcloud/storage/drivers/cloudfiles.py +++ b/libcloud/storage/drivers/cloudfiles.py @@ -139,12 +139,14 @@ def request(self, action, params=None, data='', headers=None, method='GET', params = {} # FIXME: Massive hack. - # This driver dynamically changes the url in it's connection, based on arguments + # This driver dynamically changes the url in its connection, based on arguments # passed to request(). As such, we have to manually check and reset connection # params each request self._populate_hosts_and_request_paths() - ep = self.get_endpoint(cdn_request) - (self.host, self.port, self.secure, self.request_path) = self._ex_force_base_url or self._tuple_from_url(ep) + if not self._ex_force_base_url: + self._reset_connection_params(self.get_endpoint(cdn_request)) + else: + self._reset_connection_params(self._ex_force_base_url) params['format'] = 'json' @@ -157,6 +159,9 @@ def request(self, action, params=None, data='', headers=None, method='GET', method=method, headers=headers, raw=raw) + def _reset_connection_params(self, endpoint_url): + (self.host, self.port, self.secure, self.request_path) = self._tuple_from_url(endpoint_url) + class CloudFilesUSConnection(CloudFilesConnection): """ @@ -187,6 +192,25 @@ class CloudFilesStorageDriver(StorageDriver): hash_type = 'md5' supports_chunked_encoding = True + def __init__(self, *args, **kwargs): + self._ex_force_base_url = kwargs.pop('ex_force_base_url', None) + self._ex_force_auth_url = kwargs.pop('ex_force_auth_url', None) + self._ex_force_auth_version = kwargs.pop('ex_force_auth_version', None) + self._ex_force_auth_token = kwargs.pop('ex_force_auth_token', None) + super(CloudFilesStorageDriver, self).__init__(*args, **kwargs) + + def _ex_connection_class_kwargs(self): + rv = {} + if self._ex_force_base_url: + rv['ex_force_base_url'] = self._ex_force_base_url + if self._ex_force_auth_token: + rv['ex_force_auth_token'] = self._ex_force_auth_token + if self._ex_force_auth_url: + rv['ex_force_auth_url'] = self._ex_force_auth_url + if self._ex_force_auth_version: + rv['ex_force_auth_version'] = self._ex_force_auth_version + return rv + def list_containers(self): response = self.connection.request('') diff --git a/test/compute/test_openstack.py b/test/compute/test_openstack.py index 36623f7..d588ba4 100644 --- a/test/compute/test_openstack.py +++ b/test/compute/test_openstack.py @@ -24,7 +24,8 @@ from libcloud.utils.py3 import method_type from libcloud.utils.py3 import u -from libcloud.common.types import InvalidCredsError, MalformedResponseError +from libcloud.common.types import InvalidCredsError, MalformedResponseError, \ + LibcloudError from libcloud.compute.types import Provider from libcloud.compute.providers import get_driver from libcloud.compute.drivers.openstack import ( @@ -574,6 +575,36 @@ def test_set_auth_token_populates_host_port_and_request_path(self): self.assertEqual(self.driver.connection.port, '1222') self.assertEqual(self.driver.connection.request_path, '/some-service') + def test_auth_token_without_base_url_raises_exception(self): + kwargs = { + 'ex_force_auth_version': '2.0', + 'ex_force_auth_token': 'preset-auth-token' + } + try: + self.driver_type(*self.driver_args, **kwargs) + self.fail('Expected failure setting auth token without base url') + except LibcloudError as e: + pass + else: + self.fail('Expected failure setting auth token without base url') + + def test_ex_force_auth_token_passed_to_connection(self): + base_url = 'https://servers.api.rackspacecloud.com/v1.1/slug' + kwargs = { + 'ex_force_auth_version': '2.0', + 'ex_force_auth_token': 'preset-auth-token', + 'ex_force_base_url': base_url + } + driver = self.driver_type(*self.driver_args, **kwargs) + driver.list_nodes() + + self.assertEquals(kwargs['ex_force_auth_token'], + driver.connection.auth_token) + self.assertEquals('servers.api.rackspacecloud.com', + driver.connection.host) + self.assertEquals('/v1.1/slug', driver.connection.request_path) + self.assertEquals(443, driver.connection.port) + def test_list_nodes(self): nodes = self.driver.list_nodes() self.assertEqual(len(nodes), 2) diff --git a/test/dns/test_rackspace.py b/test/dns/test_rackspace.py index 7999227..f7cd712 100644 --- a/test/dns/test_rackspace.py +++ b/test/dns/test_rackspace.py @@ -40,6 +40,31 @@ def setUp(self): # normally authentication happens lazily, but we force it here self.driver.connection._populate_hosts_and_request_paths() + def test_force_auth_token_kwargs(self): + kwargs = { + 'ex_force_auth_token': 'some-auth-token', + 'ex_force_base_url': 'https://dns.api.rackspacecloud.com/v1.0/11111' + } + driver = self.klass(*DNS_PARAMS_RACKSPACE, **kwargs) + driver.list_zones() + + self.assertEquals(kwargs['ex_force_auth_token'], + driver.connection.auth_token) + self.assertEquals('/v1.0/11111', + driver.connection.request_path) + + def test_force_auth_url_kwargs(self): + kwargs = { + 'ex_force_auth_version': '2.0', + 'ex_force_auth_url': 'https://identity.api.rackspace.com' + } + driver = self.klass(*DNS_PARAMS_RACKSPACE, **kwargs) + + self.assertEquals(kwargs['ex_force_auth_url'], + driver.connection._ex_force_auth_url) + self.assertEquals(kwargs['ex_force_auth_version'], + driver.connection._auth_version) + def test_list_record_types(self): record_types = self.driver.list_record_types() self.assertEqual(len(record_types), 7) diff --git a/test/loadbalancer/test_rackspace.py b/test/loadbalancer/test_rackspace.py index 6a38b4c..0a1bd88 100644 --- a/test/loadbalancer/test_rackspace.py +++ b/test/loadbalancer/test_rackspace.py @@ -48,6 +48,32 @@ def setUp(self): # normally authentication happens lazily, but we force it here self.driver.connection._populate_hosts_and_request_paths() + def test_force_auth_token_kwargs(self): + base_url = 'https://ord.loadbalancer.api.rackspacecloud.com/v1.0/slug' + kwargs = { + 'ex_force_auth_token': 'some-auth-token', + 'ex_force_base_url': base_url + } + driver = RackspaceLBDriver('user', 'key', **kwargs) + driver.list_balancers() + + self.assertEquals(kwargs['ex_force_auth_token'], + driver.connection.auth_token) + self.assertEquals('/v1.0/slug', + driver.connection.request_path) + + def test_force_auth_url_kwargs(self): + kwargs = { + 'ex_force_auth_version': '2.0', + 'ex_force_auth_url': 'https://identity.api.rackspace.com' + } + driver = RackspaceLBDriver('user', 'key', **kwargs) + + self.assertEquals(kwargs['ex_force_auth_url'], + driver.connection._ex_force_auth_url) + self.assertEquals(kwargs['ex_force_auth_version'], + driver.connection._auth_version) + def test_list_protocols(self): protocols = self.driver.list_protocols() diff --git a/test/storage/test_cloudfiles.py b/test/storage/test_cloudfiles.py index 3176c0b..d8dc9df 100644 --- a/test/storage/test_cloudfiles.py +++ b/test/storage/test_cloudfiles.py @@ -60,6 +60,34 @@ def setUp(self): def tearDown(self): self._remove_test_file() + def test_force_auth_token_kwargs(self): + base_url = 'https://cdn2.clouddrive.com/v1/MossoCloudFS' + kwargs = { + 'ex_force_auth_token': 'some-auth-token', + 'ex_force_base_url': base_url + } + driver = CloudFilesStorageDriver('driver', 'dummy', **kwargs) + driver.list_containers() + + self.assertEquals(kwargs['ex_force_auth_token'], + driver.connection.auth_token) + self.assertEquals('cdn2.clouddrive.com', + driver.connection.host) + self.assertEquals('/v1/MossoCloudFS', + driver.connection.request_path) + + def test_force_auth_url_kwargs(self): + kwargs = { + 'ex_force_auth_version': '2.0', + 'ex_force_auth_url': 'https://identity.api.rackspace.com' + } + driver = CloudFilesStorageDriver('driver', 'dummy', **kwargs) + + self.assertEquals(kwargs['ex_force_auth_url'], + driver.connection._ex_force_auth_url) + self.assertEquals(kwargs['ex_force_auth_version'], + driver.connection._auth_version) + def test_invalid_json_throws_exception(self): CloudFilesMockHttp.type = 'MALFORMED_JSON' try: