Skip to content

Add ITComputeTest test for resource name #4417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andreamlin merged 7 commits into from
Feb 22, 2019
Merged

Add ITComputeTest test for resource name #4417

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
34e7bcb
add ITComputeTest test for resource name working
andreamlin Jan 29, 2019
bc2cb3c
Merge branch 'master' into test_resource_name
andreamlin Feb 7, 2019
09c8032
Trying to fix the formatting
sduskis Feb 11, 2019
374426e
Merge branch 'master' into test_resource_name
andreamlin Feb 20, 2019
4fa3ea0
formatted code
andreamlin Feb 20, 2019
3a17635
Merge branch 'test_resource_name' of github.com:andreamlin/google-clo…
andreamlin Feb 20, 2019
75fe066
failure message and better assert
andreamlin Feb 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions ...ents/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/it/ITComputeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
package com.google.cloud.compute.v1.it;

import static com.google.common.truth.Truth.assertThat;
import static junit.framework.TestCase.fail;

import com.google.api.gax.core.FixedCredentialsProvider;
import com.google.api.gax.paging.Page;
import com.google.api.gax.rpc.InvalidArgumentException;
import com.google.auth.Credentials;
import com.google.auth.oauth2.GoogleCredentials;
import com.google.cloud.ServiceOptions;
Expand All @@ -27,10 +29,14 @@
import com.google.cloud.compute.v1.DiskTypeClient.AggregatedListDiskTypesPagedResponse;
import com.google.cloud.compute.v1.DiskTypeSettings;
import com.google.cloud.compute.v1.DiskTypesScopedList;
import com.google.cloud.compute.v1.Instance;
import com.google.cloud.compute.v1.InstanceClient;
import com.google.cloud.compute.v1.InstanceSettings;
import com.google.cloud.compute.v1.ListDiskTypesHttpRequest;
import com.google.cloud.compute.v1.ProjectName;
import com.google.cloud.compute.v1.ProjectRegionDiskTypeName;
import com.google.cloud.compute.v1.ProjectZoneDiskTypeName;
import com.google.cloud.compute.v1.ProjectZoneMachineTypeName;
import com.google.cloud.compute.v1.ProjectZoneName;
import com.google.common.collect.Lists;
import java.io.IOException;
Expand All @@ -52,6 +58,9 @@ public class ITComputeTest {
private static DiskTypeClient diskTypeClient;
private static DiskTypeSettings diskTypeSettings;

private static InstanceClient instanceClient;
private static InstanceSettings instanceSettings;

@Rule public Timeout globalTimeout = Timeout.seconds(300);

@BeforeClass
Expand All @@ -65,11 +74,18 @@ public static void beforeClass() throws IOException {
.setCredentialsProvider(FixedCredentialsProvider.create(credentials))
.build();
diskTypeClient = DiskTypeClient.create(diskTypeSettings);

instanceSettings =
InstanceSettings.newBuilder()
.setCredentialsProvider(FixedCredentialsProvider.create(credentials))
.build();
instanceClient = InstanceClient.create(instanceSettings);
}

@AfterClass
public static void tearDown() throws Exception {
diskTypeClient.close();
instanceClient.close();
}

@Test
Expand All @@ -85,6 +101,26 @@ public void testGetDiskType() {
assertThat(diskType.getDefaultDiskSizeGb()).isNotNull();
}

@Test
public void testInsertInstance() {
Copy link
Contributor

@kolea2 kolea2 Feb 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have a test that asserts a successfully inserted instance?

Copy link
Contributor Author

@andreamlin andreamlin Feb 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'll be in https://github.com/googleapis/google-cloud-java/pull/4420/files#diff-72d767a100f949c4606b04bb6820a8feR248. That is blocked on an LRO implementation tho.

Copy link
Contributor Author

@andreamlin andreamlin Feb 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this should be fine for now, and a later PR will test inserting an instance.

String machineType =
ProjectZoneMachineTypeName.of("n1-standard-1", DEFAULT_PROJECT, ZONE).toString();
Instance instance =
Instance.newBuilder().setName("mytestinstancetemplate").setMachineType(machineType).build();
try {
instanceClient.insertInstance(ProjectZoneName.of(DEFAULT_PROJECT, ZONE), instance);
} catch (InvalidArgumentException e) {
// Expect a Bad Request HTTP 400 error, but it should NOT be because of a resource name
// problem.
assertThat(e.getMessage()).contains("Bad Request");
assertThat(e.getCause().getMessage())
.contains("Invalid value for field 'resource.networkInterfaces'");
return;
}

fail("Expected HTTP Bad Request to be returned, but it was not returned.");
}

@Test
public void testListDiskTypes() {
Page<DiskType> diskPage =
Expand Down