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/12/23 19:29:27 UTC
[1/2] git commit: list_reserved_nodes -> ex_list_reserved_nodes,
update docstrings.
Updated Branches:
refs/heads/trunk 1655e850a -> ab2b06f3c
list_reserved_nodes -> ex_list_reserved_nodes, update docstrings.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/03f5761d
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/03f5761d
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/03f5761d
Branch: refs/heads/trunk
Commit: 03f5761df276e27bc2d1f4d825952684c9bd36a3
Parents: 1655e85
Author: Tomaz Muraus <to...@apache.org>
Authored: Mon Dec 23 19:24:03 2013 +0100
Committer: Tomaz Muraus <to...@apache.org>
Committed: Mon Dec 23 19:24:03 2013 +0100
----------------------------------------------------------------------
libcloud/compute/drivers/ec2.py | 4 ++--
libcloud/test/compute/test_ec2.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/03f5761d/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index c9b4271..b00f18a 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -876,7 +876,7 @@ class BaseEC2NodeDriver(NodeDriver):
'description': description,
'state': state})
- def list_reserved_nodes(self):
+ def ex_list_reserved_nodes(self):
"""
List all reserved instances/nodes which can be purchased from Amazon
for one or three year terms. Reservations are made at a region level
@@ -884,7 +884,7 @@ class BaseEC2NodeDriver(NodeDriver):
More information can be found at http://goo.gl/ulXCC7.
- :rtype: ``list`` of :class:`ExEC2ReservedNode`
+ :rtype: ``list`` of :class:`.EC2ReservedNode`
"""
params = {'Action': 'DescribeReservedInstances'}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/03f5761d/libcloud/test/compute/test_ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py
index e0536a5..a7194f3 100644
--- a/libcloud/test/compute/test_ec2.py
+++ b/libcloud/test/compute/test_ec2.py
@@ -197,8 +197,8 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin):
'2009-08-07T05:47:04.000Z')
self.assertTrue('instancetype' in ret_node2.extra)
- def test_list_reserved_nodes(self):
- node = self.driver.list_reserved_nodes()[0]
+ def test_ex_list_reserved_nodes(self):
+ node = self.driver.ex_list_reserved_nodes()[0]
self.assertEqual(node.id, '93bbbca2-c500-49d0-9ede-9d8737400498')
self.assertEqual(node.state, 'active')
self.assertEqual(node.extra['instance_type'], 't1.micro')
[2/2] 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/ab2b06f3
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/ab2b06f3
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/ab2b06f3
Branch: refs/heads/trunk
Commit: ab2b06f3cca8a4776ea35dcfd112fe5f9c139f54
Parents: 03f5761
Author: Tomaz Muraus <to...@apache.org>
Authored: Mon Dec 23 19:26:13 2013 +0100
Committer: Tomaz Muraus <to...@apache.org>
Committed: Mon Dec 23 19:26:13 2013 +0100
----------------------------------------------------------------------
CHANGES | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ab2b06f3/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 845d560..e0463fd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -107,6 +107,10 @@ Changes with Apache Libcloud in development
ex_delete_security_group_by_name) to the EC2 driver. (LIBCLOUD-464)
[Chris DeRamus]
+ - Add extension method for listing reserved instances
+ (ex_list_reserved_nodes) to the EC2 driver. (LIBCLOUD-469)
+ [Chris DeRamus]
+
*) Storage
- Allow user to specify 'Content-Disposition' header in the CloudFiles