Added comments and code

Author: TetyanaYahodska

compute/cloud-client/src/main/java/compute/reservation/CreateInstanceNotConsumeReservation.java

@@ -17,7 +17,6 @@
 package compute.reservation;
 
 // [START compute_instance_not_consume_reservation]
-
 import static com.google.cloud.compute.v1.ReservationAffinity.ConsumeReservationType.NO_RESERVATION;
 
 import com.google.api.gax.longrunning.OperationFuture;
@@ -40,6 +39,7 @@ public static void main(String[] args)
     // TODO(developer): Replace these variables before running the sample.
     // Project ID or project number of the Cloud project you want to use.
     String projectId = "YOUR_PROJECT_ID";
+    // Name of the zone you want to use.
     String zone = "us-central1-a";
     // Name of the VM instance you want to query.
     String instanceName = "YOUR_INSTANCE_NAME";
@@ -48,7 +48,7 @@ public static void main(String[] args)
   }
 
   // Create a virtual machine that explicitly doesn't consume reservations
-  public static void createInstanceNotConsumeReservation(
+  public static Instance createInstanceNotConsumeReservation(
       String project, String zone, String instanceName)
       throws IOException, InterruptedException, ExecutionException, TimeoutException {
     // Below are sample values that can be replaced.
@@ -60,15 +60,13 @@ public static void createInstanceNotConsumeReservation(
     // diskSizeGb: storage size of the boot disk to attach to the instance.
     // networkName: network interface to associate with the instance.
     String machineType = String.format("zones/%s/machineTypes/n1-standard-1", zone);
-    String sourceImage = String
-        .format("projects/debian-cloud/global/images/family/%s", "debian-11");
+    String sourceImage = "projects/debian-cloud/global/images/family/debian-11";
     long diskSizeGb = 10L;
     String networkName = "default";
 
     // 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 (InstancesClient instancesClient = InstancesClient.create()) {
-      // Instance creation requires at least one persistent disk and one network interface.
       AttachedDisk disk =
           AttachedDisk.newBuilder()
               .setBoot(true)
@@ -82,18 +80,15 @@ public static void createInstanceNotConsumeReservation(
                       .build())
               .build();
 
-      // Use the network interface provided in the networkName argument.
       NetworkInterface networkInterface = NetworkInterface.newBuilder()
           .setName(networkName)
           .build();
 
-      // Set reservation affinity to "none"
       ReservationAffinity reservationAffinity =
           ReservationAffinity.newBuilder()
               .setConsumeReservationType(NO_RESERVATION.toString())
               .build();
 
-      // Bind `instanceName`, `machineType`, `disk`, and `networkInterface` to an instance.
       Instance instanceResource =
           Instance.newBuilder()
               .setName(instanceName)
@@ -103,9 +98,6 @@ public static void createInstanceNotConsumeReservation(
               .setReservationAffinity(reservationAffinity)
               .build();
 
-      System.out.printf("Creating instance: %s at %s %n", instanceName, zone);
-
-      // Insert the instance in the specified project and zone.
       InsertInstanceRequest insertInstanceRequest = InsertInstanceRequest.newBuilder()
           .setProject(project)
           .setZone(zone)
@@ -120,9 +112,10 @@ public static void createInstanceNotConsumeReservation(
 
       if (response.hasError()) {
         System.out.println("Instance creation failed ! ! " + response);
-        return;
+        return null;
       }
       System.out.println("Operation Status: " + response.getStatus());
+      return instancesClient.get(project, zone, instanceName);
     }
   }
 }

compute/cloud-client/src/main/java/compute/reservation/CreateReservation.java

@@ -17,7 +17,6 @@
 package compute.reservation;
 
 // [START compute_reservation_create]
-
 import com.google.cloud.compute.v1.AcceleratorConfig;
 import com.google.cloud.compute.v1.AllocationSpecificSKUAllocationAllocatedInstancePropertiesReservedDisk;
 import com.google.cloud.compute.v1.AllocationSpecificSKUAllocationReservedInstanceProperties;

compute/cloud-client/src/main/java/compute/reservation/CreateTemplateNotConsumeReservation.java

@@ -17,7 +17,6 @@
 package compute.reservation;
 
 // [START compute_template_not_consume_reservation]
-
 import static com.google.cloud.compute.v1.ReservationAffinity.ConsumeReservationType.NO_RESERVATION;
 
 import com.google.cloud.compute.v1.AccessConfig;
@@ -49,34 +48,33 @@ public static void main(String[] args)
 
 
   // Create a template that explicitly doesn't consume any reservations.
-  public static void createTemplateNotConsumeReservation(String projectId, String templateName)
+  public static InstanceTemplate createTemplateNotConsumeReservation(
+      String projectId, String templateName)
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     try (InstanceTemplatesClient instanceTemplatesClient = InstanceTemplatesClient.create()) {
 
       String machineType = "e2-standard-4";
       String sourceImage = "projects/debian-cloud/global/images/family/debian-11";
 
-      // The template describes the size and source image of the boot disk
-      // to attach to the instance.
       AttachedDisk attachedDisk = AttachedDisk.newBuilder()
           .setInitializeParams(AttachedDiskInitializeParams.newBuilder()
               .setSourceImage(sourceImage)
               .setDiskType("pd-balanced")
-              .setDiskSizeGb(250).build())
+              .setDiskSizeGb(250)
+              .build())
           .setAutoDelete(true)
-          .setBoot(true).build();
+          .setBoot(true)
+          .build();
 
-      // The template connects the instance to the `default` network,
-      // without specifying a subnetwork.
       NetworkInterface networkInterface = NetworkInterface.newBuilder()
           .setName("global/networks/default")
-          // The template lets the instance use an external IP address.
           .addAccessConfigs(AccessConfig.newBuilder()
               .setName("External NAT")
               .setType(AccessConfig.Type.ONE_TO_ONE_NAT.toString())
-              .setNetworkTier(AccessConfig.NetworkTier.PREMIUM.toString()).build()).build();
+              .setNetworkTier(AccessConfig.NetworkTier.PREMIUM.toString())
+              .build())
+          .build();
 
-      // Set reservation affinity to "none"
       ReservationAffinity reservationAffinity =
           ReservationAffinity.newBuilder()
               .setConsumeReservationType(NO_RESERVATION.toString())
@@ -86,25 +84,28 @@ public static void createTemplateNotConsumeReservation(String projectId, String
           .addDisks(attachedDisk)
           .setMachineType(machineType)
           .setReservationAffinity(reservationAffinity)
-          .addNetworkInterfaces(networkInterface).build();
+          .addNetworkInterfaces(networkInterface)
+          .build();
 
       InsertInstanceTemplateRequest insertInstanceTemplateRequest = InsertInstanceTemplateRequest
           .newBuilder()
           .setProject(projectId)
           .setInstanceTemplateResource(InstanceTemplate.newBuilder()
               .setName(templateName)
-              .setProperties(instanceProperties).build()).build();
+              .setProperties(instanceProperties)
+              .build())
+          .build();
 
-      // Create the Instance Template.
       Operation response = instanceTemplatesClient.insertAsync(insertInstanceTemplateRequest)
           .get(3, TimeUnit.MINUTES);
 
       if (response.hasError()) {
         System.out.println("Instance Template creation failed ! ! " + response);
-        return;
+        return null;
       }
-      System.out
-          .printf("Instance Template Operation Status %s: %s", templateName, response.getStatus());
+      System.out.printf("Instance Template Operation Status %s: %s",
+          templateName, response.getStatus());
+      return instanceTemplatesClient.get(projectId, templateName);
     }
   }
 }

