Added eu-west-2*, ap-southeast-1c and ca-central-1* zones

Teevity · Jun 2, 2017 · 2e5aae8 · 2e5aae8
2 parents d6d2bd3 + d708d07
commit 2e5aae8
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/src/java/com/netflix/ice/tag/Zone.java b/src/java/com/netflix/ice/tag/Zone.java
@@ -56,8 +56,8 @@ 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_WEST_2A = new Zone(Region.EU_WEST_2, "eu-west-2a");
+    public static final Zone EU_WEST_2B = new Zone(Region.EU_WEST_2, "eu-west-2b");
 
     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");
@@ -75,11 +75,18 @@ private Zone (Region region, String name) {
 
     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_1C = new Zone(Region.AP_SOUTHEAST_1, "ap-southeast-1c");
 
     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");
 
+    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 CA_CENTRAL_1A = new Zone(Region.CA_CENTRAL_1, "ca-central-1a");
+    public static final Zone CA_CENTRAL_1B = new Zone(Region.CA_CENTRAL_1, "ca-central-1b");
+
     private static ConcurrentMap<String, Zone> zonesByName = Maps.newConcurrentMap();
 
     static {
@@ -101,13 +108,13 @@ 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);
 
+        zonesByName.put(EU_WEST_2A.name, EU_WEST_2A);
+        zonesByName.put(EU_WEST_2B.name, EU_WEST_2B);
+
         zonesByName.put(EU_CENTRAL_1A.name, EU_CENTRAL_1A);
         zonesByName.put(EU_CENTRAL_1B.name, EU_CENTRAL_1B);
 
@@ -124,10 +131,17 @@ private Zone (Region region, String name) {
 
         zonesByName.put(AP_SOUTHEAST_1A.name, AP_SOUTHEAST_1A);
         zonesByName.put(AP_SOUTHEAST_1B.name, AP_SOUTHEAST_1B);
+        zonesByName.put(AP_SOUTHEAST_1C.name, AP_SOUTHEAST_1C);
 
         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);
+
+        zonesByName.put(AP_SOUTH_1A.name, AP_SOUTH_1A);
+        zonesByName.put(AP_SOUTH_1B.name, AP_SOUTH_1B);
+
+        zonesByName.put(CA_CENTRAL_1A.name, CA_CENTRAL_1A);
+        zonesByName.put(CA_CENTRAL_1B.name, CA_CENTRAL_1B);
     }
 
     public static void addZone(Zone zone) {