Fixed code following the comments

Author: TetyanaYahodska

compute/cloud-client/src/main/java/compute/disks/CreateDiskSecondaryRegional.java

@@ -49,21 +49,16 @@ public static void main(String[] args)
     // Size of the new disk in gigabytes.
     // Learn more about disk requirements:
     // https://cloud.google.com/compute/docs/disks/async-pd/configure?authuser=0#disk_requirements
-    long diskSizeGb = 30L;
-    // The type of the disk you want to create. This value uses the following format:
-    // "projects/{projectId}/zones/{zone}/diskTypes/
-    // (pd-standard|pd-ssd|pd-balanced|pd-extreme)".
-    String diskType = String.format(
-         "projects/%s/regions/%s/diskTypes/pd-balanced", secondaryProjectId, secondaryDiskRegion);
+    int diskSizeGb = 10;
 
     createDiskSecondaryRegional(primaryProjectId, secondaryProjectId, primaryDiskName,
-            secondaryDiskName, primaryDiskRegion, secondaryDiskRegion, diskSizeGb, diskType);
+            secondaryDiskName, primaryDiskRegion, secondaryDiskRegion, diskSizeGb);
   }
 
   // Creates a secondary disk in a specified region.
   public static Disk createDiskSecondaryRegional(String projectId, String secondaryProjectId,
        String primaryDiskName, String secondaryDiskName, String primaryDiskRegion,
-       String secondaryDiskRegion, long diskSizeGb,  String diskType)
+       String secondaryDiskRegion, int diskSizeGb)
         throws IOException, ExecutionException, InterruptedException, TimeoutException {
     // An iterable collection of zone names in which you want to keep
     // the new disks' replicas. One of the replica zones of the clone must match
@@ -72,6 +67,9 @@ public static Disk createDiskSecondaryRegional(String projectId, String secondar
             String.format("projects/%s/zones/%s-c", secondaryProjectId, secondaryDiskRegion),
             String.format("projects/%s/zones/%s-b", secondaryProjectId, secondaryDiskRegion));
 
+    String diskType = String.format("projects/%s/regions/%s/diskTypes/pd-balanced",
+            secondaryProjectId, secondaryDiskRegion);
+
     String primaryDiskSource = String.format("projects/%s/regions/%s/disks/%s",
             projectId, primaryDiskRegion, primaryDiskName);
 
@@ -97,6 +95,7 @@ public static Disk createDiskSecondaryRegional(String projectId, String secondar
           .get(3, TimeUnit.MINUTES);
 
       if (response.hasError()) {
+        System.out.println(response.getError());
         return null;
       }
       return disksClient.get(secondaryProjectId, secondaryDiskRegion, secondaryDiskName);

compute/cloud-client/src/main/java/compute/disks/StartDiskReplication.java

@@ -39,20 +39,24 @@ public static void main(String[] args)
     // Learn more about zones and regions:
     // https://cloud.google.com/compute/docs/disks/async-pd/about#supported_region_pairs
     String primaryDiskLocation = "YOUR_PRIMARY_DISK_LOCATION";
-    // Path to your secondary disk.
-    // This value uses the following format for zonal location:
-    // "projects/%sYOUR_PROJECT_ID/zones/YOUR_PRIMARY_DISK_LOCATION/disks/PRIMARY_DISK_NAME"
-    String secondaryDiskPath =
-            "projects/%s/regions/YOUR_SECONDARY_DISK_LOCATION/disks/SECONDARY_DISK_NAME";
+    // The project that contains the secondary disk.
+    String secondaryProjectId = "SECONDARY_PROJECT_ID";
+    // Name of the region in which your secondary disk is located.
+    String secondaryDiskLocation = "YOUR_SECONDARY_DISK_LOCATION";
+    // Name of the secondary disk.
+    String secondaryDiskName = "SECONDARY_DISK_NAME";
 
-    startDiskAsyncReplication(
-            primaryProjectId, primaryDiskName, primaryDiskLocation, secondaryDiskPath);
+    startDiskAsyncReplication(primaryProjectId, primaryDiskName,
+            primaryDiskLocation, secondaryProjectId, secondaryDiskLocation, secondaryDiskName);
   }
 
   // Starts asynchronous replication for the specified disk.
-  public static void startDiskAsyncReplication(String primaryProjectId, String primaryDiskName,
-                                             String primaryDiskLocation, String secondaryDiskPath)
+  public static Operation.Status startDiskAsyncReplication(String primaryProjectId,
+         String primaryDiskName, String primaryDiskLocation, String secondaryProjectId,
+         String secondaryDiskLocation, String secondaryDiskName)
         throws IOException, ExecutionException, InterruptedException {
+    String secondaryDiskPath = String.format("projects/%s/regions/%s/disks/%s",
+            secondaryProjectId, secondaryDiskLocation, secondaryDiskName);
     // Initialize client that will be used to send requests. This client only needs to be created
     // once, and can be reused for multiple requests.
 
@@ -74,9 +78,10 @@ public static void startDiskAsyncReplication(String primaryProjectId, String pri
               primaryProjectId, primaryDiskLocation, primaryDiskName, replicationRequest).get();
 
       if (response.hasError()) {
-        return;
+        System.out.println(response.getError());
+        return null;
       }
-      System.out.println("Async replication started successfully.");
+      return response.getStatus();
     }
   }
 }

