Merged changes from main

Author: TetyanaYahodska

compute/cloud-client/src/main/java/compute/disks/CreateDiskSecondary.java renamed to compute/cloud-client/src/main/java/compute/disks/CreateDiskSecondaryZonal.java

@@ -26,7 +26,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-public class CreateDiskSecondary {
+public class CreateDiskSecondaryZonal {
   public static void main(String[] args)
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     // TODO(developer): Replace these variables before running the sample.
@@ -52,14 +52,14 @@ public static void main(String[] args)
     String diskType = String.format(
         "projects/%s/zones/%s/diskTypes/pd-balanced", secondaryProjectId, secondaryDiskZone);
 
-    createDiskSecondary(primaryProjectId, secondaryProjectId, primaryDiskName, secondaryDiskName,
-        primaryDiskZone, secondaryDiskZone, diskSizeGb,  diskType);
+    createDiskSecondaryZonal(primaryProjectId, secondaryProjectId, primaryDiskName,
+        secondaryDiskName, primaryDiskZone, secondaryDiskZone, diskSizeGb,  diskType);
   }
 
   // Creates a secondary disk in a specified zone.
-  public static Disk createDiskSecondary(String primaryProjectId, String secondaryProjectId,
-      String primaryDiskName, String secondaryDiskName, String primaryDiskZone,
-      String secondaryDiskZone, long diskSizeGb,  String diskType)
+  public static Operation.Status createDiskSecondaryZonal(String primaryProjectId,
+       String secondaryProjectId, String primaryDiskName, String secondaryDiskName,
+       String primaryDiskZone, String secondaryDiskZone, long diskSizeGb, String diskType)
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     String primaryDiskSource = String.format("projects/%s/zones/%s/disks/%s",
         primaryProjectId, primaryDiskZone, primaryDiskName);
@@ -79,14 +79,13 @@ public static Disk createDiskSecondary(String primaryProjectId, String secondary
           .setAsyncPrimaryDisk(asyncReplication)
           .build();
 
-      // Wait for the create disk operation to complete.
       Operation response = disksClient.insertAsync(secondaryProjectId, secondaryDiskZone, disk)
           .get(3, TimeUnit.MINUTES);
 
       if (response.hasError()) {
-        return null;
+        throw new Error("Error creating secondary disks! " + response.getError());
       }
-      return disksClient.get(secondaryProjectId, secondaryDiskZone, secondaryDiskName);
+      return response.getStatus();
     }
   }
 }

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

@@ -18,7 +18,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.Assert.assertNotNull;
 
 import com.google.cloud.compute.v1.AttachedDisk;
 import com.google.cloud.compute.v1.AttachedDiskInitializeParams;
@@ -171,6 +170,7 @@ public static void cleanUp()
     DeleteDisk.deleteDisk(PROJECT_ID, ZONE, EMPTY_DISK_NAME);
     DeleteDisk.deleteDisk(PROJECT_ID, ZONE, ZONAL_BLANK_DISK);
     RegionalDelete.deleteRegionalDisk(PROJECT_ID, REGION, REGIONAL_BLANK_DISK);
+    DeleteDisk.deleteDisk(PROJECT_ID, "us-central1-c", SECONDARY_DISK);
 
     stdOut.close();
     System.setOut(out);
@@ -303,18 +303,14 @@ public void testDiskAttachResize()
   }
 
   @Test
-  public void testCreateDiskSecondary()
+  public void testCreateDiskSecondaryZonal()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     String diskType =  String.format(
         "projects/%s/zones/%s/diskTypes/pd-ssd", PROJECT_ID, ZONE);
-    Disk disk = CreateDiskSecondary.createDiskSecondary(
+    Operation.Status status = CreateDiskSecondaryZonal.createDiskSecondaryZonal(
         PROJECT_ID, PROJECT_ID, EMPTY_DISK_NAME, SECONDARY_DISK, ZONE,
         "us-central1-c", DISK_SIZE,  diskType);
 
-    // Verify that the secondary disk was created.
-    assertNotNull(disk);
-    assertThat(disk.getAsyncPrimaryDisk().getDisk().contains(EMPTY_DISK_NAME));
-
-    DeleteDisk.deleteDisk(PROJECT_ID, "us-central1-c", SECONDARY_DISK);
+    assertThat(status).isEqualTo(Operation.Status.DONE);
   }
 }