fix(compute): bug fixes HyperdisksIT test (#9480)

* Splited HyperdisksIT test for solving PoolProvisionedIops issue, fixed naming

* Deleted redundant asserts

* Created additional zone to fix the issue

* Fixed indentation

* added comment

Author: TetyanaYahodska

compute/cloud-client/src/test/java/compute/disks/HypedisksIT.java renamed to compute/cloud-client/src/test/java/compute/disks/HyperdisksIT.java

@@ -1,18 +1,18 @@
 /*
- * Copyright 2024 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+* Copyright 2024 Google LLC
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 package compute.disks;
 
@@ -41,17 +41,20 @@
 @RunWith(JUnit4.class)
 @Timeout(value = 40, unit = TimeUnit.MINUTES)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class HypedisksIT {
+public class HyperdisksIT {
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
-  private static final String ZONE = "europe-west1-b";
+  // Zone in which the hyperdisk will be created.
+  private static final String ZONE_1 = "europe-west1-b";
+  // Zone in which the storage pool will be created.
+  private static final String ZONE_2 = "us-central1-a";
   private static String HYPERDISK_NAME;
   private static String HYPERDISK_IN_POOL_NAME;
   private static String STORAGE_POOL_NAME;
 
   // Check if the required environment variables are set.
   public static void requireEnvVar(String envVarName) {
     assertWithMessage(String.format("Missing environment variable '%s' ", envVarName))
-            .that(System.getenv(envVarName)).isNotEmpty();
+         .that(System.getenv(envVarName)).isNotEmpty();
   }
 
   @BeforeAll
@@ -66,62 +69,63 @@ public static void setUp() {
 
   @AfterAll
   public static void cleanup()
-          throws IOException, InterruptedException, ExecutionException, TimeoutException {
+       throws IOException, InterruptedException, ExecutionException, TimeoutException {
     // Delete all disks created for testing.
-    DeleteDisk.deleteDisk(PROJECT_ID, ZONE, HYPERDISK_NAME);
-    DeleteDisk.deleteDisk(PROJECT_ID, ZONE, HYPERDISK_IN_POOL_NAME);
+    DeleteDisk.deleteDisk(PROJECT_ID, ZONE_1, HYPERDISK_NAME);
+    DeleteDisk.deleteDisk(PROJECT_ID, ZONE_2, HYPERDISK_IN_POOL_NAME);
 
     try (StoragePoolsClient client = StoragePoolsClient.create()) {
-      client.deleteAsync(PROJECT_ID, ZONE, STORAGE_POOL_NAME);
+      client.deleteAsync(PROJECT_ID, ZONE_2, STORAGE_POOL_NAME);
     }
   }
 
   @Test
   public void stage1_CreateHyperdiskTest()
-          throws IOException, ExecutionException, InterruptedException, TimeoutException {
-    String diskType = String.format("zones/%s/diskTypes/hyperdisk-balanced", ZONE);
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    String diskType = String.format("zones/%s/diskTypes/hyperdisk-balanced", ZONE_1);
 
     Disk hyperdisk = CreateHyperdisk
-            .createHyperdisk(PROJECT_ID, ZONE, HYPERDISK_NAME, diskType, 10, 3000, 140);
+        .createHyperdisk(PROJECT_ID, ZONE_1, HYPERDISK_NAME, diskType,
+            10, 3000, 140);
 
     Assert.assertNotNull(hyperdisk);
     Assert.assertEquals(HYPERDISK_NAME, hyperdisk.getName());
     Assert.assertEquals(3000, hyperdisk.getProvisionedIops());
     Assert.assertEquals(140, hyperdisk.getProvisionedThroughput());
     Assert.assertEquals(10, hyperdisk.getSizeGb());
     Assert.assertTrue(hyperdisk.getType().contains("hyperdisk-balanced"));
-    Assert.assertTrue(hyperdisk.getZone().contains(ZONE));
+    Assert.assertTrue(hyperdisk.getZone().contains(ZONE_1));
   }
 
   @Test
   public void stage1_CreateHyperdiskStoragePoolTest()
-          throws IOException, ExecutionException, InterruptedException, TimeoutException {
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
     String poolType = String.format("projects/%s/zones/%s/storagePoolTypes/hyperdisk-balanced",
-            PROJECT_ID, ZONE);
+        PROJECT_ID, ZONE_2);
     StoragePool storagePool = CreateHyperdiskStoragePool
-            .createHyperdiskStoragePool(PROJECT_ID, ZONE, STORAGE_POOL_NAME, poolType,
-                    "advanced", 10240, 20000, 10240);
+         .createHyperdiskStoragePool(PROJECT_ID, ZONE_2, STORAGE_POOL_NAME, poolType,
+         "advanced", 10240, 10000, 10240);
 
     Assert.assertNotNull(storagePool);
     Assert.assertEquals(STORAGE_POOL_NAME, storagePool.getName());
-    Assert.assertEquals(20000, storagePool.getPoolProvisionedIops());
+    Assert.assertEquals(10000, storagePool.getPoolProvisionedIops());
     Assert.assertEquals(10240, storagePool.getPoolProvisionedThroughput());
     Assert.assertEquals(10240, storagePool.getPoolProvisionedCapacityGb());
     Assert.assertTrue(storagePool.getStoragePoolType().contains("hyperdisk-balanced"));
     Assert.assertTrue(storagePool.getCapacityProvisioningType().equalsIgnoreCase("advanced"));
-    Assert.assertTrue(storagePool.getZone().contains(ZONE));
+    Assert.assertTrue(storagePool.getZone().contains(ZONE_2));
   }
 
   @Test
   public void stage2_CreateHyperdiskStoragePoolTest()
-          throws IOException, ExecutionException, InterruptedException, TimeoutException {
-    String diskType = String.format("zones/%s/diskTypes/hyperdisk-balanced", ZONE);
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    String diskType = String.format("zones/%s/diskTypes/hyperdisk-balanced", ZONE_2);
     String storagePoolLink = String
-            .format("https://www.googleapis.com/compute/v1/projects/%s/zones/%s/storagePools/%s",
-                    PROJECT_ID, ZONE, STORAGE_POOL_NAME);
+        .format("https://www.googleapis.com/compute/v1/projects/%s/zones/%s/storagePools/%s",
+           PROJECT_ID, ZONE_2, STORAGE_POOL_NAME);
     Disk disk = CreateDiskInStoragePool
-            .createDiskInStoragePool(PROJECT_ID, ZONE, HYPERDISK_IN_POOL_NAME, storagePoolLink,
-                    diskType, 10, 3000, 140);
+        .createDiskInStoragePool(PROJECT_ID, ZONE_2, HYPERDISK_IN_POOL_NAME, storagePoolLink,
+           diskType, 10, 3000, 140);
 
     Assert.assertNotNull(disk);
     Assert.assertEquals(HYPERDISK_IN_POOL_NAME, disk.getName());
@@ -130,6 +134,6 @@ public void stage2_CreateHyperdiskStoragePoolTest()
     Assert.assertEquals(140, disk.getProvisionedThroughput());
     Assert.assertEquals(10, disk.getSizeGb());
     Assert.assertTrue(disk.getType().contains("hyperdisk-balanced"));
-    Assert.assertTrue(disk.getZone().contains(ZONE));
+    Assert.assertTrue(disk.getZone().contains(ZONE_2));
   }
 }