svn commit: r1092838 - in /incubator/libcloud/trunk: CHANGES libcloud/compute/drivers/gogrid.py test/compute/test_gogrid.py

[rb...@apache.org]

Author: rbogorodskiy
Date: Fri Apr 15 22:56:23 2011
New Revision: 1092838

URL: http://svn.apache.org/viewvc?rev=1092838&view=rev
Log:
GoGrid driver: update to API Version 1.8.

Fix offset for recent CHANGES items while I'm here.

Modified:
    incubator/libcloud/trunk/CHANGES
    incubator/libcloud/trunk/libcloud/compute/drivers/gogrid.py
    incubator/libcloud/trunk/test/compute/test_gogrid.py

Modified: incubator/libcloud/trunk/CHANGES
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/CHANGES?rev=1092838&r1=1092837&r2=1092838&view=diff
==============================================================================
--- incubator/libcloud/trunk/CHANGES (original)
+++ incubator/libcloud/trunk/CHANGES Fri Apr 15 22:56:23 2011
@@ -1,36 +1,40 @@
                                                         -*- coding: utf-8 -*-
 
 Changes with Apache Libcloud 0.4.3
-   *) When creating an EC2 node, don't ignore the name argument
-      and create a "Name" tag with the value of this argument.
-      [Tomaz Muraus]
+    *) Update GoGrid driver to use API Version 1.8. Sandbox flag
+       for servers is no longer used.
+       [Roman Bogorodskiy]
 
-   *) Add Gandi.net driver.
-      [Aymeric Barantal]
+    *) When creating an EC2 node, don't ignore the name argument
+       and create a "Name" tag with the value of this argument.
+       [Tomaz Muraus]
 
-   *) Add extension method for modifying node attributes and
-      changing the node size (EC2 driver).
-      [Tomaz Muraus]
+    *) Add Gandi.net driver.
+       [Aymeric Barantal]
 
-   *) Add Bluebox driver.
-      [Christian Paredes]
+    *) Add extension method for modifying node attributes and
+       changing the node size (EC2 driver).
+       [Tomaz Muraus]
 
-   *) Add Nimbus driver.
-      [David LaBissoniere]
+    *) Add Bluebox driver.
+       [Christian Paredes]
 
-   *) Minor fixes to get the library and tests working on
-      Python 2.7 and PyPy.
-      [Tomaz Muraus]
+    *) Add Nimbus driver.
+       [David LaBissoniere]
 
-   *) Added "pricing" module and improved pricing handling.
-      [Tomaz Muraus]
+    *) Minor fixes to get the library and tests working on
+       Python 2.7 and PyPy.
+       [Tomaz Muraus]
 
-   *) Add support for the new Amazon Region (Tokyo)
-      [Tomaz Muraus]
+    *) Added "pricing" module and improved pricing handling.
+       [Tomaz Muraus]
+
+    *) Add support for the new Amazon Region (Tokyo)
+       [Tomaz Muraus]
 
-   *) Implement ex_rebuild() and ex_get_node_details()
-      routines for Rackspace driver.
-      [Andrew Klochkov]
+    *) Implement ex_rebuild() and ex_get_node_details()
+       routines for Rackspace driver.
+       [Andrew Klochkov]
 
     *) Implement ex_list_ips() for GoGrid driver to list
        IP addresses assigned to the account. Make use of

Modified: incubator/libcloud/trunk/libcloud/compute/drivers/gogrid.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/compute/drivers/gogrid.py?rev=1092838&r1=1092837&r2=1092838&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/compute/drivers/gogrid.py (original)
+++ incubator/libcloud/trunk/libcloud/compute/drivers/gogrid.py Fri Apr 15 22:56:23 2011
@@ -34,11 +34,12 @@ from libcloud.compute.base import NodeSi
 
 HOST = 'api.gogrid.com'
 PORTS_BY_SECURITY = { True: 443, False: 80 }
-API_VERSION = '1.7'
+API_VERSION = '1.8'
 
 STATE = {
     "Starting": NodeState.PENDING,
     "On": NodeState.RUNNING,
+    "On/Saving": NodeState.RUNNING,
     "Off": NodeState.PENDING,
     "Restarting": NodeState.REBOOTING,
     "Saving": NodeState.PENDING,
@@ -178,8 +179,7 @@ class GoGridNodeDriver(NodeDriver):
                  state=state,
                  public_ip=[ip],
                  private_ip=[],
-                 extra={'ram': element.get('ram').get('name'),
-                     'isSandbox': element['isSandbox'] == 'true'},
+                 extra={'ram': element.get('ram').get('name')},
                  driver=self.connection.driver)
         if password:
             n.extra['password'] = password
@@ -319,7 +319,6 @@ class GoGridNodeDriver(NodeDriver):
         params = {'name': name,
                   'image': image.id,
                   'description': kwargs.get('ex_description', ''),
-                  'isSandbox': str(kwargs.get('ex_issandbox', False)).lower(),
                   'server.ram': size.id,
                   'ip': ip}
 
@@ -336,8 +335,6 @@ class GoGridNodeDriver(NodeDriver):
 
         @keyword    ex_description: Description of a Node
         @type       ex_description: C{string}
-        @keyword    ex_issandbox: Should server be sendbox?
-        @type       ex_issandbox: C{bool}
         @keyword    ex_ip: Public IP address to use for a Node. If not
                     specified, first available IP address will be picked
         @type       ex_ip: C{string}

Modified: incubator/libcloud/trunk/test/compute/test_gogrid.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/compute/test_gogrid.py?rev=1092838&r1=1092837&r2=1092838&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/compute/test_gogrid.py (original)
+++ incubator/libcloud/trunk/test/compute/test_gogrid.py Fri Apr 15 22:56:23 2011
@@ -57,7 +57,6 @@ class GoGridTests(unittest.TestCase, Tes
 
         self.assertEqual(node.id, '90967')
         self.assertEqual(node.extra['password'], 'bebebe')
-        self.assertEqual(node.extra['isSandbox'], False)
 
     def test_reboot_node(self):
         node = Node(90967, None, None, None, None, self.driver)