Repository: jclouds Updated Branches: refs/heads/master 3b726b568 -> b06795ebe
JCLOUDS-1182: Added Seoul and Mumbai regions to AWS Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/b06795eb Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/b06795eb Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/b06795eb Branch: refs/heads/master Commit: b06795ebe42400af64a5fa5949dde85422d21d09 Parents: 3b726b5 Author: Ignasi Barrera <[email protected]> Authored: Fri Sep 23 12:00:22 2016 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Thu Oct 13 18:14:20 2016 +0200 ---------------------------------------------------------------------- .../java/org/jclouds/aws/domain/Region.java | 21 ++++++++++++++++---- .../jclouds/aws/ec2/AWSEC2ProviderMetadata.java | 2 +- .../jclouds/aws/s3/AWSS3ProviderMetadata.java | 8 +++++++- 3 files changed, 25 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/b06795eb/apis/sts/src/main/java/org/jclouds/aws/domain/Region.java ---------------------------------------------------------------------- diff --git a/apis/sts/src/main/java/org/jclouds/aws/domain/Region.java b/apis/sts/src/main/java/org/jclouds/aws/domain/Region.java index a0857f7..eed921a 100644 --- a/apis/sts/src/main/java/org/jclouds/aws/domain/Region.java +++ b/apis/sts/src/main/java/org/jclouds/aws/domain/Region.java @@ -104,24 +104,35 @@ public class Region { * users */ public static final String AP_SOUTHEAST_1 = "ap-southeast-1"; + + /** + * Region in Mumbai (India), launched June 27, 2016. This region improves latency for Asia-based + * users + */ + public static final String AP_SOUTH_1 = "ap-south-1"; /** * Region in Tokyo, launched March 2, 2011. This region improves latency for Asia-based users */ public static final String AP_NORTHEAST_1 = "ap-northeast-1"; + + /** + * Region in Seoul, launched January 6, 2016. This region improves latency for Asia-based users + */ + public static final String AP_NORTHEAST_2 = "ap-northeast-2"; public static final Set<String> DEFAULT_S3 = ImmutableSet.of(US_STANDARD, US_WEST_1, US_WEST_2, EU_WEST_1, EU_CENTRAL_1, SA_EAST_1, - AP_SOUTHEAST_1, AP_SOUTHEAST_2, AP_NORTHEAST_1); + AP_SOUTHEAST_1, AP_SOUTHEAST_2, AP_SOUTH_1, AP_NORTHEAST_1, AP_NORTHEAST_2); public static final Set<String> DEFAULT_REGIONS = ImmutableSet.of(US_EAST_1, US_WEST_1, US_WEST_2, SA_EAST_1, - EU_WEST_1, EU_CENTRAL_1, AP_SOUTHEAST_1, AP_SOUTHEAST_2, AP_NORTHEAST_1); + EU_WEST_1, EU_CENTRAL_1, AP_SOUTHEAST_1, AP_SOUTHEAST_2, AP_SOUTH_1, AP_NORTHEAST_1, AP_NORTHEAST_2); public static Properties regionPropertiesS3() { Properties properties = regionProperties(); properties.setProperty(PROPERTY_REGIONS, Joiner.on(',').join(DEFAULT_S3)); // note that due to US_STANDARD the codes include US instead of US-VA - properties.setProperty(PROPERTY_ISO3166_CODES, "US,US-CA,US-OR,BR-SP,IE,DE-HE,SG,AU-NSW,JP-13"); + properties.setProperty(PROPERTY_ISO3166_CODES, "US,US-CA,US-OR,BR-SP,IE,DE-HE,SG,AU-NSW,IN-MH,JP-13,KR-11"); properties.setProperty(PROPERTY_REGION + "." + US_STANDARD + "." + ISO3166_CODES, "US"); return properties; } @@ -129,7 +140,7 @@ public class Region { public static Properties regionProperties() { Properties properties = new Properties(); properties.setProperty(PROPERTY_REGIONS, Joiner.on(',').join(DEFAULT_REGIONS)); - properties.setProperty(PROPERTY_ISO3166_CODES, "US-VA,US-CA,US-OR,BR-SP,IE,DE-HE,SG,AU-NSW,JP-13"); + properties.setProperty(PROPERTY_ISO3166_CODES, "US-VA,US-CA,US-OR,BR-SP,IE,DE-HE,SG,AU-NSW,IN-MH,JP-13,KR-11"); properties.setProperty(PROPERTY_REGION + "." + US_EAST_1 + "." + ISO3166_CODES, "US-VA"); properties.setProperty(PROPERTY_REGION + "." + US_WEST_1 + "." + ISO3166_CODES, "US-CA"); properties.setProperty(PROPERTY_REGION + "." + US_WEST_2 + "." + ISO3166_CODES, "US-OR"); @@ -138,7 +149,9 @@ public class Region { properties.setProperty(PROPERTY_REGION + "." + EU_CENTRAL_1 + "." + ISO3166_CODES, "DE-HE"); properties.setProperty(PROPERTY_REGION + "." + AP_SOUTHEAST_1 + "." + ISO3166_CODES, "SG"); properties.setProperty(PROPERTY_REGION + "." + AP_SOUTHEAST_2 + "." + ISO3166_CODES, "AU-NSW"); + properties.setProperty(PROPERTY_REGION + "." + AP_SOUTH_1 + "." + ISO3166_CODES, "IN-MH"); properties.setProperty(PROPERTY_REGION + "." + AP_NORTHEAST_1 + "." + ISO3166_CODES, "JP-13"); + properties.setProperty(PROPERTY_REGION + "." + AP_NORTHEAST_2 + "." + ISO3166_CODES, "KR-11"); return properties; } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/b06795eb/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java index 8d7054d..f316e06 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java @@ -86,7 +86,7 @@ public class AWSEC2ProviderMetadata extends BaseProviderMetadata { .console(URI.create("https://console.aws.amazon.com/ec2/home";)) .defaultProperties(AWSEC2ProviderMetadata.defaultProperties()) .linkedServices("aws-ec2", "aws-elb", "aws-cloudwatch", "aws-s3", "aws-simpledb") - .iso3166Codes("US-VA", "US-CA", "US-OR", "BR-SP", "IE", "DE-HE", "SG", "AU-NSW", "JP-13"); + .iso3166Codes("US-VA", "US-CA", "US-OR", "BR-SP", "IE", "DE-HE", "SG", "AU-NSW", "IN-MH", "JP-13", "KR-11"); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/b06795eb/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java index 60417c6..2d5f8bc 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java @@ -18,8 +18,10 @@ package org.jclouds.aws.s3; import static org.jclouds.Constants.PROPERTY_ENDPOINT; import static org.jclouds.aws.domain.Region.AP_NORTHEAST_1; +import static org.jclouds.aws.domain.Region.AP_NORTHEAST_2; import static org.jclouds.aws.domain.Region.AP_SOUTHEAST_1; import static org.jclouds.aws.domain.Region.AP_SOUTHEAST_2; +import static org.jclouds.aws.domain.Region.AP_SOUTH_1; import static org.jclouds.aws.domain.Region.EU_CENTRAL_1; import static org.jclouds.aws.domain.Region.EU_WEST_1; import static org.jclouds.aws.domain.Region.SA_EAST_1; @@ -77,8 +79,12 @@ public class AWSS3ProviderMetadata extends BaseProviderMetadata { "https://s3-ap-southeast-1.amazonaws.com";); properties.setProperty(PROPERTY_REGION + "." + AP_SOUTHEAST_2 + "." + ENDPOINT, "https://s3-ap-southeast-2.amazonaws.com";); + properties.setProperty(PROPERTY_REGION + "." + AP_SOUTH_1 + "." + ENDPOINT, + "https://s3-ap-south-1.amazonaws.com";); properties.setProperty(PROPERTY_REGION + "." + AP_NORTHEAST_1 + "." + ENDPOINT, "https://s3-ap-northeast-1.amazonaws.com";); + properties.setProperty(PROPERTY_REGION + "." + AP_NORTHEAST_2 + "." + ENDPOINT, + "https://s3-ap-northeast-2.amazonaws.com";); return properties; } @@ -91,7 +97,7 @@ public class AWSS3ProviderMetadata extends BaseProviderMetadata { .homepage(URI.create("http://aws.amazon.com/s3";)) .console(URI.create("https://console.aws.amazon.com/s3/home";)) .linkedServices("aws-ec2", "aws-elb", "aws-cloudwatch", "aws-s3", "aws-simpledb") - .iso3166Codes("US", "US-CA", "US-OR", "BR-SP", "IE", "DE-HE", "SG", "AU-NSW", "JP-13") + .iso3166Codes("US", "US-CA", "US-OR", "BR-SP", "IE", "DE-HE", "SG", "AU-NSW", "IN-MH", "JP-13", "KR-11") .defaultProperties(AWSS3ProviderMetadata.defaultProperties()); }