compute/cloud-client/src/main/java/compute/disks/StopDiskReplication.java

@@ -40,7 +40,7 @@ public static void main(String[] args)
   }
 
   // Stops asynchronous replication for the specified disk.
-  public static void stopDiskAsyncReplication(
+  public static Operation.Status stopDiskAsyncReplication(
         String project, String diskLocation, String diskName)
         throws IOException, ExecutionException, InterruptedException {
     // Initialize client that will be used to send requests. This client only needs to be created
@@ -54,9 +54,10 @@ public static void stopDiskAsyncReplication(
               project, diskLocation, diskName).get();
 
       if (response.hasError()) {
-        return;
+        System.out.println(response.getError());
+        return null;
       }
-      System.out.println("Async replication stopped successfully.");
+      return response.getStatus();
     }
   }
 }

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

@@ -61,7 +61,7 @@ public class ConsistencyGroupIT {
   private static final String DISK_TYPE = String.format("regions/%s/diskTypes/pd-balanced", REGION);
   private static final String SECONDARY_REGIONAL_DISK =
           "gcloud-test-disk-secondary-regional-" + randomUUID;
-  private static final long DISK_SIZE = 10L;
+  private static final int DISK_SIZE = 10;
   private static final List<String> replicaZones = Arrays.asList(
           String.format("projects/%s/zones/%s-a", PROJECT_ID, REGION),
           String.format("projects/%s/zones/%s-b", PROJECT_ID, REGION));
@@ -86,7 +86,6 @@ public static void cleanUp()
     StopDiskReplication.stopDiskAsyncReplication(PROJECT_ID, REGION, DISK_NAME);
     StopDiskReplication.stopDiskAsyncReplication(
             PROJECT_ID, REGION_SECONDARY, SECONDARY_REGIONAL_DISK);
-
     RegionalDelete.deleteRegionalDisk(PROJECT_ID, REGION, DISK_NAME);
     RegionalDelete.deleteRegionalDisk(PROJECT_ID, REGION_SECONDARY, SECONDARY_REGIONAL_DISK);
     DeleteDiskConsistencyGroup.deleteDiskConsistencyGroup(
@@ -128,14 +127,13 @@ public void testCloneDisksFromConsistencyGroup()
           throws IOException, ExecutionException, InterruptedException, TimeoutException {
     ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
     System.setOut(new PrintStream(stdOut));
-    Disk disk = CreateDiskSecondaryRegional.createDiskSecondaryRegional(
+    CreateDiskSecondaryRegional.createDiskSecondaryRegional(
             PROJECT_ID, PROJECT_ID, DISK_NAME, SECONDARY_REGIONAL_DISK,
-            REGION, REGION_SECONDARY, DISK_SIZE,  DISK_TYPE);
+            REGION, REGION_SECONDARY, DISK_SIZE);
     CreateDiskConsistencyGroup.createDiskConsistencyGroup(
             PROJECT_ID, REGION_SECONDARY, CONSISTENCY_GROUP_SECONDARY);
-    assert disk != null;
     StartDiskReplication.startDiskAsyncReplication(
-            PROJECT_ID, DISK_NAME, REGION, disk.getSelfLink());
+            PROJECT_ID, DISK_NAME, REGION, PROJECT_ID, REGION_SECONDARY, SECONDARY_REGIONAL_DISK);
     AddDiskToConsistencyGroup.addDiskToConsistencyGroup(PROJECT_ID, REGION_SECONDARY,
             SECONDARY_REGIONAL_DISK, CONSISTENCY_GROUP_SECONDARY, REGION_SECONDARY);
     TimeUnit.MINUTES.sleep(1);