There is no AU auth endpoint, remove that stuff. Signed-off-by: Tomaz Muraus <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/ab190c1b Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/ab190c1b Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/ab190c1b Branch: refs/heads/trunk Commit: ab190c1b85ec5bfb859f61059461da2cfb7362ef Parents: 44190f4 Author: Alex Gaynor <[email protected]> Authored: Tue Jun 18 10:57:54 2013 -0700 Committer: Tomaz Muraus <[email protected]> Committed: Fri Jun 21 12:54:30 2013 +0200 ---------------------------------------------------------------------- libcloud/common/rackspace.py | 2 -- libcloud/compute/drivers/rackspace.py | 8 ++------ libcloud/dns/drivers/rackspace.py | 6 +----- libcloud/loadbalancer/drivers/rackspace.py | 6 +----- libcloud/storage/drivers/cloudfiles.py | 7 ++----- 5 files changed, 6 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/ab190c1b/libcloud/common/rackspace.py ---------------------------------------------------------------------- diff --git a/libcloud/common/rackspace.py b/libcloud/common/rackspace.py index d05bbd9..79da728 100644 --- a/libcloud/common/rackspace.py +++ b/libcloud/common/rackspace.py @@ -19,10 +19,8 @@ Common settings for Rackspace Cloud Servers and Cloud Files AUTH_URL_US = 'https://auth.api.rackspacecloud.com/v1.1/' AUTH_URL_UK = 'https://lon.auth.api.rackspacecloud.com/v1.1/' -AUTH_URL_AU = 'https://syd.auth.api.rackspacecloud.com/v1.1/' __all__ = [ "AUTH_URL_US", "AUTH_URL_UK", - "AUTH_URL_AU", ] http://git-wip-us.apache.org/repos/asf/libcloud/blob/ab190c1b/libcloud/compute/drivers/rackspace.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/rackspace.py b/libcloud/compute/drivers/rackspace.py index 2d56d7f..9aadad3 100644 --- a/libcloud/compute/drivers/rackspace.py +++ b/libcloud/compute/drivers/rackspace.py @@ -22,8 +22,7 @@ from libcloud.compute.drivers.openstack import OpenStack_1_0_Connection,\ from libcloud.compute.drivers.openstack import OpenStack_1_1_Connection,\ OpenStack_1_1_NodeDriver -from libcloud.common.rackspace import ( - AUTH_URL_US, AUTH_URL_UK, AUTH_URL_AU) +from libcloud.common.rackspace import AUTH_URL_US, AUTH_URL_UK ENDPOINT_ARGS_MAP = { @@ -157,15 +156,12 @@ class RackspaceNodeDriver(OpenStack_1_1_NodeDriver): if datacenter not in ['dfw', 'ord', 'lon', 'syd']: raise ValueError('Invalid datacenter: %s' % (datacenter)) - if datacenter in ['dfw', 'ord']: + if datacenter in ['dfw', 'ord', 'syd']: self.connectionCls.auth_url = AUTH_URL_US self.api_name = 'rackspacenovaus' elif datacenter == 'lon': self.connectionCls.auth_url = AUTH_URL_UK self.api_name = 'rackspacenovalon' - elif datacenter == 'syd': - self.connectionCls.auth_url = AUTH_URL_AU - self.api_name = 'rackspacenovasyd' self.connectionCls._auth_version = '2.0' self.connectionCls.get_endpoint_args = \ http://git-wip-us.apache.org/repos/asf/libcloud/blob/ab190c1b/libcloud/dns/drivers/rackspace.py ---------------------------------------------------------------------- diff --git a/libcloud/dns/drivers/rackspace.py b/libcloud/dns/drivers/rackspace.py index a19706b..171cc72 100644 --- a/libcloud/dns/drivers/rackspace.py +++ b/libcloud/dns/drivers/rackspace.py @@ -25,7 +25,7 @@ import copy from libcloud.common.base import PollingConnection from libcloud.common.types import LibcloudError from libcloud.utils.misc import merge_valid_keys, get_new_obj -from libcloud.common.rackspace import AUTH_URL_US, AUTH_URL_UK, AUTH_URL_AU +from libcloud.common.rackspace import AUTH_URL_US, AUTH_URL_UK from libcloud.compute.drivers.openstack import OpenStack_1_1_Connection from libcloud.compute.drivers.openstack import OpenStack_1_1_Response @@ -127,10 +127,6 @@ class RackspaceUKDNSConnection(RackspaceDNSConnection): auth_url = AUTH_URL_UK -class RackspaceAUDNSConnection(RackspaceDNSConnection): - auth_url = AUTH_URL_AU - - class RackspaceDNSDriver(DNSDriver, OpenStackDriverMixin): website = 'http://www.rackspace.com/' http://git-wip-us.apache.org/repos/asf/libcloud/blob/ab190c1b/libcloud/loadbalancer/drivers/rackspace.py ---------------------------------------------------------------------- diff --git a/libcloud/loadbalancer/drivers/rackspace.py b/libcloud/loadbalancer/drivers/rackspace.py index 324377a..39d25e7 100644 --- a/libcloud/loadbalancer/drivers/rackspace.py +++ b/libcloud/loadbalancer/drivers/rackspace.py @@ -29,7 +29,7 @@ from libcloud.common.base import JsonResponse, PollingConnection from libcloud.loadbalancer.types import State, MemberCondition from libcloud.common.openstack import OpenStackBaseConnection,\ OpenStackDriverMixin -from libcloud.common.rackspace import AUTH_URL_US, AUTH_URL_UK, AUTH_URL_AU +from libcloud.common.rackspace import AUTH_URL_US, AUTH_URL_UK class RackspaceResponse(JsonResponse): @@ -299,10 +299,6 @@ class RackspaceUKConnection(RackspaceConnection): auth_url = AUTH_URL_UK -class RackspaceAUConnection(RackspaceConnection): - auth_url = AUTH_URL_AU - - class RackspaceLBDriver(Driver, OpenStackDriverMixin): connectionCls = RackspaceConnection api_name = 'rackspace_lb' http://git-wip-us.apache.org/repos/asf/libcloud/blob/ab190c1b/libcloud/storage/drivers/cloudfiles.py ---------------------------------------------------------------------- diff --git a/libcloud/storage/drivers/cloudfiles.py b/libcloud/storage/drivers/cloudfiles.py index d738459..8e51e59 100644 --- a/libcloud/storage/drivers/cloudfiles.py +++ b/libcloud/storage/drivers/cloudfiles.py @@ -48,8 +48,7 @@ from libcloud.storage.types import InvalidContainerNameError from libcloud.common.openstack import OpenStackBaseConnection from libcloud.common.openstack import OpenStackDriverMixin -from libcloud.common.rackspace import ( - AUTH_URL_US, AUTH_URL_UK, AUTH_URL_AU) +from libcloud.common.rackspace import AUTH_URL_US, AUTH_URL_UK CDN_HOST = 'cdn.clouddrive.com' API_VERSION = 'v1.0' @@ -795,12 +794,10 @@ class CloudFilesStorageDriver(StorageDriver, OpenStackDriverMixin): def _ex_connection_class_kwargs(self): kwargs = {'ex_force_service_region': self.datacenter} - if self.datacenter in ['dfw', 'ord']: + if self.datacenter in ['dfw', 'ord', 'syd']: kwargs['auth_url'] = AUTH_URL_US elif self.datacenter == 'lon': kwargs['auth_url'] = AUTH_URL_UK - elif self.datacenter == 'syd': - kwargs['auth_url'] = AUTH_URL_AU kwargs.update(self.openstack_connection_kwargs()) return kwargs
