libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject [1/2] git commit: list_reserved_nodes -> ex_list_reserved_nodes, update docstrings.
Date Mon, 23 Dec 2013 18:29:27 GMT
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 <tomaz@apache.org>
Authored: Mon Dec 23 19:24:03 2013 +0100
Committer: Tomaz Muraus <tomaz@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')


Mime
View raw message