Fixed empty lines and tests, deleted cleanup method

Author: TetyanaYahodska

tpu/src/main/java/tpu/CreateQueuedResourceWithNetwork.java

@@ -127,12 +127,10 @@ public static QueuedResource createQueuedResourceWithNetwork(
               .setQueuedResource(queuedResource)
               .setQueuedResourceId(queuedResourceId)
               .build();
-
-      QueuedResource response = tpuClient.createQueuedResourceAsync(request).get();
       // You can wait until TPU Node is READY,
       // and check its status using getTpuVm() from "tpu_vm_get" sample.
-      System.out.println("Queued Resource created: " + queuedResourceId);
-      return response;
+
+      return tpuClient.createQueuedResourceAsync(request).get();
     }
   }
 }

tpu/src/main/java/tpu/CreateTpuVm.java

@@ -39,7 +39,7 @@ public static void main(String[] args)
     // see https://cloud.google.com/tpu/docs/regions-zones
     String zone = "europe-west4-a";
     // The name for your TPU.
-    String nodeName = "YOUR_TPY_NAME";
+    String nodeName = "YOUR_TPU_NAME";
     // The accelerator type that specifies the version and size of the Cloud TPU you want to create.
     // For more information about supported accelerator types for each TPU version,
     // see https://cloud.google.com/tpu/docs/system-architecture-tpu-vm#versions.
@@ -90,9 +90,7 @@ public static Node createTpuVm(
               .setNode(tpuVm)
               .build();
 
-      Node response = tpuClient.createNodeAsync(request).get();
-      System.out.printf("TPU VM created: %s\n", response.getName());
-      return response;
+      return tpuClient.createNodeAsync(request).get();
     }
   }
 }

tpu/src/main/java/tpu/DeleteForceQueuedResource.java

@@ -17,7 +17,6 @@
 package tpu;
 
 //[START tpu_queued_resources_delete_force]
-
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.api.gax.rpc.UnknownException;
 import com.google.cloud.tpu.v2alpha1.DeleteQueuedResourceRequest;

tpu/src/main/java/tpu/DeleteTpuVm.java

@@ -39,7 +39,7 @@ public static void main(String[] args)
     // see https://cloud.google.com/tpu/docs/regions-zones
     String zone = "europe-west4-a";
     // The name for your TPU.
-    String nodeName = "YOUR_TPY_NAME";
+    String nodeName = "YOUR_TPU_NAME";
 
     deleteTpuVm(projectId, zone, nodeName);
   }

tpu/src/main/java/tpu/GetQueuedResource.java

@@ -17,7 +17,6 @@
 package tpu;
 
 //[START tpu_queued_resources_get]
-
 import com.google.cloud.tpu.v2alpha1.GetQueuedResourceRequest;
 import com.google.cloud.tpu.v2alpha1.QueuedResource;
 import com.google.cloud.tpu.v2alpha1.TpuClient;

tpu/src/main/java/tpu/GetTpuVm.java

@@ -34,7 +34,7 @@ public static void main(String[] args) throws IOException {
     // see https://cloud.google.com/tpu/docs/regions-zones
     String zone = "europe-west4-a";
     // The name for your TPU.
-    String nodeName = "YOUR_TPY_NAME";
+    String nodeName = "YOUR_TPU_NAME";
 
     getTpuVm(projectId, zone, nodeName);
   }

tpu/src/main/java/tpu/StartTpuVm.java

@@ -36,7 +36,7 @@ public static void main(String[] args)
     // see https://cloud.google.com/tpu/docs/regions-zones
     String zone = "europe-west4-a";
     // The name for your TPU.
-    String nodeName = "YOUR_TPY_NAME";
+    String nodeName = "YOUR_TPU_NAME";
 
     startTpuVm(projectId, zone, nodeName);
   }

tpu/src/main/java/tpu/StopTpuVm.java

@@ -36,7 +36,7 @@ public static void main(String[] args)
     // see https://cloud.google.com/tpu/docs/regions-zones
     String zone = "europe-west4-a";
     // The name for your TPU.
-    String nodeName = "YOUR_TPY_NAME";
+    String nodeName = "YOUR_TPU_NAME";
 
     stopTpuVm(projectId, zone, nodeName);
   }

…u/CreateQueuedResourceWithNetworkIT.java …/src/test/java/tpu/QueuedResourceIT.javatpu/src/test/java/tpu/CreateQueuedResourceWithNetworkIT.java renamed to tpu/src/test/java/tpu/QueuedResourceIT.java tpu/src/test/java/tpu/CreateQueuedResourceWithNetworkIT.java renamed to tpu/src/test/java/tpu/QueuedResourceIT.java

@@ -17,10 +17,10 @@
 package tpu;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import com.google.api.gax.rpc.NotFoundException;
 import com.google.cloud.tpu.v2alpha1.QueuedResource;
-import java.io.IOException;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import org.junit.Test;
@@ -33,7 +33,7 @@
 
 @RunWith(JUnit4.class)
 @Timeout(value = 6, unit = TimeUnit.MINUTES)
-public class CreateQueuedResourceWithNetworkIT {
+public class QueuedResourceIT {
 
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
   private static final String ZONE = "europe-west4-a";
@@ -46,11 +46,15 @@ public class CreateQueuedResourceWithNetworkIT {
       + UUID.randomUUID().toString().substring(0, 8);
   private static final String NETWORK_NAME = "default";
 
-  @BeforeAll
-  public static void setUp() throws IOException {
+  public static void requireEnvVar(String envVarName) {
+    assertWithMessage(String.format("Missing environment variable '%s' ", envVarName))
+        .that(System.getenv(envVarName)).isNotEmpty();
+  }
 
-    // Cleanup existing stale resources.
-    Util.cleanUpExistingQueuedResources("queued-resource-network-", PROJECT_ID, ZONE);
+  @BeforeAll
+  public static void setUp() {
+    requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
+    requireEnvVar("GOOGLE_CLOUD_PROJECT");
   }
 
   @AfterAll

tpu/src/test/java/tpu/TpuVmIT.java

@@ -45,9 +45,7 @@
 public class TpuVmIT {
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
   private static final String ZONE = "us-south1-a";
-  static String javaVersion = System.getProperty("java.version").substring(0, 2);
-  private static final String NODE_NAME = "test-tpu-" + javaVersion + "-"
-      + UUID.randomUUID().toString().substring(0, 8);
+  private static final String NODE_NAME = "test-tpu-" + UUID.randomUUID();
   private static final String TPU_TYPE = "v5litepod-1";
   private static final String TPU_SOFTWARE_VERSION = "tpu-vm-tf-2.12.1";
   private static final String NODE_PATH_NAME =
@@ -59,13 +57,9 @@ public static void requireEnvVar(String envVarName) {
   }
 
   @BeforeAll
-  public static void setUp()
-      throws IOException, ExecutionException, InterruptedException {
+  public static void setUp() {
     requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
     requireEnvVar("GOOGLE_CLOUD_PROJECT");
-
-    // Cleanup existing stale resources.
-    Util.cleanUpExistingTpu("test-tpu-" + javaVersion, PROJECT_ID, ZONE);
   }
 
   @AfterAll
@@ -81,7 +75,6 @@ public static void cleanup() throws Exception {
   @Test
   @Order(1)
   public void testCreateTpuVm() throws IOException, ExecutionException, InterruptedException {
-
     Node node = CreateTpuVm.createTpuVm(
         PROJECT_ID, ZONE, NODE_NAME, TPU_TYPE, TPU_SOFTWARE_VERSION);