svn commit: r1129638 - in /libcloud/trunk: libcloud/compute/drivers/gogrid.py test/compute/fixtures/gogrid/server_list.json test/compute/test_gogrid.py

[rb...@apache.org]

Author: rbogorodskiy
Date: Tue May 31 12:10:22 2011
New Revision: 1129638

URL: http://svn.apache.org/viewvc?rev=1129638&view=rev
Log:
GoGrid driver: provide node description via 'extra' if it's available.

Modified:
    libcloud/trunk/libcloud/compute/drivers/gogrid.py
    libcloud/trunk/test/compute/fixtures/gogrid/server_list.json
    libcloud/trunk/test/compute/test_gogrid.py

Modified: libcloud/trunk/libcloud/compute/drivers/gogrid.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/gogrid.py?rev=1129638&r1=1129637&r2=1129638&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/gogrid.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/gogrid.py Tue May 31 12:10:22 2011
@@ -116,7 +116,8 @@ class GoGridNodeDriver(BaseGoGridDriver,
                  state=state,
                  public_ip=[ip],
                  private_ip=[],
-                 extra={'ram': element.get('ram').get('name')},
+                 extra={'ram': element.get('ram').get('name'),
+                     'description': element.get('description', '')},
                  driver=self.connection.driver)
         if password:
             n.extra['password'] = password

Modified: libcloud/trunk/test/compute/fixtures/gogrid/server_list.json
URL: http://svn.apache.org/viewvc/libcloud/trunk/test/compute/fixtures/gogrid/server_list.json?rev=1129638&r1=1129637&r2=1129638&view=diff
==============================================================================
--- libcloud/trunk/test/compute/fixtures/gogrid/server_list.json (original)
+++ libcloud/trunk/test/compute/fixtures/gogrid/server_list.json Tue May 31 12:10:22 2011
@@ -59,6 +59,7 @@
             },
             "isSandbox": false,
             "name": "test1",
+            "description": "test server",
             "object": "server",
             "os": {
                 "description": "CentOS 5.3 (32-bit)",

Modified: libcloud/trunk/test/compute/test_gogrid.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_gogrid.py?rev=1129638&r1=1129637&r2=1129638&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_gogrid.py (original)
+++ libcloud/trunk/test/compute/test_gogrid.py Tue May 31 12:10:22 2011
@@ -58,6 +58,7 @@ class GoGridTests(unittest.TestCase, Tes
 
         self.assertEqual(node.id, '90967')
         self.assertEqual(node.extra['password'], 'bebebe')
+        self.assertEqual(node.extra['description'], 'test server')
 
     def test_reboot_node(self):
         node = Node(90967, None, None, None, None, self.driver)