From 34e7bcbe7a56489373f83ecf6180f5ad501a8603 Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Tue, 29 Jan 2019 12:39:52 -0800 Subject: [PATCH 1/6] add ITComputeTest test for resource name working --- .../cloud/compute/v1/it/ITComputeTest.java | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/it/ITComputeTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/it/ITComputeTest.java index f2834c5dd18a..148070f36851 100644 --- a/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/it/ITComputeTest.java +++ b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/it/ITComputeTest.java @@ -16,27 +16,41 @@ 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; +import com.google.cloud.compute.v1.AttachedDisk; import com.google.cloud.compute.v1.DiskType; import com.google.cloud.compute.v1.DiskTypeClient; 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.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.NetworkInterface; import com.google.cloud.compute.v1.ProjectName; import com.google.cloud.compute.v1.ProjectRegionDiskTypeName; +import com.google.cloud.compute.v1.ProjectZoneDiskName; import com.google.cloud.compute.v1.ProjectZoneDiskTypeName; +import com.google.cloud.compute.v1.ProjectZoneInstanceName; +import com.google.cloud.compute.v1.ProjectZoneMachineTypeName; import com.google.cloud.compute.v1.ProjectZoneName; import com.google.common.collect.Lists; import java.io.IOException; import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import org.apache.http.client.HttpResponseException; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; @@ -52,6 +66,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 @@ -65,11 +82,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 @@ -85,6 +109,28 @@ public void testGetDiskType() { assertThat(diskType.getDefaultDiskSizeGb()).isNotNull(); } + @Test + public void testInsertInstance() { + 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()) + .doesNotContain("Invalid value for field 'resource.machineType'"); + return; + } + + fail(); + } + @Test public void testListDiskTypes() { Page diskPage = From f77e003faba1c8e89f8b95b9dd2c4674fde0eddd Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Wed, 30 Jan 2019 16:36:27 -0800 Subject: [PATCH 2/6] add resource name fix --- .../cloud/compute/v1/FixedOrPercent.java | 204 +++++++++++++++ .../cloud/compute/v1/ForwardingRule.java | 64 +++++ .../cloud/compute/v1/InstanceClient.java | 12 +- .../compute/v1/InstanceGroupManager.java | 107 ++++++++ .../v1/InstanceGroupManagerStatus.java | 142 +++++++++++ .../v1/InstanceGroupManagerUpdatePolicy.java | 234 ++++++++++++++++++ .../v1/InstanceGroupManagerVersion.java | 205 +++++++++++++++ .../compute/v1/ProjectGlobalAddressName.java | 7 +- .../v1/ProjectGlobalBackendBucketName.java | 7 +- .../v1/ProjectGlobalBackendServiceName.java | 7 +- .../compute/v1/ProjectGlobalFirewallName.java | 7 +- .../v1/ProjectGlobalForwardingRuleName.java | 7 +- .../v1/ProjectGlobalHealthCheckName.java | 7 +- .../v1/ProjectGlobalHttpHealthCheckName.java | 7 +- .../v1/ProjectGlobalHttpsHealthCheckName.java | 7 +- .../v1/ProjectGlobalImageFamilyName.java | 7 +- .../compute/v1/ProjectGlobalImageName.java | 7 +- .../v1/ProjectGlobalImageResourceName.java | 7 +- .../v1/ProjectGlobalInstanceTemplateName.java | 7 +- ...ectGlobalInstanceTemplateResourceName.java | 7 +- ...ProjectGlobalInterconnectLocationName.java | 7 +- .../v1/ProjectGlobalInterconnectName.java | 7 +- .../v1/ProjectGlobalLicenseCodeName.java | 7 +- .../ProjectGlobalLicenseCodeResourceName.java | 7 +- .../compute/v1/ProjectGlobalLicenseName.java | 7 +- .../v1/ProjectGlobalLicenseResourceName.java | 7 +- .../compute/v1/ProjectGlobalNetworkName.java | 7 +- .../v1/ProjectGlobalOperationName.java | 7 +- .../compute/v1/ProjectGlobalRouteName.java | 7 +- .../v1/ProjectGlobalSecurityPolicyName.java | 7 +- .../compute/v1/ProjectGlobalSnapshotName.java | 7 +- .../v1/ProjectGlobalSnapshotResourceName.java | 7 +- .../v1/ProjectGlobalSslCertificateName.java | 7 +- .../v1/ProjectGlobalSslPolicyName.java | 7 +- .../v1/ProjectGlobalTargetHttpProxyName.java | 7 +- .../v1/ProjectGlobalTargetHttpsProxyName.java | 7 +- .../v1/ProjectGlobalTargetSslProxyName.java | 7 +- .../v1/ProjectGlobalTargetTcpProxyName.java | 7 +- .../compute/v1/ProjectGlobalUrlMapName.java | 7 +- .../google/cloud/compute/v1/ProjectName.java | 2 +- .../compute/v1/ProjectRegionAddressName.java | 9 +- .../v1/ProjectRegionAutoscalerName.java | 9 +- .../v1/ProjectRegionBackendServiceName.java | 9 +- .../v1/ProjectRegionCommitmentName.java | 9 +- .../compute/v1/ProjectRegionDiskName.java | 9 +- .../v1/ProjectRegionDiskResourceName.java | 9 +- .../compute/v1/ProjectRegionDiskTypeName.java | 9 +- .../v1/ProjectRegionForwardingRuleName.java | 9 +- ...ProjectRegionInstanceGroupManagerName.java | 9 +- .../v1/ProjectRegionInstanceGroupName.java | 9 +- ...ojectRegionInterconnectAttachmentName.java | 9 +- .../cloud/compute/v1/ProjectRegionName.java | 7 +- .../v1/ProjectRegionNodeTemplateName.java | 9 +- ...ProjectRegionNodeTemplateResourceName.java | 9 +- .../v1/ProjectRegionOperationName.java | 9 +- .../compute/v1/ProjectRegionRouterName.java | 9 +- .../v1/ProjectRegionSubnetworkName.java | 9 +- .../ProjectRegionSubnetworkResourceName.java | 9 +- .../v1/ProjectRegionTargetPoolName.java | 9 +- .../v1/ProjectRegionTargetVpnGatewayName.java | 9 +- .../v1/ProjectRegionVpnTunnelName.java | 9 +- .../v1/ProjectTargetHttpProxyName.java | 7 +- .../v1/ProjectTargetHttpsProxyName.java | 7 +- .../v1/ProjectZoneAcceleratorTypeName.java | 9 +- .../compute/v1/ProjectZoneAutoscalerName.java | 9 +- .../cloud/compute/v1/ProjectZoneDiskName.java | 9 +- .../v1/ProjectZoneDiskResourceName.java | 9 +- .../compute/v1/ProjectZoneDiskTypeName.java | 9 +- .../ProjectZoneInstanceGroupManagerName.java | 9 +- .../v1/ProjectZoneInstanceGroupName.java | 9 +- .../compute/v1/ProjectZoneInstanceName.java | 9 +- .../v1/ProjectZoneInstanceResourceName.java | 9 +- .../v1/ProjectZoneMachineTypeName.java | 9 +- .../cloud/compute/v1/ProjectZoneName.java | 7 +- .../compute/v1/ProjectZoneNodeGroupName.java | 9 +- .../v1/ProjectZoneNodeGroupResourceName.java | 9 +- .../compute/v1/ProjectZoneNodeTypeName.java | 9 +- .../compute/v1/ProjectZoneOperationName.java | 9 +- .../v1/ProjectZoneTargetInstanceName.java | 9 +- 79 files changed, 1284 insertions(+), 253 deletions(-) create mode 100644 google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/FixedOrPercent.java create mode 100644 google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceGroupManagerStatus.java create mode 100644 google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceGroupManagerUpdatePolicy.java create mode 100644 google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceGroupManagerVersion.java diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/FixedOrPercent.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/FixedOrPercent.java new file mode 100644 index 000000000000..9530f06cef1d --- /dev/null +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/FixedOrPercent.java @@ -0,0 +1,204 @@ +/* + * Copyright 2019 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.cloud.compute.v1; + +import com.google.api.core.BetaApi; +import com.google.api.gax.httpjson.ApiMessage; +import java.util.List; +import java.util.Objects; +import javax.annotation.Generated; +import javax.annotation.Nullable; + +@Generated("by GAPIC") +@BetaApi +public final class FixedOrPercent implements ApiMessage { + private final Integer calculated; + private final Integer fixed; + private final Integer percent; + + private FixedOrPercent() { + this.calculated = null; + this.fixed = null; + this.percent = null; + } + + private FixedOrPercent(Integer calculated, Integer fixed, Integer percent) { + this.calculated = calculated; + this.fixed = fixed; + this.percent = percent; + } + + @Override + public Object getFieldValue(String fieldName) { + if ("calculated".equals(fieldName)) { + return calculated; + } + if ("fixed".equals(fieldName)) { + return fixed; + } + if ("percent".equals(fieldName)) { + return percent; + } + return null; + } + + @Nullable + @Override + public ApiMessage getApiMessageRequestBody() { + return null; + } + + @Nullable + @Override + public List getFieldMask() { + return null; + } + + public Integer getCalculated() { + return calculated; + } + + public Integer getFixed() { + return fixed; + } + + public Integer getPercent() { + return percent; + } + + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + + public static Builder newBuilder(FixedOrPercent prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + + public Builder toBuilder() { + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + } + + public static FixedOrPercent getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final FixedOrPercent DEFAULT_INSTANCE; + + static { + DEFAULT_INSTANCE = new FixedOrPercent(); + } + + public static class Builder { + private Integer calculated; + private Integer fixed; + private Integer percent; + + Builder() {} + + public Builder mergeFrom(FixedOrPercent other) { + if (other == FixedOrPercent.getDefaultInstance()) return this; + if (other.getCalculated() != null) { + this.calculated = other.calculated; + } + if (other.getFixed() != null) { + this.fixed = other.fixed; + } + if (other.getPercent() != null) { + this.percent = other.percent; + } + return this; + } + + Builder(FixedOrPercent source) { + this.calculated = source.calculated; + this.fixed = source.fixed; + this.percent = source.percent; + } + + public Integer getCalculated() { + return calculated; + } + + public Builder setCalculated(Integer calculated) { + this.calculated = calculated; + return this; + } + + public Integer getFixed() { + return fixed; + } + + public Builder setFixed(Integer fixed) { + this.fixed = fixed; + return this; + } + + public Integer getPercent() { + return percent; + } + + public Builder setPercent(Integer percent) { + this.percent = percent; + return this; + } + + public FixedOrPercent build() { + + return new FixedOrPercent(calculated, fixed, percent); + } + + public Builder clone() { + Builder newBuilder = new Builder(); + newBuilder.setCalculated(this.calculated); + newBuilder.setFixed(this.fixed); + newBuilder.setPercent(this.percent); + return newBuilder; + } + } + + @Override + public String toString() { + return "FixedOrPercent{" + + "calculated=" + + calculated + + ", " + + "fixed=" + + fixed + + ", " + + "percent=" + + percent + + "}"; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (o instanceof FixedOrPercent) { + FixedOrPercent that = (FixedOrPercent) o; + return Objects.equals(this.calculated, that.getCalculated()) + && Objects.equals(this.fixed, that.getFixed()) + && Objects.equals(this.percent, that.getPercent()); + } + return false; + } + + @Override + public int hashCode() { + return Objects.hash(calculated, fixed, percent); + } +} diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ForwardingRule.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ForwardingRule.java index 1f8380c42c0e..6f53a1dae830 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ForwardingRule.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ForwardingRule.java @@ -48,6 +48,8 @@ public final class ForwardingRule implements ApiMessage { private final List ports; private final String region; private final String selfLink; + private final String serviceLabel; + private final String serviceName; private final String subnetwork; private final String target; @@ -68,6 +70,8 @@ private ForwardingRule() { this.ports = null; this.region = null; this.selfLink = null; + this.serviceLabel = null; + this.serviceName = null; this.subnetwork = null; this.target = null; } @@ -89,6 +93,8 @@ private ForwardingRule( List ports, String region, String selfLink, + String serviceLabel, + String serviceName, String subnetwork, String target) { this.backendService = backendService; @@ -107,6 +113,8 @@ private ForwardingRule( this.ports = ports; this.region = region; this.selfLink = selfLink; + this.serviceLabel = serviceLabel; + this.serviceName = serviceName; this.subnetwork = subnetwork; this.target = target; } @@ -161,6 +169,12 @@ public Object getFieldValue(String fieldName) { if ("selfLink".equals(fieldName)) { return selfLink; } + if ("serviceLabel".equals(fieldName)) { + return serviceLabel; + } + if ("serviceName".equals(fieldName)) { + return serviceName; + } if ("subnetwork".equals(fieldName)) { return subnetwork; } @@ -246,6 +260,14 @@ public String getSelfLink() { return selfLink; } + public String getServiceLabel() { + return serviceLabel; + } + + public String getServiceName() { + return serviceName; + } + public String getSubnetwork() { return subnetwork; } @@ -293,6 +315,8 @@ public static class Builder { private List ports; private String region; private String selfLink; + private String serviceLabel; + private String serviceName; private String subnetwork; private String target; @@ -348,6 +372,12 @@ public Builder mergeFrom(ForwardingRule other) { if (other.getSelfLink() != null) { this.selfLink = other.selfLink; } + if (other.getServiceLabel() != null) { + this.serviceLabel = other.serviceLabel; + } + if (other.getServiceName() != null) { + this.serviceName = other.serviceName; + } if (other.getSubnetwork() != null) { this.subnetwork = other.subnetwork; } @@ -374,6 +404,8 @@ public Builder mergeFrom(ForwardingRule other) { this.ports = source.ports; this.region = source.region; this.selfLink = source.selfLink; + this.serviceLabel = source.serviceLabel; + this.serviceName = source.serviceName; this.subnetwork = source.subnetwork; this.target = source.target; } @@ -533,6 +565,24 @@ public Builder setSelfLink(String selfLink) { return this; } + public String getServiceLabel() { + return serviceLabel; + } + + public Builder setServiceLabel(String serviceLabel) { + this.serviceLabel = serviceLabel; + return this; + } + + public String getServiceName() { + return serviceName; + } + + public Builder setServiceName(String serviceName) { + this.serviceName = serviceName; + return this; + } + public String getSubnetwork() { return subnetwork; } @@ -570,6 +620,8 @@ public ForwardingRule build() { ports, region, selfLink, + serviceLabel, + serviceName, subnetwork, target); } @@ -592,6 +644,8 @@ public Builder clone() { newBuilder.addAllPorts(this.ports); newBuilder.setRegion(this.region); newBuilder.setSelfLink(this.selfLink); + newBuilder.setServiceLabel(this.serviceLabel); + newBuilder.setServiceName(this.serviceName); newBuilder.setSubnetwork(this.subnetwork); newBuilder.setTarget(this.target); return newBuilder; @@ -649,6 +703,12 @@ public String toString() { + "selfLink=" + selfLink + ", " + + "serviceLabel=" + + serviceLabel + + ", " + + "serviceName=" + + serviceName + + ", " + "subnetwork=" + subnetwork + ", " @@ -680,6 +740,8 @@ public boolean equals(Object o) { && Objects.equals(this.ports, that.getPortsList()) && Objects.equals(this.region, that.getRegion()) && Objects.equals(this.selfLink, that.getSelfLink()) + && Objects.equals(this.serviceLabel, that.getServiceLabel()) + && Objects.equals(this.serviceName, that.getServiceName()) && Objects.equals(this.subnetwork, that.getSubnetwork()) && Objects.equals(this.target, that.getTarget()); } @@ -705,6 +767,8 @@ public int hashCode() { ports, region, selfLink, + serviceLabel, + serviceName, subnetwork, target); } diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceClient.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceClient.java index f2bd3aa3b502..1e5eb0c61f5f 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceClient.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceClient.java @@ -1610,7 +1610,8 @@ public final ListReferrersInstancesPagedResponse listReferrersInstances( // AUTO-GENERATED DOCUMENTATION AND METHOD /** - * Performs a reset on the instance. For more information, see Resetting an instance. + * Performs a reset on the instance. This is a hard reset; the VM does not do a graceful shutdown. + * For more information, see Resetting an instance. * *

Sample code: * @@ -1636,7 +1637,8 @@ public final Operation resetInstance(ProjectZoneInstanceName instance) { // AUTO-GENERATED DOCUMENTATION AND METHOD /** - * Performs a reset on the instance. For more information, see Resetting an instance. + * Performs a reset on the instance. This is a hard reset; the VM does not do a graceful shutdown. + * For more information, see Resetting an instance. * *

Sample code: * @@ -1660,7 +1662,8 @@ public final Operation resetInstance(String instance) { // AUTO-GENERATED DOCUMENTATION AND METHOD /** - * Performs a reset on the instance. For more information, see Resetting an instance. + * Performs a reset on the instance. This is a hard reset; the VM does not do a graceful shutdown. + * For more information, see Resetting an instance. * *

Sample code: * @@ -1684,7 +1687,8 @@ public final Operation resetInstance(ResetInstanceHttpRequest request) { // AUTO-GENERATED DOCUMENTATION AND METHOD /** - * Performs a reset on the instance. For more information, see Resetting an instance. + * Performs a reset on the instance. This is a hard reset; the VM does not do a graceful shutdown. + * For more information, see Resetting an instance. * *

Sample code: * diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceGroupManager.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceGroupManager.java index 1b8b68a106b2..66dff0682b92 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceGroupManager.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceGroupManager.java @@ -41,8 +41,11 @@ public final class InstanceGroupManager implements ApiMessage { private final List namedPorts; private final String region; private final String selfLink; + private final InstanceGroupManagerStatus status; private final List targetPools; private final Integer targetSize; + private final InstanceGroupManagerUpdatePolicy updatePolicy; + private final List versions; private final String zone; private InstanceGroupManager() { @@ -61,8 +64,11 @@ private InstanceGroupManager() { this.namedPorts = null; this.region = null; this.selfLink = null; + this.status = null; this.targetPools = null; this.targetSize = null; + this.updatePolicy = null; + this.versions = null; this.zone = null; } @@ -82,8 +88,11 @@ private InstanceGroupManager( List namedPorts, String region, String selfLink, + InstanceGroupManagerStatus status, List targetPools, Integer targetSize, + InstanceGroupManagerUpdatePolicy updatePolicy, + List versions, String zone) { this.autoHealingPolicies = autoHealingPolicies; this.baseInstanceName = baseInstanceName; @@ -100,8 +109,11 @@ private InstanceGroupManager( this.namedPorts = namedPorts; this.region = region; this.selfLink = selfLink; + this.status = status; this.targetPools = targetPools; this.targetSize = targetSize; + this.updatePolicy = updatePolicy; + this.versions = versions; this.zone = zone; } @@ -152,12 +164,21 @@ public Object getFieldValue(String fieldName) { if ("selfLink".equals(fieldName)) { return selfLink; } + if ("status".equals(fieldName)) { + return status; + } if ("targetPools".equals(fieldName)) { return targetPools; } if ("targetSize".equals(fieldName)) { return targetSize; } + if ("updatePolicy".equals(fieldName)) { + return updatePolicy; + } + if ("versions".equals(fieldName)) { + return versions; + } if ("zone".equals(fieldName)) { return zone; } @@ -236,6 +257,10 @@ public String getSelfLink() { return selfLink; } + public InstanceGroupManagerStatus getStatus() { + return status; + } + public List getTargetPoolsList() { return targetPools; } @@ -244,6 +269,14 @@ public Integer getTargetSize() { return targetSize; } + public InstanceGroupManagerUpdatePolicy getUpdatePolicy() { + return updatePolicy; + } + + public List getVersionsList() { + return versions; + } + public String getZone() { return zone; } @@ -286,8 +319,11 @@ public static class Builder { private List namedPorts; private String region; private String selfLink; + private InstanceGroupManagerStatus status; private List targetPools; private Integer targetSize; + private InstanceGroupManagerUpdatePolicy updatePolicy; + private List versions; private String zone; Builder() {} @@ -339,12 +375,21 @@ public Builder mergeFrom(InstanceGroupManager other) { if (other.getSelfLink() != null) { this.selfLink = other.selfLink; } + if (other.getStatus() != null) { + this.status = other.status; + } if (other.getTargetPoolsList() != null) { this.targetPools = other.targetPools; } if (other.getTargetSize() != null) { this.targetSize = other.targetSize; } + if (other.getUpdatePolicy() != null) { + this.updatePolicy = other.updatePolicy; + } + if (other.getVersionsList() != null) { + this.versions = other.versions; + } if (other.getZone() != null) { this.zone = other.zone; } @@ -367,8 +412,11 @@ public Builder mergeFrom(InstanceGroupManager other) { this.namedPorts = source.namedPorts; this.region = source.region; this.selfLink = source.selfLink; + this.status = source.status; this.targetPools = source.targetPools; this.targetSize = source.targetSize; + this.updatePolicy = source.updatePolicy; + this.versions = source.versions; this.zone = source.zone; } @@ -531,6 +579,15 @@ public Builder setSelfLink(String selfLink) { return this; } + public InstanceGroupManagerStatus getStatus() { + return status; + } + + public Builder setStatus(InstanceGroupManagerStatus status) { + this.status = status; + return this; + } + public List getTargetPoolsList() { return targetPools; } @@ -560,6 +617,35 @@ public Builder setTargetSize(Integer targetSize) { return this; } + public InstanceGroupManagerUpdatePolicy getUpdatePolicy() { + return updatePolicy; + } + + public Builder setUpdatePolicy(InstanceGroupManagerUpdatePolicy updatePolicy) { + this.updatePolicy = updatePolicy; + return this; + } + + public List getVersionsList() { + return versions; + } + + public Builder addAllVersions(List versions) { + if (this.versions == null) { + this.versions = new LinkedList<>(); + } + this.versions.addAll(versions); + return this; + } + + public Builder addVersions(InstanceGroupManagerVersion versions) { + if (this.versions == null) { + this.versions = new LinkedList<>(); + } + this.versions.add(versions); + return this; + } + public String getZone() { return zone; } @@ -587,8 +673,11 @@ public InstanceGroupManager build() { namedPorts, region, selfLink, + status, targetPools, targetSize, + updatePolicy, + versions, zone); } @@ -609,8 +698,11 @@ public Builder clone() { newBuilder.addAllNamedPorts(this.namedPorts); newBuilder.setRegion(this.region); newBuilder.setSelfLink(this.selfLink); + newBuilder.setStatus(this.status); newBuilder.addAllTargetPools(this.targetPools); newBuilder.setTargetSize(this.targetSize); + newBuilder.setUpdatePolicy(this.updatePolicy); + newBuilder.addAllVersions(this.versions); newBuilder.setZone(this.zone); return newBuilder; } @@ -664,12 +756,21 @@ public String toString() { + "selfLink=" + selfLink + ", " + + "status=" + + status + + ", " + "targetPools=" + targetPools + ", " + "targetSize=" + targetSize + ", " + + "updatePolicy=" + + updatePolicy + + ", " + + "versions=" + + versions + + ", " + "zone=" + zone + "}"; @@ -697,8 +798,11 @@ public boolean equals(Object o) { && Objects.equals(this.namedPorts, that.getNamedPortsList()) && Objects.equals(this.region, that.getRegion()) && Objects.equals(this.selfLink, that.getSelfLink()) + && Objects.equals(this.status, that.getStatus()) && Objects.equals(this.targetPools, that.getTargetPoolsList()) && Objects.equals(this.targetSize, that.getTargetSize()) + && Objects.equals(this.updatePolicy, that.getUpdatePolicy()) + && Objects.equals(this.versions, that.getVersionsList()) && Objects.equals(this.zone, that.getZone()); } return false; @@ -722,8 +826,11 @@ public int hashCode() { namedPorts, region, selfLink, + status, targetPools, targetSize, + updatePolicy, + versions, zone); } } diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceGroupManagerStatus.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceGroupManagerStatus.java new file mode 100644 index 000000000000..227c8820d688 --- /dev/null +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceGroupManagerStatus.java @@ -0,0 +1,142 @@ +/* + * Copyright 2019 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.cloud.compute.v1; + +import com.google.api.core.BetaApi; +import com.google.api.gax.httpjson.ApiMessage; +import java.util.List; +import java.util.Objects; +import javax.annotation.Generated; +import javax.annotation.Nullable; + +@Generated("by GAPIC") +@BetaApi +public final class InstanceGroupManagerStatus implements ApiMessage { + private final Boolean isStable; + + private InstanceGroupManagerStatus() { + this.isStable = null; + } + + private InstanceGroupManagerStatus(Boolean isStable) { + this.isStable = isStable; + } + + @Override + public Object getFieldValue(String fieldName) { + if ("isStable".equals(fieldName)) { + return isStable; + } + return null; + } + + @Nullable + @Override + public ApiMessage getApiMessageRequestBody() { + return null; + } + + @Nullable + @Override + public List getFieldMask() { + return null; + } + + public Boolean getIsStable() { + return isStable; + } + + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + + public static Builder newBuilder(InstanceGroupManagerStatus prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + + public Builder toBuilder() { + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + } + + public static InstanceGroupManagerStatus getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final InstanceGroupManagerStatus DEFAULT_INSTANCE; + + static { + DEFAULT_INSTANCE = new InstanceGroupManagerStatus(); + } + + public static class Builder { + private Boolean isStable; + + Builder() {} + + public Builder mergeFrom(InstanceGroupManagerStatus other) { + if (other == InstanceGroupManagerStatus.getDefaultInstance()) return this; + if (other.getIsStable() != null) { + this.isStable = other.isStable; + } + return this; + } + + Builder(InstanceGroupManagerStatus source) { + this.isStable = source.isStable; + } + + public Boolean getIsStable() { + return isStable; + } + + public Builder setIsStable(Boolean isStable) { + this.isStable = isStable; + return this; + } + + public InstanceGroupManagerStatus build() { + return new InstanceGroupManagerStatus(isStable); + } + + public Builder clone() { + Builder newBuilder = new Builder(); + newBuilder.setIsStable(this.isStable); + return newBuilder; + } + } + + @Override + public String toString() { + return "InstanceGroupManagerStatus{" + "isStable=" + isStable + "}"; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (o instanceof InstanceGroupManagerStatus) { + InstanceGroupManagerStatus that = (InstanceGroupManagerStatus) o; + return Objects.equals(this.isStable, that.getIsStable()); + } + return false; + } + + @Override + public int hashCode() { + return Objects.hash(isStable); + } +} diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceGroupManagerUpdatePolicy.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceGroupManagerUpdatePolicy.java new file mode 100644 index 000000000000..7ed3a69f847c --- /dev/null +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceGroupManagerUpdatePolicy.java @@ -0,0 +1,234 @@ +/* + * Copyright 2019 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.cloud.compute.v1; + +import com.google.api.core.BetaApi; +import com.google.api.gax.httpjson.ApiMessage; +import java.util.List; +import java.util.Objects; +import javax.annotation.Generated; +import javax.annotation.Nullable; + +@Generated("by GAPIC") +@BetaApi +public final class InstanceGroupManagerUpdatePolicy implements ApiMessage { + private final FixedOrPercent maxSurge; + private final FixedOrPercent maxUnavailable; + private final String minimalAction; + private final String type; + + private InstanceGroupManagerUpdatePolicy() { + this.maxSurge = null; + this.maxUnavailable = null; + this.minimalAction = null; + this.type = null; + } + + private InstanceGroupManagerUpdatePolicy( + FixedOrPercent maxSurge, FixedOrPercent maxUnavailable, String minimalAction, String type) { + this.maxSurge = maxSurge; + this.maxUnavailable = maxUnavailable; + this.minimalAction = minimalAction; + this.type = type; + } + + @Override + public Object getFieldValue(String fieldName) { + if ("maxSurge".equals(fieldName)) { + return maxSurge; + } + if ("maxUnavailable".equals(fieldName)) { + return maxUnavailable; + } + if ("minimalAction".equals(fieldName)) { + return minimalAction; + } + if ("type".equals(fieldName)) { + return type; + } + return null; + } + + @Nullable + @Override + public ApiMessage getApiMessageRequestBody() { + return null; + } + + @Nullable + @Override + public List getFieldMask() { + return null; + } + + public FixedOrPercent getMaxSurge() { + return maxSurge; + } + + public FixedOrPercent getMaxUnavailable() { + return maxUnavailable; + } + + public String getMinimalAction() { + return minimalAction; + } + + public String getType() { + return type; + } + + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + + public static Builder newBuilder(InstanceGroupManagerUpdatePolicy prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + + public Builder toBuilder() { + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + } + + public static InstanceGroupManagerUpdatePolicy getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final InstanceGroupManagerUpdatePolicy DEFAULT_INSTANCE; + + static { + DEFAULT_INSTANCE = new InstanceGroupManagerUpdatePolicy(); + } + + public static class Builder { + private FixedOrPercent maxSurge; + private FixedOrPercent maxUnavailable; + private String minimalAction; + private String type; + + Builder() {} + + public Builder mergeFrom(InstanceGroupManagerUpdatePolicy other) { + if (other == InstanceGroupManagerUpdatePolicy.getDefaultInstance()) return this; + if (other.getMaxSurge() != null) { + this.maxSurge = other.maxSurge; + } + if (other.getMaxUnavailable() != null) { + this.maxUnavailable = other.maxUnavailable; + } + if (other.getMinimalAction() != null) { + this.minimalAction = other.minimalAction; + } + if (other.getType() != null) { + this.type = other.type; + } + return this; + } + + Builder(InstanceGroupManagerUpdatePolicy source) { + this.maxSurge = source.maxSurge; + this.maxUnavailable = source.maxUnavailable; + this.minimalAction = source.minimalAction; + this.type = source.type; + } + + public FixedOrPercent getMaxSurge() { + return maxSurge; + } + + public Builder setMaxSurge(FixedOrPercent maxSurge) { + this.maxSurge = maxSurge; + return this; + } + + public FixedOrPercent getMaxUnavailable() { + return maxUnavailable; + } + + public Builder setMaxUnavailable(FixedOrPercent maxUnavailable) { + this.maxUnavailable = maxUnavailable; + return this; + } + + public String getMinimalAction() { + return minimalAction; + } + + public Builder setMinimalAction(String minimalAction) { + this.minimalAction = minimalAction; + return this; + } + + public String getType() { + return type; + } + + public Builder setType(String type) { + this.type = type; + return this; + } + + public InstanceGroupManagerUpdatePolicy build() { + + return new InstanceGroupManagerUpdatePolicy(maxSurge, maxUnavailable, minimalAction, type); + } + + public Builder clone() { + Builder newBuilder = new Builder(); + newBuilder.setMaxSurge(this.maxSurge); + newBuilder.setMaxUnavailable(this.maxUnavailable); + newBuilder.setMinimalAction(this.minimalAction); + newBuilder.setType(this.type); + return newBuilder; + } + } + + @Override + public String toString() { + return "InstanceGroupManagerUpdatePolicy{" + + "maxSurge=" + + maxSurge + + ", " + + "maxUnavailable=" + + maxUnavailable + + ", " + + "minimalAction=" + + minimalAction + + ", " + + "type=" + + type + + "}"; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (o instanceof InstanceGroupManagerUpdatePolicy) { + InstanceGroupManagerUpdatePolicy that = (InstanceGroupManagerUpdatePolicy) o; + return Objects.equals(this.maxSurge, that.getMaxSurge()) + && Objects.equals(this.maxUnavailable, that.getMaxUnavailable()) + && Objects.equals(this.minimalAction, that.getMinimalAction()) + && Objects.equals(this.type, that.getType()); + } + return false; + } + + @Override + public int hashCode() { + return Objects.hash(maxSurge, maxUnavailable, minimalAction, type); + } +} diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceGroupManagerVersion.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceGroupManagerVersion.java new file mode 100644 index 000000000000..04530b1e9355 --- /dev/null +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/InstanceGroupManagerVersion.java @@ -0,0 +1,205 @@ +/* + * Copyright 2019 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.cloud.compute.v1; + +import com.google.api.core.BetaApi; +import com.google.api.gax.httpjson.ApiMessage; +import java.util.List; +import java.util.Objects; +import javax.annotation.Generated; +import javax.annotation.Nullable; + +@Generated("by GAPIC") +@BetaApi +public final class InstanceGroupManagerVersion implements ApiMessage { + private final String instanceTemplate; + private final String name; + private final FixedOrPercent targetSize; + + private InstanceGroupManagerVersion() { + this.instanceTemplate = null; + this.name = null; + this.targetSize = null; + } + + private InstanceGroupManagerVersion( + String instanceTemplate, String name, FixedOrPercent targetSize) { + this.instanceTemplate = instanceTemplate; + this.name = name; + this.targetSize = targetSize; + } + + @Override + public Object getFieldValue(String fieldName) { + if ("instanceTemplate".equals(fieldName)) { + return instanceTemplate; + } + if ("name".equals(fieldName)) { + return name; + } + if ("targetSize".equals(fieldName)) { + return targetSize; + } + return null; + } + + @Nullable + @Override + public ApiMessage getApiMessageRequestBody() { + return null; + } + + @Nullable + @Override + public List getFieldMask() { + return null; + } + + public String getInstanceTemplate() { + return instanceTemplate; + } + + public String getName() { + return name; + } + + public FixedOrPercent getTargetSize() { + return targetSize; + } + + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + + public static Builder newBuilder(InstanceGroupManagerVersion prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + + public Builder toBuilder() { + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + } + + public static InstanceGroupManagerVersion getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final InstanceGroupManagerVersion DEFAULT_INSTANCE; + + static { + DEFAULT_INSTANCE = new InstanceGroupManagerVersion(); + } + + public static class Builder { + private String instanceTemplate; + private String name; + private FixedOrPercent targetSize; + + Builder() {} + + public Builder mergeFrom(InstanceGroupManagerVersion other) { + if (other == InstanceGroupManagerVersion.getDefaultInstance()) return this; + if (other.getInstanceTemplate() != null) { + this.instanceTemplate = other.instanceTemplate; + } + if (other.getName() != null) { + this.name = other.name; + } + if (other.getTargetSize() != null) { + this.targetSize = other.targetSize; + } + return this; + } + + Builder(InstanceGroupManagerVersion source) { + this.instanceTemplate = source.instanceTemplate; + this.name = source.name; + this.targetSize = source.targetSize; + } + + public String getInstanceTemplate() { + return instanceTemplate; + } + + public Builder setInstanceTemplate(String instanceTemplate) { + this.instanceTemplate = instanceTemplate; + return this; + } + + public String getName() { + return name; + } + + public Builder setName(String name) { + this.name = name; + return this; + } + + public FixedOrPercent getTargetSize() { + return targetSize; + } + + public Builder setTargetSize(FixedOrPercent targetSize) { + this.targetSize = targetSize; + return this; + } + + public InstanceGroupManagerVersion build() { + + return new InstanceGroupManagerVersion(instanceTemplate, name, targetSize); + } + + public Builder clone() { + Builder newBuilder = new Builder(); + newBuilder.setInstanceTemplate(this.instanceTemplate); + newBuilder.setName(this.name); + newBuilder.setTargetSize(this.targetSize); + return newBuilder; + } + } + + @Override + public String toString() { + return "InstanceGroupManagerVersion{" + + "instanceTemplate=" + + instanceTemplate + + ", " + + "name=" + + name + + ", " + + "targetSize=" + + targetSize + + "}"; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (o instanceof InstanceGroupManagerVersion) { + InstanceGroupManagerVersion that = (InstanceGroupManagerVersion) o; + return Objects.equals(this.instanceTemplate, that.getInstanceTemplate()) + && Objects.equals(this.name, that.getName()) + && Objects.equals(this.targetSize, that.getTargetSize()); + } + return false; + } + + @Override + public int hashCode() { + return Objects.hash(instanceTemplate, name, targetSize); + } +} diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalAddressName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalAddressName.java index 4cd40826d853..8b82c39da963 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalAddressName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalAddressName.java @@ -148,9 +148,10 @@ public ProjectGlobalAddressName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "address", address, - "project", project); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "address", address, + "project", project); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalBackendBucketName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalBackendBucketName.java index f67572ede419..5737310e82ab 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalBackendBucketName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalBackendBucketName.java @@ -149,9 +149,10 @@ public ProjectGlobalBackendBucketName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "backendBucket", backendBucket, - "project", project); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "backendBucket", backendBucket, + "project", project); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalBackendServiceName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalBackendServiceName.java index 663631a85229..00eada1256d7 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalBackendServiceName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalBackendServiceName.java @@ -149,9 +149,10 @@ public ProjectGlobalBackendServiceName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "backendService", backendService, - "project", project); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "backendService", backendService, + "project", project); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalFirewallName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalFirewallName.java index 298b4902d879..967fdd64897c 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalFirewallName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalFirewallName.java @@ -148,9 +148,10 @@ public ProjectGlobalFirewallName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "firewall", firewall, - "project", project); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "firewall", firewall, + "project", project); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalForwardingRuleName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalForwardingRuleName.java index f75e6424337a..eb655021c985 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalForwardingRuleName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalForwardingRuleName.java @@ -149,9 +149,10 @@ public ProjectGlobalForwardingRuleName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "forwardingRule", forwardingRule, - "project", project); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "forwardingRule", forwardingRule, + "project", project); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalHealthCheckName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalHealthCheckName.java index 29fd87d3a730..a550003ac666 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalHealthCheckName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalHealthCheckName.java @@ -149,9 +149,10 @@ public ProjectGlobalHealthCheckName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "healthCheck", healthCheck, - "project", project); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "healthCheck", healthCheck, + "project", project); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalHttpHealthCheckName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalHttpHealthCheckName.java index 46b809891828..2304e9d22fa5 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalHttpHealthCheckName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalHttpHealthCheckName.java @@ -149,9 +149,10 @@ public ProjectGlobalHttpHealthCheckName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "httpHealthCheck", httpHealthCheck, - "project", project); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "httpHealthCheck", httpHealthCheck, + "project", project); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalHttpsHealthCheckName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalHttpsHealthCheckName.java index 865efe7f514f..1f0dbfd08559 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalHttpsHealthCheckName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalHttpsHealthCheckName.java @@ -150,9 +150,10 @@ public ProjectGlobalHttpsHealthCheckName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "httpsHealthCheck", httpsHealthCheck, - "project", project); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "httpsHealthCheck", httpsHealthCheck, + "project", project); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalImageFamilyName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalImageFamilyName.java index 54d815687808..dc6c0bc3869f 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalImageFamilyName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalImageFamilyName.java @@ -149,9 +149,10 @@ public ProjectGlobalImageFamilyName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "family", family, - "project", project); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "family", family, + "project", project); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalImageName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalImageName.java index c3b90748c934..b99c4e11216e 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalImageName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalImageName.java @@ -148,9 +148,10 @@ public ProjectGlobalImageName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "image", image, - "project", project); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "image", image, + "project", project); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalImageResourceName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalImageResourceName.java index ea20f7471a05..5f554fb31b38 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalImageResourceName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalImageResourceName.java @@ -149,9 +149,10 @@ public ProjectGlobalImageResourceName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "resource", resource); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "resource", resource); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalInstanceTemplateName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalInstanceTemplateName.java index b1d5409a00d6..eff7f48c8d7b 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalInstanceTemplateName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalInstanceTemplateName.java @@ -150,9 +150,10 @@ public ProjectGlobalInstanceTemplateName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "instanceTemplate", instanceTemplate, - "project", project); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "instanceTemplate", instanceTemplate, + "project", project); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalInstanceTemplateResourceName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalInstanceTemplateResourceName.java index b2a992851d6e..a0e6780e23c6 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalInstanceTemplateResourceName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalInstanceTemplateResourceName.java @@ -150,9 +150,10 @@ public ProjectGlobalInstanceTemplateResourceName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "resource", resource); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "resource", resource); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalInterconnectLocationName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalInterconnectLocationName.java index 65acb787d2d5..1bd434e36246 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalInterconnectLocationName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalInterconnectLocationName.java @@ -151,9 +151,10 @@ public ProjectGlobalInterconnectLocationName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "interconnectLocation", interconnectLocation, - "project", project); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "interconnectLocation", interconnectLocation, + "project", project); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalInterconnectName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalInterconnectName.java index 7d979de6f966..e39f4c6e0799 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalInterconnectName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalInterconnectName.java @@ -149,9 +149,10 @@ public ProjectGlobalInterconnectName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "interconnect", interconnect, - "project", project); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "interconnect", interconnect, + "project", project); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalLicenseCodeName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalLicenseCodeName.java index dad26f01d15a..f7ef1782e0cd 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalLicenseCodeName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalLicenseCodeName.java @@ -149,9 +149,10 @@ public ProjectGlobalLicenseCodeName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "licenseCode", licenseCode, - "project", project); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "licenseCode", licenseCode, + "project", project); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalLicenseCodeResourceName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalLicenseCodeResourceName.java index 5e289286803a..6025b1b36a82 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalLicenseCodeResourceName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalLicenseCodeResourceName.java @@ -149,9 +149,10 @@ public ProjectGlobalLicenseCodeResourceName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "resource", resource); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "resource", resource); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalLicenseName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalLicenseName.java index ba73fc169236..d233a7730561 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalLicenseName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalLicenseName.java @@ -148,9 +148,10 @@ public ProjectGlobalLicenseName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "license", license, - "project", project); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "license", license, + "project", project); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalLicenseResourceName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalLicenseResourceName.java index 5f4a9655c2d7..1871dc54afea 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalLicenseResourceName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalLicenseResourceName.java @@ -149,9 +149,10 @@ public ProjectGlobalLicenseResourceName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "resource", resource); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "resource", resource); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalNetworkName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalNetworkName.java index 065e29e30d1a..40e3ead3b184 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalNetworkName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalNetworkName.java @@ -148,9 +148,10 @@ public ProjectGlobalNetworkName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "network", network, - "project", project); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "network", network, + "project", project); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalOperationName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalOperationName.java index 3f1278168f9e..360c1e89b169 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalOperationName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalOperationName.java @@ -148,9 +148,10 @@ public ProjectGlobalOperationName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "operation", operation, - "project", project); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "operation", operation, + "project", project); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalRouteName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalRouteName.java index 29dd54c51979..f7da7284eea3 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalRouteName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalRouteName.java @@ -148,9 +148,10 @@ public ProjectGlobalRouteName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "route", route); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "route", route); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSecurityPolicyName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSecurityPolicyName.java index 39d1498237ff..2acceeddcff6 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSecurityPolicyName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSecurityPolicyName.java @@ -149,9 +149,10 @@ public ProjectGlobalSecurityPolicyName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "securityPolicy", securityPolicy); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "securityPolicy", securityPolicy); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSnapshotName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSnapshotName.java index b84c06c559ec..5273bdfd7430 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSnapshotName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSnapshotName.java @@ -148,9 +148,10 @@ public ProjectGlobalSnapshotName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "snapshot", snapshot); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "snapshot", snapshot); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSnapshotResourceName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSnapshotResourceName.java index dca1abf33397..9d3275b81581 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSnapshotResourceName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSnapshotResourceName.java @@ -149,9 +149,10 @@ public ProjectGlobalSnapshotResourceName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "resource", resource); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "resource", resource); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSslCertificateName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSslCertificateName.java index f45814fff509..fb2b7f40a314 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSslCertificateName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSslCertificateName.java @@ -149,9 +149,10 @@ public ProjectGlobalSslCertificateName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "sslCertificate", sslCertificate); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "sslCertificate", sslCertificate); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSslPolicyName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSslPolicyName.java index b7c70c6d96c6..64e709f022e2 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSslPolicyName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalSslPolicyName.java @@ -148,9 +148,10 @@ public ProjectGlobalSslPolicyName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "sslPolicy", sslPolicy); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "sslPolicy", sslPolicy); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalTargetHttpProxyName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalTargetHttpProxyName.java index 580c12220fb4..e898a2891ddc 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalTargetHttpProxyName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalTargetHttpProxyName.java @@ -149,9 +149,10 @@ public ProjectGlobalTargetHttpProxyName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "targetHttpProxy", targetHttpProxy); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "targetHttpProxy", targetHttpProxy); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalTargetHttpsProxyName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalTargetHttpsProxyName.java index 7a7e908917fa..27e5a19fe9a8 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalTargetHttpsProxyName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalTargetHttpsProxyName.java @@ -150,9 +150,10 @@ public ProjectGlobalTargetHttpsProxyName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "targetHttpsProxy", targetHttpsProxy); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "targetHttpsProxy", targetHttpsProxy); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalTargetSslProxyName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalTargetSslProxyName.java index c59623a36085..11624f0fff46 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalTargetSslProxyName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalTargetSslProxyName.java @@ -149,9 +149,10 @@ public ProjectGlobalTargetSslProxyName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "targetSslProxy", targetSslProxy); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "targetSslProxy", targetSslProxy); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalTargetTcpProxyName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalTargetTcpProxyName.java index 30acb16c57ad..ab0e576dca92 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalTargetTcpProxyName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalTargetTcpProxyName.java @@ -149,9 +149,10 @@ public ProjectGlobalTargetTcpProxyName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "targetTcpProxy", targetTcpProxy); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "targetTcpProxy", targetTcpProxy); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalUrlMapName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalUrlMapName.java index 5c5f545321a7..8b42bb97a655 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalUrlMapName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalUrlMapName.java @@ -148,9 +148,10 @@ public ProjectGlobalUrlMapName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "urlMap", urlMap); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "urlMap", urlMap); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectName.java index db75e9f56663..422bb4ae32c8 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectName.java @@ -130,7 +130,7 @@ public ProjectName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate("project", project); + return SERVICE_ADDRESS + PATH_TEMPLATE.instantiate("project", project); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionAddressName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionAddressName.java index 50f4d4b9b908..95a56dad9725 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionAddressName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionAddressName.java @@ -166,10 +166,11 @@ public ProjectRegionAddressName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "address", address, - "project", project, - "region", region); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "address", address, + "project", project, + "region", region); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionAutoscalerName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionAutoscalerName.java index bd3bb3175b86..4ffeaffdf5ad 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionAutoscalerName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionAutoscalerName.java @@ -166,10 +166,11 @@ public ProjectRegionAutoscalerName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "autoscaler", autoscaler, - "project", project, - "region", region); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "autoscaler", autoscaler, + "project", project, + "region", region); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionBackendServiceName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionBackendServiceName.java index 10320d79b68c..335b7edbf2bf 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionBackendServiceName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionBackendServiceName.java @@ -173,10 +173,11 @@ public ProjectRegionBackendServiceName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "backendService", backendService, - "project", project, - "region", region); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "backendService", backendService, + "project", project, + "region", region); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionCommitmentName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionCommitmentName.java index 8241017701af..a966d1f8f56d 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionCommitmentName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionCommitmentName.java @@ -166,10 +166,11 @@ public ProjectRegionCommitmentName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "commitment", commitment, - "project", project, - "region", region); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "commitment", commitment, + "project", project, + "region", region); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionDiskName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionDiskName.java index 5324a46c347e..4c9725ad9868 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionDiskName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionDiskName.java @@ -166,10 +166,11 @@ public ProjectRegionDiskName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "disk", disk, - "project", project, - "region", region); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "disk", disk, + "project", project, + "region", region); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionDiskResourceName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionDiskResourceName.java index 844d987d3f67..260b21c74e6b 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionDiskResourceName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionDiskResourceName.java @@ -167,10 +167,11 @@ public ProjectRegionDiskResourceName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "region", region, - "resource", resource); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "region", region, + "resource", resource); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionDiskTypeName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionDiskTypeName.java index 6f93fe6ec974..8a69f0dd5d9b 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionDiskTypeName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionDiskTypeName.java @@ -166,10 +166,11 @@ public ProjectRegionDiskTypeName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "diskType", diskType, - "project", project, - "region", region); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "diskType", diskType, + "project", project, + "region", region); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionForwardingRuleName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionForwardingRuleName.java index eab18028da7e..435ccf025f68 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionForwardingRuleName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionForwardingRuleName.java @@ -173,10 +173,11 @@ public ProjectRegionForwardingRuleName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "forwardingRule", forwardingRule, - "project", project, - "region", region); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "forwardingRule", forwardingRule, + "project", project, + "region", region); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionInstanceGroupManagerName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionInstanceGroupManagerName.java index 85aa88bc554b..fe6a650fbce0 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionInstanceGroupManagerName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionInstanceGroupManagerName.java @@ -174,10 +174,11 @@ public ProjectRegionInstanceGroupManagerName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "instanceGroupManager", instanceGroupManager, - "project", project, - "region", region); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "instanceGroupManager", instanceGroupManager, + "project", project, + "region", region); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionInstanceGroupName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionInstanceGroupName.java index 0bfe5ef6d37a..b85d3bcd6c63 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionInstanceGroupName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionInstanceGroupName.java @@ -173,10 +173,11 @@ public ProjectRegionInstanceGroupName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "instanceGroup", instanceGroup, - "project", project, - "region", region); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "instanceGroup", instanceGroup, + "project", project, + "region", region); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionInterconnectAttachmentName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionInterconnectAttachmentName.java index c2cbebdd5103..e11203a14c1e 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionInterconnectAttachmentName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionInterconnectAttachmentName.java @@ -175,10 +175,11 @@ public ProjectRegionInterconnectAttachmentName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "interconnectAttachment", interconnectAttachment, - "project", project, - "region", region); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "interconnectAttachment", interconnectAttachment, + "project", project, + "region", region); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionName.java index ef10e8356b0c..7b8fb7eb1fdd 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionName.java @@ -148,9 +148,10 @@ public ProjectRegionName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "region", region); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "region", region); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionNodeTemplateName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionNodeTemplateName.java index ba78d5784bea..e875b42529e3 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionNodeTemplateName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionNodeTemplateName.java @@ -169,10 +169,11 @@ public ProjectRegionNodeTemplateName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "nodeTemplate", nodeTemplate, - "project", project, - "region", region); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "nodeTemplate", nodeTemplate, + "project", project, + "region", region); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionNodeTemplateResourceName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionNodeTemplateResourceName.java index 88eeb95e3048..cda9649e6d55 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionNodeTemplateResourceName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionNodeTemplateResourceName.java @@ -168,10 +168,11 @@ public ProjectRegionNodeTemplateResourceName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "region", region, - "resource", resource); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "region", region, + "resource", resource); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionOperationName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionOperationName.java index 88e1f00e825d..d8736166d454 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionOperationName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionOperationName.java @@ -166,10 +166,11 @@ public ProjectRegionOperationName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "operation", operation, - "project", project, - "region", region); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "operation", operation, + "project", project, + "region", region); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionRouterName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionRouterName.java index 266845c81db6..4484fcc503a5 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionRouterName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionRouterName.java @@ -166,10 +166,11 @@ public ProjectRegionRouterName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "region", region, - "router", router); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "region", region, + "router", router); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionSubnetworkName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionSubnetworkName.java index ec712fc549d2..02c04193bac4 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionSubnetworkName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionSubnetworkName.java @@ -166,10 +166,11 @@ public ProjectRegionSubnetworkName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "region", region, - "subnetwork", subnetwork); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "region", region, + "subnetwork", subnetwork); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionSubnetworkResourceName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionSubnetworkResourceName.java index b358e718a07f..fd228577fb07 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionSubnetworkResourceName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionSubnetworkResourceName.java @@ -168,10 +168,11 @@ public ProjectRegionSubnetworkResourceName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "region", region, - "resource", resource); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "region", region, + "resource", resource); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionTargetPoolName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionTargetPoolName.java index 0b4ff5242040..1e8f59a2ce65 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionTargetPoolName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionTargetPoolName.java @@ -166,10 +166,11 @@ public ProjectRegionTargetPoolName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "region", region, - "targetPool", targetPool); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "region", region, + "targetPool", targetPool); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionTargetVpnGatewayName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionTargetVpnGatewayName.java index c3482c6d46eb..05f9916b27de 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionTargetVpnGatewayName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionTargetVpnGatewayName.java @@ -173,10 +173,11 @@ public ProjectRegionTargetVpnGatewayName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "region", region, - "targetVpnGateway", targetVpnGateway); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "region", region, + "targetVpnGateway", targetVpnGateway); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionVpnTunnelName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionVpnTunnelName.java index 4ac5f1112092..250c2dcf4b1b 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionVpnTunnelName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectRegionVpnTunnelName.java @@ -166,10 +166,11 @@ public ProjectRegionVpnTunnelName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "region", region, - "vpnTunnel", vpnTunnel); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "region", region, + "vpnTunnel", vpnTunnel); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectTargetHttpProxyName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectTargetHttpProxyName.java index 41472e8cf542..51e83bc30033 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectTargetHttpProxyName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectTargetHttpProxyName.java @@ -148,9 +148,10 @@ public ProjectTargetHttpProxyName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "targetHttpProxy", targetHttpProxy); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "targetHttpProxy", targetHttpProxy); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectTargetHttpsProxyName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectTargetHttpsProxyName.java index a441c06a46ae..60cac52ee72c 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectTargetHttpsProxyName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectTargetHttpsProxyName.java @@ -148,9 +148,10 @@ public ProjectTargetHttpsProxyName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "targetHttpsProxy", targetHttpsProxy); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "targetHttpsProxy", targetHttpsProxy); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneAcceleratorTypeName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneAcceleratorTypeName.java index 25887a1f0e41..d7fb60242827 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneAcceleratorTypeName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneAcceleratorTypeName.java @@ -173,10 +173,11 @@ public ProjectZoneAcceleratorTypeName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "acceleratorType", acceleratorType, - "project", project, - "zone", zone); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "acceleratorType", acceleratorType, + "project", project, + "zone", zone); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneAutoscalerName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneAutoscalerName.java index a7b201e671c6..f8315c9d3be8 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneAutoscalerName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneAutoscalerName.java @@ -166,10 +166,11 @@ public ProjectZoneAutoscalerName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "autoscaler", autoscaler, - "project", project, - "zone", zone); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "autoscaler", autoscaler, + "project", project, + "zone", zone); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneDiskName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneDiskName.java index 53f5c501d498..88f700a582f3 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneDiskName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneDiskName.java @@ -166,10 +166,11 @@ public ProjectZoneDiskName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "disk", disk, - "project", project, - "zone", zone); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "disk", disk, + "project", project, + "zone", zone); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneDiskResourceName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneDiskResourceName.java index 47f148e6a831..d01e828aefe4 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneDiskResourceName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneDiskResourceName.java @@ -166,10 +166,11 @@ public ProjectZoneDiskResourceName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "resource", resource, - "zone", zone); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "resource", resource, + "zone", zone); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneDiskTypeName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneDiskTypeName.java index 668395f66b11..2d696e69668e 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneDiskTypeName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneDiskTypeName.java @@ -166,10 +166,11 @@ public ProjectZoneDiskTypeName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "diskType", diskType, - "project", project, - "zone", zone); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "diskType", diskType, + "project", project, + "zone", zone); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneInstanceGroupManagerName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneInstanceGroupManagerName.java index 2a19dbf53be0..7248ebf346ba 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneInstanceGroupManagerName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneInstanceGroupManagerName.java @@ -173,10 +173,11 @@ public ProjectZoneInstanceGroupManagerName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "instanceGroupManager", instanceGroupManager, - "project", project, - "zone", zone); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "instanceGroupManager", instanceGroupManager, + "project", project, + "zone", zone); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneInstanceGroupName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneInstanceGroupName.java index d39bcaae5f2a..cd64dd324817 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneInstanceGroupName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneInstanceGroupName.java @@ -168,10 +168,11 @@ public ProjectZoneInstanceGroupName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "instanceGroup", instanceGroup, - "project", project, - "zone", zone); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "instanceGroup", instanceGroup, + "project", project, + "zone", zone); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneInstanceName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneInstanceName.java index 558ee35622f7..9376a1770b07 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneInstanceName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneInstanceName.java @@ -166,10 +166,11 @@ public ProjectZoneInstanceName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "instance", instance, - "project", project, - "zone", zone); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "instance", instance, + "project", project, + "zone", zone); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneInstanceResourceName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneInstanceResourceName.java index d03c4fbdb020..909d9c8a9514 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneInstanceResourceName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneInstanceResourceName.java @@ -167,10 +167,11 @@ public ProjectZoneInstanceResourceName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "resource", resource, - "zone", zone); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "resource", resource, + "zone", zone); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneMachineTypeName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneMachineTypeName.java index 0763ea92d02b..05155bb244d0 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneMachineTypeName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneMachineTypeName.java @@ -166,10 +166,11 @@ public ProjectZoneMachineTypeName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "machineType", machineType, - "project", project, - "zone", zone); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "machineType", machineType, + "project", project, + "zone", zone); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneName.java index b75e0f35d735..9a9a94b1d8e8 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneName.java @@ -148,9 +148,10 @@ public ProjectZoneName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "zone", zone); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "zone", zone); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneNodeGroupName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneNodeGroupName.java index 80d72840960b..4d13a79029c3 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneNodeGroupName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneNodeGroupName.java @@ -166,10 +166,11 @@ public ProjectZoneNodeGroupName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "nodeGroup", nodeGroup, - "project", project, - "zone", zone); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "nodeGroup", nodeGroup, + "project", project, + "zone", zone); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneNodeGroupResourceName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneNodeGroupResourceName.java index e133e4db7dc1..0cff1a96e640 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneNodeGroupResourceName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneNodeGroupResourceName.java @@ -167,10 +167,11 @@ public ProjectZoneNodeGroupResourceName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "resource", resource, - "zone", zone); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "resource", resource, + "zone", zone); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneNodeTypeName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneNodeTypeName.java index af964b8ab13b..5a7d125e30b0 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneNodeTypeName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneNodeTypeName.java @@ -166,10 +166,11 @@ public ProjectZoneNodeTypeName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "nodeType", nodeType, - "project", project, - "zone", zone); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "nodeType", nodeType, + "project", project, + "zone", zone); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneOperationName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneOperationName.java index e3a12eb5147e..af62430e26ad 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneOperationName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneOperationName.java @@ -166,10 +166,11 @@ public ProjectZoneOperationName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "operation", operation, - "project", project, - "zone", zone); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "operation", operation, + "project", project, + "zone", zone); } @Override diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneTargetInstanceName.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneTargetInstanceName.java index 2f1088875950..a5c71ba17296 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneTargetInstanceName.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectZoneTargetInstanceName.java @@ -169,10 +169,11 @@ public ProjectZoneTargetInstanceName build() { @Override public String toString() { - return PATH_TEMPLATE.instantiate( - "project", project, - "targetInstance", targetInstance, - "zone", zone); + return SERVICE_ADDRESS + + PATH_TEMPLATE.instantiate( + "project", project, + "targetInstance", targetInstance, + "zone", zone); } @Override From b0b0f90ca1dc2e65c3b34e0dbadc73067ef0c64c Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Wed, 30 Jan 2019 16:36:40 -0800 Subject: [PATCH 3/6] starting work on ITCompute test for inserting and getting --- .../cloud/compute/v1/it/ITComputeTest.java | 214 +++++++++++++++++- 1 file changed, 202 insertions(+), 12 deletions(-) diff --git a/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/it/ITComputeTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/it/ITComputeTest.java index 148070f36851..11bf54c0ee7a 100644 --- a/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/it/ITComputeTest.java +++ b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/it/ITComputeTest.java @@ -20,37 +20,60 @@ import com.google.api.gax.core.FixedCredentialsProvider; import com.google.api.gax.paging.Page; +import com.google.api.gax.rpc.AlreadyExistsException; +import com.google.api.gax.rpc.ApiException; import com.google.api.gax.rpc.InvalidArgumentException; +import com.google.api.gax.rpc.NotFoundException; +import com.google.api.gax.rpc.PermissionDeniedException; +import com.google.api.gax.rpc.ResourceExhaustedException; import com.google.auth.Credentials; import com.google.auth.oauth2.GoogleCredentials; import com.google.cloud.ServiceOptions; +import com.google.cloud.compute.v1.AggregatedListSubnetworksHttpRequest; import com.google.cloud.compute.v1.AttachedDisk; +import com.google.cloud.compute.v1.AttachedDiskInitializeParams; +import com.google.cloud.compute.v1.Disk; +import com.google.cloud.compute.v1.DiskClient; +import com.google.cloud.compute.v1.DiskSettings; import com.google.cloud.compute.v1.DiskType; import com.google.cloud.compute.v1.DiskTypeClient; 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.Image; +import com.google.cloud.compute.v1.ImageClient; +import com.google.cloud.compute.v1.ImageSettings; 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.Network; +import com.google.cloud.compute.v1.NetworkClient; import com.google.cloud.compute.v1.NetworkInterface; +import com.google.cloud.compute.v1.NetworkSettings; +import com.google.cloud.compute.v1.Operation; +import com.google.cloud.compute.v1.ProjectGlobalImageName; +import com.google.cloud.compute.v1.ProjectGlobalNetworkName; import com.google.cloud.compute.v1.ProjectName; import com.google.cloud.compute.v1.ProjectRegionDiskTypeName; +import com.google.cloud.compute.v1.ProjectRegionName; +import com.google.cloud.compute.v1.ProjectRegionSubnetworkName; import com.google.cloud.compute.v1.ProjectZoneDiskName; import com.google.cloud.compute.v1.ProjectZoneDiskTypeName; import com.google.cloud.compute.v1.ProjectZoneInstanceName; import com.google.cloud.compute.v1.ProjectZoneMachineTypeName; import com.google.cloud.compute.v1.ProjectZoneName; +import com.google.cloud.compute.v1.Subnetwork; +import com.google.cloud.compute.v1.SubnetworkClient; +import com.google.cloud.compute.v1.SubnetworkSettings; +import com.google.cloud.compute.v1.SubnetworksScopedList; import com.google.common.collect.Lists; import java.io.IOException; +import java.util.Arrays; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import org.apache.http.client.HttpResponseException; +import java.util.UUID; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; @@ -62,40 +85,207 @@ public class ITComputeTest { private static final String ZONE = "us-central1-a"; private static final String DISK_TYPE = "local-ssd"; private static final String DEFAULT_PROJECT = ServiceOptions.getDefaultProjectId(); + private static final String UUID_INSTANCE = UUID.randomUUID().toString().replaceAll("-", ""); + private static final String INSTANCE_NAME_FORMAT = String.format("test-api-instance-%s", UUID_INSTANCE); + private static final String REGION = "us-west1"; + // private static final String ZONE = "us-west1-a"; + private static final String NETWORK = String.format("test%s", UUID_INSTANCE); + private static final String SUBNET = "test-create-subnet1"; + private static final String IMAGE = String.format("test%s", UUID_INSTANCE); + + private static final ProjectZoneName PROJECT_ZONE_NAME = ProjectZoneName.of(DEFAULT_PROJECT, ZONE); + private static final ProjectZoneMachineTypeName MACHINE_TYPE_NAME = ProjectZoneMachineTypeName + .of(String.format("custom-%s-%s", 4, 4 * 1024), DEFAULT_PROJECT, ZONE); + private static final ProjectGlobalNetworkName NETWORK_NAME = ProjectGlobalNetworkName.of(NETWORK, DEFAULT_PROJECT); + + // private static final ProjectRegionSubnetworkName SUBNETWORK_NAME = ProjectRegionSubnetworkName + // .of(DEFAULT_PROJECT, REGION, SUBNET); + private static final ProjectGlobalImageName IMAGE_NAME = ProjectGlobalImageName.of(IMAGE, DEFAULT_PROJECT); + private static final ProjectZoneInstanceName INSTANCE_NAME = ProjectZoneInstanceName + .of(String.format(INSTANCE_NAME_FORMAT, UUID_INSTANCE), DEFAULT_PROJECT, ZONE); + + private static final ProjectZoneDiskTypeName diskTypeName = ProjectZoneDiskTypeName.of("pd-standard", DEFAULT_PROJECT, ZONE); + private static final ProjectZoneDiskName DISK_NAME = ProjectZoneDiskName + .of(String.format("test-api-device-name-%s", UUID_INSTANCE), DEFAULT_PROJECT, ZONE); - private static DiskTypeClient diskTypeClient; - private static DiskTypeSettings diskTypeSettings; + private static DiskTypeClient diskTypeClient; private static InstanceClient instanceClient; - private static InstanceSettings instanceSettings; + private static DiskClient diskClient; + private static NetworkClient networkClient; + private static SubnetworkClient subNetworkClient; + private static ImageClient imageClient; @Rule public Timeout globalTimeout = Timeout.seconds(300); - + @BeforeClass public static void beforeClass() throws IOException { Credentials credentials = GoogleCredentials.getApplicationDefault() .createScoped(DiskTypeSettings.getDefaultServiceScopes()); - diskTypeSettings = + DiskTypeSettings diskTypeSettings = DiskTypeSettings.newBuilder() .setCredentialsProvider(FixedCredentialsProvider.create(credentials)) .build(); diskTypeClient = DiskTypeClient.create(diskTypeSettings); - instanceSettings = + InstanceSettings instanceSettings = InstanceSettings.newBuilder() .setCredentialsProvider(FixedCredentialsProvider.create(credentials)) .build(); instanceClient = InstanceClient.create(instanceSettings); + + DiskSettings diskSettings = + DiskSettings.newBuilder() + .setCredentialsProvider(FixedCredentialsProvider.create(credentials)) + .build(); + diskClient = DiskClient.create(diskSettings); + + NetworkSettings networkSettings = + NetworkSettings.newBuilder() + .setCredentialsProvider(FixedCredentialsProvider.create(credentials)) + .build(); + networkClient = NetworkClient.create(networkSettings); + + SubnetworkSettings subNetworkSettings = + SubnetworkSettings.newBuilder() + .setCredentialsProvider(FixedCredentialsProvider.create(credentials)) + .build(); + subNetworkClient = SubnetworkClient.create(subNetworkSettings); + + ImageSettings imageSettings = + ImageSettings.newBuilder() + .setCredentialsProvider(FixedCredentialsProvider.create(credentials)) + .build(); + imageClient = ImageClient.create(imageSettings); + + // Remove resources that will be created later to avoid quota problems or resource overriding errors. + removeResources(Arrays.asList(PermissionDeniedException.class, NotFoundException.class)); + } + + // Remove resources that are created in this test class to avoid overbilling and 403s. + private static void removeResources(List> exceptionTypes) { + try { + instanceClient.deleteInstance(INSTANCE_NAME); + } catch (Exception e) { + if (isNotExceptionType(exceptionTypes, e)) throw e; + } + try { + diskClient.deleteDisk(DISK_NAME); + }catch (Exception e) { + if (isNotExceptionType(exceptionTypes, e)) throw e; + } + try { + networkClient.deleteNetwork(NETWORK_NAME); + }catch (Exception e) { + if (isNotExceptionType(exceptionTypes, e)) throw e; + } + try { + instanceClient.deleteInstance(INSTANCE_NAME); + } catch (Exception e) { + if (isNotExceptionType(exceptionTypes, e)) throw e; + } + try { + imageClient.deleteImage(IMAGE_NAME); + } catch (Exception e) { + if (isNotExceptionType(exceptionTypes, e)) throw e; + } + } + + private static boolean isNotExceptionType(List> exceptionTypes, Exception e) { + for (Class type : exceptionTypes) { + if (type.isInstance(e)) { + return false; + } + } + return true; } @AfterClass public static void tearDown() throws Exception { - diskTypeClient.close(); - instanceClient.close(); + try { + removeResources(Arrays.asList(NotFoundException.class, PermissionDeniedException.class)); + } finally { + diskTypeClient.close(); + instanceClient.close(); + networkClient.close(); + subNetworkClient.close(); + } } + @Test + public void testDetachDisk() throws Exception { + long startAt = System.currentTimeMillis(); + System.out.println("Clients created in " + (System.currentTimeMillis() - startAt) + "ms."); + + // Insert a network. + try { + networkClient.insertNetwork(DEFAULT_PROJECT, + Network.newBuilder().setName(NETWORK_NAME.getNetwork()).setAutoCreateSubnetworks(true).build()); + } catch (AlreadyExistsException e) {} + + Iterable subnetworks = subNetworkClient.aggregatedListSubnetworks(DEFAULT_PROJECT).iterateAll(); + // TODO(andrealin): Implement futures for Compute methods. + Thread.sleep(10000); + Subnetwork subnetwork = subnetworks.iterator().next().getSubnetworksList().get(0); + + imageClient.insertImage(true, DEFAULT_PROJECT, Image.newBuilder().setName(IMAGE).build()); + + NetworkInterface networkInterface = NetworkInterface.newBuilder() + .setNetwork(NETWORK_NAME.toString()) + .setSubnetwork(ProjectRegionSubnetworkName.of(DEFAULT_PROJECT, REGION, subnetwork.getName()).toString()) + .build(); + AttachedDisk bootDisk = AttachedDisk.newBuilder() + .setAutoDelete(true) + .setBoot(true) + .setInitializeParams(AttachedDiskInitializeParams.newBuilder() + .setSourceImage(IMAGE_NAME.toString()) + .setDiskSizeGb(String.valueOf(100)) + .build()) + .build(); + + Instance instanceResource = Instance.newBuilder() + .setName(INSTANCE_NAME.getInstance()) + .addNetworkInterfaces(networkInterface) + .setMachineType(MACHINE_TYPE_NAME.toString()) + .addDisks(bootDisk) + .build(); + Operation op1 = instanceClient.insertInstance(PROJECT_ZONE_NAME, instanceResource); + System.out.println(String.format("Instance created: %s", op1.toString())); + + Disk disk = Disk.newBuilder() + .setName(DISK_NAME.getDisk()) + .setSizeGb(String.valueOf(7)) + .setType(diskTypeName.toString()) + .build(); + + Operation op2 = diskClient.insertDisk(PROJECT_ZONE_NAME, disk); + System.out.println(String.format("Disk created: %s", op2.toString())); + Thread.sleep(10000); + + AttachedDisk attachedDisk = AttachedDisk.newBuilder() + .setDeviceName(DISK_NAME.getDisk()) + .setAutoDelete(false) + .setMode("READ_WRITE") + .setSource(DISK_NAME.toString()) + .build(); + Operation op3 = instanceClient.attachDiskInstance(INSTANCE_NAME, false, attachedDisk); + System.out.println(String.format("Disk attached: %s", op3.toString())); + Thread.sleep(10000); + + System.out.println("----------------------------------------"); + System.out.println(String.format( + "After getting error you should manually delete instance %s and disk %s", + INSTANCE_NAME.getInstance(), + DISK_NAME.getDisk() + )); + System.out.println("----------------------------------------"); + + Operation op4 = instanceClient.detachDiskInstance(INSTANCE_NAME, DISK_NAME.getDisk()); + System.out.println(String.format("Disk detached: %s", op4.toString())); + } + @Test public void testGetDiskType() { DiskType diskType = From 2958a26ccb6a471c981afc9dfcb0dea6ab247e95 Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Wed, 30 Jan 2019 17:10:57 -0800 Subject: [PATCH 4/6] add detachDisk test --- .../cloud/compute/v1/it/ITComputeTest.java | 79 ++++--------------- 1 file changed, 15 insertions(+), 64 deletions(-) diff --git a/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/it/ITComputeTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/it/ITComputeTest.java index 11bf54c0ee7a..e2e257e9bc0b 100644 --- a/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/it/ITComputeTest.java +++ b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/it/ITComputeTest.java @@ -82,25 +82,19 @@ public class ITComputeTest { - private static final String ZONE = "us-central1-a"; + private static final String ZONE = "us-west1-a"; private static final String DISK_TYPE = "local-ssd"; private static final String DEFAULT_PROJECT = ServiceOptions.getDefaultProjectId(); private static final String UUID_INSTANCE = UUID.randomUUID().toString().replaceAll("-", ""); private static final String INSTANCE_NAME_FORMAT = String.format("test-api-instance-%s", UUID_INSTANCE); private static final String REGION = "us-west1"; - // private static final String ZONE = "us-west1-a"; - private static final String NETWORK = String.format("test%s", UUID_INSTANCE); - private static final String SUBNET = "test-create-subnet1"; - private static final String IMAGE = String.format("test%s", UUID_INSTANCE); private static final ProjectZoneName PROJECT_ZONE_NAME = ProjectZoneName.of(DEFAULT_PROJECT, ZONE); private static final ProjectZoneMachineTypeName MACHINE_TYPE_NAME = ProjectZoneMachineTypeName .of(String.format("custom-%s-%s", 4, 4 * 1024), DEFAULT_PROJECT, ZONE); - private static final ProjectGlobalNetworkName NETWORK_NAME = ProjectGlobalNetworkName.of(NETWORK, DEFAULT_PROJECT); - // private static final ProjectRegionSubnetworkName SUBNETWORK_NAME = ProjectRegionSubnetworkName - // .of(DEFAULT_PROJECT, REGION, SUBNET); - private static final ProjectGlobalImageName IMAGE_NAME = ProjectGlobalImageName.of(IMAGE, DEFAULT_PROJECT); + // Google-managed image. See https://cloud.google.com/compute/docs/images. + private static final ProjectGlobalImageName IMAGE_NAME = ProjectGlobalImageName.of("cos-69-10895-138-0", "cos-cloud"); private static final ProjectZoneInstanceName INSTANCE_NAME = ProjectZoneInstanceName .of(String.format(INSTANCE_NAME_FORMAT, UUID_INSTANCE), DEFAULT_PROJECT, ZONE); @@ -112,14 +106,13 @@ public class ITComputeTest { private static DiskTypeClient diskTypeClient; private static InstanceClient instanceClient; private static DiskClient diskClient; - private static NetworkClient networkClient; private static SubnetworkClient subNetworkClient; private static ImageClient imageClient; @Rule public Timeout globalTimeout = Timeout.seconds(300); @BeforeClass - public static void beforeClass() throws IOException { + public static void beforeClass() throws Exception { Credentials credentials = GoogleCredentials.getApplicationDefault() .createScoped(DiskTypeSettings.getDefaultServiceScopes()); @@ -142,12 +135,6 @@ public static void beforeClass() throws IOException { .build(); diskClient = DiskClient.create(diskSettings); - NetworkSettings networkSettings = - NetworkSettings.newBuilder() - .setCredentialsProvider(FixedCredentialsProvider.create(credentials)) - .build(); - networkClient = NetworkClient.create(networkSettings); - SubnetworkSettings subNetworkSettings = SubnetworkSettings.newBuilder() .setCredentialsProvider(FixedCredentialsProvider.create(credentials)) @@ -165,20 +152,17 @@ public static void beforeClass() throws IOException { } // Remove resources that are created in this test class to avoid overbilling and 403s. - private static void removeResources(List> exceptionTypes) { + private static void removeResources(List> exceptionTypes) throws Exception { try { instanceClient.deleteInstance(INSTANCE_NAME); + Thread.sleep(10000); } catch (Exception e) { if (isNotExceptionType(exceptionTypes, e)) throw e; } + Thread.sleep(10000); try { diskClient.deleteDisk(DISK_NAME); - }catch (Exception e) { - if (isNotExceptionType(exceptionTypes, e)) throw e; - } - try { - networkClient.deleteNetwork(NETWORK_NAME); - }catch (Exception e) { + } catch (Exception e) { if (isNotExceptionType(exceptionTypes, e)) throw e; } try { @@ -209,8 +193,9 @@ public static void tearDown() throws Exception { } finally { diskTypeClient.close(); instanceClient.close(); - networkClient.close(); subNetworkClient.close(); + diskClient.close(); + imageClient.close(); } } @@ -219,21 +204,14 @@ public void testDetachDisk() throws Exception { long startAt = System.currentTimeMillis(); System.out.println("Clients created in " + (System.currentTimeMillis() - startAt) + "ms."); - // Insert a network. - try { - networkClient.insertNetwork(DEFAULT_PROJECT, - Network.newBuilder().setName(NETWORK_NAME.getNetwork()).setAutoCreateSubnetworks(true).build()); - } catch (AlreadyExistsException e) {} - + // Fetch a subnetwork, assuming there is one. Projects start with a default network. Iterable subnetworks = subNetworkClient.aggregatedListSubnetworks(DEFAULT_PROJECT).iterateAll(); // TODO(andrealin): Implement futures for Compute methods. Thread.sleep(10000); Subnetwork subnetwork = subnetworks.iterator().next().getSubnetworksList().get(0); - imageClient.insertImage(true, DEFAULT_PROJECT, Image.newBuilder().setName(IMAGE).build()); - NetworkInterface networkInterface = NetworkInterface.newBuilder() - .setNetwork(NETWORK_NAME.toString()) + .setNetwork(subnetwork.getNetwork()) .setSubnetwork(ProjectRegionSubnetworkName.of(DEFAULT_PROJECT, REGION, subnetwork.getName()).toString()) .build(); AttachedDisk bootDisk = AttachedDisk.newBuilder() @@ -245,6 +223,7 @@ public void testDetachDisk() throws Exception { .build()) .build(); + // Insert an instance using the found subnetwork and its corresponding network (may not be the inserted network). Instance instanceResource = Instance.newBuilder() .setName(INSTANCE_NAME.getInstance()) .addNetworkInterfaces(networkInterface) @@ -254,16 +233,17 @@ public void testDetachDisk() throws Exception { Operation op1 = instanceClient.insertInstance(PROJECT_ZONE_NAME, instanceResource); System.out.println(String.format("Instance created: %s", op1.toString())); + // Insert a disk. Disk disk = Disk.newBuilder() .setName(DISK_NAME.getDisk()) .setSizeGb(String.valueOf(7)) .setType(diskTypeName.toString()) .build(); - Operation op2 = diskClient.insertDisk(PROJECT_ZONE_NAME, disk); System.out.println(String.format("Disk created: %s", op2.toString())); Thread.sleep(10000); + // Attach the disk to the instance. AttachedDisk attachedDisk = AttachedDisk.newBuilder() .setDeviceName(DISK_NAME.getDisk()) .setAutoDelete(false) @@ -273,13 +253,6 @@ public void testDetachDisk() throws Exception { Operation op3 = instanceClient.attachDiskInstance(INSTANCE_NAME, false, attachedDisk); System.out.println(String.format("Disk attached: %s", op3.toString())); Thread.sleep(10000); - - System.out.println("----------------------------------------"); - System.out.println(String.format( - "After getting error you should manually delete instance %s and disk %s", - INSTANCE_NAME.getInstance(), - DISK_NAME.getDisk() - )); System.out.println("----------------------------------------"); Operation op4 = instanceClient.detachDiskInstance(INSTANCE_NAME, DISK_NAME.getDisk()); @@ -299,28 +272,6 @@ public void testGetDiskType() { assertThat(diskType.getDefaultDiskSizeGb()).isNotNull(); } - @Test - public void testInsertInstance() { - 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()) - .doesNotContain("Invalid value for field 'resource.machineType'"); - return; - } - - fail(); - } - @Test public void testListDiskTypes() { Page diskPage = From eb5116d4b0f803118823faabba8ffc9c5b89ecd5 Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Wed, 30 Jan 2019 17:11:22 -0800 Subject: [PATCH 5/6] add required dep versions --- google-cloud-bom/pom.xml | 2 +- google-cloud-clients/google-cloud-compute/synth.py | 14 +++++++------- google-cloud-clients/pom.xml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index ccdfca220098..671715727edf 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -168,7 +168,7 @@ com.google.api gax-bom - 1.37.0 + 1.37.1-SNAPSHOT pom import diff --git a/google-cloud-clients/google-cloud-compute/synth.py b/google-cloud-clients/google-cloud-compute/synth.py index a8c0faaaf767..b446fee176b3 100644 --- a/google-cloud-clients/google-cloud-compute/synth.py +++ b/google-cloud-clients/google-cloud-compute/synth.py @@ -25,12 +25,12 @@ config_pattern = '/gapic/google/compute/artman_compute.yaml' for version in versions: - library = gapic.java_library( - service=service, - version=version, - config_path=config_pattern.format(version=version), - artman_output_name='') - - s.copy(library / f'gapic-google-cloud-{service}-{version}/src', 'src') + # library = gapic.java_library( + # service=service, + # version=version, + # config_path=config_pattern.format(version=version), + # artman_output_name='') + # + # s.copy(library / f'gapic-google-cloud-{service}-{version}/src', 'src') java.format_code('./src') diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml index 595bac9eafcb..38dee21d707e 100644 --- a/google-cloud-clients/pom.xml +++ b/google-cloud-clients/pom.xml @@ -153,14 +153,14 @@ github google-cloud-clients 0.79.1-alpha-SNAPSHOT - 1.27.0 + 1.28.0 - 1.37.0 + 1.37.1-SNAPSHOT 1.7.0 0.12.0 1.17.1 26.0-android - 1.27.0 + 1.28.0 1.27.0 3.6.1 From f162854766a5f6d74226b9c3e043a499155d23b5 Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Wed, 30 Jan 2019 17:11:54 -0800 Subject: [PATCH 6/6] formatting --- .../cloud/compute/v1/it/ITComputeTest.java | 125 +++++++++--------- 1 file changed, 66 insertions(+), 59 deletions(-) diff --git a/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/it/ITComputeTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/it/ITComputeTest.java index e2e257e9bc0b..02838f2cbc3f 100644 --- a/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/it/ITComputeTest.java +++ b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/it/ITComputeTest.java @@ -16,20 +16,15 @@ 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.AlreadyExistsException; import com.google.api.gax.rpc.ApiException; -import com.google.api.gax.rpc.InvalidArgumentException; import com.google.api.gax.rpc.NotFoundException; import com.google.api.gax.rpc.PermissionDeniedException; -import com.google.api.gax.rpc.ResourceExhaustedException; import com.google.auth.Credentials; import com.google.auth.oauth2.GoogleCredentials; import com.google.cloud.ServiceOptions; -import com.google.cloud.compute.v1.AggregatedListSubnetworksHttpRequest; import com.google.cloud.compute.v1.AttachedDisk; import com.google.cloud.compute.v1.AttachedDiskInitializeParams; import com.google.cloud.compute.v1.Disk; @@ -40,23 +35,17 @@ 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.Image; import com.google.cloud.compute.v1.ImageClient; import com.google.cloud.compute.v1.ImageSettings; 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.Network; -import com.google.cloud.compute.v1.NetworkClient; import com.google.cloud.compute.v1.NetworkInterface; -import com.google.cloud.compute.v1.NetworkSettings; import com.google.cloud.compute.v1.Operation; import com.google.cloud.compute.v1.ProjectGlobalImageName; -import com.google.cloud.compute.v1.ProjectGlobalNetworkName; import com.google.cloud.compute.v1.ProjectName; import com.google.cloud.compute.v1.ProjectRegionDiskTypeName; -import com.google.cloud.compute.v1.ProjectRegionName; import com.google.cloud.compute.v1.ProjectRegionSubnetworkName; import com.google.cloud.compute.v1.ProjectZoneDiskName; import com.google.cloud.compute.v1.ProjectZoneDiskTypeName; @@ -68,7 +57,6 @@ import com.google.cloud.compute.v1.SubnetworkSettings; import com.google.cloud.compute.v1.SubnetworksScopedList; import com.google.common.collect.Lists; -import java.io.IOException; import java.util.Arrays; import java.util.Iterator; import java.util.LinkedList; @@ -86,22 +74,28 @@ public class ITComputeTest { private static final String DISK_TYPE = "local-ssd"; private static final String DEFAULT_PROJECT = ServiceOptions.getDefaultProjectId(); private static final String UUID_INSTANCE = UUID.randomUUID().toString().replaceAll("-", ""); - private static final String INSTANCE_NAME_FORMAT = String.format("test-api-instance-%s", UUID_INSTANCE); + private static final String INSTANCE_NAME_FORMAT = + String.format("test-api-instance-%s", UUID_INSTANCE); private static final String REGION = "us-west1"; - private static final ProjectZoneName PROJECT_ZONE_NAME = ProjectZoneName.of(DEFAULT_PROJECT, ZONE); - private static final ProjectZoneMachineTypeName MACHINE_TYPE_NAME = ProjectZoneMachineTypeName - .of(String.format("custom-%s-%s", 4, 4 * 1024), DEFAULT_PROJECT, ZONE); + private static final ProjectZoneName PROJECT_ZONE_NAME = + ProjectZoneName.of(DEFAULT_PROJECT, ZONE); + private static final ProjectZoneMachineTypeName MACHINE_TYPE_NAME = + ProjectZoneMachineTypeName.of( + String.format("custom-%s-%s", 4, 4 * 1024), DEFAULT_PROJECT, ZONE); // Google-managed image. See https://cloud.google.com/compute/docs/images. - private static final ProjectGlobalImageName IMAGE_NAME = ProjectGlobalImageName.of("cos-69-10895-138-0", "cos-cloud"); - private static final ProjectZoneInstanceName INSTANCE_NAME = ProjectZoneInstanceName - .of(String.format(INSTANCE_NAME_FORMAT, UUID_INSTANCE), DEFAULT_PROJECT, ZONE); - - private static final ProjectZoneDiskTypeName diskTypeName = ProjectZoneDiskTypeName.of("pd-standard", DEFAULT_PROJECT, ZONE); - private static final ProjectZoneDiskName DISK_NAME = ProjectZoneDiskName - .of(String.format("test-api-device-name-%s", UUID_INSTANCE), DEFAULT_PROJECT, ZONE); + private static final ProjectGlobalImageName IMAGE_NAME = + ProjectGlobalImageName.of("cos-69-10895-138-0", "cos-cloud"); + private static final ProjectZoneInstanceName INSTANCE_NAME = + ProjectZoneInstanceName.of( + String.format(INSTANCE_NAME_FORMAT, UUID_INSTANCE), DEFAULT_PROJECT, ZONE); + private static final ProjectZoneDiskTypeName diskTypeName = + ProjectZoneDiskTypeName.of("pd-standard", DEFAULT_PROJECT, ZONE); + private static final ProjectZoneDiskName DISK_NAME = + ProjectZoneDiskName.of( + String.format("test-api-device-name-%s", UUID_INSTANCE), DEFAULT_PROJECT, ZONE); private static DiskTypeClient diskTypeClient; private static InstanceClient instanceClient; @@ -110,7 +104,7 @@ public class ITComputeTest { private static ImageClient imageClient; @Rule public Timeout globalTimeout = Timeout.seconds(300); - + @BeforeClass public static void beforeClass() throws Exception { Credentials credentials = @@ -147,12 +141,14 @@ public static void beforeClass() throws Exception { .build(); imageClient = ImageClient.create(imageSettings); - // Remove resources that will be created later to avoid quota problems or resource overriding errors. + // Remove resources that will be created later to avoid quota problems or resource overriding + // errors. removeResources(Arrays.asList(PermissionDeniedException.class, NotFoundException.class)); } // Remove resources that are created in this test class to avoid overbilling and 403s. - private static void removeResources(List> exceptionTypes) throws Exception { + private static void removeResources(List> exceptionTypes) + throws Exception { try { instanceClient.deleteInstance(INSTANCE_NAME); Thread.sleep(10000); @@ -177,7 +173,8 @@ private static void removeResources(List> exceptio } } - private static boolean isNotExceptionType(List> exceptionTypes, Exception e) { + private static boolean isNotExceptionType( + List> exceptionTypes, Exception e) { for (Class type : exceptionTypes) { if (type.isInstance(e)) { return false; @@ -205,51 +202,61 @@ public void testDetachDisk() throws Exception { System.out.println("Clients created in " + (System.currentTimeMillis() - startAt) + "ms."); // Fetch a subnetwork, assuming there is one. Projects start with a default network. - Iterable subnetworks = subNetworkClient.aggregatedListSubnetworks(DEFAULT_PROJECT).iterateAll(); + Iterable subnetworks = + subNetworkClient.aggregatedListSubnetworks(DEFAULT_PROJECT).iterateAll(); // TODO(andrealin): Implement futures for Compute methods. Thread.sleep(10000); Subnetwork subnetwork = subnetworks.iterator().next().getSubnetworksList().get(0); - NetworkInterface networkInterface = NetworkInterface.newBuilder() - .setNetwork(subnetwork.getNetwork()) - .setSubnetwork(ProjectRegionSubnetworkName.of(DEFAULT_PROJECT, REGION, subnetwork.getName()).toString()) - .build(); - AttachedDisk bootDisk = AttachedDisk.newBuilder() - .setAutoDelete(true) - .setBoot(true) - .setInitializeParams(AttachedDiskInitializeParams.newBuilder() - .setSourceImage(IMAGE_NAME.toString()) - .setDiskSizeGb(String.valueOf(100)) - .build()) - .build(); + NetworkInterface networkInterface = + NetworkInterface.newBuilder() + .setNetwork(subnetwork.getNetwork()) + .setSubnetwork( + ProjectRegionSubnetworkName.of(DEFAULT_PROJECT, REGION, subnetwork.getName()) + .toString()) + .build(); + AttachedDisk bootDisk = + AttachedDisk.newBuilder() + .setAutoDelete(true) + .setBoot(true) + .setInitializeParams( + AttachedDiskInitializeParams.newBuilder() + .setSourceImage(IMAGE_NAME.toString()) + .setDiskSizeGb(String.valueOf(100)) + .build()) + .build(); - // Insert an instance using the found subnetwork and its corresponding network (may not be the inserted network). - Instance instanceResource = Instance.newBuilder() - .setName(INSTANCE_NAME.getInstance()) - .addNetworkInterfaces(networkInterface) - .setMachineType(MACHINE_TYPE_NAME.toString()) - .addDisks(bootDisk) - .build(); + // Insert an instance using the found subnetwork and its corresponding network (may not be the + // inserted network). + Instance instanceResource = + Instance.newBuilder() + .setName(INSTANCE_NAME.getInstance()) + .addNetworkInterfaces(networkInterface) + .setMachineType(MACHINE_TYPE_NAME.toString()) + .addDisks(bootDisk) + .build(); Operation op1 = instanceClient.insertInstance(PROJECT_ZONE_NAME, instanceResource); System.out.println(String.format("Instance created: %s", op1.toString())); // Insert a disk. - Disk disk = Disk.newBuilder() - .setName(DISK_NAME.getDisk()) - .setSizeGb(String.valueOf(7)) - .setType(diskTypeName.toString()) - .build(); + Disk disk = + Disk.newBuilder() + .setName(DISK_NAME.getDisk()) + .setSizeGb(String.valueOf(7)) + .setType(diskTypeName.toString()) + .build(); Operation op2 = diskClient.insertDisk(PROJECT_ZONE_NAME, disk); System.out.println(String.format("Disk created: %s", op2.toString())); Thread.sleep(10000); // Attach the disk to the instance. - AttachedDisk attachedDisk = AttachedDisk.newBuilder() - .setDeviceName(DISK_NAME.getDisk()) - .setAutoDelete(false) - .setMode("READ_WRITE") - .setSource(DISK_NAME.toString()) - .build(); + AttachedDisk attachedDisk = + AttachedDisk.newBuilder() + .setDeviceName(DISK_NAME.getDisk()) + .setAutoDelete(false) + .setMode("READ_WRITE") + .setSource(DISK_NAME.toString()) + .build(); Operation op3 = instanceClient.attachDiskInstance(INSTANCE_NAME, false, attachedDisk); System.out.println(String.format("Disk attached: %s", op3.toString())); Thread.sleep(10000); @@ -258,7 +265,7 @@ public void testDetachDisk() throws Exception { Operation op4 = instanceClient.detachDiskInstance(INSTANCE_NAME, DISK_NAME.getDisk()); System.out.println(String.format("Disk detached: %s", op4.toString())); } - + @Test public void testGetDiskType() { DiskType diskType =