From 75a674fcf62af74bb43389a2cfa4c76655e7286b Mon Sep 17 00:00:00 2001 From: Ignasi Barrera Date: Fri, 23 Sep 2016 12:00:22 +0200 Subject: [PATCH] JCLOUDS-1182: Added Seoul and Mumbai regions to AWS --- .../java/org/jclouds/aws/domain/Region.java | 23 +++++++++++++++---- .../aws/ec2/AWSEC2ProviderMetadata.java | 2 +- .../jclouds/aws/s3/AWSS3ProviderMetadata.java | 14 +++++++---- 3 files changed, 29 insertions(+), 10 deletions(-) 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 1a3a9c7bbe..1db3c9f410 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 DEFAULT_S3 = ImmutableSet.of(US_STANDARD, US_WEST_1, US_WEST_2, EU_WEST_1, SA_EAST_1, - AP_SOUTHEAST_1, AP_SOUTHEAST_2, AP_NORTHEAST_1); + public static final Set 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_SOUTH_1, AP_NORTHEAST_1, AP_NORTHEAST_2); public static final Set 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,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"); properties.setProperty(PROPERTY_REGION + "." + EU_WEST_1 + "." + ISO3166_CODES, "IE"); return properties; @@ -130,7 +141,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"); @@ -139,7 +150,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; } } 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 8d7054dffe..f316e06b70 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 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 899c3decb1..476bda5d1f 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_WEST_1; import static org.jclouds.aws.domain.Region.SA_EAST_1; import static org.jclouds.aws.domain.Region.US_STANDARD; @@ -52,7 +54,7 @@ public class AWSS3ProviderMetadata extends BaseProviderMetadata { public Builder toBuilder() { return builder().fromProviderMetadata(this); } - + public AWSS3ProviderMetadata() { super(builder()); } @@ -74,11 +76,15 @@ 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; } - + public static class Builder extends BaseProviderMetadata.Builder { protected Builder() { @@ -88,7 +94,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", "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()); } @@ -96,7 +102,7 @@ public class AWSS3ProviderMetadata extends BaseProviderMetadata { public AWSS3ProviderMetadata build() { return new AWSS3ProviderMetadata(this); } - + @Override public Builder fromProviderMetadata( ProviderMetadata in) {