Return-Path: X-Original-To: apmail-libcloud-notifications-archive@www.apache.org Delivered-To: apmail-libcloud-notifications-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C5DFE17F4B for ; Sat, 28 Mar 2015 14:51:18 +0000 (UTC) Received: (qmail 21482 invoked by uid 500); 28 Mar 2015 14:51:18 -0000 Delivered-To: apmail-libcloud-notifications-archive@libcloud.apache.org Received: (qmail 21378 invoked by uid 500); 28 Mar 2015 14:51:18 -0000 Mailing-List: contact notifications-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 notifications@libcloud.apache.org Received: (qmail 21324 invoked by uid 500); 28 Mar 2015 14:51:18 -0000 Delivered-To: apmail-libcloud-commits@libcloud.apache.org Received: (qmail 21315 invoked by uid 99); 28 Mar 2015 14:51:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 Mar 2015 14:51:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2FEA4E17A2; Sat, 28 Mar 2015 14:51:18 +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: Sat, 28 Mar 2015 14:51:21 -0000 Message-Id: <1275411a40c242baa1ed591f49960e43@git.apache.org> In-Reply-To: <977e38487c4e4ae6a3efa79e21f596ac@git.apache.org> References: <977e38487c4e4ae6a3efa79e21f596ac@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/16] libcloud git commit: Make supported nodes for EC2EUCentralNodeDriver available Make supported nodes for EC2EUCentralNodeDriver available Signed-off-by: Tomaz Muraus Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/b3e463f4 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/b3e463f4 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/b3e463f4 Branch: refs/heads/trunk Commit: b3e463f4fe3ea6c79146f41588d8194852c98e53 Parents: 3caed8b Author: Gertjan Oude Lohuis Authored: Mon Feb 2 15:03:47 2015 +0100 Committer: Tomaz Muraus Committed: Fri Mar 6 15:58:12 2015 +0100 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 41 +++++++++++++++++++++++++++++++++++- libcloud/compute/providers.py | 2 ++ libcloud/compute/types.py | 1 + 3 files changed, 43 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/b3e463f4/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index d05e74f..f87c797 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -539,6 +539,35 @@ REGION_DETAILS = { 't2.medium' ] }, + # EU (Frankfurt) Region + 'eu-central-1': { + 'endpoint': 'ec2.eu-central-1.amazonaws.com', + 'api_name': 'ec2_eu_central', + 'country': 'Frankfurt', + 'instance_types': [ + 'm3.medium', + 'm3.large', + 'm3.xlarge', + 'm3.2xlarge', + 'c3.large', + 'c3.xlarge', + 'c3.2xlarge', + 'c3.4xlarge', + 'c3.8xlarge', + 'i2.xlarge', + 'i2.2xlarge', + 'i2.4xlarge', + 'i2.8xlarge', + 'r3.large', + 'r3.xlarge', + 'r3.2xlarge', + 'r3.4xlarge', + 'r3.8xlarge', + 't2.micro', + 't2.small', + 't2.medium' + ] + }, # Asia Pacific (Singapore) Region 'ap-southeast-1': { 'endpoint': 'ec2.ap-southeast-1.amazonaws.com', @@ -5551,11 +5580,21 @@ class EC2EUNodeDriver(EC2NodeDriver): Driver class for EC2 in the Western Europe Region. """ - connectionCls = EC2V4Connection + connectionCls = EC2Connection name = 'Amazon EC2 (eu-west-1)' _region = 'eu-west-1' +class EC2EUCentralNodeDriver(EC2NodeDriver): + """ + Driver class for EC2 in the Central Europe Region. + """ + + connectionCls = EC2V4Connection + name = 'Amazon EC2 (eu-central-1)' + _region = 'eu-central-1' + + class EC2USWestNodeDriver(EC2NodeDriver): """ Driver class for EC2 in the Western US Region http://git-wip-us.apache.org/repos/asf/libcloud/blob/b3e463f4/libcloud/compute/providers.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/providers.py b/libcloud/compute/providers.py index bdceafc..bf0c38e 100644 --- a/libcloud/compute/providers.py +++ b/libcloud/compute/providers.py @@ -33,6 +33,8 @@ DRIVERS = { ('libcloud.compute.drivers.ec2', 'EC2NodeDriver'), Provider.EC2_EU_WEST: ('libcloud.compute.drivers.ec2', 'EC2EUNodeDriver'), + Provider.EC2_EU_CENTRAL: + ('libcloud.compute.drivers.ec2', 'EC2EUCentralNodeDriver'), Provider.EC2_US_WEST: ('libcloud.compute.drivers.ec2', 'EC2USWestNodeDriver'), Provider.EC2_US_WEST_OREGON: http://git-wip-us.apache.org/repos/asf/libcloud/blob/b3e463f4/libcloud/compute/types.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/types.py b/libcloud/compute/types.py index c21a4d1..061827e 100644 --- a/libcloud/compute/types.py +++ b/libcloud/compute/types.py @@ -135,6 +135,7 @@ class Provider(object): EC2_US_EAST = 'ec2_us_east' EC2_EU = 'ec2_eu_west' # deprecated name EC2_EU_WEST = 'ec2_eu_west' + EC2_EU_CENTRAL = 'ec2_eu_central' EC2_US_WEST = 'ec2_us_west' EC2_AP_SOUTHEAST = 'ec2_ap_southeast' EC2_AP_NORTHEAST = 'ec2_ap_northeast'