You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2016/03/28 12:14:50 UTC
[1/5] libcloud git commit: fix module ref for loggingconnection
Repository: libcloud
Updated Branches:
refs/heads/trunk 22aa0a0f2 -> 7dc0fb03d
fix module ref for loggingconnection
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/36f3a81f
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/36f3a81f
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/36f3a81f
Branch: refs/heads/trunk
Commit: 36f3a81f88554d5cb482aac15773df23c73c3d5d
Parents: 22aa0a0
Author: anthony-shaw <an...@gmail.com>
Authored: Sat Mar 26 21:25:44 2016 +1100
Committer: anthony-shaw <an...@gmail.com>
Committed: Sat Mar 26 21:25:44 2016 +1100
----------------------------------------------------------------------
libcloud/test/test_connection.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/36f3a81f/libcloud/test/test_connection.py
----------------------------------------------------------------------
diff --git a/libcloud/test/test_connection.py b/libcloud/test/test_connection.py
index 96e86ce..a588ca6 100644
--- a/libcloud/test/test_connection.py
+++ b/libcloud/test/test_connection.py
@@ -23,7 +23,7 @@ from mock import Mock, call, patch
from libcloud.test import unittest
from libcloud.common.base import Connection
-from libcloud.common.base import LoggingConnection
+from libcloud.utils.loggingconnection import LoggingConnection
from libcloud.httplib_ssl import LibcloudBaseConnection
from libcloud.httplib_ssl import LibcloudHTTPConnection
from libcloud.utils.misc import retry
[3/5] libcloud git commit: add ex_encrypted and ex_kms_key_id kwargs
in EC2NodeDriver.create_volume
Posted by an...@apache.org.
add ex_encrypted and ex_kms_key_id kwargs in EC2NodeDriver.create_volume
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/5dd36c54
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/5dd36c54
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/5dd36c54
Branch: refs/heads/trunk
Commit: 5dd36c54c061768a58dd7611896e2d2c037cd589
Parents: 53946f6
Author: ViktorOgnev <v....@scalr.com>
Authored: Mon Jan 25 11:30:07 2016 +0300
Committer: anthony-shaw <an...@gmail.com>
Committed: Mon Mar 28 21:14:13 2016 +1100
----------------------------------------------------------------------
libcloud/compute/drivers/ec2.py | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/5dd36c54/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index 2562c72..1dacf40 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -3074,7 +3074,8 @@ class BaseEC2NodeDriver(NodeDriver):
return self._get_terminate_boolean(res)
def create_volume(self, size, name, location=None, snapshot=None,
- ex_volume_type='standard', ex_iops=None):
+ ex_volume_type='standard', ex_iops=None,
+ ex_encrypted=None, ex_kms_key_id=None):
"""
Create a new volume.
@@ -3104,6 +3105,15 @@ class BaseEC2NodeDriver(NodeDriver):
is io1.
:type iops: ``int``
+ :param ex_encrypted: Specifies whether the volume should be encrypted.
+ :type ex_encrypted: ``bool``
+
+ :param ex_kms_key_id: The full ARN of the AWS Key Management Service (AWS KMS)
+ customer master key (CMK) to use when creating the encrypted volume.
+ Example: arn:aws:kms:us-east-1:012345678910:key/abcd1234-a123-456a-a12b-a123b4cd56ef.
+ Only used if encrypted is set to True
+ :type ex_kms_key_id: ``str``
+
:return: The newly created volume.
:rtype: :class:`StorageVolume`
"""
@@ -3129,6 +3139,12 @@ class BaseEC2NodeDriver(NodeDriver):
if ex_volume_type == 'io1' and ex_iops:
params['Iops'] = ex_iops
+ if ex_encrypted:
+ params['Encrypted'] = 1
+
+ if ex_kms_key_id:
+ params['KmsKeyId'] = ex_kms_key_id
+
volume = self._to_volume(
self.connection.request(self.path, params=params).object,
name=name)
[4/5] libcloud git commit: make more explicit value checks,
fix line length
Posted by an...@apache.org.
make more explicit value checks, fix line length
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/4a9628d6
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/4a9628d6
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/4a9628d6
Branch: refs/heads/trunk
Commit: 4a9628d6a8f19ed42d1946d7d8229f1299d0d07b
Parents: 5dd36c5
Author: ViktorOgnev <v....@scalr.com>
Authored: Mon Mar 28 11:58:26 2016 +0300
Committer: anthony-shaw <an...@gmail.com>
Committed: Mon Mar 28 21:14:13 2016 +1100
----------------------------------------------------------------------
libcloud/compute/drivers/ec2.py | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/4a9628d6/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index 1dacf40..f88bc52 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -3108,10 +3108,13 @@ class BaseEC2NodeDriver(NodeDriver):
:param ex_encrypted: Specifies whether the volume should be encrypted.
:type ex_encrypted: ``bool``
- :param ex_kms_key_id: The full ARN of the AWS Key Management Service (AWS KMS)
- customer master key (CMK) to use when creating the encrypted volume.
- Example: arn:aws:kms:us-east-1:012345678910:key/abcd1234-a123-456a-a12b-a123b4cd56ef.
- Only used if encrypted is set to True
+ :param ex_kms_key_id: The full ARN of the AWS Key Management
+ Service (AWS KMS) customer master key (CMK) to use
+ when creating the encrypted volume.
+ Example:
+ arn:aws:kms:us-east-1:012345678910:key/abcd1234-a123
+ -456a-a12b-a123b4cd56ef.
+ Only used if encrypted is set to True
:type ex_kms_key_id: ``str``
:return: The newly created volume.
@@ -3139,10 +3142,10 @@ class BaseEC2NodeDriver(NodeDriver):
if ex_volume_type == 'io1' and ex_iops:
params['Iops'] = ex_iops
- if ex_encrypted:
+ if ex_encrypted is not None:
params['Encrypted'] = 1
- if ex_kms_key_id:
+ if ex_kms_key_id is not None:
params['KmsKeyId'] = ex_kms_key_id
volume = self._to_volume(
[2/5] libcloud git commit: Revert "fix module ref for
loggingconnection"
Posted by an...@apache.org.
Revert "fix module ref for loggingconnection"
This reverts commit 36f3a81f88554d5cb482aac15773df23c73c3d5d.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/53946f6e
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/53946f6e
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/53946f6e
Branch: refs/heads/trunk
Commit: 53946f6e361a9057e2835bd1252e4bc637c75699
Parents: 36f3a81
Author: anthony-shaw <an...@gmail.com>
Authored: Sat Mar 26 21:27:17 2016 +1100
Committer: anthony-shaw <an...@gmail.com>
Committed: Sat Mar 26 21:27:17 2016 +1100
----------------------------------------------------------------------
libcloud/test/test_connection.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/53946f6e/libcloud/test/test_connection.py
----------------------------------------------------------------------
diff --git a/libcloud/test/test_connection.py b/libcloud/test/test_connection.py
index a588ca6..96e86ce 100644
--- a/libcloud/test/test_connection.py
+++ b/libcloud/test/test_connection.py
@@ -23,7 +23,7 @@ from mock import Mock, call, patch
from libcloud.test import unittest
from libcloud.common.base import Connection
-from libcloud.utils.loggingconnection import LoggingConnection
+from libcloud.common.base import LoggingConnection
from libcloud.httplib_ssl import LibcloudBaseConnection
from libcloud.httplib_ssl import LibcloudHTTPConnection
from libcloud.utils.misc import retry
[5/5] libcloud git commit: fix docstring indent Closes #729
Posted by an...@apache.org.
fix docstring indent
Closes #729
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/7dc0fb03
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/7dc0fb03
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/7dc0fb03
Branch: refs/heads/trunk
Commit: 7dc0fb03d7a1af42315f0c93eea0a9953caa3fee
Parents: 4a9628d
Author: ViktorOgnev <v....@scalr.com>
Authored: Mon Mar 28 12:10:09 2016 +0300
Committer: anthony-shaw <an...@gmail.com>
Committed: Mon Mar 28 21:14:24 2016 +1100
----------------------------------------------------------------------
libcloud/compute/drivers/ec2.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/7dc0fb03/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index f88bc52..07637c8 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -3113,8 +3113,8 @@ class BaseEC2NodeDriver(NodeDriver):
when creating the encrypted volume.
Example:
arn:aws:kms:us-east-1:012345678910:key/abcd1234-a123
- -456a-a12b-a123b4cd56ef.
- Only used if encrypted is set to True
+ -456a-a12b-a123b4cd56ef.
+ Only used if encrypted is set to True.
:type ex_kms_key_id: ``str``
:return: The newly created volume.