Return-Path: X-Original-To: apmail-libcloud-commits-archive@www.apache.org Delivered-To: apmail-libcloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A665610921 for ; Thu, 30 Jan 2014 14:32:55 +0000 (UTC) Received: (qmail 39968 invoked by uid 500); 30 Jan 2014 14:32:55 -0000 Delivered-To: apmail-libcloud-commits-archive@libcloud.apache.org Received: (qmail 39941 invoked by uid 500); 30 Jan 2014 14:32:54 -0000 Mailing-List: contact commits-help@libcloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@libcloud.apache.org Delivered-To: mailing list commits@libcloud.apache.org Received: (qmail 39922 invoked by uid 99); 30 Jan 2014 14:32:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Jan 2014 14:32:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 612E9913CA7; Thu, 30 Jan 2014 14:32:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tomaz@apache.org To: commits@libcloud.apache.org Date: Thu, 30 Jan 2014 14:32:53 -0000 Message-Id: <9ea7cbeab3a7425ab1aa671d9c779ab9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Thu Jan 30 15:26:23 2014 +0100 Committer: Tomaz Muraus 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 ` CLOUDFRAMES :mod:`libcloud.compute.drivers.cloudframes` :class:`CloudFramesNodeDriver` -`CloudSigma`_ :doc:`Click ` CLOUDSIGMA :mod:`libcloud.compute.drivers.cloudsigma` :class:`CloudSigmaNodeDriver` +`CloudSigma (API v2.0)`_ :doc:`Click ` CLOUDSIGMA :mod:`libcloud.compute.drivers.cloudsigma` :class:`CloudSigmaNodeDriver` `CloudStack`_ :doc:`Click ` 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/