Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing regions and zones #228

Merged
merged 2 commits into from
Jun 7, 2017
Merged

Add missing regions and zones #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d381214
Add missing regions and zones
dpeterka Oct 26, 2016
db3e5cb
Update Region.java
dpeterka Nov 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/java/com/netflix/ice/tag/Region.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,37 +26,45 @@
public class Region extends Tag {

public static final Region US_EAST_1 = new Region("us-east-1", "USE1");
public static final Region US_EAST_2 = new Region("us-east-2", "USE2");
public static final Region US_WEST_1 = new Region("us-west-1", "USW1");
public static final Region US_WEST_2 = new Region("us-west-2", "USW2");
public static final Region EU_WEST_1 = new Region("eu-west-1", "EU");
public static final Region AP_SOUTH_1 = new Region("ap-south-1", "APS1");
public static final Region EU_CENTRAL_1 = new Region("eu-central-1", "EUC1");
public static final Region AP_SOUTHEAST_1 = new Region("ap-southeast-1", "APS1");
public static final Region AP_SOUTHEAST_2 = new Region("ap-southeast-2", "APS2");
public static final Region AP_SOUTHEAST_1 = new Region("ap-southeast-1", "APSE1");
public static final Region AP_SOUTHEAST_2 = new Region("ap-southeast-2", "APSE2");
public static final Region AP_NORTHEAST_1 = new Region("ap-northeast-1","APN1");
public static final Region AP_NORTHEAST_2 = new Region("ap-northeast-2","APN2");
public static final Region SA_EAST_1 = new Region("sa-east-1", "SAE1");

private static ConcurrentMap<String, Region> regionsByName = Maps.newConcurrentMap();
private static ConcurrentMap<String, Region> regionsByShortName = Maps.newConcurrentMap();

static {
regionsByShortName.put(US_EAST_1.shortName, US_EAST_1);
regionsByShortName.put(US_EAST_2.shortName, US_EAST_2);
regionsByShortName.put(US_WEST_1.shortName, US_WEST_1);
regionsByShortName.put(US_WEST_2.shortName, US_WEST_2);
regionsByShortName.put(EU_WEST_1.shortName, EU_WEST_1);
regionsByShortName.put(AP_SOUTH_1.shortName, AP_SOUTH_1);
regionsByShortName.put(EU_CENTRAL_1.shortName, EU_CENTRAL_1);
regionsByShortName.put(AP_SOUTHEAST_1.shortName, AP_SOUTHEAST_1);
regionsByShortName.put(AP_SOUTHEAST_2.shortName, AP_SOUTHEAST_2);
regionsByShortName.put(AP_NORTHEAST_1.shortName, AP_NORTHEAST_1);
regionsByShortName.put(AP_NORTHEAST_2.shortName, AP_NORTHEAST_2);
regionsByShortName.put(SA_EAST_1.shortName, SA_EAST_1);

regionsByName.put(US_EAST_1.name, US_EAST_1);
regionsByName.put(US_EAST_2.name, US_EAST_2);
regionsByName.put(US_WEST_1.name, US_WEST_1);
regionsByName.put(US_WEST_2.name, US_WEST_2);
regionsByName.put(EU_WEST_1.name, EU_WEST_1);
regionsByName.put(EU_CENTRAL_1.name, EU_CENTRAL_1);
regionsByName.put(AP_SOUTHEAST_1.name, AP_SOUTHEAST_1);
regionsByName.put(AP_SOUTHEAST_2.name, AP_SOUTHEAST_2);
regionsByName.put(AP_NORTHEAST_1.name, AP_NORTHEAST_1);
regionsByName.put(AP_NORTHEAST_2.name, AP_NORTHEAST_2);
regionsByName.put(SA_EAST_1.name, SA_EAST_1);
}

Expand Down
25 changes: 23 additions & 2 deletions src/java/com/netflix/ice/tag/Zone.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ private Zone (Region region, String name) {
public static final Zone US_EAST_1D = new Zone(Region.US_EAST_1, "us-east-1d");
public static final Zone US_EAST_1E = new Zone(Region.US_EAST_1, "us-east-1e");

public static final Zone US_EAST_2A = new Zone(Region.US_EAST_2, "us-east-2a");
public static final Zone US_EAST_2B = new Zone(Region.US_EAST_2, "us-east-2b");
public static final Zone US_EAST_2C = new Zone(Region.US_EAST_2, "us-east-2c");

public static final Zone US_WEST_1A = new Zone(Region.US_WEST_1, "us-west-1a");
public static final Zone US_WEST_1B = new Zone(Region.US_WEST_1, "us-west-1b");
public static final Zone US_WEST_1C = new Zone(Region.US_WEST_1, "us-west-1c");
Expand All @@ -52,6 +56,9 @@ private Zone (Region region, String name) {
public static final Zone EU_WEST_1B = new Zone(Region.EU_WEST_1, "eu-west-1b");
public static final Zone EU_WEST_1C = new Zone(Region.EU_WEST_1, "eu-west-1c");

public static final Zone AP_SOUTH_1A = new Zone(Region.AP_SOUTH_1, "ap-south-1a");
public static final Zone AP_SOUTH_1B = new Zone(Region.AP_SOUTH_1, "ap-south-1b");

public static final Zone EU_CENTRAL_1A = new Zone(Region.EU_CENTRAL_1, "eu-central-1a");
public static final Zone EU_CENTRAL_1B = new Zone(Region.EU_CENTRAL_1, "eu-central-1b");

Expand All @@ -63,11 +70,15 @@ private Zone (Region region, String name) {
public static final Zone AP_NORTHEAST_1B = new Zone(Region.AP_NORTHEAST_1, "ap-northeast-1b");
public static final Zone AP_NORTHEAST_1C = new Zone(Region.AP_NORTHEAST_1, "ap-northeast-1c");

public static final Zone AP_NORTHEAST_2A = new Zone(Region.AP_NORTHEAST_2, "ap-northeast-2a");
public static final Zone AP_NORTHEAST_2B = new Zone(Region.AP_NORTHEAST_2, "ap-northeast-2b");

public static final Zone AP_SOUTHEAST_1A = new Zone(Region.AP_SOUTHEAST_1, "ap-southeast-1a");
public static final Zone AP_SOUTHEAST_1B = new Zone(Region.AP_SOUTHEAST_1, "ap-southeast-1b");

public static final Zone AP_SOUTHEAST_2A = new Zone(Region.AP_SOUTHEAST_2, "ap-southeast-2a");
public static final Zone AP_SOUTHEAST_2B = new Zone(Region.AP_SOUTHEAST_2, "ap-southeast-2b");
public static final Zone AP_SOUTHEAST_2C = new Zone(Region.AP_SOUTHEAST_2, "ap-southeast-2c");

private static ConcurrentMap<String, Zone> zonesByName = Maps.newConcurrentMap();

Expand All @@ -78,6 +89,10 @@ private Zone (Region region, String name) {
zonesByName.put(US_EAST_1D.name, US_EAST_1D);
zonesByName.put(US_EAST_1E.name, US_EAST_1E);

zonesByName.put(US_EAST_2A.name, US_EAST_2A);
zonesByName.put(US_EAST_2B.name, US_EAST_2B);
zonesByName.put(US_EAST_2C.name, US_EAST_2C);

zonesByName.put(US_WEST_1A.name, US_WEST_1A);
zonesByName.put(US_WEST_1B.name, US_WEST_1B);
zonesByName.put(US_WEST_1C.name, US_WEST_1C);
Expand All @@ -86,6 +101,9 @@ private Zone (Region region, String name) {
zonesByName.put(US_WEST_2B.name, US_WEST_2B);
zonesByName.put(US_WEST_2C.name, US_WEST_2C);

zonesByName.put(AP_SOUTH_1A.name, AP_SOUTH_1A);
zonesByName.put(AP_SOUTH_1B.name, AP_SOUTH_1B);

zonesByName.put(EU_WEST_1A.name, EU_WEST_1A);
zonesByName.put(EU_WEST_1B.name, EU_WEST_1B);
zonesByName.put(EU_WEST_1C.name, EU_WEST_1C);
Expand All @@ -101,11 +119,15 @@ private Zone (Region region, String name) {
zonesByName.put(AP_NORTHEAST_1B.name, AP_NORTHEAST_1B);
zonesByName.put(AP_NORTHEAST_1C.name, AP_NORTHEAST_1C);

zonesByName.put(AP_NORTHEAST_2A.name, AP_NORTHEAST_2A);
zonesByName.put(AP_NORTHEAST_2B.name, AP_NORTHEAST_2B);

zonesByName.put(AP_SOUTHEAST_1A.name, AP_SOUTHEAST_1A);
zonesByName.put(AP_SOUTHEAST_1B.name, AP_SOUTHEAST_1B);

zonesByName.put(AP_SOUTHEAST_2A.name, AP_SOUTHEAST_2A);
zonesByName.put(AP_SOUTHEAST_2B.name, AP_SOUTHEAST_2B);
zonesByName.put(AP_SOUTHEAST_2C.name, AP_SOUTHEAST_2C);
}

public static void addZone(Zone zone) {
Expand Down Expand Up @@ -140,5 +162,4 @@ public static List<Zone> getZones(List<String> names) {
result.add(zonesByName.get(name));
return result;
}
}

}