Fixed code

Author: TetyanaYahodska

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

@@ -18,6 +18,7 @@
 
 //[START compute_disk_create_secondary_custom]
 import com.google.cloud.compute.v1.Disk;
+import com.google.cloud.compute.v1.DiskAsyncReplication;
 import com.google.cloud.compute.v1.DisksClient;
 import com.google.cloud.compute.v1.GuestOsFeature;
 import com.google.cloud.compute.v1.Operation;
@@ -36,63 +37,72 @@ public static void main(String[] args)
     // TODO(developer): Replace these variables before running the sample.
     // The project that contains the primary disk.
     String projectId = "YOUR_PROJECT_ID";
-    // Name of the zone in which you want to create the secondary disk.
-    String disksZone = "us-central1-a";
+    // Name of the primary disk you want to use.
+    String primaryDiskName = "PRIMARY_DISK_NAME";
+    // Name of the zone in which your primary disk is located.
+    // Learn more about zones and regions:
+    // https://cloud.google.com/compute/docs/disks/async-pd/about#supported_region_pairs
+    String primaryDiskZone = "us-central1-a";
     // Name of the disk you want to create.
     String secondaryDiskName = "SECONDARY_DISK_NAME";
+    // Name of the zone in which you want to create the secondary disk.
+    String secondaryDiskZone = "us-east1-c";
     // Size of the new disk in gigabytes.
     long diskSizeGb = 100;
-    // Name of the primary disk you want to use as a source for the new disk.
-    String primaryDiskName = "PRIMARY_DISK_NAME";
     // 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/zones/%s/diskTypes/pd-balanced", projectId, disksZone);
+        "projects/%s/zones/%s/diskTypes/pd-balanced", projectId, secondaryDiskZone);
 
-    createDiskSecondaryCustom(projectId, secondaryDiskName, disksZone,
-        diskSizeGb, primaryDiskName, diskType);
+    createDiskSecondaryCustom(projectId, primaryDiskName, secondaryDiskName,
+        primaryDiskZone, secondaryDiskZone, diskSizeGb,  diskType);
   }
 
   // Creates a secondary disk with specified custom parameters.
-  public static Disk createDiskSecondaryCustom(String projectId, String secondaryDiskName,
-       String disksZone, long diskSizeGb, String primaryDiskName, String diskType)
+  public static Disk createDiskSecondaryCustom(String projectId, 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",
+        projectId, primaryDiskZone, primaryDiskName);
+
+    DiskAsyncReplication asyncReplication = DiskAsyncReplication.newBuilder()
+        .setDisk(primaryDiskSource)
+        .build();
+
+    // Define the guest OS features.
+    List<GuestOsFeature> guestOsFeatures = Arrays.asList(
+        GuestOsFeature.newBuilder().setType("UEFI_COMPATIBLE").build(),
+        GuestOsFeature.newBuilder().setType("GVNIC").build(),
+        GuestOsFeature.newBuilder().setType("MULTI_IP_SUBNET").build());
+
+    // Define the labels.
+    Map<String, String> labels = new HashMap<>();
+    labels.put("secondary-disk-for-replication", "yes");
+
     // Initialize client that will be used to send requests. This client only needs to be created
     // once, and can be reused for multiple requests.
     try (DisksClient disksClient = DisksClient.create()) {
-      String primaryDiskSource = String.format("projects/%s/zones/%s/disks/%s",
-          projectId, disksZone, primaryDiskName);
-
-      // Define the guest OS features.
-      List<GuestOsFeature> guestOsFeatures = Arrays.asList(
-          GuestOsFeature.newBuilder().setType("UEFI_COMPATIBLE").build(),
-          GuestOsFeature.newBuilder().setType("GVNIC").build(),
-          GuestOsFeature.newBuilder().setType("MULTI_IP_SUBNET").build()
-      );
-      // Define the labels.
-      Map<String, String> labels = new HashMap<>();
-      labels.put("secondary-disk-for-replication", "yes");
 
-      // Create the disk object with the source disk information.
       Disk disk = Disk.newBuilder()
           .setName(secondaryDiskName)
           .setSizeGb(diskSizeGb)
           .setType(diskType)
-          .setZone(disksZone)
+          .setZone(secondaryDiskZone)
           .addAllGuestOsFeatures(guestOsFeatures)
           .putAllLabels(labels)
-          .setSourceDisk(primaryDiskSource)
+          .setAsyncPrimaryDisk(asyncReplication)
           .build();
 
       // Wait for the create disk operation to complete.
-      Operation response = disksClient.insertAsync(projectId, disksZone, disk)
+      Operation response = disksClient.insertAsync(projectId, secondaryDiskZone, disk)
           .get(3, TimeUnit.MINUTES);
 
       if (response.hasError()) {
         return null;
       }
-      return disksClient.get(projectId, disksZone, secondaryDiskName);
+      return disksClient.get(projectId, secondaryDiskZone, secondaryDiskName);
     }
   }
 }

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

