Less copy and paste.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/d6ca8092 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/d6ca8092 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/d6ca8092 Branch: refs/heads/trunk Commit: d6ca809264cd241dd8bffa6d19a6d45b93a7906c Parents: ddb601e Author: Tomaz Muraus <[email protected]> Authored: Wed Aug 28 14:25:08 2013 +0200 Committer: Tomaz Muraus <[email protected]> Committed: Wed Aug 28 14:25:08 2013 +0200 ---------------------------------------------------------------------- libcloud/compute/drivers/rackspace.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/d6ca8092/libcloud/compute/drivers/rackspace.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/rackspace.py b/libcloud/compute/drivers/rackspace.py index 3a83767..bced602 100644 --- a/libcloud/compute/drivers/rackspace.py +++ b/libcloud/compute/drivers/rackspace.py @@ -155,15 +155,16 @@ class RackspaceNodeDriver(OpenStack_1_1_NodeDriver): @param region: ID of the region which should be used. @type region: C{str} """ - if region not in ['dfw', 'ord', 'iad', 'lon', 'syd']: + valid_regions = ENDPOINT_ARGS_MAP.keys() + if region not in valid_regions: raise ValueError('Invalid region: %s' % (region)) - if region in ['dfw', 'ord', 'iad', 'syd']: - self.connectionCls.auth_url = AUTH_URL_US - self.api_name = 'rackspacenovaus' - elif region == 'lon': + if region == 'lon': self.connectionCls.auth_url = AUTH_URL_UK self.api_name = 'rackspacenovalon' + else: + self.connectionCls.auth_url = AUTH_URL_US + self.api_name = 'rackspacenovaus' self.connectionCls._auth_version = '2.0' self.connectionCls.get_endpoint_args = \
