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 D0ACC102F4 for ; Thu, 17 Oct 2013 21:59:10 +0000 (UTC) Received: (qmail 72656 invoked by uid 500); 17 Oct 2013 21:59:10 -0000 Delivered-To: apmail-libcloud-commits-archive@libcloud.apache.org Received: (qmail 72356 invoked by uid 500); 17 Oct 2013 21:59:09 -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 72336 invoked by uid 99); 17 Oct 2013 21:59:09 -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, 17 Oct 2013 21:59:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D2B5391787C; Thu, 17 Oct 2013 21:59:08 +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, 17 Oct 2013 21:59:09 -0000 Message-Id: In-Reply-To: <8f739da0ddb44ba9826dddb5b8420b38@git.apache.org> References: <8f739da0ddb44ba9826dddb5b8420b38@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] git commit: Re-apply previously reverted patch, regenerate documentation fixtures. Re-apply previously reverted patch, regenerate documentation fixtures. Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/57f77365 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/57f77365 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/57f77365 Branch: refs/heads/trunk Commit: 57f77365154a32bf842e652dd91a088a10159296 Parents: 0b98660 Author: Tomaz Muraus Authored: Thu Oct 17 23:54:11 2013 +0200 Committer: Tomaz Muraus Committed: Thu Oct 17 23:54:11 2013 +0200 ---------------------------------------------------------------------- .../_supported_methods_block_storage.rst | 32 ++++++++++---------- docs/compute/_supported_methods_main.rst | 32 ++++++++++---------- docs/compute/_supported_providers.rst | 32 ++++++++++---------- libcloud/compute/drivers/elastichosts.py | 8 +++++ 4 files changed, 56 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/57f77365/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 b761fc8..d206864 100644 --- a/docs/compute/_supported_methods_block_storage.rst +++ b/docs/compute/_supported_methods_block_storage.rst @@ -22,14 +22,14 @@ Provider list volumes create volume destroy volume `Amazon EC2 (us-west-2)`_ yes yes yes yes yes yes yes `Enomaly Elastic Computing Platform`_ no no no no no no no `ElasticHosts`_ no no no no no no no -`ElasticHosts`_ no no no no no no no -`ElasticHosts`_ no no no no no no no -`ElasticHosts`_ no no no no no no no -`ElasticHosts`_ no no no no no no no -`ElasticHosts`_ no no no no no no no -`ElasticHosts`_ no no no no no no no -`ElasticHosts`_ no no no no no no no -`ElasticHosts`_ no no no no no no no +`ElasticHosts (syd-y)`_ no no no no no no no +`ElasticHosts (tor-p)`_ no no no no no no no +`ElasticHosts (cn-1)`_ no no no no no no no +`ElasticHosts (lon-p)`_ no no no no no no no +`ElasticHosts (lon-b)`_ no no no no no no no +`ElasticHosts (sat-p)`_ no no no no no no no +`ElasticHosts (lax-p)`_ no no no no no no no +`ElasticHosts (sjc-c)`_ no no no no no no no `Eucalyptus`_ yes yes yes yes yes yes yes `Gandi`_ no yes yes yes yes yes no `Google Compute Engine`_ no yes yes yes yes yes no @@ -81,14 +81,14 @@ Provider list volumes create volume destroy volume .. _`Amazon EC2 (us-west-2)`: http://aws.amazon.com/ec2/ .. _`Enomaly Elastic Computing Platform`: http://www.enomaly.com/ .. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ +.. _`ElasticHosts (syd-y)`: http://www.elastichosts.com/ +.. _`ElasticHosts (tor-p)`: http://www.elastichosts.com/ +.. _`ElasticHosts (cn-1)`: http://www.elastichosts.com/ +.. _`ElasticHosts (lon-p)`: http://www.elastichosts.com/ +.. _`ElasticHosts (lon-b)`: http://www.elastichosts.com/ +.. _`ElasticHosts (sat-p)`: http://www.elastichosts.com/ +.. _`ElasticHosts (lax-p)`: http://www.elastichosts.com/ +.. _`ElasticHosts (sjc-c)`: http://www.elastichosts.com/ .. _`Eucalyptus`: http://www.eucalyptus.com/ .. _`Gandi`: http://www.gandi.net/ .. _`Google Compute Engine`: https://www.googleapis.com/ http://git-wip-us.apache.org/repos/asf/libcloud/blob/57f77365/docs/compute/_supported_methods_main.rst ---------------------------------------------------------------------- diff --git a/docs/compute/_supported_methods_main.rst b/docs/compute/_supported_methods_main.rst index 587392f..d2a7310 100644 --- a/docs/compute/_supported_methods_main.rst +++ b/docs/compute/_supported_methods_main.rst @@ -22,14 +22,14 @@ Provider list nodes create node reboot node destroy `Amazon EC2 (us-west-2)`_ yes yes yes yes yes yes yes `Enomaly Elastic Computing Platform`_ yes yes yes yes yes yes no `ElasticHosts`_ yes yes yes yes yes yes yes -`ElasticHosts`_ yes yes yes yes yes yes yes -`ElasticHosts`_ yes yes yes yes yes yes yes -`ElasticHosts`_ yes yes yes yes yes yes yes -`ElasticHosts`_ yes yes yes yes yes yes yes -`ElasticHosts`_ yes yes yes yes yes yes yes -`ElasticHosts`_ yes yes yes yes yes yes yes -`ElasticHosts`_ yes yes yes yes yes yes yes -`ElasticHosts`_ yes yes yes yes yes yes yes +`ElasticHosts (syd-y)`_ yes yes yes yes yes yes yes +`ElasticHosts (tor-p)`_ yes yes yes yes yes yes yes +`ElasticHosts (cn-1)`_ yes yes yes yes yes yes yes +`ElasticHosts (lon-p)`_ yes yes yes yes yes yes yes +`ElasticHosts (lon-b)`_ yes yes yes yes yes yes yes +`ElasticHosts (sat-p)`_ yes yes yes yes yes yes yes +`ElasticHosts (lax-p)`_ yes yes yes yes yes yes yes +`ElasticHosts (sjc-c)`_ yes yes yes yes yes yes yes `Eucalyptus`_ yes yes yes yes yes yes yes `Gandi`_ yes yes yes yes yes yes no `Google Compute Engine`_ yes yes yes yes yes yes no @@ -81,14 +81,14 @@ Provider list nodes create node reboot node destroy .. _`Amazon EC2 (us-west-2)`: http://aws.amazon.com/ec2/ .. _`Enomaly Elastic Computing Platform`: http://www.enomaly.com/ .. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ +.. _`ElasticHosts (syd-y)`: http://www.elastichosts.com/ +.. _`ElasticHosts (tor-p)`: http://www.elastichosts.com/ +.. _`ElasticHosts (cn-1)`: http://www.elastichosts.com/ +.. _`ElasticHosts (lon-p)`: http://www.elastichosts.com/ +.. _`ElasticHosts (lon-b)`: http://www.elastichosts.com/ +.. _`ElasticHosts (sat-p)`: http://www.elastichosts.com/ +.. _`ElasticHosts (lax-p)`: http://www.elastichosts.com/ +.. _`ElasticHosts (sjc-c)`: http://www.elastichosts.com/ .. _`Eucalyptus`: http://www.eucalyptus.com/ .. _`Gandi`: http://www.gandi.net/ .. _`Google Compute Engine`: https://www.googleapis.com/ http://git-wip-us.apache.org/repos/asf/libcloud/blob/57f77365/docs/compute/_supported_providers.rst ---------------------------------------------------------------------- diff --git a/docs/compute/_supported_providers.rst b/docs/compute/_supported_providers.rst index bcc5e96..5bc5dfb 100644 --- a/docs/compute/_supported_providers.rst +++ b/docs/compute/_supported_providers.rst @@ -22,14 +22,14 @@ Provider Documentation `Amazon EC2 (us-west-2)`_ EC2_US_WEST_OREGON :mod:`libcloud.compute.drivers.ec2` :class:`EC2USWestOregonNodeDriver` `Enomaly Elastic Computing Platform`_ ECP :mod:`libcloud.compute.drivers.ecp` :class:`ECPNodeDriver` `ElasticHosts`_ ELASTICHOSTS :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsNodeDriver` -`ElasticHosts`_ ELASTICHOSTS_AU1 :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsAU1NodeDriver` -`ElasticHosts`_ ELASTICHOSTS_CA1 :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsCA1NodeDriver` -`ElasticHosts`_ ELASTICHOSTS_CN1 :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsCN1NodeDriver` -`ElasticHosts`_ ELASTICHOSTS_UK1 :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsUK1NodeDriver` -`ElasticHosts`_ ELASTICHOSTS_UK2 :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsUK2NodeDriver` -`ElasticHosts`_ ELASTICHOSTS_US1 :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsUS1NodeDriver` -`ElasticHosts`_ ELASTICHOSTS_US2 :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsUS2NodeDriver` -`ElasticHosts`_ ELASTICHOSTS_US3 :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsUS3NodeDriver` +`ElasticHosts (syd-y)`_ ELASTICHOSTS_AU1 :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsAU1NodeDriver` +`ElasticHosts (tor-p)`_ ELASTICHOSTS_CA1 :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsCA1NodeDriver` +`ElasticHosts (cn-1)`_ ELASTICHOSTS_CN1 :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsCN1NodeDriver` +`ElasticHosts (lon-p)`_ ELASTICHOSTS_UK1 :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsUK1NodeDriver` +`ElasticHosts (lon-b)`_ ELASTICHOSTS_UK2 :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsUK2NodeDriver` +`ElasticHosts (sat-p)`_ ELASTICHOSTS_US1 :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsUS1NodeDriver` +`ElasticHosts (lax-p)`_ ELASTICHOSTS_US2 :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsUS2NodeDriver` +`ElasticHosts (sjc-c)`_ ELASTICHOSTS_US3 :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsUS3NodeDriver` `Eucalyptus`_ EUCALYPTUS :mod:`libcloud.compute.drivers.ec2` :class:`EucNodeDriver` `Gandi`_ GANDI :mod:`libcloud.compute.drivers.gandi` :class:`GandiNodeDriver` `Google Compute Engine`_ GCE :mod:`libcloud.compute.drivers.gce` :class:`GCENodeDriver` @@ -81,14 +81,14 @@ Provider Documentation .. _`Amazon EC2 (us-west-2)`: http://aws.amazon.com/ec2/ .. _`Enomaly Elastic Computing Platform`: http://www.enomaly.com/ .. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ -.. _`ElasticHosts`: http://www.elastichosts.com/ +.. _`ElasticHosts (syd-y)`: http://www.elastichosts.com/ +.. _`ElasticHosts (tor-p)`: http://www.elastichosts.com/ +.. _`ElasticHosts (cn-1)`: http://www.elastichosts.com/ +.. _`ElasticHosts (lon-p)`: http://www.elastichosts.com/ +.. _`ElasticHosts (lon-b)`: http://www.elastichosts.com/ +.. _`ElasticHosts (sat-p)`: http://www.elastichosts.com/ +.. _`ElasticHosts (lax-p)`: http://www.elastichosts.com/ +.. _`ElasticHosts (sjc-c)`: http://www.elastichosts.com/ .. _`Eucalyptus`: http://www.eucalyptus.com/ .. _`Gandi`: http://www.gandi.net/ .. _`Google Compute Engine`: https://www.googleapis.com/ http://git-wip-us.apache.org/repos/asf/libcloud/blob/57f77365/libcloud/compute/drivers/elastichosts.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/elastichosts.py b/libcloud/compute/drivers/elastichosts.py index f9e18df..736ac7f 100644 --- a/libcloud/compute/drivers/elastichosts.py +++ b/libcloud/compute/drivers/elastichosts.py @@ -176,6 +176,7 @@ class ElasticHostsUK1NodeDriver(ElasticHostsNodeDriver): """ ElasticHosts node driver for the London Peer 1 end-point """ + name = 'ElasticHosts (lon-p)' _region = 'lon-p' @@ -183,6 +184,7 @@ class ElasticHostsUK2NodeDriver(ElasticHostsNodeDriver): """ ElasticHosts node driver for the London Bluesquare end-point """ + name = 'ElasticHosts (lon-b)' _region = 'lon-b' @@ -190,6 +192,7 @@ class ElasticHostsUS1NodeDriver(ElasticHostsNodeDriver): """ ElasticHosts node driver for the San Antonio Peer 1 end-point """ + name = 'ElasticHosts (sat-p)' _region = 'sat-p' @@ -197,6 +200,7 @@ class ElasticHostsUS2NodeDriver(ElasticHostsNodeDriver): """ ElasticHosts node driver for the Los Angeles Peer 1 end-point """ + name = 'ElasticHosts (lax-p)' _region = 'lax-p' @@ -204,6 +208,7 @@ class ElasticHostsUS3NodeDriver(ElasticHostsNodeDriver): """ ElasticHosts node driver for the San Jose (Silicon Valley) end-point """ + name = 'ElasticHosts (sjc-c)' _region = 'sjc-c' @@ -211,6 +216,7 @@ class ElasticHostsCA1NodeDriver(ElasticHostsNodeDriver): """ ElasticHosts node driver for the Toronto Peer 1 end-point """ + name = 'ElasticHosts (tor-p)' _region = 'tor-p' @@ -218,6 +224,7 @@ class ElasticHostsAU1NodeDriver(ElasticHostsNodeDriver): """ ElasticHosts node driver for the Sydney end-point """ + name = 'ElasticHosts (syd-y)' _region = 'syd-y' @@ -225,4 +232,5 @@ class ElasticHostsCN1NodeDriver(ElasticHostsNodeDriver): """ ElasticHosts node driver for the Hong Kong end-point """ + name = 'ElasticHosts (cn-1)' _region = 'cn-1'