From 979ce4112f31468976adcc38536e4381ad9fc3a4 Mon Sep 17 00:00:00 2001 From: James Guthrie Date: Mon, 13 Jul 2015 17:46:52 +0200 Subject: [PATCH] Add eu-central-1 to EC2 drivers Signed-off-by: James Guthrie --- libcloud/compute/drivers/ec2.py | 10 +++++++++- libcloud/compute/providers.py | 4 +++- libcloud/compute/types.py | 1 + libcloud/test/compute/test_ec2.py | 9 +++++++-- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index 9930f7374d..fa312899e1 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -5679,7 +5679,7 @@ def __str__(self): return repr(self.value) -class EC2EUNodeDriver(EC2NodeDriver): +class EC2EUWestNodeDriver(EC2NodeDriver): """ Driver class for EC2 in the Western Europe Region. """ @@ -5687,6 +5687,14 @@ class EC2EUNodeDriver(EC2NodeDriver): _region = 'eu-west-1' +class EC2EUCentralNodeDriver(EC2NodeDriver): + """ + Driver class for EC2 in the Central Europe Region. + """ + name = 'Amazon EC2 (eu-central-1)' + _region = 'eu-central-1' + + class EC2USWestNodeDriver(EC2NodeDriver): """ Driver class for EC2 in the Western US Region diff --git a/libcloud/compute/providers.py b/libcloud/compute/providers.py index 25687c342e..6a7e2fd281 100644 --- a/libcloud/compute/providers.py +++ b/libcloud/compute/providers.py @@ -33,8 +33,10 @@ ('libcloud.compute.drivers.dummy', 'DummyNodeDriver'), Provider.EC2_US_EAST: ('libcloud.compute.drivers.ec2', 'EC2NodeDriver'), + Provider.EC2_EU_CENTRAL: + ('libcloud.compute.drivers.ec2', 'EC2EUCentralNodeDriver'), Provider.EC2_EU_WEST: - ('libcloud.compute.drivers.ec2', 'EC2EUNodeDriver'), + ('libcloud.compute.drivers.ec2', 'EC2EUWestNodeDriver'), Provider.EC2_US_WEST: ('libcloud.compute.drivers.ec2', 'EC2USWestNodeDriver'), Provider.EC2_US_WEST_OREGON: diff --git a/libcloud/compute/types.py b/libcloud/compute/types.py index f0455466b9..d6bade25e9 100644 --- a/libcloud/compute/types.py +++ b/libcloud/compute/types.py @@ -143,6 +143,7 @@ class Provider(object): # Deprecated constants which are still supported EC2_US_EAST = 'ec2_us_east' EC2_EU = 'ec2_eu_west' # deprecated name + EC2_EU_CENTRAL = 'ec2_eu_central' EC2_EU_WEST = 'ec2_eu_west' EC2_US_WEST = 'ec2_us_west' EC2_AP_SOUTHEAST = 'ec2_ap_southeast' diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py index 6a5cdeb9f6..a6ad29e76e 100644 --- a/libcloud/test/compute/test_ec2.py +++ b/libcloud/test/compute/test_ec2.py @@ -25,7 +25,8 @@ from libcloud.compute.drivers.ec2 import EC2NodeDriver from libcloud.compute.drivers.ec2 import EC2USWestNodeDriver from libcloud.compute.drivers.ec2 import EC2USWestOregonNodeDriver -from libcloud.compute.drivers.ec2 import EC2EUNodeDriver +from libcloud.compute.drivers.ec2 import EC2EUCentralNodeDriver +from libcloud.compute.drivers.ec2 import EC2EUWestNodeDriver from libcloud.compute.drivers.ec2 import EC2APSENodeDriver from libcloud.compute.drivers.ec2 import EC2APNENodeDriver from libcloud.compute.drivers.ec2 import EC2APSESydneyNodeDriver @@ -1170,8 +1171,12 @@ class EC2USWest2OldStyleModelTests(EC2OldStyleModelTests): driver_klass = EC2USWestOregonNodeDriver +class EC2EUCentralOldStyleModelTests(EC2OldStyleModelTests): + driver_klass = EC2EUCentralNodeDriver + + class EC2EUWestOldStyleModelTests(EC2OldStyleModelTests): - driver_klass = EC2EUNodeDriver + driver_klass = EC2EUWestNodeDriver class EC2APSE1OldStyleModelTests(EC2OldStyleModelTests):