compute/cloud-client/src/test/java/compute/reservation/ConsumeReservationIT.java

@@ -40,7 +40,7 @@
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
-@Timeout(value = 25, unit = TimeUnit.MINUTES)
+@Timeout(value = 3, unit = TimeUnit.MINUTES)
 public class ConsumeReservationIT {
 
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
@@ -74,13 +74,6 @@ public static void setUp()
     // Cleanup existing stale resources.
     Util.cleanUpExistingInstances("test-instance-not-consume-"  + javaVersion, PROJECT_ID, ZONE);
     Util.cleanUpExistingInstanceTemplates("test-template-not-consume-"  + javaVersion, PROJECT_ID);
-
-    // Create resources for testing.
-    CreateInstanceNotConsumeReservation.createInstanceNotConsumeReservation(
-        PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME);
-    CreateTemplateNotConsumeReservation.createTemplateNotConsumeReservation(
-        PROJECT_ID, TEMPLATE_NOT_CONSUME_RESERVATION_NAME);
-    TimeUnit.SECONDS.sleep(30);
   }
 
   @AfterAll
@@ -97,21 +90,24 @@ public static void cleanup()
   }
 
   @Test
-  public void testCreateInstanceNotConsumeReservation() {
-    Instance instance = instancesClient.get(
-        PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME);
+  public void testCreateInstanceNotConsumeReservation()
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    Instance instance = CreateInstanceNotConsumeReservation.createInstanceNotConsumeReservation(
+            PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME);
 
-    // Verify that the instance was created with the correct consumeReservationType
+    Assertions.assertNotNull(instance);
     Assertions.assertEquals(NO_RESERVATION.toString(),
         instance.getReservationAffinity().getConsumeReservationType());
   }
 
   @Test
-  public void testCreateTemplateNotConsumeReservation() {
-    InstanceTemplate template = instanceTemplatesClient.get(
+  public void testCreateTemplateNotConsumeReservation()
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    InstanceTemplate template =
+        CreateTemplateNotConsumeReservation.createTemplateNotConsumeReservation(
         PROJECT_ID, TEMPLATE_NOT_CONSUME_RESERVATION_NAME);
 
-    // Verify that the instance template was created with the correct consumeReservationType
+    Assertions.assertNotNull(template);
     Assertions.assertEquals(NO_RESERVATION.toString(),
         template.getPropertiesOrBuilder().getReservationAffinity().getConsumeReservationType());
   }