Replace US_CENTRAL2 with US_CENTRAL1 in tests

US_CENTRAL2 has been removed.
apache · Jul 29, 2023 · 1252f19 · 1252f19
1 parent 20ebc67
commit 1252f19
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/...loud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiLiveTest.java b/...loud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiLiveTest.java
@@ -95,7 +95,7 @@ public void testCreateBucket() {
       Logging log = Logging.create(LOG_BUCKET_NAME, BUCKET_NAME);
 
       BucketTemplate template = new BucketTemplate().name(BUCKET_NAME).addAcl(acl).addDefaultObjectAccessControls(oac)
-               .versioning(version).location(Location.US_CENTRAL2).logging(log)
+               .versioning(version).location(Location.US_CENTRAL1).logging(log)
                .storageClass(StorageClass.DURABLE_REDUCED_AVAILABILITY).addCORS(cors);
 
       Bucket response = api().createBucket(PROJECT_NUMBER, template);
@@ -104,7 +104,7 @@ public void testCreateBucket() {
       assertNotNull(response.cors());
       assertTrue(response.cors().size() == 1);
       assertEquals(response.name(), BUCKET_NAME);
-      assertEquals(response.location(), Location.US_CENTRAL2);
+      assertEquals(response.location(), Location.US_CENTRAL1);
       assertThat(response.storageClass()).isEqualTo(StorageClass.DURABLE_REDUCED_AVAILABILITY);
       assertTrue(response.versioning().enabled());
    }
@@ -197,7 +197,7 @@ public void testCreateBucketNearline() {
    @Test(groups = "live", dependsOnMethods = { "testCreateBucket" })
    public void testCreateAlreadyExistBucket() {
 
-      BucketTemplate template = new BucketTemplate().name(BUCKET_NAME).location(Location.US_CENTRAL2)
+      BucketTemplate template = new BucketTemplate().name(BUCKET_NAME).location(Location.US_CENTRAL1)
                .storageClass(StorageClass.DURABLE_REDUCED_AVAILABILITY);
 
       assertNull(api().createBucket(PROJECT_NUMBER, template));
@@ -212,7 +212,7 @@ public void testCreateBucketWithOptions() {
       Versioning version = Versioning.create(true);
 
       BucketTemplate template = new BucketTemplate().name(BUCKET_NAME_WITHOPTIONS).addDefaultObjectAccessControls(oac)
-               .versioning(version).location(Location.US_CENTRAL2)
+               .versioning(version).location(Location.US_CENTRAL1)
                .storageClass(StorageClass.DURABLE_REDUCED_AVAILABILITY).addCORS(cors);
 
       InsertBucketOptions options = new InsertBucketOptions().projection(Projection.FULL);
@@ -222,7 +222,7 @@ public void testCreateBucketWithOptions() {
       assertNotNull(response);
       assertNotNull(response.cors());
       assertEquals(response.name(), BUCKET_NAME_WITHOPTIONS);
-      assertEquals(response.location(), Location.US_CENTRAL2);
+      assertEquals(response.location(), Location.US_CENTRAL1);
       assertTrue(response.versioning().enabled());
    }
 

diff --git a/...mpute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java b/...mpute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java
@@ -50,11 +50,11 @@ public ListPage<Region> expected(String baseUrl) {
       Region region2 = Region.create( //
             "6396763663251190992", // id
             parse("2013-07-08T14:40:37.939-07:00"), // creationTimestamp
-            URI.create(baseUrl + "/party/regions/us-central2"), // selfLink
-            "us-central2", // name
-            "us-central2", // description
+            URI.create(baseUrl + "/party/regions/us-central1"), // selfLink
+            "us-central1", // name
+            "us-central1", // description
             Region.Status.UP, // status
-            ImmutableList.of(URI.create(baseUrl + "/party/zones/us-central2-a")), // zones
+            ImmutableList.of(URI.create(baseUrl + "/party/zones/us-central1-a")), // zones
             ImmutableList.of( //
                   Quota.create("INSTANCES", 0, 8), //
                   Quota.create("CPUS", 0, 8), //

diff --git a/providers/google-compute-engine/src/test/resources/region_list.json b/providers/google-compute-engine/src/test/resources/region_list.json
@@ -65,14 +65,14 @@
         },
         {
             "kind": "compute#region",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/party/regions/us-central2",
+            "selfLink": "https://www.googleapis.com/compute/v1/projects/party/regions/us-central1",
             "id": "6396763663251190992",
             "creationTimestamp": "2013-07-08T14:40:37.939-07:00",
-            "name": "us-central2",
-            "description": "us-central2",
+            "name": "us-central1",
+            "description": "us-central1",
             "status": "UP",
             "zones": [
-                "https://www.googleapis.com/compute/v1/projects/party/zones/us-central2-a"
+                "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a"
             ],
             "quotas": [
                 {
@@ -123,4 +123,4 @@
             ]
         }
     ]
-}
+}