Fixed code and test

Author: TetyanaYahodska

compute/cloud-client/src/main/java/compute/disks/consistencygroup/AddDiskToConsistencyGroup.java

@@ -84,7 +84,7 @@ public static Disk addDiskToConsistencyGroup(
 
       Operation response = disksClient.addResourcePoliciesAsync(disksRequest).get();
       if (response.hasError()) {
-        return null;
+        throw new Error("Error attaching disk to consistency group! " + response.getError());
       }
       System.out.println(disksClient.get(project, location, diskName).getResourcePoliciesList());
       return disksClient.get(project, location, diskName);

compute/cloud-client/src/main/java/compute/disks/consistencygroup/CreateDiskConsistencyGroup.java

@@ -40,7 +40,7 @@ public static void main(String[] args)
 
   // Creates a new disk consistency group resource policy in the specified project and region.
   // Return a link to the consistency group.
-  public static String createDiskConsistencyGroup(
+  public static Operation.Status createDiskConsistencyGroup(
       String project, String region, String consistencyGroupName)
       throws IOException, ExecutionException, InterruptedException {
     // Initialize client that will be used to send requests. This client only needs to be created
@@ -58,9 +58,9 @@ public static String createDiskConsistencyGroup(
           regionResourcePoliciesClient.insertAsync(project, region, resourcePolicy).get();
 
       if (response.hasError()) {
-        return null;
+        throw new Error("Error creating consistency group! " + response.getError());
       }
-      return regionResourcePoliciesClient.get(project, region, consistencyGroupName).getSelfLink();
+      return response.getStatus();
     }
   }
 }

compute/cloud-client/src/main/java/compute/disks/consistencygroup/DeleteDiskConsistencyGroup.java

@@ -38,7 +38,7 @@ public static void main(String[] args)
   }
 
   // Deletes a disk consistency group resource policy in the specified project and region.
-  public static void deleteDiskConsistencyGroup(
+  public static Operation.Status deleteDiskConsistencyGroup(
       String project, String region, String consistencyGroupName)
       throws IOException, ExecutionException, InterruptedException {
     // Initialize client that will be used to send requests. This client only needs to be created
@@ -48,11 +48,9 @@ public static void deleteDiskConsistencyGroup(
           .deleteAsync(project, region, consistencyGroupName).get();
 
       if (response.hasError()) {
-        return;
+        throw new Error("Error deleting disk! " + response.getError());
       }
-      System.out.println(
-          "Disk consistency group resource policy deleted successfully: "
-              + consistencyGroupName);
+      return response.getStatus();
     }
   }
 }

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

@@ -22,6 +22,7 @@
 import static org.junit.Assert.assertTrue;
 
 import com.google.cloud.compute.v1.Disk;
+import com.google.cloud.compute.v1.Operation;
 import compute.Util;
 import compute.disks.consistencygroup.AddDiskToConsistencyGroup;
 import compute.disks.consistencygroup.CreateDiskConsistencyGroup;
@@ -89,11 +90,10 @@ public static void cleanUp()
   @Order(1)
   public void testCreateDiskConsistencyGroupResourcePolicy()
       throws IOException, ExecutionException, InterruptedException {
-    String consistencyGroupLink = CreateDiskConsistencyGroup.createDiskConsistencyGroup(
+    Operation.Status status = CreateDiskConsistencyGroup.createDiskConsistencyGroup(
             PROJECT_ID, REGION, CONSISTENCY_GROUP_NAME);
 
-    assertNotNull(consistencyGroupLink);
-    assertThat(consistencyGroupLink.contains(CONSISTENCY_GROUP_NAME));
+    assertThat(status).isEqualTo(Operation.Status.DONE);
   }
 
   @Test