svn commit: r895829 - in /incubator/libcloud/trunk: libcloud/drivers/ec2.py test/__init__.py test/test_ec2.py

[pq...@apache.org]

Author: pquerna
Date: Mon Jan  4 23:46:31 2010
New Revision: 895829

URL: http://svn.apache.org/viewvc?rev=895829&view=rev
Log:
Update EC2 driver for kwargs create_node

Modified:
    incubator/libcloud/trunk/libcloud/drivers/ec2.py
    incubator/libcloud/trunk/test/__init__.py
    incubator/libcloud/trunk/test/test_ec2.py

Modified: incubator/libcloud/trunk/libcloud/drivers/ec2.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/ec2.py?rev=895829&r1=895828&r2=895829&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/ec2.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/ec2.py Mon Jan  4 23:46:31 2010
@@ -237,7 +237,10 @@
         return images
 
     # name doesn't apply to EC2 nodes.
-    def create_node(self, name, image, size, **kwargs):
+    def create_node(self, **kwargs):
+        name = kwargs["name"]
+        image = kwargs["image"]
+        size = kwargs["size"]
         params = {'Action': 'RunInstances',
                   'ImageId': image.id,
                   'MinCount': kwargs.get('mincount','1'),

Modified: incubator/libcloud/trunk/test/__init__.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/__init__.py?rev=895829&r1=895828&r2=895829&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/__init__.py (original)
+++ incubator/libcloud/trunk/test/__init__.py Mon Jan  4 23:46:31 2010
@@ -174,7 +174,9 @@
         # should return a node object
         size = self.driver.list_sizes()[0]
         image = self.driver.list_images()[0]
-        node = self.driver.create_node('node-name',image, size)
+        node = self.driver.create_node(name='node-name',
+                                     image=image,
+                                     size=size)
         self.assertTrue(isinstance(node, Node))
 
     def test_destroy_node_response(self):

Modified: incubator/libcloud/trunk/test/test_ec2.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/test_ec2.py?rev=895829&r1=895828&r2=895829&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/test_ec2.py (original)
+++ incubator/libcloud/trunk/test/test_ec2.py Mon Jan  4 23:46:31 2010
@@ -35,7 +35,7 @@
                           name='ec2-public-images/fedora-8-i386-base-v1.04.manifest.xml',
                           driver=self.driver)
         size = NodeSize('m1.small', 'Small Instance', None, None, None, None, driver=self.driver)
-        node = self.driver.create_node('foo', image, size)
+        node = self.driver.create_node(name='foo', image=image, size=size)
         self.assertEqual(node.id, 'i-2ba64342')
 
     def test_list_nodes(self):