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:08 UTC
[1/5] git commit: Bump version.
Updated Branches:
refs/heads/trunk 536ae048a -> 78f895879
Bump version.
Conflicts:
libcloud/__init__.py
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/a918be45
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/a918be45
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/a918be45
Branch: refs/heads/trunk
Commit: a918be458aa8a096e46a5386449d614b0f0e1eb8
Parents: 536ae04
Author: Tomaz Muraus <to...@apache.org>
Authored: Wed Jun 26 18:52:31 2013 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Fri Jul 5 15:24:20 2013 +0200
----------------------------------------------------------------------
CHANGES | 2 +-
libcloud/__init__.py | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/a918be45/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 4b270d4..efd78b8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
-*- coding: utf-8 -*-
-Changes with Apache Libcloud in deveploment:
+Changes with Apache Libcloud 0.13.0:
*) General
http://git-wip-us.apache.org/repos/asf/libcloud/blob/a918be45/libcloud/__init__.py
----------------------------------------------------------------------
diff --git a/libcloud/__init__.py b/libcloud/__init__.py
index f2ff5ed..64cb177 100644
--- a/libcloud/__init__.py
+++ b/libcloud/__init__.py
@@ -20,7 +20,10 @@ libcloud provides a unified interface to the cloud computing resources.
"""
__all__ = ['__version__', 'enable_debug']
-__version__ = '0.13.0-dev'
+__version__ = '0.14.0-dev'
+
+import os
+import atexit
try:
import paramiko
[4/5] 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/20befa33
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/20befa33
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/20befa33
Branch: refs/heads/trunk
Commit: 20befa33cf56759e30b47105dcf506e96c38f2c3
Parents: 8465e29
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:26:16 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/20befa33/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/5] git commit: LIBCLOUD-357: Modified ElasticHosts to store drive
UUID in 'extra' field.
Posted by to...@apache.org.
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/8465e297
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/8465e297
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/8465e297
Branch: refs/heads/trunk
Commit: 8465e2976b1f57e234b65c50ec12afe6a2e9a91a
Parents: 3bc2f69
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:26:16 2013 +0200
----------------------------------------------------------------------
libcloud/compute/drivers/elasticstack.py | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/8465e297/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/5] git commit: Add missing setUp method to some OpenStack tests.
Posted by to...@apache.org.
Add missing setUp method to some OpenStack tests.
Conflicts:
libcloud/test/compute/test_openstack.py
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/3bc2f69d
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/3bc2f69d
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/3bc2f69d
Branch: refs/heads/trunk
Commit: 3bc2f69d93980449c3dc450fdeb5a53e0aae085b
Parents: a918be4
Author: Tomaz Muraus <to...@apache.org>
Authored: Wed Jun 26 19:13:25 2013 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Fri Jul 5 15:25:10 2013 +0200
----------------------------------------------------------------------
libcloud/test/compute/test_openstack.py | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/3bc2f69d/libcloud/test/compute/test_openstack.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_openstack.py b/libcloud/test/compute/test_openstack.py
index 16f081a..09ce48d 100644
--- a/libcloud/test/compute/test_openstack.py
+++ b/libcloud/test/compute/test_openstack.py
@@ -104,6 +104,9 @@ class OpenStackServiceCatalogTests(unittest.TestCase):
class OpenStackAuthConnectionTests(unittest.TestCase):
# TODO refactor and move into libcloud/test/common
+ def setUp(self):
+ OpenStackBaseConnection.conn_classes = (OpenStackMockHttp,
+ OpenStackMockHttp)
def test_basic_authentication(self):
tuples = [
[5/5] 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/78f89587
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/78f89587
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/78f89587
Branch: refs/heads/trunk
Commit: 78f895879ae3cd9ce5648e5200d24f441673def5
Parents: 20befa3
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:45:29 2013 +0200
----------------------------------------------------------------------
CHANGES | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/78f89587/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index efd78b8..f1b25fa 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