mirror of https://github.com/apache/jclouds.git
Adds EU North 1 region (Stockholm)
This commit is contained in:
Dani Estevez
Daniel Estévez
parent
1c9322e41c
commit
6fda1736ad
|
|
@ -65,6 +65,11 @@ public class Region {
|
|||
*/
|
||||
public static final String EU_CENTRAL_1 = "eu-central-1";
|
||||
|
||||
/**
|
||||
* EU (Stockholm)
|
||||
*/
|
||||
public static final String EU_NORTH_1 = "eu-north-1";
|
||||
|
||||
/**
|
||||
*
|
||||
* US Standard
|
||||
|
|
@ -156,11 +161,13 @@ public class Region {
|
|||
public static final String CN_NORTHWEST_1 = "cn-northwest-1";
|
||||
|
||||
public static final Set<String> DEFAULT_S3 = ImmutableSet.of(US_STANDARD, US_EAST_2, US_WEST_1, US_WEST_2,
|
||||
CA_CENTRAL_1, EU_WEST_1, EU_WEST_2, EU_WEST_3, EU_CENTRAL_1, SA_EAST_1, AP_SOUTHEAST_1, AP_SOUTHEAST_2,
|
||||
CA_CENTRAL_1, EU_WEST_1, EU_WEST_2, EU_WEST_3, EU_CENTRAL_1, EU_NORTH_1, SA_EAST_1, AP_SOUTHEAST_1,
|
||||
AP_SOUTHEAST_2,
|
||||
AP_SOUTH_1, AP_NORTHEAST_1, AP_NORTHEAST_2, CN_NORTH_1, CN_NORTHWEST_1);
|
||||
|
||||
public static final Set<String> DEFAULT_REGIONS = ImmutableSet.of(US_EAST_1, US_EAST_2, US_WEST_1, US_WEST_2,
|
||||
CA_CENTRAL_1, SA_EAST_1, EU_WEST_1, EU_WEST_2, EU_WEST_3, EU_CENTRAL_1, AP_SOUTHEAST_1, AP_SOUTHEAST_2,
|
||||
CA_CENTRAL_1, SA_EAST_1, EU_WEST_1, EU_WEST_2, EU_WEST_3, EU_CENTRAL_1, EU_NORTH_1, AP_SOUTHEAST_1,
|
||||
AP_SOUTHEAST_2,
|
||||
AP_SOUTH_1, AP_NORTHEAST_1, AP_NORTHEAST_2, CN_NORTH_1, CN_NORTHWEST_1);
|
||||
|
||||
public static Properties regionPropertiesS3() {
|
||||
|
|
@ -168,7 +175,8 @@ public class Region {
|
|||
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-OH,US-CA,US-OR,CA,BR-SP,IE,GB-LND,FR-IDF,DE-HE,SG,AU-NSW,"
|
||||
properties.setProperty(PROPERTY_ISO3166_CODES, "US,US-OH,US-CA,US-OR,CA,BR-SP,IE,GB-LND,FR-IDF,DE-HE,SE-AB,SG,"
|
||||
+ "AU-NSW,"
|
||||
+ "IN-MH,JP-13,KR-11,CN-BJ,CN-NX");
|
||||
properties.setProperty(PROPERTY_REGION + "." + US_STANDARD + "." + ISO3166_CODES, "US");
|
||||
return properties;
|
||||
|
|
@ -189,6 +197,7 @@ public class Region {
|
|||
properties.setProperty(PROPERTY_REGION + "." + EU_WEST_2 + "." + ISO3166_CODES, "GB-LND");
|
||||
properties.setProperty(PROPERTY_REGION + "." + EU_WEST_3 + "." + ISO3166_CODES, "FR-IDF");
|
||||
properties.setProperty(PROPERTY_REGION + "." + EU_CENTRAL_1 + "." + ISO3166_CODES, "DE-HE");
|
||||
properties.setProperty(PROPERTY_REGION + "." + EU_NORTH_1 + "." + ISO3166_CODES, "SE-AB");
|
||||
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");
|
||||
|
|
|
|||
|
|
@ -354,7 +354,7 @@ public class AWSEC2TemplateBuilderLiveTest extends EC2TemplateBuilderLiveTest {
|
|||
@Override
|
||||
protected Set<String> getIso3166Codes() {
|
||||
return ImmutableSet.of("US-VA", "US-OH", "US-CA", "US-OR", "CA", "BR-SP", "IE", "GB-LND", "FR-IDF", "DE-HE",
|
||||
"SG", "AU-NSW", "IN-MH", "JP-13", "KR-11", "CN-11");
|
||||
"SE-AB", "SG", "AU-NSW", "IN-MH", "JP-13", "KR-11", "CN-BJ", "CN-NX");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,8 +23,10 @@ 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.CA_CENTRAL_1;
|
||||
import static org.jclouds.aws.domain.Region.CN_NORTHWEST_1;
|
||||
import static org.jclouds.aws.domain.Region.CN_NORTH_1;
|
||||
import static org.jclouds.aws.domain.Region.EU_CENTRAL_1;
|
||||
import static org.jclouds.aws.domain.Region.EU_NORTH_1;
|
||||
import static org.jclouds.aws.domain.Region.EU_WEST_1;
|
||||
import static org.jclouds.aws.domain.Region.EU_WEST_2;
|
||||
import static org.jclouds.aws.domain.Region.EU_WEST_3;
|
||||
|
|
@ -84,6 +86,7 @@ public class AWSS3ProviderMetadata extends BaseProviderMetadata {
|
|||
properties.setProperty(PROPERTY_REGION + "." + EU_WEST_1 + "." + ENDPOINT, "https://s3-eu-west-1.amazonaws.com");
|
||||
properties.setProperty(PROPERTY_REGION + "." + EU_WEST_2 + "." + ENDPOINT, "https://s3-eu-west-2.amazonaws.com");
|
||||
properties.setProperty(PROPERTY_REGION + "." + EU_WEST_3 + "." + ENDPOINT, "https://s3-eu-west-3.amazonaws.com");
|
||||
properties.setProperty(PROPERTY_REGION + "." + EU_NORTH_1 + "." + ENDPOINT, "https://s3-eu-north-1.amazonaws.com");
|
||||
properties.setProperty(PROPERTY_REGION + "." + AP_SOUTHEAST_1 + "." + ENDPOINT,
|
||||
"https://s3-ap-southeast-1.amazonaws.com");
|
||||
properties.setProperty(PROPERTY_REGION + "." + AP_SOUTHEAST_2 + "." + ENDPOINT,
|
||||
|
|
@ -95,7 +98,9 @@ public class AWSS3ProviderMetadata extends BaseProviderMetadata {
|
|||
properties.setProperty(PROPERTY_REGION + "." + AP_NORTHEAST_2 + "." + ENDPOINT,
|
||||
"https://s3-ap-northeast-2.amazonaws.com");
|
||||
properties.setProperty(PROPERTY_REGION + "." + CN_NORTH_1 + "." + ENDPOINT,
|
||||
"https://s3.cn-north-1.amazonaws.com.cn");
|
||||
"https://s3.cn-north-1.amazonaws.com.cn");
|
||||
properties.setProperty(PROPERTY_REGION + "." + CN_NORTHWEST_1 + "." + ENDPOINT,
|
||||
"https://s3.cn-north-s3.cn-northwest-1.amazonaws.com.cn");
|
||||
return properties;
|
||||
}
|
||||
|
||||
|
|
@ -108,8 +113,9 @@ 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-OH", "US-CA", "US-OR", "CA", "BR-SP", "IE", "GB-LND", "FR-IDF", "DE-HE", "SG",
|
||||
"AU-NSW", "IN-MH", "JP-13", "KR-11", "CN-11")
|
||||
.iso3166Codes("US", "US-OH", "US-CA", "US-OR", "CA", "BR-SP", "IE", "GB-LND", "FR-IDF", "DE-HE", "SE"
|
||||
+ "-AB", "SG",
|
||||
"AU-NSW", "IN-MH", "JP-13", "KR-11", "CN-BJ", "CN-NX")
|
||||
.defaultProperties(AWSS3ProviderMetadata.defaultProperties());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -36,8 +36,10 @@ public class AWSS3ServiceIntegrationLiveTest extends S3ServiceIntegrationLiveTes
|
|||
"AU-NSW",
|
||||
"BR-SP",
|
||||
"CA",
|
||||
"CN-11",
|
||||
"CN-BJ",
|
||||
"CN-NX",
|
||||
"DE-HE",
|
||||
"SE-AB",
|
||||
"GB-LND",
|
||||
"FR-IDF",
|
||||
"IE",
|
||||
|
|
|
|||
Loading…
Reference in New Issue