Fixed code

Author: TetyanaYahodska

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

@@ -44,66 +44,73 @@ public static void main(String[] args)
     String zone = "us-central1-a";
     // Name of the VM instance you want to query.
     String instanceName = "YOUR_INSTANCE_NAME";
-    // Machine type of the instances in the reservation.
-    String machineType = "n2-standard-32";
 
-    createInstanceNotConsumeReservation(projectId, zone, instanceName, machineType);
+    createInstanceNotConsumeReservation(projectId, zone, instanceName);
   }
 
   // Create a virtual machine that explicitly doesn't consume reservations
   public static void createInstanceNotConsumeReservation(
-      String projectId, String zone, String instanceName, String machineType)
+      String project, String zone, String instanceName)
       throws IOException, InterruptedException, ExecutionException, TimeoutException {
     // Below are sample values that can be replaced.
+    // machineType: machine type of the VM being created.
+    // *   This value uses the format zones/{zone}/machineTypes/{type_name}.
+    // *   For a list of machine types, see https://cloud.google.com/compute/docs/machine-types
     // sourceImage: path to the operating system image to mount.
     // *   For details about images you can mount, see https://cloud.google.com/compute/docs/images
-    // Network interface to associate with the instance.
+    // 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 network = "global/networks/default"; // Example network
     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()) {
-
-      // Create the attached disk object
-      AttachedDisk attachedDisk =
+      // Instance creation requires at least one persistent disk and one network interface.
+      AttachedDisk disk =
           AttachedDisk.newBuilder()
               .setBoot(true)
               .setAutoDelete(true)
               .setType(AttachedDisk.Type.PERSISTENT.toString())
+              .setDeviceName("disk-1")
               .setInitializeParams(
                   AttachedDiskInitializeParams.newBuilder()
                       .setSourceImage(sourceImage)
                       .setDiskSizeGb(diskSizeGb)
                       .build())
               .build();
 
-      // Create the network interface object
-      NetworkInterface networkInterface =
-          NetworkInterface.newBuilder().setName(network).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();
 
-      // Create the instance object
-      Instance instance =
+      // Bind `instanceName`, `machineType`, `disk`, and `networkInterface` to an instance.
+      Instance instanceResource =
           Instance.newBuilder()
               .setName(instanceName)
-              .setMachineType("zones/" + zone + "/machineTypes/" + machineType)
-              .addDisks(attachedDisk)
+              .setMachineType(machineType)
+              .addDisks(disk)
               .addNetworkInterfaces(networkInterface)
               .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(projectId)
+          .setProject(project)
           .setZone(zone)
-          .setInstanceResource(instance)
+          .setInstanceResource(instanceResource)
           .build();
 
       OperationFuture<Operation, Operation> operation = instancesClient.insertAsync(
@@ -114,6 +121,7 @@ public static void createInstanceNotConsumeReservation(
 
       if (response.hasError()) {
         System.out.println("Instance creation failed ! ! " + response);
+        return;
       }
       System.out.println("Operation Status: " + response.getStatus());
     }

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

@@ -43,23 +43,18 @@ public static void main(String[] args)
     String projectId = "YOUR_PROJECT_ID";
     // Name of the template you want to query.
     String templateName = "YOUR_INSTANCE_TEMPLATE_NAME";
-    // Machine type of the template.
-    String machineType = "n2-standard-32";
 
-    createTemplateNotConsumeReservation(projectId, templateName, machineType);
+    createTemplateNotConsumeReservation(projectId, templateName);
   }
 
+
   // Create a template that explicitly doesn't consume any reservations.
-  public static void createTemplateNotConsumeReservation(
-      String projectId, String templateName, String machineType)
-      throws IOException, InterruptedException, ExecutionException, TimeoutException {
+  public static void createTemplateNotConsumeReservation(String projectId, String templateName)
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
     try (InstanceTemplatesClient instanceTemplatesClient = InstanceTemplatesClient.create()) {
-      // Below are sample values that can be replaced.
-      // sourceImage: path to the operating system image to mount.
-      // *   For details about images you can mount, see https://cloud.google.com/compute/docs/images
-      // Network interface to associate with the instance.
-      String sourceImage = String
-          .format("projects/debian-cloud/global/images/family/%s", "debian-11");
+
+      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.
@@ -106,6 +101,7 @@ public static void createTemplateNotConsumeReservation(
 
       if (response.hasError()) {
         System.out.println("Instance Template creation failed ! ! " + response);
+        return;
       }
       System.out
           .printf("Instance Template Operation Status %s: %s", templateName, response.getStatus());

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

@@ -23,7 +23,7 @@
 import com.google.cloud.compute.v1.InstanceTemplate;
 import com.google.cloud.compute.v1.InstanceTemplatesClient;
 import com.google.cloud.compute.v1.InstancesClient;
-import compute.CreateInstance;
+import compute.DeleteInstance;
 import compute.DeleteInstanceTemplate;
 import compute.Util;
 import java.io.IOException;
@@ -34,7 +34,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.runner.RunWith;
@@ -45,7 +44,7 @@
 public class ConsumeReservationIT {
 
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
-  private static final String ZONE = "europe-southwest1-a";
+  private static final String ZONE = "us-central1-a";
   private static InstancesClient instancesClient;
   private static InstanceTemplatesClient instanceTemplatesClient;
   static String javaVersion = System.getProperty("java.version").substring(0, 2);
@@ -55,7 +54,6 @@ public class ConsumeReservationIT {
   private static final String TEMPLATE_NOT_CONSUME_RESERVATION_NAME =
       "test-template-not-consume-"  + javaVersion  + "-"
       + UUID.randomUUID().toString().substring(0, 8);
-  private static final String MACHINE_TYPE = "n2-standard-32";
 
   // Check if the required environment variables are set.
   public static void requireEnvVar(String envVarName) {
@@ -78,19 +76,18 @@ public static void setUp()
     Util.cleanUpExistingInstanceTemplates("test-template-not-consume-"  + javaVersion, PROJECT_ID);
 
     // Create resources for testing.
-    CreateInstance.createInstance(PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME);
-    //    CreateInstanceNotConsumeReservation.createInstanceNotConsumeReservation(
-    //        PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME, MACHINE_TYPE);
+    CreateInstanceNotConsumeReservation.createInstanceNotConsumeReservation(
+        PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME);
     CreateTemplateNotConsumeReservation.createTemplateNotConsumeReservation(
-        PROJECT_ID, TEMPLATE_NOT_CONSUME_RESERVATION_NAME, MACHINE_TYPE);
+        PROJECT_ID, TEMPLATE_NOT_CONSUME_RESERVATION_NAME);
     TimeUnit.SECONDS.sleep(30);
   }
 
   @AfterAll
   public static void cleanup()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     // Delete the instance created for testing.
-    //DeleteInstance.deleteInstance(PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME);
+    DeleteInstance.deleteInstance(PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME);
     DeleteInstanceTemplate.deleteInstanceTemplate(
         PROJECT_ID, TEMPLATE_NOT_CONSUME_RESERVATION_NAME);
 
@@ -99,7 +96,6 @@ public static void cleanup()
     instanceTemplatesClient.close();
   }
 
-  @Disabled
   @Test
   public void testCreateInstanceNotConsumeReservation() {
     Instance instance = instancesClient.get(