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 2014/01/30 15:32:53 UTC
[1/3] git commit: Quick hack for providers which support multiple API
versions.
Updated Branches:
refs/heads/trunk feba5a3be -> e1039acb6
Quick hack for providers which support multiple API versions.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/9bba66e1
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/9bba66e1
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/9bba66e1
Branch: refs/heads/trunk
Commit: 9bba66e101f114950710f1abe8afa366e182e175
Parents: feba5a3
Author: Tomaz Muraus <to...@apache.org>
Authored: Thu Jan 30 15:26:23 2014 +0100
Committer: Tomaz Muraus <to...@apache.org>
Committed: Thu Jan 30 15:26:23 2014 +0100
----------------------------------------------------------------------
contrib/generate_provider_feature_matrix_table.py | 13 +++++++++++++
docs/compute/_supported_methods_block_storage.rst | 6 +++---
.../compute/_supported_methods_key_pair_management.rst | 4 ++--
docs/compute/_supported_methods_main.rst | 6 +++---
docs/compute/_supported_providers.rst | 4 ++--
5 files changed, 23 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9bba66e1/contrib/generate_provider_feature_matrix_table.py
----------------------------------------------------------------------
diff --git a/contrib/generate_provider_feature_matrix_table.py b/contrib/generate_provider_feature_matrix_table.py
index 728ee9c..6d93f7a 100755
--- a/contrib/generate_provider_feature_matrix_table.py
+++ b/contrib/generate_provider_feature_matrix_table.py
@@ -192,6 +192,19 @@ def generate_providers_table(api):
# Deprecated providers throw an exception
continue
+ # Hack for providers which expose multiple classes and support multiple
+ # API versions
+ # TODO: Make entry per version
+
+ if name.lower() == 'cloudsigma':
+ from libcloud.compute.drivers.cloudsigma import \
+ CloudSigma_2_0_NodeDriver
+ cls = CloudSigma_2_0_NodeDriver
+ elif name.lower() == 'opennebula':
+ from libcloud.compute.drivers.opennebula import \
+ OpenNebula_3_8_NodeDriver
+ cls = OpenNebula_3_8_NodeDriver
+
if name.lower() in IGNORED_PROVIDERS:
continue
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9bba66e1/docs/compute/_supported_methods_block_storage.rst
----------------------------------------------------------------------
diff --git a/docs/compute/_supported_methods_block_storage.rst b/docs/compute/_supported_methods_block_storage.rst
index f2ba2b5..bfbf873 100644
--- a/docs/compute/_supported_methods_block_storage.rst
+++ b/docs/compute/_supported_methods_block_storage.rst
@@ -5,7 +5,7 @@ Provider list volumes create volume destroy volume
`Bluebox Blocks`_ no no no no no no no
`Brightbox`_ no no no no no no no
`CloudFrames`_ no no no no no no no
-`CloudSigma`_ no no no no no no no
+`CloudSigma (API v2.0)`_ no no no no no no no
`CloudStack`_ yes yes yes yes yes no no
`Digital Ocean`_ no no no no no no no
`Dreamhost`_ no no no no no no no
@@ -44,7 +44,7 @@ Provider list volumes create volume destroy volume
`NephoScale`_ no no no no no no no
`Nimbus`_ yes yes yes yes yes yes yes
`Ninefold`_ yes yes yes yes yes no no
-`OpenNebula`_ no no no no no no no
+`OpenNebula`_ yes yes yes yes yes no no
`OpenStack`_ yes yes yes yes yes no no
`Opsource`_ no no no no no no no
`Rackspace Cloud (Next Gen)`_ yes yes yes yes yes no no
@@ -64,7 +64,7 @@ Provider list volumes create volume destroy volume
.. _`Bluebox Blocks`: http://bluebox.net
.. _`Brightbox`: http://www.brightbox.co.uk/
.. _`CloudFrames`: http://www.cloudframes.net/
-.. _`CloudSigma`: http://www.cloudsigma.com/
+.. _`CloudSigma (API v2.0)`: http://www.cloudsigma.com/
.. _`CloudStack`: http://cloudstack.org/
.. _`Digital Ocean`: https://www.digitalocean.com
.. _`Dreamhost`: http://dreamhost.com/
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9bba66e1/docs/compute/_supported_methods_key_pair_management.rst
----------------------------------------------------------------------
diff --git a/docs/compute/_supported_methods_key_pair_management.rst b/docs/compute/_supported_methods_key_pair_management.rst
index a677d60..939d898 100644
--- a/docs/compute/_supported_methods_key_pair_management.rst
+++ b/docs/compute/_supported_methods_key_pair_management.rst
@@ -5,7 +5,7 @@ Provider list key pairs get key pair create key pai
`Bluebox Blocks`_ no no no no no no
`Brightbox`_ no no no no no no
`CloudFrames`_ no no no no no no
-`CloudSigma`_ no no no no no no
+`CloudSigma (API v2.0)`_ no no no no no no
`CloudStack`_ yes yes yes yes no yes
`Digital Ocean`_ no no no no no no
`Dreamhost`_ no no no no no no
@@ -64,7 +64,7 @@ Provider list key pairs get key pair create key pai
.. _`Bluebox Blocks`: http://bluebox.net
.. _`Brightbox`: http://www.brightbox.co.uk/
.. _`CloudFrames`: http://www.cloudframes.net/
-.. _`CloudSigma`: http://www.cloudsigma.com/
+.. _`CloudSigma (API v2.0)`: http://www.cloudsigma.com/
.. _`CloudStack`: http://cloudstack.org/
.. _`Digital Ocean`: https://www.digitalocean.com
.. _`Dreamhost`: http://dreamhost.com/
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9bba66e1/docs/compute/_supported_methods_main.rst
----------------------------------------------------------------------
diff --git a/docs/compute/_supported_methods_main.rst b/docs/compute/_supported_methods_main.rst
index f969a81..a835f2c 100644
--- a/docs/compute/_supported_methods_main.rst
+++ b/docs/compute/_supported_methods_main.rst
@@ -5,7 +5,7 @@ Provider list nodes create node reboot node destroy
`Bluebox Blocks`_ yes yes yes yes yes yes yes
`Brightbox`_ yes yes no yes yes yes no
`CloudFrames`_ yes yes yes yes yes yes no
-`CloudSigma`_ no no no no no no no
+`CloudSigma (API v2.0)`_ yes yes no yes yes yes no
`CloudStack`_ yes yes yes yes yes yes yes
`Digital Ocean`_ yes yes yes yes yes yes no
`Dreamhost`_ yes yes yes yes yes yes no
@@ -44,7 +44,7 @@ Provider list nodes create node reboot node destroy
`NephoScale`_ yes yes yes yes yes yes yes
`Nimbus`_ yes yes yes yes yes yes yes
`Ninefold`_ yes yes yes yes yes yes yes
-`OpenNebula`_ yes yes no yes yes yes no
+`OpenNebula`_ yes yes yes yes yes yes no
`OpenStack`_ yes no yes yes yes yes no
`Opsource`_ yes yes yes yes yes yes yes
`Rackspace Cloud (Next Gen)`_ yes yes yes yes yes yes yes
@@ -64,7 +64,7 @@ Provider list nodes create node reboot node destroy
.. _`Bluebox Blocks`: http://bluebox.net
.. _`Brightbox`: http://www.brightbox.co.uk/
.. _`CloudFrames`: http://www.cloudframes.net/
-.. _`CloudSigma`: http://www.cloudsigma.com/
+.. _`CloudSigma (API v2.0)`: http://www.cloudsigma.com/
.. _`CloudStack`: http://cloudstack.org/
.. _`Digital Ocean`: https://www.digitalocean.com
.. _`Dreamhost`: http://dreamhost.com/
http://git-wip-us.apache.org/repos/asf/libcloud/blob/9bba66e1/docs/compute/_supported_providers.rst
----------------------------------------------------------------------
diff --git a/docs/compute/_supported_providers.rst b/docs/compute/_supported_providers.rst
index 32ef342..60b8923 100644
--- a/docs/compute/_supported_providers.rst
+++ b/docs/compute/_supported_providers.rst
@@ -5,7 +5,7 @@ Provider Documentation
`Bluebox Blocks`_ BLUEBOX :mod:`libcloud.compute.drivers.bluebox` :class:`BlueboxNodeDriver`
`Brightbox`_ BRIGHTBOX :mod:`libcloud.compute.drivers.brightbox` :class:`BrightboxNodeDriver`
`CloudFrames`_ :doc:`Click </compute/drivers/cloudframes>` CLOUDFRAMES :mod:`libcloud.compute.drivers.cloudframes` :class:`CloudFramesNodeDriver`
-`CloudSigma`_ :doc:`Click </compute/drivers/cloudsigma>` CLOUDSIGMA :mod:`libcloud.compute.drivers.cloudsigma` :class:`CloudSigmaNodeDriver`
+`CloudSigma (API v2.0)`_ :doc:`Click </compute/drivers/cloudsigma>` CLOUDSIGMA :mod:`libcloud.compute.drivers.cloudsigma` :class:`CloudSigmaNodeDriver`
`CloudStack`_ :doc:`Click </compute/drivers/cloudstack>` CLOUDSTACK :mod:`libcloud.compute.drivers.cloudstack` :class:`CloudStackNodeDriver`
`Digital Ocean`_ DIGITAL_OCEAN :mod:`libcloud.compute.drivers.digitalocean` :class:`DigitalOceanNodeDriver`
`Dreamhost`_ DREAMHOST :mod:`libcloud.compute.drivers.dreamhost` :class:`DreamhostNodeDriver`
@@ -64,7 +64,7 @@ Provider Documentation
.. _`Bluebox Blocks`: http://bluebox.net
.. _`Brightbox`: http://www.brightbox.co.uk/
.. _`CloudFrames`: http://www.cloudframes.net/
-.. _`CloudSigma`: http://www.cloudsigma.com/
+.. _`CloudSigma (API v2.0)`: http://www.cloudsigma.com/
.. _`CloudStack`: http://cloudstack.org/
.. _`Digital Ocean`: https://www.digitalocean.com
.. _`Dreamhost`: http://dreamhost.com/
[3/3] git commit: Re-generate documentation fixtures.
Posted by to...@apache.org.
Re-generate documentation fixtures.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/e1039acb
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/e1039acb
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/e1039acb
Branch: refs/heads/trunk
Commit: e1039acb61a16d945fa57984423900404e095530
Parents: 4a37c1f
Author: Tomaz Muraus <to...@apache.org>
Authored: Thu Jan 30 15:32:27 2014 +0100
Committer: Tomaz Muraus <to...@apache.org>
Committed: Thu Jan 30 15:32:27 2014 +0100
----------------------------------------------------------------------
docs/compute/_supported_methods_block_storage.rst | 4 ++--
docs/compute/_supported_methods_key_pair_management.rst | 4 ++--
docs/compute/_supported_methods_main.rst | 4 ++--
docs/compute/_supported_providers.rst | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/e1039acb/docs/compute/_supported_methods_block_storage.rst
----------------------------------------------------------------------
diff --git a/docs/compute/_supported_methods_block_storage.rst b/docs/compute/_supported_methods_block_storage.rst
index bfbf873..23860db 100644
--- a/docs/compute/_supported_methods_block_storage.rst
+++ b/docs/compute/_supported_methods_block_storage.rst
@@ -44,7 +44,7 @@ Provider list volumes create volume destroy volume
`NephoScale`_ no no no no no no no
`Nimbus`_ yes yes yes yes yes yes yes
`Ninefold`_ yes yes yes yes yes no no
-`OpenNebula`_ yes yes yes yes yes no no
+`OpenNebula (v3.8)`_ yes yes yes yes yes no no
`OpenStack`_ yes yes yes yes yes no no
`Opsource`_ no no no no no no no
`Rackspace Cloud (Next Gen)`_ yes yes yes yes yes no no
@@ -103,7 +103,7 @@ Provider list volumes create volume destroy volume
.. _`NephoScale`: http://www.nephoscale.com
.. _`Nimbus`: http://www.nimbusproject.org/
.. _`Ninefold`: http://ninefold.com/
-.. _`OpenNebula`: http://opennebula.org/
+.. _`OpenNebula (v3.8)`: http://opennebula.org/
.. _`OpenStack`: http://openstack.org/
.. _`Opsource`: http://www.opsource.net/
.. _`Rackspace Cloud (Next Gen)`: http://www.rackspace.com
http://git-wip-us.apache.org/repos/asf/libcloud/blob/e1039acb/docs/compute/_supported_methods_key_pair_management.rst
----------------------------------------------------------------------
diff --git a/docs/compute/_supported_methods_key_pair_management.rst b/docs/compute/_supported_methods_key_pair_management.rst
index 939d898..2bc8fed 100644
--- a/docs/compute/_supported_methods_key_pair_management.rst
+++ b/docs/compute/_supported_methods_key_pair_management.rst
@@ -44,7 +44,7 @@ Provider list key pairs get key pair create key pai
`NephoScale`_ no no no no no no
`Nimbus`_ yes yes yes yes no yes
`Ninefold`_ yes yes yes yes no yes
-`OpenNebula`_ no no no no no no
+`OpenNebula (v3.8)`_ no no no no no no
`OpenStack`_ no no no no no no
`Opsource`_ no no no no no no
`Rackspace Cloud (Next Gen)`_ yes yes yes yes no yes
@@ -103,7 +103,7 @@ Provider list key pairs get key pair create key pai
.. _`NephoScale`: http://www.nephoscale.com
.. _`Nimbus`: http://www.nimbusproject.org/
.. _`Ninefold`: http://ninefold.com/
-.. _`OpenNebula`: http://opennebula.org/
+.. _`OpenNebula (v3.8)`: http://opennebula.org/
.. _`OpenStack`: http://openstack.org/
.. _`Opsource`: http://www.opsource.net/
.. _`Rackspace Cloud (Next Gen)`: http://www.rackspace.com
http://git-wip-us.apache.org/repos/asf/libcloud/blob/e1039acb/docs/compute/_supported_methods_main.rst
----------------------------------------------------------------------
diff --git a/docs/compute/_supported_methods_main.rst b/docs/compute/_supported_methods_main.rst
index a835f2c..84ffffd 100644
--- a/docs/compute/_supported_methods_main.rst
+++ b/docs/compute/_supported_methods_main.rst
@@ -44,7 +44,7 @@ Provider list nodes create node reboot node destroy
`NephoScale`_ yes yes yes yes yes yes yes
`Nimbus`_ yes yes yes yes yes yes yes
`Ninefold`_ yes yes yes yes yes yes yes
-`OpenNebula`_ yes yes yes yes yes yes no
+`OpenNebula (v3.8)`_ yes yes yes yes yes yes no
`OpenStack`_ yes no yes yes yes yes no
`Opsource`_ yes yes yes yes yes yes yes
`Rackspace Cloud (Next Gen)`_ yes yes yes yes yes yes yes
@@ -103,7 +103,7 @@ Provider list nodes create node reboot node destroy
.. _`NephoScale`: http://www.nephoscale.com
.. _`Nimbus`: http://www.nimbusproject.org/
.. _`Ninefold`: http://ninefold.com/
-.. _`OpenNebula`: http://opennebula.org/
+.. _`OpenNebula (v3.8)`: http://opennebula.org/
.. _`OpenStack`: http://openstack.org/
.. _`Opsource`: http://www.opsource.net/
.. _`Rackspace Cloud (Next Gen)`: http://www.rackspace.com
http://git-wip-us.apache.org/repos/asf/libcloud/blob/e1039acb/docs/compute/_supported_providers.rst
----------------------------------------------------------------------
diff --git a/docs/compute/_supported_providers.rst b/docs/compute/_supported_providers.rst
index 60b8923..0a2c888 100644
--- a/docs/compute/_supported_providers.rst
+++ b/docs/compute/_supported_providers.rst
@@ -44,7 +44,7 @@ Provider Documentation
`NephoScale`_ NEPHOSCALE :mod:`libcloud.compute.drivers.nephoscale` :class:`NephoscaleNodeDriver`
`Nimbus`_ :doc:`Click </compute/drivers/nimbus>` NIMBUS :mod:`libcloud.compute.drivers.ec2` :class:`NimbusNodeDriver`
`Ninefold`_ NINEFOLD :mod:`libcloud.compute.drivers.ninefold` :class:`NinefoldNodeDriver`
-`OpenNebula`_ OPENNEBULA :mod:`libcloud.compute.drivers.opennebula` :class:`OpenNebulaNodeDriver`
+`OpenNebula (v3.8)`_ OPENNEBULA :mod:`libcloud.compute.drivers.opennebula` :class:`OpenNebulaNodeDriver`
`OpenStack`_ :doc:`Click </compute/drivers/openstack>` OPENSTACK :mod:`libcloud.compute.drivers.openstack` :class:`OpenStackNodeDriver`
`Opsource`_ OPSOURCE :mod:`libcloud.compute.drivers.opsource` :class:`OpsourceNodeDriver`
`Rackspace Cloud (Next Gen)`_ :doc:`Click </compute/drivers/rackspace>` RACKSPACE :mod:`libcloud.compute.drivers.rackspace` :class:`RackspaceNodeDriver`
@@ -103,7 +103,7 @@ Provider Documentation
.. _`NephoScale`: http://www.nephoscale.com
.. _`Nimbus`: http://www.nimbusproject.org/
.. _`Ninefold`: http://ninefold.com/
-.. _`OpenNebula`: http://opennebula.org/
+.. _`OpenNebula (v3.8)`: http://opennebula.org/
.. _`OpenStack`: http://openstack.org/
.. _`Opsource`: http://www.opsource.net/
.. _`Rackspace Cloud (Next Gen)`: http://www.rackspace.com
[2/3] git commit: Add name attribute to all OpenNebula driver classes.
Posted by to...@apache.org.
Add name attribute to all OpenNebula driver classes.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/4a37c1fe
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/4a37c1fe
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/4a37c1fe
Branch: refs/heads/trunk
Commit: 4a37c1feecdc36f777579e2ac49b0c2e655db1ee
Parents: 9bba66e
Author: Tomaz Muraus <to...@apache.org>
Authored: Thu Jan 30 15:28:03 2014 +0100
Committer: Tomaz Muraus <to...@apache.org>
Committed: Thu Jan 30 15:28:03 2014 +0100
----------------------------------------------------------------------
libcloud/compute/drivers/opennebula.py | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/4a37c1fe/libcloud/compute/drivers/opennebula.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/opennebula.py b/libcloud/compute/drivers/opennebula.py
index bdb9755..08db5ed 100644
--- a/libcloud/compute/drivers/opennebula.py
+++ b/libcloud/compute/drivers/opennebula.py
@@ -647,7 +647,7 @@ class OpenNebula_1_4_NodeDriver(OpenNebulaNodeDriver):
OpenNebula.org node driver for OpenNebula.org v1.4.
"""
- pass
+ name = 'OpenNebula (v1.4)'
class OpenNebula_2_0_NodeDriver(OpenNebulaNodeDriver):
@@ -656,6 +656,8 @@ class OpenNebula_2_0_NodeDriver(OpenNebulaNodeDriver):
v2.2.
"""
+ name = 'OpenNebula (v2.0 - v2.2)'
+
def create_node(self, **kwargs):
"""
Create a new OpenNebula node.
@@ -951,6 +953,8 @@ class OpenNebula_3_0_NodeDriver(OpenNebula_2_0_NodeDriver):
OpenNebula.org node driver for OpenNebula.org v3.0.
"""
+ name = 'OpenNebula (v3.0)'
+
def ex_node_set_save_name(self, node, name):
"""
Build action representation and instruct node to commit action.
@@ -1020,6 +1024,8 @@ class OpenNebula_3_2_NodeDriver(OpenNebula_3_0_NodeDriver):
OpenNebula.org node driver for OpenNebula.org v3.2.
"""
+ name = 'OpenNebula (v3.2)'
+
def reboot_node(self, node):
return self.ex_node_action(node, ACTION.REBOOT)
@@ -1086,6 +1092,8 @@ class OpenNebula_3_6_NodeDriver(OpenNebula_3_2_NodeDriver):
OpenNebula.org node driver for OpenNebula.org v3.6.
"""
+ name = 'OpenNebula (v3.6)'
+
def create_volume(self, size, name, location=None, snapshot=None):
storage = ET.Element('STORAGE')
@@ -1205,6 +1213,7 @@ class OpenNebula_3_8_NodeDriver(OpenNebula_3_6_NodeDriver):
OpenNebula.org node driver for OpenNebula.org v3.8.
"""
+ name = 'OpenNebula (v3.8)'
plain_auth = API_PLAIN_AUTH
def _to_sizes(self, object):