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/07/05 15:54:20 UTC

[1/3] git commit: LIBCLOUD-357: Modified ElasticHosts to store drive UUID in 'extra' field.

Updated Branches:
  refs/heads/0.13.x [created] 5e481e061


LIBCLOUD-357: Modified ElasticHosts to store drive UUID in 'extra' field.

Signed-off-by: Tomaz Muraus <to...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/a8e473d2
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/a8e473d2
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/a8e473d2

Branch: refs/heads/0.13.x
Commit: a8e473d2aac6e06b027afc6cb861aae0e8cf3685
Parents: 9c0d11a
Author: Bob Thompson <bo...@gmail.com>
Authored: Wed Jul 3 11:22:02 2013 -0400
Committer: Tomaz Muraus <to...@apache.org>
Committed: Fri Jul 5 15:46:28 2013 +0200

----------------------------------------------------------------------
 libcloud/compute/drivers/elasticstack.py | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/a8e473d2/libcloud/compute/drivers/elasticstack.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/elasticstack.py b/libcloud/compute/drivers/elasticstack.py
index 7058dbd..b957614 100644
--- a/libcloud/compute/drivers/elasticstack.py
+++ b/libcloud/compute/drivers/elasticstack.py
@@ -469,6 +469,14 @@ class ElasticStackBaseNodeDriver(NodeDriver):
         if 'vnc:password' in data:
             extra['vnc:password'] = data['vnc:password']
 
+        boot_device = data['boot']
+
+        if isinstance(boot_device, list):
+            for device in boot_device:
+                extra[device] = data[device]
+        else:
+            extra[boot_device] = data[boot_device]
+
         if ssh_password:
             extra.update({'password': ssh_password})
 


[2/3] git commit: LIBCLOUD-357: Updated unit tests for ElasticStack to ensure driver UUID is stored in 'extra' field.

Posted by to...@apache.org.
LIBCLOUD-357: Updated unit tests for ElasticStack to ensure driver UUID is stored in 'extra' field.

Signed-off-by: Tomaz Muraus <to...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/360a93de
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/360a93de
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/360a93de

Branch: refs/heads/0.13.x
Commit: 360a93de0a5e27f0e5d345d78a63c8f89f251252
Parents: a8e473d
Author: Bob Thompson <bo...@gmail.com>
Authored: Fri Jul 5 08:55:00 2013 -0400
Committer: Tomaz Muraus <to...@apache.org>
Committed: Fri Jul 5 15:46:31 2013 +0200

----------------------------------------------------------------------
 libcloud/test/compute/test_elasticstack.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/360a93de/libcloud/test/compute/test_elasticstack.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_elasticstack.py b/libcloud/test/compute/test_elasticstack.py
index af08dfb..0b3faf8 100644
--- a/libcloud/test/compute/test_elasticstack.py
+++ b/libcloud/test/compute/test_elasticstack.py
@@ -105,6 +105,7 @@ class ElasticStackTestCase(object):
         self.assertEqual(node.public_ips[0], "1.2.3.4")
         self.assertEqual(node.public_ips[1], "1.2.3.5")
         self.assertEqual(node.extra['smp'], 1)
+        self.assertEqual(node.extra['ide:0:0'], "b6049e7a-aa1b-47f9-b21d-cdf2354e28d3")
 
     def test_list_sizes(self):
         images = self.driver.list_sizes()
@@ -194,20 +195,20 @@ class ElasticStackMockHttp(MockHttp):
     fixtures = ComputeFileFixtures('elastichosts')
 
     def _servers_info_UNAUTHORIZED(self, method, url, body, headers):
-         return (httplib.UNAUTHORIZED, body, {}, httplib.responses[httplib.NO_CONTENT])
+        return (httplib.UNAUTHORIZED, body, {}, httplib.responses[httplib.NO_CONTENT])
 
     def _servers_info_MALFORMED(self, method, url, body, headers):
-         body = "{malformed: '"
-         return (httplib.OK, body, {}, httplib.responses[httplib.NO_CONTENT])
+        body = "{malformed: '"
+        return (httplib.OK, body, {}, httplib.responses[httplib.NO_CONTENT])
 
     def _servers_info_PARSE_ERROR(self, method, url, body, headers):
-         return (505, body, {}, httplib.responses[httplib.NO_CONTENT])
+        return (505, body, {}, httplib.responses[httplib.NO_CONTENT])
 
     def _servers_b605ca90_c3e6_4cee_85f8_a8ebdf8f9903_reset(self, method, url, body, headers):
-         return (httplib.NO_CONTENT, body, {}, httplib.responses[httplib.NO_CONTENT])
+        return (httplib.NO_CONTENT, body, {}, httplib.responses[httplib.NO_CONTENT])
 
     def _servers_b605ca90_c3e6_4cee_85f8_a8ebdf8f9903_destroy(self, method, url, body, headers):
-         return (httplib.NO_CONTENT, body, {}, httplib.responses[httplib.NO_CONTENT])
+        return (httplib.NO_CONTENT, body, {}, httplib.responses[httplib.NO_CONTENT])
 
     def _drives_create(self, method, url, body, headers):
         body = self.fixtures.load('drives_create.json')


[3/3] 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/5e481e06
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/5e481e06
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/5e481e06

Branch: refs/heads/0.13.x
Commit: 5e481e06175681b3be44992fe59d540b43e9db29
Parents: 360a93d
Author: Tomaz Muraus <to...@apache.org>
Authored: Fri Jul 5 15:45:29 2013 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Fri Jul 5 15:46:33 2013 +0200

----------------------------------------------------------------------
 CHANGES | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/5e481e06/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 640bd2f..350598f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,13 @@
                                    -*- coding: utf-8 -*-
 
+Changes with Apache Libcloud in development
+
+ *) Compute
+
+    - Modify ElasticHosts drive to store drive UUID in 'extra' field.
+      (LIBCLOUD-357)
+      [Bob Thompson]
+
 Changes with Apache Libcloud 0.13.0:
 
  *) General