You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2013/08/18 23:24:07 UTC
[1/4] git commit: datacenter -> region.
Updated Branches:
refs/heads/trunk 3c3804ba8 -> d173f21b8
datacenter -> region.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/dbf8f67d
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/dbf8f67d
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/dbf8f67d
Branch: refs/heads/trunk
Commit: dbf8f67d3d8aefc1d28323f5503ad9c9c8fd8435
Parents: 3c3804b
Author: Tomaz Muraus <to...@apache.org>
Authored: Sun Aug 18 23:02:17 2013 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Sun Aug 18 23:02:17 2013 +0200
----------------------------------------------------------------------
CHANGES | 2 +-
libcloud/compute/drivers/ec2.py | 28 +++++++++++-----------
libcloud/compute/drivers/rackspace.py | 19 +++++++--------
libcloud/storage/drivers/cloudfiles.py | 24 +++++++++----------
libcloud/test/compute/test_ec2.py | 34 +++++++++++++--------------
libcloud/test/compute/test_rackspace.py | 6 ++---
libcloud/test/storage/test_cloudfiles.py | 10 ++++----
7 files changed, 61 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/dbf8f67d/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index addbc69..2c40863 100644
--- a/CHANGES
+++ b/CHANGES
@@ -477,7 +477,7 @@ Changes with Apache Libcloud 0.12.1:
- Deprecate CLOUDFILES_US and CLOUDFILES_UK storage provider constants and
add a new CLOUDFILES constant.
- Driver referenced by this constant takes a "datacenter" keyword argument
+ Driver referenced by this constant takes a "region" keyword argument
and can be one of 'ord', 'dfw' or 'lon'.
Note: Deprecated constants will continue to work for the foreseeable
http://git-wip-us.apache.org/repos/asf/libcloud/blob/dbf8f67d/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index 5d18469..cbeba3e 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -1483,15 +1483,15 @@ class EC2NodeDriver(BaseEC2NodeDriver):
}
def __init__(self, key, secret=None, secure=True, host=None, port=None,
- datacenter='us-east-1', **kwargs):
- if hasattr(self, '_datacenter'):
- datacenter = self._datacenter
+ region='us-east-1', **kwargs):
+ if hasattr(self, '_region'):
+ region = self._region
- if datacenter not in VALID_EC2_DATACENTERS:
- raise ValueError('Invalid datacenter: %s' % (datacenter))
+ if region not in VALID_EC2_DATACENTERS:
+ raise ValueError('Invalid region: %s' % (region))
- details = REGION_DETAILS[datacenter]
- self.region_name = datacenter
+ details = REGION_DETAILS[region]
+ self.region_name = region
self.api_name = details['api_name']
self.country = details['country']
@@ -1516,49 +1516,49 @@ class EC2EUNodeDriver(EC2NodeDriver):
"""
Driver class for EC2 in the Western Europe Region.
"""
- _datacenter = 'eu-west-1'
+ _region = 'eu-west-1'
class EC2USWestNodeDriver(EC2NodeDriver):
"""
Driver class for EC2 in the Western US Region
"""
- _datacenter = 'us-west-1'
+ _region = 'us-west-1'
class EC2USWestOregonNodeDriver(EC2NodeDriver):
"""
Driver class for EC2 in the US West Oregon region.
"""
- _datacenter = 'us-west-2'
+ _region = 'us-west-2'
class EC2APSENodeDriver(EC2NodeDriver):
"""
Driver class for EC2 in the Southeast Asia Pacific Region.
"""
- _datacenter = 'ap-southeast-1'
+ _region = 'ap-southeast-1'
class EC2APNENodeDriver(EC2NodeDriver):
"""
Driver class for EC2 in the Northeast Asia Pacific Region.
"""
- _datacenter = 'ap-northeast-1'
+ _region = 'ap-northeast-1'
class EC2SAEastNodeDriver(EC2NodeDriver):
"""
Driver class for EC2 in the South America (Sao Paulo) Region.
"""
- _datacenter = 'sa-east-1'
+ _region = 'sa-east-1'
class EC2APSESydneyNodeDriver(EC2NodeDriver):
"""
Driver class for EC2 in the Southeast Asia Pacific (Sydney) Region.
"""
- _datacenter = 'ap-southeast-2'
+ _region = 'ap-southeast-2'
class EucConnection(EC2Connection):
http://git-wip-us.apache.org/repos/asf/libcloud/blob/dbf8f67d/libcloud/compute/drivers/rackspace.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/rackspace.py b/libcloud/compute/drivers/rackspace.py
index 9aadad3..e94c677 100644
--- a/libcloud/compute/drivers/rackspace.py
+++ b/libcloud/compute/drivers/rackspace.py
@@ -145,29 +145,28 @@ class RackspaceNodeDriver(OpenStack_1_1_NodeDriver):
api_name = None
def __init__(self, key, secret=None, secure=True, host=None, port=None,
- datacenter='dfw', **kwargs):
+ region='dfw', **kwargs):
"""
@inherits: L{NodeDriver.__init__}
- @param datacenter: Datacenter ID which should be used
- @type datacenter: C{str}
+ @param region: ID of the region which should be used.
+ @type region: C{str}
"""
+ if region not in ['dfw', 'ord', 'lon', 'syd']:
+ raise ValueError('Invalid region: %s' % (region))
- if datacenter not in ['dfw', 'ord', 'lon', 'syd']:
- raise ValueError('Invalid datacenter: %s' % (datacenter))
-
- if datacenter in ['dfw', 'ord', 'syd']:
+ if region in ['dfw', 'ord', 'syd']:
self.connectionCls.auth_url = AUTH_URL_US
self.api_name = 'rackspacenovaus'
- elif datacenter == 'lon':
+ elif region == 'lon':
self.connectionCls.auth_url = AUTH_URL_UK
self.api_name = 'rackspacenovalon'
self.connectionCls._auth_version = '2.0'
self.connectionCls.get_endpoint_args = \
- ENDPOINT_ARGS_MAP[datacenter]
+ ENDPOINT_ARGS_MAP[region]
- self.datacenter = datacenter
+ self.region = region
super(RackspaceNodeDriver, self).__init__(key=key, secret=secret,
secure=secure, host=host,
http://git-wip-us.apache.org/repos/asf/libcloud/blob/dbf8f67d/libcloud/storage/drivers/cloudfiles.py
----------------------------------------------------------------------
diff --git a/libcloud/storage/drivers/cloudfiles.py b/libcloud/storage/drivers/cloudfiles.py
index 3ca6adb..92e2e3a 100644
--- a/libcloud/storage/drivers/cloudfiles.py
+++ b/libcloud/storage/drivers/cloudfiles.py
@@ -204,21 +204,21 @@ class CloudFilesStorageDriver(StorageDriver, OpenStackDriverMixin):
supports_chunked_encoding = True
def __init__(self, key, secret=None, secure=True, host=None, port=None,
- datacenter='ord', **kwargs):
+ region='ord', **kwargs):
"""
@inherits: L{StorageDriver.__init__}
- @param datacenter: Datacenter ID which should be used.
- @type datacenter: C{str}
+ @param region: ID of the region which should be used.
+ @type region: C{str}
"""
- if hasattr(self, '_datacenter'):
- datacenter = self._datacenter
+ if hasattr(self, '_region'):
+ region = self._region
# This is here for backard compatibility
if 'ex_force_service_region' in kwargs:
- datacenter = kwargs['ex_force_service_region']
+ region = kwargs['ex_force_service_region']
- self.datacenter = datacenter
+ self.region = region
OpenStackDriverMixin.__init__(self, (), **kwargs)
super(CloudFilesStorageDriver, self).__init__(key=key, secret=secret,
@@ -822,11 +822,11 @@ class CloudFilesStorageDriver(StorageDriver, OpenStackDriverMixin):
return obj
def _ex_connection_class_kwargs(self):
- kwargs = {'ex_force_service_region': self.datacenter}
+ kwargs = {'ex_force_service_region': self.region}
- if self.datacenter in ['dfw', 'ord', 'syd']:
+ if self.region in ['dfw', 'ord', 'syd']:
kwargs['auth_url'] = AUTH_URL_US
- elif self.datacenter == 'lon':
+ elif self.region == 'lon':
kwargs['auth_url'] = AUTH_URL_UK
kwargs.update(self.openstack_connection_kwargs())
@@ -840,7 +840,7 @@ class CloudFilesUSStorageDriver(CloudFilesStorageDriver):
type = Provider.CLOUDFILES_US
name = 'CloudFiles (US)'
- _datacenter = 'ord'
+ _region = 'ord'
class CloudFilesSwiftStorageDriver(CloudFilesStorageDriver):
@@ -869,7 +869,7 @@ class CloudFilesUKStorageDriver(CloudFilesStorageDriver):
type = Provider.CLOUDFILES_UK
name = 'CloudFiles (UK)'
- _datacenter = 'lon'
+ _region = 'lon'
class FileChunkReader(object):
http://git-wip-us.apache.org/repos/asf/libcloud/blob/dbf8f67d/libcloud/test/compute/test_ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py
index d08936e..6be7da3 100644
--- a/libcloud/test/compute/test_ec2.py
+++ b/libcloud/test/compute/test_ec2.py
@@ -47,17 +47,17 @@ null_fingerprint = '00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:' + \
class BaseEC2Tests(LibcloudTestCase):
- def test_instantiate_driver_valid_datacenters(self):
- datacenters = REGION_DETAILS.keys()
- datacenters = [d for d in datacenters if d != 'nimbus']
+ def test_instantiate_driver_valid_regions(self):
+ regions = REGION_DETAILS.keys()
+ regions = [d for d in regions if d != 'nimbus']
- for datacenter in datacenters:
- EC2NodeDriver(*EC2_PARAMS, **{'datacenter': datacenter})
+ for region in regions:
+ EC2NodeDriver(*EC2_PARAMS, **{'region': region})
- def test_instantiate_driver_invalid_datacenters(self):
- for datacenter in ['invalid', 'nimbus']:
+ def test_instantiate_driver_invalid_regions(self):
+ for region in ['invalid', 'nimbus']:
try:
- EC2NodeDriver(*EC2_PARAMS, **{'datacenter': datacenter})
+ EC2NodeDriver(*EC2_PARAMS, **{'region': region})
except ValueError:
pass
else:
@@ -66,7 +66,7 @@ class BaseEC2Tests(LibcloudTestCase):
class EC2Tests(LibcloudTestCase, TestCaseMixin):
image_name = 'ec2-public-images/fedora-8-i386-base-v1.04.manifest.xml'
- datacenter = 'us-east-1'
+ region = 'us-east-1'
def setUp(self):
EC2MockHttp.test = self
@@ -75,7 +75,7 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin):
EC2MockHttp.type = None
self.driver = EC2NodeDriver(*EC2_PARAMS,
- **{'datacenter': self.datacenter})
+ **{'region': self.region})
def test_create_node(self):
image = NodeImage(id='ami-be3adfd7',
@@ -457,31 +457,31 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin):
class EC2USWest1Tests(EC2Tests):
- datacenter = 'us-west-1'
+ region = 'us-west-1'
class EC2USWest2Tests(EC2Tests):
- datacenter = 'us-west-2'
+ region = 'us-west-2'
class EC2EUWestTests(EC2Tests):
- datacenter = 'eu-west-1'
+ region = 'eu-west-1'
class EC2APSE1Tests(EC2Tests):
- datacenter = 'ap-southeast-1'
+ region = 'ap-southeast-1'
class EC2APNETests(EC2Tests):
- datacenter = 'ap-northeast-1'
+ region = 'ap-northeast-1'
class EC2APSE2Tests(EC2Tests):
- datacenter = 'ap-southeast-2'
+ region = 'ap-southeast-2'
class EC2SAEastTests(EC2Tests):
- datacenter = 'sa-east-1'
+ region = 'sa-east-1'
# Tests for the old, deprecated way of instantiating a driver.
http://git-wip-us.apache.org/repos/asf/libcloud/blob/dbf8f67d/libcloud/test/compute/test_rackspace.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_rackspace.py b/libcloud/test/compute/test_rackspace.py
index 78ed9f3..c232f05 100644
--- a/libcloud/test/compute/test_rackspace.py
+++ b/libcloud/test/compute/test_rackspace.py
@@ -101,7 +101,7 @@ class RackspaceNovaDfwTests(OpenStack_1_1_Tests):
driver_klass = RackspaceNodeDriver
driver_type = RackspaceNodeDriver
driver_args = RACKSPACE_NOVA_PARAMS
- driver_kwargs = {'datacenter': 'dfw'}
+ driver_kwargs = {'region': 'dfw'}
@classmethod
def create_driver(self):
@@ -129,7 +129,7 @@ class RackspaceNovaOrdTests(OpenStack_1_1_Tests):
driver_klass = RackspaceNodeDriver
driver_type = RackspaceNodeDriver
driver_args = RACKSPACE_NOVA_PARAMS
- driver_kwargs = {'datacenter': 'ord'}
+ driver_kwargs = {'region': 'ord'}
@classmethod
def create_driver(self):
@@ -163,7 +163,7 @@ class RackspaceNovaLonTests(OpenStack_1_1_Tests):
driver_klass = RackspaceNodeDriver
driver_type = RackspaceNodeDriver
driver_args = RACKSPACE_NOVA_PARAMS
- driver_kwargs = {'datacenter': 'lon'}
+ driver_kwargs = {'region': 'lon'}
@classmethod
def create_driver(self):
http://git-wip-us.apache.org/repos/asf/libcloud/blob/dbf8f67d/libcloud/test/storage/test_cloudfiles.py
----------------------------------------------------------------------
diff --git a/libcloud/test/storage/test_cloudfiles.py b/libcloud/test/storage/test_cloudfiles.py
index e5e0330..d42053e 100644
--- a/libcloud/test/storage/test_cloudfiles.py
+++ b/libcloud/test/storage/test_cloudfiles.py
@@ -56,7 +56,7 @@ class CloudFilesTests(unittest.TestCase):
driver_klass = CloudFilesStorageDriver
driver_args = ('dummy', 'dummy')
driver_kwargs = {}
- datacenter = 'ord'
+ region = 'ord'
def setUp(self):
self.driver_klass.connectionCls.conn_classes = (
@@ -148,7 +148,7 @@ class CloudFilesTests(unittest.TestCase):
def test_service_catalog(self):
url = 'https://storage101.%s1.clouddrive.com/v1/MossoCloudFS' % \
- (self.datacenter)
+ (self.region)
self.assertEqual(
url,
self.driver.connection.get_endpoint())
@@ -746,7 +746,7 @@ class CloudFilesTests(unittest.TestCase):
"/v1/MossoCloudFS/foo_bar_container/foo_bar_object")
sig = hmac.new(b('foo'), b(hmac_body), sha1).hexdigest()
ret = self.driver.ex_get_object_temp_url(obj, 'GET')
- temp_url = 'https://storage101.%s1.clouddrive.com/v1/MossoCloudFS/foo_bar_container/foo_bar_object?temp_url_expires=60&temp_url_sig=%s' % (self.datacenter, sig)
+ temp_url = 'https://storage101.%s1.clouddrive.com/v1/MossoCloudFS/foo_bar_container/foo_bar_object?temp_url_expires=60&temp_url_sig=%s' % (self.region, sig)
self.assertEquals(''.join(sorted(ret)), ''.join(sorted(temp_url)))
@@ -773,12 +773,12 @@ class CloudFilesTests(unittest.TestCase):
class CloudFilesDeprecatedUSTests(CloudFilesTests):
driver_klass = CloudFilesUSStorageDriver
- datacenter = 'ord'
+ region = 'ord'
class CloudFilesDeprecatedUKTests(CloudFilesTests):
driver_klass = CloudFilesUKStorageDriver
- datacenter = 'lon'
+ region = 'lon'
class CloudFilesMockHttp(StorageMockHttp, MockHttpTestCase):
[3/4] git commit: DATACENTER -> REGION.
Posted by to...@apache.org.
DATACENTER -> REGION.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/99fd19a6
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/99fd19a6
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/99fd19a6
Branch: refs/heads/trunk
Commit: 99fd19a62809930d83d62c332b084e09c08c5f93
Parents: fd2b409
Author: Tomaz Muraus <to...@apache.org>
Authored: Sun Aug 18 23:06:22 2013 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Sun Aug 18 23:06:22 2013 +0200
----------------------------------------------------------------------
libcloud/compute/drivers/ec2.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/99fd19a6/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index cbeba3e..627e788 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -337,8 +337,8 @@ REGION_DETAILS = {
}
}
-VALID_EC2_DATACENTERS = REGION_DETAILS.keys()
-VALID_EC2_DATACENTERS = [d for d in VALID_EC2_DATACENTERS if d != 'nimbus']
+VALID_EC2_REGIONS = REGION_DETAILS.keys()
+VALID_EC2_REGIONS = [r for r in VALID_EC2_REGIONS if r != 'nimbus']
class EC2NodeLocation(NodeLocation):
@@ -1487,7 +1487,7 @@ class EC2NodeDriver(BaseEC2NodeDriver):
if hasattr(self, '_region'):
region = self._region
- if region not in VALID_EC2_DATACENTERS:
+ if region not in VALID_EC2_REGIONS:
raise ValueError('Invalid region: %s' % (region))
details = REGION_DETAILS[region]
[2/4] git commit: Update changes.
Posted by to...@apache.org.
Update changes.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/fd2b4093
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/fd2b4093
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/fd2b4093
Branch: refs/heads/trunk
Commit: fd2b40931fc04f416665e6a31df8cd8757f7d453
Parents: dbf8f67
Author: Tomaz Muraus <to...@apache.org>
Authored: Sun Aug 18 23:02:46 2013 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Sun Aug 18 23:02:46 2013 +0200
----------------------------------------------------------------------
CHANGES | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/fd2b4093/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 2c40863..2c1be7c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,15 @@ Changes with Apache Libcloud in development
*) Compute
+ - Deprecate CLOUDFILES_US and CLOUDFILES_UK storage provider constants and
+ add a new CLOUDFILES constant.
+ Driver referenced by this constant takes a "region" keyword argument
+ and can be one of 'ord', 'dfw' or 'lon'.
+
+ Note: Deprecated constants will continue to work for the foreseeable
+ future.
+ [Tomaz Muraus]
+
- Modify ElasticHosts drive to store drive UUID in 'extra' field.
(LIBCLOUD-357)
[Bob Thompson]
@@ -475,15 +484,6 @@ Changes with Apache Libcloud 0.12.1:
(LIBCLOUD-267)
[Tomaz Muraus]
- - Deprecate CLOUDFILES_US and CLOUDFILES_UK storage provider constants and
- add a new CLOUDFILES constant.
- Driver referenced by this constant takes a "region" keyword argument
- and can be one of 'ord', 'dfw' or 'lon'.
-
- Note: Deprecated constants will continue to work for the foreseeable
- future.
- [Tomaz Muraus]
-
- Support for multipart uploads and other improvements in the S3 driver
so it can more easily be re-used with other implementations (e.g. Google
Storage, etc.).
[4/4] git commit: Fix a bug with data encoding.
Posted by to...@apache.org.
Fix a bug with data encoding.
encode_data shoud only be called if data is present.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/d173f21b
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/d173f21b
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/d173f21b
Branch: refs/heads/trunk
Commit: d173f21b896452f9921e7debc19ee54c00c0edf4
Parents: 99fd19a
Author: Tomaz Muraus <to...@apache.org>
Authored: Sun Aug 18 23:20:54 2013 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Sun Aug 18 23:20:54 2013 +0200
----------------------------------------------------------------------
libcloud/common/base.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/d173f21b/libcloud/common/base.py
----------------------------------------------------------------------
diff --git a/libcloud/common/base.py b/libcloud/common/base.py
index 609dd78..529bdbe 100644
--- a/libcloud/common/base.py
+++ b/libcloud/common/base.py
@@ -571,10 +571,12 @@ class Connection(object):
else:
headers.update({'Host': self.host})
- # Encode data if necessary
- if data is not None:
+ # Encode data if provided
+ if data:
data = self.encode_data(data)
- # Only send Content-Length 0 with POST and PUT request
+
+ # Only send Content-Length 0 with POST and PUT request
+ if data is not None:
if len(data) > 0 or (len(data) == 0 and method in ['POST', 'PUT']):
headers.update({'Content-Length': str(len(data))})