@@ -72,7 +72,7 @@ public class DisksIT {
   private static String DISK_TYPE;
   private static String ZONAL_BLANK_DISK;
   private static String REGIONAL_BLANK_DISK;
-  private static String SECONDARY_DISK_CUSTOM_NAME;
+  private static String SECONDARY_DISK_CUSTOM;
   private static final long DISK_SIZE = 10;
 
   private ByteArrayOutputStream stdOut;
@@ -102,7 +102,7 @@ public static void setup()
     DISK_TYPE = String.format("zones/%s/diskTypes/pd-ssd", ZONE);
     ZONAL_BLANK_DISK = "gcloud-test-disk-zattach-" + uuid;
     REGIONAL_BLANK_DISK = "gcloud-test-disk-rattach-" + uuid;
-    SECONDARY_DISK_CUSTOM_NAME = "gcloud-test-disk-custom-" + uuid;
+    SECONDARY_DISK_CUSTOM = "gcloud-test-disk-custom-" + uuid;
 
     // Cleanup existing stale instances.
     Util.cleanUpExistingInstances("test-disks", PROJECT_ID, ZONE);
@@ -172,7 +172,6 @@ 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, ZONE, SECONDARY_DISK_CUSTOM_NAME);
 
     stdOut.close();
     System.setOut(out);
@@ -310,16 +309,15 @@ public void testCreateDiskSecondaryCustom()
     String diskType =  String.format(
         "projects/%s/zones/%s/diskTypes/pd-ssd", PROJECT_ID, ZONE);
     Disk disk = CreateDiskSecondaryCustom.createDiskSecondaryCustom(
-        PROJECT_ID, SECONDARY_DISK_CUSTOM_NAME, ZONE,
-        DISK_SIZE, EMPTY_DISK_NAME, diskType);
+        PROJECT_ID, EMPTY_DISK_NAME, SECONDARY_DISK_CUSTOM, ZONE,
+        "us-central1-c", DISK_SIZE,  diskType);
 
     // Verify that the secondary disk was created.
     assertNotNull(disk);
-    assertThat(disk.getSizeGb()).isEqualTo(DISK_SIZE);
-    assertThat(disk.getSourceDisk()).isEqualTo(
-        String.format("https://www.googleapis.com/compute/v1/projects/%s/zones/%s/disks/%s",
-            PROJECT_ID, ZONE, EMPTY_DISK_NAME));
+    assertThat(disk.getAsyncPrimaryDisk().getDisk().contains(EMPTY_DISK_NAME));
     assertThat(disk.getLabelsMap().get("secondary-disk-for-replication")).isEqualTo("yes");
     assertThat(disk.getGuestOsFeaturesCount()).isEqualTo(3);
+
+    DeleteDisk.deleteDisk(PROJECT_ID, "us-central1-c", SECONDARY_DISK_CUSTOM);
   }
 }