Remove cn-north-1 from VALID_EC2_REGIONS list in EC2 compute driver
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/1e1d77f3 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/1e1d77f3 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/1e1d77f3 Branch: refs/heads/trunk Commit: 1e1d77f320a2314e96c79011ab62ee028a835503 Parents: 9bdde6e Author: Francisco Ros <fj...@doalitic.com> Authored: Tue May 9 12:11:20 2017 +0200 Committer: Anthony Shaw <anthonys...@apache.org> Committed: Sat Jun 24 19:44:59 2017 +1000 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 2 +- libcloud/test/compute/test_ec2.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/1e1d77f3/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index 0397d2b..5a4cee9 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -3042,7 +3042,7 @@ VOLUME_MODIFICATION_ATTRIBUTE_MAP = { } VALID_EC2_REGIONS = REGION_DETAILS.keys() -VALID_EC2_REGIONS = [r for r in VALID_EC2_REGIONS if r != 'nimbus'] +VALID_EC2_REGIONS = [r for r in VALID_EC2_REGIONS if r != 'nimbus' and r != 'cn-north-1'] VALID_VOLUME_TYPES = ['standard', 'io1', 'gp2', 'st1', 'sc1'] http://git-wip-us.apache.org/repos/asf/libcloud/blob/1e1d77f3/libcloud/test/compute/test_ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py index 14bb71f..6aaff35 100644 --- a/libcloud/test/compute/test_ec2.py +++ b/libcloud/test/compute/test_ec2.py @@ -51,7 +51,7 @@ class BaseEC2Tests(LibcloudTestCase): def test_instantiate_driver_valid_regions(self): regions = REGION_DETAILS.keys() - regions = [d for d in regions if d != 'nimbus'] + regions = [d for d in regions if d != 'nimbus' and d != 'cn-north-1'] region_endpoints = [ EC2NodeDriver(*EC2_PARAMS, **{'region': region}).connection.host for region in regions
