diff --git a/google-compute-engine/pom.xml b/google-compute-engine/pom.xml index 446ec0361..67713023e 100644 --- a/google-compute-engine/pom.xml +++ b/google-compute-engine/pom.xml @@ -34,7 +34,7 @@ Email associated with the Google API client_id Private key (PKCS12 file) associated with the Google API client_id - v1beta15 + v1beta16 osFamily=GCEL,osVersionMatches=1[012].[01][04],locationId=us-central1-a,minRam=2048 diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApi.java index 575619872..94972f5f9 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApi.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApi.java @@ -42,7 +42,7 @@ *

* * @author David Alves - * @see api doc + * @see api doc */ @Beta public interface GoogleComputeEngineApi extends Closeable { diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApiMetadata.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApiMetadata.java index 0333f6ca8..f2281c7d8 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApiMetadata.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApiMetadata.java @@ -41,7 +41,7 @@ import com.google.inject.Module; /** - * Implementation of {@link ApiMetadata} for GoogleCompute v1beta15 API + * Implementation of {@link ApiMetadata} for GoogleCompute v1beta16 API * * @author David Alves */ @@ -81,8 +81,8 @@ protected Builder() { .identityName("Email associated with the Google API client_id") .credentialName("Private key literal associated with the Google API client_id") .documentation(URI.create("https://developers.google.com/compute/docs")) - .version("v1beta15") - .defaultEndpoint("https://www.googleapis.com/compute/v1beta15") + .version("v1beta16") + .defaultEndpoint("https://www.googleapis.com/compute/v1beta16") .defaultProperties(GoogleComputeEngineApiMetadata.defaultProperties()) .view(typeToken(ComputeServiceContext.class)) .defaultModules(ImmutableSet.>builder() diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineParserModule.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineParserModule.java index 13d1b75d9..bc7903e58 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineParserModule.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineParserModule.java @@ -83,7 +83,7 @@ public Map provideCustomAdapterBindings() { /** * Parser for operations that unwraps errors avoiding an extra intermediate object. * - * @see + * @see */ @Singleton private static class OperationTypeAdapter implements JsonDeserializer { diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AbstractDisk.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AbstractDisk.java index fda65ec10..44e13a24f 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AbstractDisk.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AbstractDisk.java @@ -28,7 +28,7 @@ * A persistent disk resource * * @author David Alves - * @see + * @see */ @Beta public abstract class AbstractDisk extends Resource { diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Disk.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Disk.java index df5e38c69..a986eba5e 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Disk.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Disk.java @@ -30,7 +30,7 @@ * A persistent disk resource * * @author David Alves - * @see + * @see */ @Beta public final class Disk extends AbstractDisk { diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Firewall.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Firewall.java index feef148d6..69018f2d1 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Firewall.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Firewall.java @@ -38,7 +38,7 @@ * Represents a network firewall * * @author David Alves - * @see + * @see * @see */ @Beta @@ -241,7 +241,7 @@ public Builder fromFirewall(Firewall in) { * permitted connection. * * @author David Alves - * @see + * @see */ public static final class Rule { diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java index 048be1e7f..68546c2d9 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java @@ -33,7 +33,7 @@ * Represents a disk image to use on an instance. * * @author David Alves - * @see + * @see */ @Beta public final class Image extends Resource { @@ -343,7 +343,7 @@ public Builder fromDeprecated(Deprecated in) { * A raw disk image, usually the base for an image. * * @author David Alves - * @see + * @see */ public static class RawDisk { diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java index ba27c2ddc..b245b3067 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java @@ -39,7 +39,7 @@ * Represents a virtual machine. * * @author David Alves - * @see + * @see */ @Beta public class Instance extends Resource { @@ -476,7 +476,7 @@ public Builder fromTags(Tags in) { /** * A disk attached to an Instance. * - * @see + * @see */ public static class AttachedDisk { @@ -665,7 +665,7 @@ public Builder fromPersistentAttachedDisk(PersistentAttachedDisk in) { /** * A network interface for an Instance. * - * @see + * @see */ public static final class NetworkInterface { @@ -959,7 +959,7 @@ public Builder fromAccessConfig(AccessConfig in) { * The output of an instance's serial port; * * @author David Alves - * @see + * @see */ public static final class SerialPortOutput { @@ -1067,7 +1067,7 @@ public Builder fromInstanceSerialPortOutput(SerialPortOutput in) { * A service account for which access tokens are to be made available to the instance through metadata queries. * * @author David Alves - * @see + * @see */ public static final class ServiceAccount { diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Kernel.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Kernel.java index 80ffce35c..86cea857f 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Kernel.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Kernel.java @@ -26,7 +26,7 @@ * Represents a kernel. * * @author David Alves - * @see + * @see */ @Beta public final class Kernel extends Resource { diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java index fd1aa58f9..86b1a2ce0 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java @@ -33,7 +33,7 @@ * Represents a machine type used to host an instance. * * @author David Alves - * @see + * @see */ @Beta public final class MachineType extends Resource { diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Network.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Network.java index 2fe913ca5..223587306 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Network.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Network.java @@ -32,7 +32,7 @@ * Represents a network used to enable instance communication. * * @author David Alves - * @see + * @see */ @Beta public final class Network extends Resource { diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Operation.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Operation.java index f387aee2b..b3547ce19 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Operation.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Operation.java @@ -38,7 +38,7 @@ * Describes an operation being executed on some Resource * * @author David Alves - * @see + * @see */ @Beta public class Operation extends Resource { diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Project.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Project.java index a8545c250..e18e7eb85 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Project.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Project.java @@ -177,7 +177,7 @@ public Builder fromProject(Project in) { /** * Quotas assigned to a given project * - * @see + * @see */ public static final class Quota { diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Zone.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Zone.java index 254b83dff..c67222211 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Zone.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Zone.java @@ -37,7 +37,7 @@ * Represents a zone resource. * * @author David Alves - * @see + * @see */ @Beta public final class Zone extends Resource { @@ -182,7 +182,7 @@ public Builder fromZone(Zone in) { * Scheduled maintenance windows for the zone. When the zone is in a maintenance window, * all resources which reside in the zone will be unavailable. * - * @see + * @see */ public static final class MaintenanceWindow { diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskApi.java index f3d620ce8..41e6700a4 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskApi.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskApi.java @@ -55,7 +55,7 @@ * Provides access to Disks via their REST API. * * @author David Alves - * @see + * @see */ @SkipEncoding({'/', '='}) @RequestFilters(OAuthAuthenticator.class) diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/FirewallApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/FirewallApi.java index a02b6d07e..4b01f034f 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/FirewallApi.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/FirewallApi.java @@ -63,7 +63,7 @@ *

* * @author David Alves - * @see + * @see */ @SkipEncoding({'/', '='}) @RequestFilters(OAuthAuthenticator.class) diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/GlobalOperationApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/GlobalOperationApi.java index a4e2dbca7..e85f08ace 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/GlobalOperationApi.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/GlobalOperationApi.java @@ -49,7 +49,7 @@ * Provides access to Global Operations via their REST API. * * @author David Alves - * @see + * @see */ @SkipEncoding({'/', '='}) @RequestFilters(OAuthAuthenticator.class) diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ImageApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ImageApi.java index d3475e8a3..ff55184b2 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ImageApi.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ImageApi.java @@ -51,7 +51,7 @@ *

* * @author David Alves - * @see + * @see */ @SkipEncoding({'/', '='}) @RequestFilters(OAuthAuthenticator.class) diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java index 7fb49eb8c..2dc10ce60 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java @@ -63,7 +63,7 @@ * Provides access to Instances via their REST API. * * @author David Alves - * @see + * @see * @see InstanceApi */ @SkipEncoding({'/', '='}) diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/KernelApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/KernelApi.java index 76acf9c51..99df99c0d 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/KernelApi.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/KernelApi.java @@ -47,7 +47,7 @@ * Provides access to Kernels via their REST API. * * @author David Alves - * @see + * @see */ @SkipEncoding({'/', '='}) @RequestFilters(OAuthAuthenticator.class) diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java index acdd24f3f..8d4aa5319 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java @@ -47,7 +47,7 @@ * Provides access to MachineTypes via their REST API. * * @author David Alves - * @see + * @see */ @SkipEncoding({'/', '='}) @RequestFilters(OAuthAuthenticator.class) diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java index 5a04ccd21..b4de2acb2 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java @@ -55,7 +55,7 @@ * Provides access to Networks via their REST API. * * @author David Alves - * @see + * @see */ @SkipEncoding({'/', '='}) @RequestFilters(OAuthAuthenticator.class) diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java index 47df5a03a..458582fac 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java @@ -45,7 +45,7 @@ * Provides access to Projects via their REST API. * * @author David Alves - * @see + * @see */ @SkipEncoding({'/', '='}) @RequestFilters(OAuthAuthenticator.class) diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java index 054284240..c3c01e24d 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java @@ -45,7 +45,7 @@ * Provides access to Zones via their REST API. * * @author David Alves - * @see + * @see */ @SkipEncoding({'/', '='}) @RequestFilters(OAuthAuthenticator.class) diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneOperationApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneOperationApi.java index e96bd6e54..b23ee1369 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneOperationApi.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneOperationApi.java @@ -49,7 +49,7 @@ * Provides access to Operations via their REST API. * * @author David Alves - * @see + * @see */ @SkipEncoding({'/', '='}) @RequestFilters(OAuthAuthenticator.class) diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/options/ListOptions.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/options/ListOptions.java index 2f79f0f1a..43055799b 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/options/ListOptions.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/options/ListOptions.java @@ -24,7 +24,7 @@ * Allows to optionally specify a filter, max results and a page token for listFirstPage() REST methods. * * @author David Alves - * @see + * @see */ public class ListOptions extends BaseHttpRequestOptions { diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/PageSystemExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/PageSystemExpectTest.java index c9d9c7063..880252afd 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/PageSystemExpectTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/PageSystemExpectTest.java @@ -43,7 +43,7 @@ public void testGetSinglePage() { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/images") + ".com/compute/v1beta16/projects/myproject/global/images") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -66,7 +66,7 @@ public void testGetMultiplePages() { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/images?maxResults=3") + ".com/compute/v1beta16/projects/myproject/global/images?maxResults=3") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -74,7 +74,7 @@ public void testGetMultiplePages() { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/images?pageToken" + + ".com/compute/v1beta16/projects/myproject/global/images?pageToken" + "=CgVJTUFHRRIbZ29vZ2xlLmNlbnRvcy02LTItdjIwMTIwNjIx&maxResults=3") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -83,7 +83,7 @@ public void testGetMultiplePages() { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/images?pageToken" + + ".com/compute/v1beta16/projects/myproject/global/images?pageToken" + "=CgVJTUFHRRIbZ29vZ2xlLmdjZWwtMTAtMDQtdjIwMTIxMTA2&maxResults=3") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java index ef88eb8f7..3b9ef8860 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java @@ -83,7 +83,7 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin private HttpRequest INSERT_NETWORK_REQUEST = HttpRequest .builder() .method("POST") - .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks") + .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN) .payload(payloadFromStringWithContentType("{\"name\":\"jclouds-test\",\"IPv4Range\":\"10.0.0.0/8\"}", @@ -93,11 +93,11 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin private HttpRequest INSERT_FIREWALL_REQUEST = HttpRequest .builder() .method("POST") - .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/firewalls") + .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/firewalls") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN) .payload(payloadFromStringWithContentType("{\"name\":\"jclouds-test\",\"network\":\"https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/networks/jclouds-test\"," + + ".com/compute/v1beta16/projects/myproject/global/networks/jclouds-test\"," + "\"sourceRanges\":[\"10.0.0.0/8\",\"0.0.0.0/0\"],\"allowed\":[{\"IPProtocol\":\"tcp\"," + "\"ports\":[\"22\"]}," + "{\"IPProtocol\":\"udp\",\"ports\":[\"22\"]}]}", @@ -110,7 +110,7 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin " \"id\": \"13024414170909937976\",\n" + " \"creationTimestamp\": \"2012-10-24T20:13:19.967\",\n" + " \"selfLink\": \"https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/networks/jclouds-test\",\n" + + ".com/compute/v1beta16/projects/myproject/global/networks/jclouds-test\",\n" + " \"name\": \"jclouds-test\",\n" + " \"description\": \"test network\",\n" + " \"IPv4Range\": \"10.0.0.0/8\",\n" + @@ -122,7 +122,7 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin private HttpRequest SET_TAGS_REQUEST = HttpRequest.builder() .method("POST") - .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/test-1/setTags") + .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances/test-1/setTags") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN) .payload(payloadFromStringWithContentType("{\"items\":[\"aTag\"],\"fingerprint\":\"abcd\"}", @@ -166,17 +166,17 @@ private HttpRequest createInstanceRequestForInstance(String instanceName, String return HttpRequest .builder() .method("POST") - .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances") + .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN) .payload(payloadFromStringWithContentType("{\"name\":\"" + instanceName + "\"," + "\"machineType\":\"https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1\"," + + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1\"," + "\"image\":\"https://www.googleapis" + - ".com/compute/v1beta15/projects/google/global/images/gcel-12-04-v20121106\"," + + ".com/compute/v1beta16/projects/google/global/images/gcel-12-04-v20121106\"," + "\"serviceAccounts\":[]," + "\"networkInterfaces\":[{\"network\":\"https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/networks/" + networkName + "\"," + + ".com/compute/v1beta16/projects/myproject/global/networks/" + networkName + "\"," + "\"accessConfigs\":[{\"type\":\"ONE_TO_ONE_NAT\"}]}]," + "\"metadata\":{\"kind\":\"compute#metadata\",\"items\":[{\"key\":\"sshKeys\"," + "\"value\":\"jclouds:" + @@ -189,7 +189,7 @@ private HttpRequest getInstanceRequestForInstance(String instanceName) { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/" + instanceName) + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances/" + instanceName) .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); } @@ -258,21 +258,21 @@ public void testNetworksAndFirewallDeletedWhenAllGroupNodesAreTerminated() throw HttpRequest deleteNodeRequest = HttpRequest.builder() .method("DELETE") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/test-delete-networks") + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances/test-delete-networks") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); HttpRequest deleteFirewallRequest = HttpRequest.builder() .method("DELETE") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/firewalls/jclouds-test-delete") + ".com/compute/v1beta16/projects/myproject/global/firewalls/jclouds-test-delete") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); HttpRequest deleteNetworkReqquest = HttpRequest.builder() .method("DELETE") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/networks/jclouds-test-delete") + ".com/compute/v1beta16/projects/myproject/global/networks/jclouds-test-delete") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/DiskApiExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/DiskApiExpectTest.java index 484bb840e..2d156882e 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/DiskApiExpectTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/DiskApiExpectTest.java @@ -42,7 +42,7 @@ public void testGetDiskResponseIs2xx() throws Exception { HttpRequest get = HttpRequest .builder() .method("GET") - .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/testimage1") + .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/testimage1") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -60,7 +60,7 @@ public void testGetDiskResponseIs4xx() throws Exception { HttpRequest get = HttpRequest .builder() .method("GET") - .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/testimage1") + .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/testimage1") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -76,7 +76,7 @@ public void testInsertDiskResponseIs2xx() { HttpRequest insert = HttpRequest .builder() .method("POST") - .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks") + .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN) .payload(payloadFromResourceWithContentType("/disk_insert.json", MediaType.APPLICATION_JSON)) @@ -97,7 +97,7 @@ public void testDeleteDiskResponseIs2xx() { .builder() .method("DELETE") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/testimage1") + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/testimage1") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -116,7 +116,7 @@ public void testDeleteDiskResponseIs4xx() { .builder() .method("DELETE") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/testimage1") + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/testimage1") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -133,7 +133,7 @@ public void testListDisksResponseIs2xx() { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks") + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -152,7 +152,7 @@ public void testListDisksResponseIs4xx() { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks") + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/FirewallApiExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/FirewallApiExpectTest.java index 6345c5100..e992726d2 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/FirewallApiExpectTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/FirewallApiExpectTest.java @@ -58,7 +58,7 @@ public class FirewallApiExpectTest extends BaseGoogleComputeEngineApiExpectTest .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/firewalls/jclouds-test") + ".com/compute/v1beta16/projects/myproject/global/firewalls/jclouds-test") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -108,7 +108,7 @@ public void testGetFirewallResponseIs4xx() throws Exception { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/firewalls/jclouds-test") + ".com/compute/v1beta16/projects/myproject/global/firewalls/jclouds-test") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -125,7 +125,7 @@ public void testInsertFirewallResponseIs2xx() throws IOException { HttpRequest request = HttpRequest .builder() .method("POST") - .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/firewalls") + .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/firewalls") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN) .payload(firewallPayloadFirewallOfName( @@ -144,7 +144,7 @@ public void testInsertFirewallResponseIs2xx() throws IOException { TOKEN_RESPONSE, request, insertFirewallResponse).getFirewallApiForProject("myproject"); assertEquals(api.createInNetwork("myfw", URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/networks/default"), + ".com/compute/v1beta16/projects/myproject/global/networks/default"), new FirewallOptions() .addAllowedRule(Firewall.Rule.builder() .IPProtocol(IPProtocol.TCP) @@ -160,7 +160,7 @@ public void testUpdateFirewallResponseIs2xx() throws IOException { HttpRequest update = HttpRequest .builder() .method("PUT") - .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/firewalls/myfw") + .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/firewalls/myfw") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN) .payload(firewallPayloadFirewallOfName( @@ -183,7 +183,7 @@ public void testUpdateFirewallResponseIs2xx() throws IOException { new FirewallOptions() .name("myfw") .network(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/networks/default")) + ".com/compute/v1beta16/projects/myproject/global/networks/default")) .addAllowedRule(Firewall.Rule.builder() .IPProtocol(IPProtocol.TCP) .addPort(22) @@ -197,7 +197,7 @@ public void testPatchFirewallResponseIs2xx() throws IOException { HttpRequest update = HttpRequest .builder() .method("PATCH") - .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/firewalls/myfw") + .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/firewalls/myfw") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN) .payload(firewallPayloadFirewallOfName( @@ -220,7 +220,7 @@ public void testPatchFirewallResponseIs2xx() throws IOException { new FirewallOptions() .name("myfw") .network(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/networks/default")) + ".com/compute/v1beta16/projects/myproject/global/networks/default")) .addAllowedRule(Firewall.Rule.builder() .IPProtocol(IPProtocol.TCP) .addPort(22) @@ -235,7 +235,7 @@ public void testDeleteFirewallResponseIs2xx() { .builder() .method("DELETE") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/firewalls/default-allow-internal") + ".com/compute/v1beta16/projects/myproject/global/firewalls/default-allow-internal") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -254,7 +254,7 @@ public void testDeleteFirewallResponseIs4xx() { .builder() .method("DELETE") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/firewalls/default-allow-internal") + ".com/compute/v1beta16/projects/myproject/global/firewalls/default-allow-internal") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -271,7 +271,7 @@ public void testListFirewallsResponseIs2xx() { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/firewalls") + ".com/compute/v1beta16/projects/myproject/global/firewalls") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -290,7 +290,7 @@ public void testListFirewallsResponseIs4xx() { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/firewalls") + ".com/compute/v1beta16/projects/myproject/global/firewalls") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/GlobalOperationApiExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/GlobalOperationApiExpectTest.java index 412dc32b4..e6bf13a19 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/GlobalOperationApiExpectTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/GlobalOperationApiExpectTest.java @@ -37,7 +37,7 @@ public class GlobalOperationApiExpectTest extends BaseGoogleComputeEngineApiExpectTest { private static final String OPERATIONS_URL_PREFIX = "https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/operations"; + ".com/compute/v1beta16/projects/myproject/global/operations"; public static final HttpRequest GET_GLOBAL_OPERATION_REQUEST = HttpRequest .builder() diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ImageApiExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ImageApiExpectTest.java index d8baecf11..1dacd22c8 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ImageApiExpectTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ImageApiExpectTest.java @@ -40,7 +40,7 @@ public class ImageApiExpectTest extends BaseGoogleComputeEngineApiExpectTest { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/images") + ".com/compute/v1beta16/projects/myproject/global/images") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -50,7 +50,7 @@ public class ImageApiExpectTest extends BaseGoogleComputeEngineApiExpectTest { public static final HttpRequest LIST_GOOGLE_IMAGES_REQUEST = HttpRequest .builder() .method("GET") - .endpoint("https://www.googleapis.com/compute/v1beta15/projects/google/global/images") + .endpoint("https://www.googleapis.com/compute/v1beta16/projects/google/global/images") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -63,7 +63,7 @@ public void testGetImageResponseIs2xx() throws Exception { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/google/global/images/centos-6-2-v20120326") + ".com/compute/v1beta16/projects/google/global/images/centos-6-2-v20120326") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -82,7 +82,7 @@ public void testGetImageResponseIs4xx() throws Exception { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/google/global/images/centos-6-2-v20120326") + ".com/compute/v1beta16/projects/google/global/images/centos-6-2-v20120326") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -99,7 +99,7 @@ public void testDeleteImageResponseIs2xx() { .builder() .method("DELETE") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/images/centos-6-2-v20120326") + ".com/compute/v1beta16/projects/myproject/global/images/centos-6-2-v20120326") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -118,7 +118,7 @@ public void testDeleteImageResponseIs4xx() { .builder() .method("DELETE") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/images/centos-6-2-v20120326") + ".com/compute/v1beta16/projects/myproject/global/images/centos-6-2-v20120326") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiExpectTest.java index 3cde1e8cc..db3dced74 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiExpectTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiExpectTest.java @@ -52,7 +52,7 @@ public class InstanceApiExpectTest extends BaseGoogleComputeEngineApiExpectTest .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/test-1") + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances/test-1") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -64,7 +64,7 @@ public class InstanceApiExpectTest extends BaseGoogleComputeEngineApiExpectTest .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances") + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -75,7 +75,7 @@ public class InstanceApiExpectTest extends BaseGoogleComputeEngineApiExpectTest .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-b/instances") + ".com/compute/v1beta16/projects/myproject/zones/us-central1-b/instances") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -110,7 +110,7 @@ public void testGetInstanceSerialPortOutput() throws Exception { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/test-1/serialPort") + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances/test-1/serialPort") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -128,7 +128,7 @@ public void testInsertInstanceResponseIs2xxNoOptions() { HttpRequest insert = HttpRequest .builder() .method("POST") - .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances") + .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN) .payload(payloadFromResourceWithContentType("/instance_insert_simple.json", MediaType.APPLICATION_JSON)) @@ -141,9 +141,9 @@ public void testInsertInstanceResponseIs2xxNoOptions() { CREATE_INSTANCE_RESPONSE)).getInstanceApiForProject("myproject"); InstanceTemplate options = InstanceTemplate.builder().forMachineType("us-central1-a/n1-standard-1") - .image(URI.create("https://www.googleapis.com/compute/v1beta15/projects/google/global/images/gcel-12-04-v20121106")) + .image(URI.create("https://www.googleapis.com/compute/v1beta16/projects/google/global/images/gcel-12-04-v20121106")) .addNetworkInterface(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/networks/default")); + ".com/compute/v1beta16/projects/myproject/global/networks/default")); assertEquals(api.createInZone("test-1", "us-central1-a", options), new ParseOperationTest().expected()); } @@ -152,7 +152,7 @@ public void testInsertInstanceResponseIs2xxAllOptions() { HttpRequest insert = HttpRequest .builder() .method("POST") - .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances") + .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN) .payload(payloadFromResourceWithContentType("/instance_insert.json", MediaType.APPLICATION_JSON)) @@ -168,12 +168,12 @@ public void testInsertInstanceResponseIs2xxAllOptions() { InstanceTemplate options = InstanceTemplate.builder().forMachineType("us-central1-a/n1-standard-1") .addNetworkInterface(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/networks/default"), Instance.NetworkInterface.AccessConfig.Type.ONE_TO_ONE_NAT) + ".com/compute/v1beta16/projects/myproject/global/networks/default"), Instance.NetworkInterface.AccessConfig.Type.ONE_TO_ONE_NAT) .description("desc") .image(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/google/global/images/gcel-12-04-v20121106")) + ".com/compute/v1beta16/projects/google/global/images/gcel-12-04-v20121106")) .addDisk(InstanceTemplate.PersistentDisk.Mode.READ_WRITE, - create("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/test")) + create("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/test")) .addServiceAccount(Instance.ServiceAccount.builder().email("default").addScopes("myscope").build()) .addMetadata("aKey", "aValue"); @@ -186,7 +186,7 @@ public void testDeleteInstanceResponseIs2xx() { .builder() .method("DELETE") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/test-1") + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances/test-1") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -205,7 +205,7 @@ public void testDeleteInstanceResponseIs4xx() { .builder() .method("DELETE") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/test-1") + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances/test-1") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -232,7 +232,7 @@ public void testListInstancesResponseIs4xx() { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances") + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/KernelApiExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/KernelApiExpectTest.java index d6f2f5c35..89a2979b8 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/KernelApiExpectTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/KernelApiExpectTest.java @@ -39,7 +39,7 @@ public void testGetKernelResponseIs2xx() throws Exception { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/kernels/12941177846308850718") + ".com/compute/v1beta16/projects/myproject/global/kernels/12941177846308850718") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -58,7 +58,7 @@ public void testGetKernelResponseIs4xx() throws Exception { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/kernels/12941177846308850718") + ".com/compute/v1beta16/projects/myproject/global/kernels/12941177846308850718") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -75,7 +75,7 @@ public void testListKernelNoOptionsResponseIs2xx() throws Exception { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/kernels") + ".com/compute/v1beta16/projects/myproject/global/kernels") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -94,7 +94,7 @@ public void testListKernelsResponseIs4xx() { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/kernels") + ".com/compute/v1beta16/projects/myproject/global/kernels") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/MachineTypeApiExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/MachineTypeApiExpectTest.java index 702f99536..fe4f3b9f4 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/MachineTypeApiExpectTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/MachineTypeApiExpectTest.java @@ -37,7 +37,7 @@ public class MachineTypeApiExpectTest extends BaseGoogleComputeEngineApiExpectTe public static final HttpRequest LIST_MACHINE_TYPES_REQUEST = HttpRequest .builder() .method("GET") - .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes") + .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -49,7 +49,7 @@ public class MachineTypeApiExpectTest extends BaseGoogleComputeEngineApiExpectTe public static final HttpRequest LIST_CENTRAL1B_MACHINE_TYPES_REQUEST = HttpRequest .builder() .method("GET") - .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-b/machineTypes") + .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-b/machineTypes") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -63,7 +63,7 @@ public void testGetMachineTypeResponseIs2xx() throws Exception { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1") + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -82,7 +82,7 @@ public void testGetMachineTypeResponseIs4xx() throws Exception { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1") + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiExpectTest.java index 0198644b8..af571592a 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiExpectTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiExpectTest.java @@ -41,7 +41,7 @@ public class NetworkApiExpectTest extends BaseGoogleComputeEngineApiExpectTest { public static final HttpRequest GET_NETWORK_REQUEST = HttpRequest .builder() .method("GET") - .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/jclouds-test") + .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/jclouds-test") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -61,7 +61,7 @@ public void testGetNetworkResponseIs4xx() throws Exception { HttpRequest get = HttpRequest .builder() .method("GET") - .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/jclouds-test") + .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/jclouds-test") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -77,7 +77,7 @@ public void testInsertNetworkResponseIs2xx() { HttpRequest insert = HttpRequest .builder() .method("POST") - .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks") + .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN) .payload(payloadFromResourceWithContentType("/network_insert.json", MediaType.APPLICATION_JSON)) @@ -98,7 +98,7 @@ public void testDeleteNetworkResponseIs2xx() { .builder() .method("DELETE") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/networks/jclouds-test") + ".com/compute/v1beta16/projects/myproject/global/networks/jclouds-test") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -117,7 +117,7 @@ public void testDeleteNetworkResponseIs4xx() { .builder() .method("DELETE") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/networks/jclouds-test") + ".com/compute/v1beta16/projects/myproject/global/networks/jclouds-test") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -134,7 +134,7 @@ public void testListNetworksResponseIs2xx() { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/networks") + ".com/compute/v1beta16/projects/myproject/global/networks") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); @@ -153,7 +153,7 @@ public void testListNetworksResponseIs4xx() { .builder() .method("GET") .endpoint("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/networks") + ".com/compute/v1beta16/projects/myproject/global/networks") .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ProjectApiExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ProjectApiExpectTest.java index ebcbdfbcc..62842ad80 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ProjectApiExpectTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ProjectApiExpectTest.java @@ -37,7 +37,7 @@ @Test(groups = "unit") public class ProjectApiExpectTest extends BaseGoogleComputeEngineApiExpectTest { - public static final String PROJECTS_URL_PREFIX = "https://www.googleapis.com/compute/v1beta15/projects"; + public static final String PROJECTS_URL_PREFIX = "https://www.googleapis.com/compute/v1beta16/projects"; public static final HttpRequest GET_PROJECT_REQUEST = HttpRequest .builder() diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ZoneApiExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ZoneApiExpectTest.java index aecfcab6d..8ecc53211 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ZoneApiExpectTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ZoneApiExpectTest.java @@ -34,7 +34,7 @@ @Test(groups = "unit") public class ZoneApiExpectTest extends BaseGoogleComputeEngineApiExpectTest { - public static final String ZONES_URL_PREFIX = "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones"; + public static final String ZONES_URL_PREFIX = "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones"; public static final HttpRequest GET_ZONE_REQ = HttpRequest .builder() diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ZoneOperationApiExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ZoneOperationApiExpectTest.java index d5d536238..cfd49adf2 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ZoneOperationApiExpectTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ZoneOperationApiExpectTest.java @@ -41,7 +41,7 @@ public class ZoneOperationApiExpectTest extends BaseGoogleComputeEngineApiExpectTest { private static final String OPERATIONS_URL_PREFIX = "https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/operations"; + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/operations"; public static final HttpRequest GET_ZONE_OPERATION_REQUEST = HttpRequest .builder() @@ -57,11 +57,11 @@ private Operation expected() { SimpleDateFormatDateService dateService = new SimpleDateFormatDateService(); return Operation.builder().id("13053095055850848306") .selfLink(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8" + + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8" + "-bbbb12cb")) .name("operation-1354084865060-4cf88735faeb8-bbbb12cb") .targetLink(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance")) + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance")) .targetId("13053094017547040099") .status(Operation.Status.DONE) .user("user@developer.gserviceaccount.com") @@ -70,7 +70,7 @@ private Operation expected() { .startTime(dateService.iso8601DateParse("2012-11-28T06:41:05.142")) .endTime(dateService.iso8601DateParse("2012-11-28T06:41:06.142")) .operationType("insert") - .zone(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a")) + .zone(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a")) .build(); } @@ -78,7 +78,7 @@ private ListPage expectedList() { return ListPage.builder() .kind(Resource.Kind.OPERATION_LIST) .id("projects/myproject/zones/us-central1-a/operations") - .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/operations")) + .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/operations")) .addItem(expected()) .build(); } diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/handlers/GoogleComputeEngineErrorHandlerTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/handlers/GoogleComputeEngineErrorHandlerTest.java index ccad32175..e406da0f1 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/handlers/GoogleComputeEngineErrorHandlerTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/handlers/GoogleComputeEngineErrorHandlerTest.java @@ -40,7 +40,7 @@ public class GoogleComputeEngineErrorHandlerTest { public void test409MakesIllegalStateException() { assertCodeMakes( "POST", - URI.create("https://www.googleapis.com/compute/v1beta15"), + URI.create("https://www.googleapis.com/compute/v1beta16"), 409, "HTTP/1.1 409 Conflict", "\"{\"code\":\"InvalidState\",\"message\":\"An incompatible transition has already been queued for this" + diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiLiveTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiLiveTest.java index e76699b09..dd321293a 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiLiveTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiLiveTest.java @@ -44,7 +44,7 @@ */ public class BaseGoogleComputeEngineApiLiveTest extends BaseApiLiveTest { - protected static final String API_URL_PREFIX = "https://www.googleapis.com/compute/v1beta15/projects/"; + protected static final String API_URL_PREFIX = "https://www.googleapis.com/compute/v1beta16/projects/"; protected static final String ZONE_API_URL_SUFFIX = "/zones/"; protected static final String DEFAULT_ZONE_NAME = "us-central1-a"; diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskListTest.java index 7b83d8ef8..825aee538 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskListTest.java @@ -47,16 +47,16 @@ public ListPage expected() { return ListPage.builder() .kind(Resource.Kind.DISK_LIST) .id("projects/myproject/zones/us-central1-a/disks") - .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks")) + .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks")) .items(ImmutableSet.of(Disk.builder() .id("13050421646334304115") .creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse("2012-11-25T01:38:48.306")) .selfLink(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/testimage1")) + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/testimage1")) .name("testimage1") .sizeGb(1) .zone(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a")) + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a")) .status("READY") .build()) ).build(); diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTest.java index 83cea8d18..5e84fa9df 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTest.java @@ -43,10 +43,10 @@ public Disk expected() { return Disk.builder() .id("13050421646334304115") .creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse("2012-11-25T01:38:48.306")) - .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/testimage1")) + .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/testimage1")) .name("testimage1") .sizeGb(1) - .zone(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a")) + .zone(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a")) .status("READY") .build(); } diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallListTest.java index a90f17bfc..4881f16b2 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallListTest.java @@ -47,18 +47,18 @@ public ListPage expected() { return ListPage.builder() .kind(Resource.Kind.FIREWALL_LIST) .id("projects/google/firewalls") - .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/google/global/firewalls")) + .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/google/global/firewalls")) .items(ImmutableSet.of( new ParseFirewallTest().expected() , Firewall.builder() .id("12862241067393040785") .creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse("2012-04-13T03:05:04.365")) .selfLink(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/google/global/firewalls/default-ssh")) + ".com/compute/v1beta16/projects/google/global/firewalls/default-ssh")) .name("default-ssh") .description("SSH allowed from anywhere") .network(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/google/global/networks/default")) + ".com/compute/v1beta16/projects/google/global/networks/default")) .addSourceRange("0.0.0.0/0") .addAllowed(Firewall.Rule.builder() .IPProtocol(Firewall.Rule.IPProtocol.TCP) diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallTest.java index 187380feb..3fc672366 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallTest.java @@ -45,10 +45,10 @@ public Firewall expected() { return Firewall.builder() .id("12862241031274216284") .creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse("2012-04-13T03:05:02.855")) - .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/firewalls/jclouds-test")) + .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/firewalls/jclouds-test")) .name("jclouds-test") .description("Internal traffic from default allowed") - .network(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/jclouds-test")) + .network(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/jclouds-test")) .addSourceRange("10.0.0.0/8") .addAllowed(Firewall.Rule.builder() .IPProtocol(IPProtocol.TCP) diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageListTest.java index c288079c7..fedee16a1 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageListTest.java @@ -47,20 +47,20 @@ public ListPage expected() { return ListPage.builder() .kind(Resource.Kind.IMAGE_LIST) .id("projects/google/global/images") - .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/google/global/images")) + .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/google/global/images")) .items(ImmutableSet.of(Image.builder() .id("12941197498378735318") .creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse("2012-07-16T22:16:13.468")) .selfLink(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/google/global/images/centos-6-2-v20120326")) + ".com/compute/v1beta16/projects/google/global/images/centos-6-2-v20120326")) .name("centos-6-2-v20120326") .description("DEPRECATED. CentOS 6.2 image; Created Mon, 26 Mar 2012 21:19:09 +0000") .sourceType("RAW") .preferredKernel(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/google/kernels/gce-20120326")) + ".com/compute/v1beta16/projects/google/kernels/gce-20120326")) .deprecated(Image.Deprecated.builder() .state("DEPRECATED") - .replacement(URI.create("https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-v20130104")) + .replacement(URI.create("https://www.googleapis.com/compute/v1beta16/projects/google/global/images/centos-6-v20130104")) .build()) .rawDisk( Image.RawDisk.builder() diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageTest.java index a62e59add..6f1246fb9 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageTest.java @@ -43,13 +43,13 @@ public Image expected() { return Image.builder() .id("12941197498378735318") .creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse("2012-07-16T22:16:13.468")) - .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-2" + + .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/google/global/images/centos-6-2" + "-v20120326")) .name("centos-6-2-v20120326") .description("DEPRECATED. CentOS 6.2 image; Created Mon, 26 Mar 2012 21:19:09 +0000") .sourceType("RAW") .preferredKernel(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/google/kernels/gce-20120326")) + ".com/compute/v1beta16/projects/google/kernels/gce-20120326")) .rawDisk( Image.RawDisk.builder() .source("") diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceListTest.java index 3bd010d5d..4821d2e97 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceListTest.java @@ -44,7 +44,7 @@ public ListPage expected() { return ListPage.builder() .kind(Resource.Kind.INSTANCE_LIST) .id("projects/myproject/zones/us-central1-a/instances") - .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances")) + .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances")) .items(ImmutableSet.of(new ParseInstanceTest().expected())) .build(); } diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceTest.java index efff80977..71fcb3bbc 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceTest.java @@ -44,21 +44,21 @@ public Instance expected() { .id("13051190678907570425") .creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse("2012-11-25T23:48:20.758")) .selfLink(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/test-0")) + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances/test-0")) .description("desc") .name("test-0") .image(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/google/global/images/gcel-12-04-v20121106")) - .machineType(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes/n1" + + ".com/compute/v1beta16/projects/google/global/images/gcel-12-04-v20121106")) + .machineType(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes/n1" + "-standard-1")) .status(Instance.Status.RUNNING) - .zone(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a")) + .zone(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a")) .addNetworkInterface( Instance.NetworkInterface.builder() .name("nic0") .networkIP("10.240.121.115") .network(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/networks/default")) + ".com/compute/v1beta16/projects/myproject/global/networks/default")) .build() ) .addDisk( @@ -67,7 +67,7 @@ public Instance expected() { .mode(Instance.PersistentAttachedDisk.Mode.READ_WRITE) .deviceName("test") .source(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/test")) + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/test")) .build() ) .tags(Instance.Tags.builder().fingerprint("abcd").addItem("aTag").build()) diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseKernelListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseKernelListTest.java index 7f330385d..c1d2ab242 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseKernelListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseKernelListTest.java @@ -47,14 +47,14 @@ public ListPage expected() { return ListPage.builder() .kind(Resource.Kind.KERNEL_LIST) .id("projects/google/global/kernels") - .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels")) + .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels")) .items(ImmutableSet.of( Kernel.builder() .id("12941177846308850718") .creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse ("2012-07-16T21:42:16.950")) .selfLink(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/google/global/kernels/gce-20110524")) + ".com/compute/v1beta16/projects/google/global/kernels/gce-20110524")) .name("gce-20110524") .description("DEPRECATED. Created Tue, 24 May 2011 00:48:22 +0000").build(), Kernel.builder() @@ -62,7 +62,7 @@ public ListPage expected() { .creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse ("2012-07-16T21:42:31.166")) .selfLink(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/google/global/kernels/gce-20110728")) + ".com/compute/v1beta16/projects/google/global/kernels/gce-20110728")) .name("gce-20110728") .description("DEPRECATED. Created Thu, 28 Jul 2011 16:44:38 +0000").build() )).build(); diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseKernelTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseKernelTest.java index 84fdd8967..1770b96ba 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseKernelTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseKernelTest.java @@ -43,7 +43,7 @@ public Kernel expected() { return Kernel.builder() .id("12941177846308850718") .creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse("2012-07-16T21:42:16.950")) - .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-20110524")) + .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-20110524")) .name("gce-20110524") .description("DEPRECATED. Created Tue, 24 May 2011 00:48:22 +0000") .build(); diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeListTest.java index e854d6b8b..3896dd31e 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeListTest.java @@ -46,12 +46,12 @@ public ListPage expected() { return ListPage.builder() .kind(MACHINE_TYPE_LIST) .id("projects/myproject/machineTypes") - .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes")) + .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes")) .addItem(MachineType.builder() .id("4618642685664990776") .creationTimestamp(dateService.iso8601DateParse("2013-04-25T13:32:49.088-07:00")) .selfLink(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes/f1-micro")) + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes/f1-micro")) .zone("us-central1-a") .name("f1-micro") .description("1 vCPU (shared physical core) and 0.6 GB RAM") @@ -65,7 +65,7 @@ public ListPage expected() { .id("12907738072351752276") .creationTimestamp(dateService.iso8601DateParse("2012-06-07T20:48:14.670")) .selfLink(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1")) + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1")) .zone("us-central1-a") .name("n1-standard-1") .description("1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk") @@ -79,7 +79,7 @@ public ListPage expected() { .id("12908560709887590691") .creationTimestamp(dateService.iso8601DateParse("2012-06-07T20:51:19.936")) .selfLink(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-8-d")) + ".com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-8-d")) .zone("us-central1-a") .name("n1-standard-8-d") .description("8 vCPUs, 30 GB RAM, a 10 GB ephemeral root disk, " + diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java index e55cd5c3e..5fb2128e1 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java @@ -43,7 +43,7 @@ public MachineType expected() { return MachineType.builder() .id("12907738072351752276") .creationTimestamp(dateService.iso8601DateParse("2012-06-07T20:48:14.670")) - .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes/n1" + + .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes/n1" + "-standard-1")) .zone("us-central1-a") .name("n1-standard-1") diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkListTest.java index b271e91f6..b1f6d7188 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkListTest.java @@ -44,7 +44,7 @@ public ListPage expected() { return ListPage.builder() .kind(Resource.Kind.NETWORK_LIST) .id("projects/myproject/networks") - .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/networks")) + .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/networks")) .items(ImmutableSet.of(new ParseNetworkTest().expected())) .build(); diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkTest.java index da6992a2e..223955e5d 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkTest.java @@ -41,7 +41,7 @@ public Network expected() { return Network.builder() .id("13024414170909937976") .creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse("2012-10-24T20:13:19.967")) - .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/networks/jclouds-test")) + .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/networks/jclouds-test")) .name("default") .description("Default network for the project") .IPv4Range("10.0.0.0/8") diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseOperationListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseOperationListTest.java index c62b49a1a..1a5520d4e 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseOperationListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseOperationListTest.java @@ -42,7 +42,7 @@ public ListPage expected() { return ListPage.builder() .kind(Resource.Kind.OPERATION_LIST) .id("projects/myproject/global/operations") - .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/operations")) + .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/operations")) .addItem(new ParseOperationTest().expected()) .build(); } diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseOperationTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseOperationTest.java index c3b1e90cc..21203fc25 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseOperationTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseOperationTest.java @@ -43,11 +43,11 @@ public Operation expected() { SimpleDateFormatDateService dateService = new SimpleDateFormatDateService(); return Operation.builder().id("13053095055850848306") .selfLink(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/operations/operation-1354084865060-4cf88735faeb8" + + ".com/compute/v1beta16/projects/myproject/global/operations/operation-1354084865060-4cf88735faeb8" + "-bbbb12cb")) .name("operation-1354084865060-4cf88735faeb8-bbbb12cb") .targetLink(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/global/firewalls/jclouds-test-delete")) + ".com/compute/v1beta16/projects/myproject/global/firewalls/jclouds-test-delete")) .targetId("13053094017547040099") .status(Operation.Status.DONE) .user("user@developer.gserviceaccount.com") diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseProjectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseProjectTest.java index 8b3976c63..c03720b04 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseProjectTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseProjectTest.java @@ -45,7 +45,7 @@ public Project expected() { return Project.builder() .id("13024414184846275913") .creationTimestamp(new Date(Long.parseLong("1351109596252"))) - .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject")) + .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject")) .name("myproject") .description("") .commonInstanceMetadata( diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneListTest.java index 367cb63bd..293c86f16 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneListTest.java @@ -47,7 +47,7 @@ public ListPage expected() { return ListPage.builder() .kind(Resource.Kind.ZONE_LIST) .id("projects/myproject/zones") - .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones")) + .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones")) .items(ImmutableSet.of( new ParseZoneTest().expected() , Zone.builder() @@ -55,7 +55,7 @@ public ListPage expected() { .creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse ("2012-10-24T20:13:19.271")) .selfLink(URI.create("https://www.googleapis" + - ".com/compute/v1beta15/projects/myproject/zones/us-central1-b")) + ".com/compute/v1beta16/projects/myproject/zones/us-central1-b")) .name("us-central1-b") .description("us-central1-b") .status(Zone.Status.UP) diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneTest.java index 60a0b04a9..ad6017fe3 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneTest.java @@ -43,7 +43,7 @@ public Zone expected() { return Zone.builder() .id("13020128040171887099") .creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse("2012-10-19T16:42:54.131")) - .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a")) + .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a")) .name("us-central1-a") .description("us-central1-a") .status(Zone.Status.DOWN) diff --git a/google-compute-engine/src/test/resources/disk_get.json b/google-compute-engine/src/test/resources/disk_get.json index 4e351cee2..b895279bf 100644 --- a/google-compute-engine/src/test/resources/disk_get.json +++ b/google-compute-engine/src/test/resources/disk_get.json @@ -2,9 +2,9 @@ "kind": "compute#disk", "id": "13050421646334304115", "creationTimestamp": "2012-11-25T01:38:48.306", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/testimage1", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/testimage1", "name": "testimage1", "sizeGb": "1", - "zone": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a", + "zone": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a", "status": "READY" } \ No newline at end of file diff --git a/google-compute-engine/src/test/resources/disk_list.json b/google-compute-engine/src/test/resources/disk_list.json index 6836907a1..e0db2007a 100644 --- a/google-compute-engine/src/test/resources/disk_list.json +++ b/google-compute-engine/src/test/resources/disk_list.json @@ -1,16 +1,16 @@ { "kind": "compute#diskList", "id": "projects/myproject/zones/us-central1-a/disks", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks", "items": [ { "kind": "compute#disk", "id": "13050421646334304115", "creationTimestamp": "2012-11-25T01:38:48.306", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/testimage1", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/testimage1", "name": "testimage1", "sizeGb": "1", - "zone": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a", + "zone": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a", "status": "READY" } ] diff --git a/google-compute-engine/src/test/resources/firewall_get.json b/google-compute-engine/src/test/resources/firewall_get.json index dbf4e90ac..62f8a4213 100644 --- a/google-compute-engine/src/test/resources/firewall_get.json +++ b/google-compute-engine/src/test/resources/firewall_get.json @@ -3,10 +3,10 @@ "kind": "compute#firewall", "id": "12862241031274216284", "creationTimestamp": "2012-04-13T03:05:02.855", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/firewalls/jclouds-test", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/firewalls/jclouds-test", "name": "jclouds-test", "description": "Internal traffic from default allowed", - "network": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/jclouds-test", + "network": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/jclouds-test", "sourceRanges": [ "10.0.0.0/8" ], diff --git a/google-compute-engine/src/test/resources/firewall_insert.json b/google-compute-engine/src/test/resources/firewall_insert.json index b9d0a9a41..da4d5e8f0 100644 --- a/google-compute-engine/src/test/resources/firewall_insert.json +++ b/google-compute-engine/src/test/resources/firewall_insert.json @@ -1 +1 @@ -{"name":"%s","network":"https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/%s","sourceRanges":[%s],"sourceTags":[%s],"targetTags":[%s],"allowed":[{"IPProtocol":"tcp","ports":[%s]}]} \ No newline at end of file +{"name":"%s","network":"https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/%s","sourceRanges":[%s],"sourceTags":[%s],"targetTags":[%s],"allowed":[{"IPProtocol":"tcp","ports":[%s]}]} \ No newline at end of file diff --git a/google-compute-engine/src/test/resources/firewall_list.json b/google-compute-engine/src/test/resources/firewall_list.json index 6fe7da829..95d6a4167 100644 --- a/google-compute-engine/src/test/resources/firewall_list.json +++ b/google-compute-engine/src/test/resources/firewall_list.json @@ -1,17 +1,17 @@ { "kind": "compute#firewallList", "id": "projects/google/firewalls", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/firewalls", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/firewalls", "items": [ { "kind": "compute#firewall", "id": "12862241031274216284", "creationTimestamp": "2012-04-13T03:05:02.855", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/firewalls/jclouds-test", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/firewalls/jclouds-test", "name": "jclouds-test", "description": "Internal traffic from default allowed", - "network": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/jclouds-test", + "network": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/jclouds-test", "sourceRanges": [ "10.0.0.0/8" ], @@ -38,10 +38,10 @@ "kind": "compute#firewall", "id": "12862241067393040785", "creationTimestamp": "2012-04-13T03:05:04.365", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/firewalls/default-ssh", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/firewalls/default-ssh", "name": "default-ssh", "description": "SSH allowed from anywhere", - "network": "https://www.googleapis.com/compute/v1beta15/projects/google/global/networks/default", + "network": "https://www.googleapis.com/compute/v1beta16/projects/google/global/networks/default", "sourceRanges": [ "0.0.0.0/0" ], diff --git a/google-compute-engine/src/test/resources/global_operation.json b/google-compute-engine/src/test/resources/global_operation.json index c949699dd..a54aaf16c 100644 --- a/google-compute-engine/src/test/resources/global_operation.json +++ b/google-compute-engine/src/test/resources/global_operation.json @@ -1,9 +1,9 @@ { "kind": "compute#operation", "id": "13053095055850848306", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", - "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/firewalls/jclouds-test-delete", + "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/firewalls/jclouds-test-delete", "targetId": "13053094017547040099", "status": "DONE", "user": "user@developer.gserviceaccount.com", diff --git a/google-compute-engine/src/test/resources/global_operation_list.json b/google-compute-engine/src/test/resources/global_operation_list.json index f3c6ecda2..fcc106e47 100644 --- a/google-compute-engine/src/test/resources/global_operation_list.json +++ b/google-compute-engine/src/test/resources/global_operation_list.json @@ -1,14 +1,14 @@ { "kind": "compute#operationList", "id": "projects/myproject/global/operations", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/operations", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/operations", "items": [ { "kind": "compute#operation", "id": "13053095055850848306", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", - "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/firewalls/jclouds-test-delete", + "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/firewalls/jclouds-test-delete", "targetId": "13053094017547040099", "status": "DONE", "user": "user@developer.gserviceaccount.com", diff --git a/google-compute-engine/src/test/resources/image_get.json b/google-compute-engine/src/test/resources/image_get.json index eaadc4ed8..25fab88ea 100644 --- a/google-compute-engine/src/test/resources/image_get.json +++ b/google-compute-engine/src/test/resources/image_get.json @@ -2,11 +2,11 @@ "kind": "compute#image", "id": "12941197498378735318", "creationTimestamp": "2012-07-16T22:16:13.468", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-2-v20120326", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images/centos-6-2-v20120326", "name": "centos-6-2-v20120326", "description": "DEPRECATED. CentOS 6.2 image; Created Mon, 26 Mar 2012 21:19:09 +0000", "sourceType": "RAW", - "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/kernels/gce-20120326", + "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/kernels/gce-20120326", "rawDisk": { "source": "", "containerType": "TAR" diff --git a/google-compute-engine/src/test/resources/image_list.json b/google-compute-engine/src/test/resources/image_list.json index cb7653359..4078c04e6 100644 --- a/google-compute-engine/src/test/resources/image_list.json +++ b/google-compute-engine/src/test/resources/image_list.json @@ -1,20 +1,20 @@ { "kind": "compute#imageList", "id": "projects/google/global/images", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images", "items": [ { "kind": "compute#image", "id": "12941197498378735318", "creationTimestamp": "2012-07-16T22:16:13.468", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-2-v20120326", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images/centos-6-2-v20120326", "name": "centos-6-2-v20120326", "description": "DEPRECATED. CentOS 6.2 image; Created Mon, 26 Mar 2012 21:19:09 +0000", "sourceType": "RAW", - "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/kernels/gce-20120326", + "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/kernels/gce-20120326", "deprecated": { "state": "DEPRECATED", - "replacement": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-v20130104" + "replacement": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images/centos-6-v20130104" }, "rawDisk": { "source": "", diff --git a/google-compute-engine/src/test/resources/image_list_multiple_page_1.json b/google-compute-engine/src/test/resources/image_list_multiple_page_1.json index 950613d79..224d0bea5 100644 --- a/google-compute-engine/src/test/resources/image_list_multiple_page_1.json +++ b/google-compute-engine/src/test/resources/image_list_multiple_page_1.json @@ -1,21 +1,21 @@ { "kind": "compute#imageList", "id": "projects/google/global/images", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images", "nextPageToken": "CgVJTUFHRRIbZ29vZ2xlLmNlbnRvcy02LTItdjIwMTIwNjIx", "items": [ { "kind": "compute#image", "id": "12941197498378735318", "creationTimestamp": "2012-07-16T15:16:13.468-07:00", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-2-v20120326", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images/centos-6-2-v20120326", "name": "centos-6-2-v20120326", "description": "DEPRECATED. CentOS 6.2 image; Created Mon, 26 Mar 2012 21:19:09 +0000", "sourceType": "RAW", - "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/kernels/gce-20120326", + "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/kernels/gce-20120326", "deprecated": { "state": "DELETED", - "replacement": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-v20130104" + "replacement": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images/centos-6-v20130104" }, "rawDisk": { "source": "", @@ -26,11 +26,11 @@ "kind": "compute#image", "id": "12894486577628239762", "creationTimestamp": "2012-05-21T13:15:37.215-07:00", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-2-v20120503", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images/centos-6-2-v20120503", "name": "centos-6-2-v20120503", "description": "CentOS 6.2; Created Wed, 09 May 2012 11:55:54 +0000", "sourceType": "RAW", - "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/kernels/gce-20120326", + "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/kernels/gce-20120326", "rawDisk": { "source": "", "containerType": "TAR" @@ -40,14 +40,14 @@ "kind": "compute#image", "id": "12917726455664967299", "creationTimestamp": "2012-06-18T11:05:30.664-07:00", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-2-v20120611", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images/centos-6-2-v20120611", "name": "centos-6-2-v20120611", "description": "CentOS 6.2; Created Mon, 11 Jun 2012 13:15:44 +0000", "sourceType": "RAW", - "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/kernels/gce-20120611", + "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/kernels/gce-20120611", "deprecated": { "state": "DEPRECATED", - "replacement": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-20130509" + "replacement": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-20130509" }, "rawDisk": { "source": "", diff --git a/google-compute-engine/src/test/resources/image_list_multiple_page_2.json b/google-compute-engine/src/test/resources/image_list_multiple_page_2.json index e48986860..c993ff15f 100644 --- a/google-compute-engine/src/test/resources/image_list_multiple_page_2.json +++ b/google-compute-engine/src/test/resources/image_list_multiple_page_2.json @@ -1,18 +1,18 @@ { "kind": "compute#imageList", "id": "projects/google/global/images", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images", "nextPageToken": "CgVJTUFHRRIbZ29vZ2xlLmdjZWwtMTAtMDQtdjIwMTIxMTA2", "items": [ { "kind": "compute#image", "id": "12920641029336858796", "creationTimestamp": "2012-06-21T22:59:56.392-07:00", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-2-v20120621", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images/centos-6-2-v20120621", "name": "centos-6-2-v20120621", "description": "CentOS 6.2; Created Thu, 21 Jun 2012 14:22:21 +0000", "sourceType": "RAW", - "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/kernels/gce-20120621", + "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/kernels/gce-20120621", "rawDisk": { "source": "", "containerType": "TAR" @@ -22,11 +22,11 @@ "kind": "compute#image", "id": "12994279803511049620", "creationTimestamp": "2012-09-18T08:52:47.584-07:00", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-v20120912", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images/centos-6-v20120912", "name": "centos-6-v20120912", "description": "CentOS 6; Created Wed, 12 Sep 2012 00:00:00 +0000", "sourceType": "RAW", - "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/kernels/gce-v20120912", + "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/kernels/gce-v20120912", "rawDisk": { "source": "", "containerType": "TAR" @@ -36,11 +36,11 @@ "kind": "compute#image", "id": "13037720516378381209", "creationTimestamp": "2012-11-09T11:40:41.079-08:00", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-v20121106", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images/centos-6-v20121106", "name": "centos-6-v20121106", "description": "SCSI-enabled CentOS 6; Created Tue, 06 Nov 2012 00:00:00 +0000", "sourceType": "RAW", - "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/kernels/gce-v20121106", + "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/kernels/gce-v20121106", "rawDisk": { "source": "", "containerType": "TAR" diff --git a/google-compute-engine/src/test/resources/image_list_single_page.json b/google-compute-engine/src/test/resources/image_list_single_page.json index ab11b0d54..06296c1b7 100644 --- a/google-compute-engine/src/test/resources/image_list_single_page.json +++ b/google-compute-engine/src/test/resources/image_list_single_page.json @@ -1,17 +1,17 @@ { "kind": "compute#imageList", "id": "projects/google/global/images", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images", "items": [ { "kind": "compute#image", "id": "13037722963789596520", "creationTimestamp": "2012-11-09T11:43:28.749-08:00", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/gcel-10-04-v20121106", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images/gcel-10-04-v20121106", "name": "gcel-10-04-v20121106", "description": "SCSI-enabled GCEL 10.04 LTS; Created Tue, 06 Nov 2012 00:00:00 +0000", "sourceType": "RAW", - "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/kernels/gce-v20121106", + "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/kernels/gce-v20121106", "rawDisk": { "source": "", "containerType": "TAR" @@ -21,11 +21,11 @@ "kind": "compute#image", "id": "13037721421359523565", "creationTimestamp": "2012-11-09T11:40:51.994-08:00", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/gcel-12-04-v20121106", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images/gcel-12-04-v20121106", "name": "gcel-12-04-v20121106", "description": "SCSI-enabled GCEL 12.04 LTS; Created Tue, 06 Nov 2012 00:00:00 +0000", "sourceType": "RAW", - "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/kernels/gce-v20121106", + "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/kernels/gce-v20121106", "rawDisk": { "source": "", "containerType": "TAR" @@ -35,14 +35,14 @@ "kind": "compute#image", "id": "12941198995845323366", "creationTimestamp": "2012-07-16T15:18:50.405-07:00", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/ubuntu-10-04-v20110728", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images/ubuntu-10-04-v20110728", "name": "ubuntu-10-04-v20110728", "description": "DEPRECATED. GCEL 10.04 LTS; Created Thu, 28 Jul 2011 16:45:51 +0000", "sourceType": "RAW", - "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/kernels/gce-20110728", + "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/kernels/gce-20110728", "deprecated": { "state": "DELETED", - "replacement": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/gcel-10-04-v20130104" + "replacement": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images/gcel-10-04-v20130104" }, "rawDisk": { "source": "", diff --git a/google-compute-engine/src/test/resources/instance_add_access_config.json b/google-compute-engine/src/test/resources/instance_add_access_config.json index 8edaf8a50..9c709561e 100644 --- a/google-compute-engine/src/test/resources/instance_add_access_config.json +++ b/google-compute-engine/src/test/resources/instance_add_access_config.json @@ -1,4 +1,4 @@ -POST https://www.googleapis.com/compute/v1beta15/projects/jclouds-gce/zones/us-central1-a/instances/test-instance/addAccessConfig?network_interface=nic0&key={YOUR_API_KEY} +POST https://www.googleapis.com/compute/v1beta16/projects/jclouds-gce/zones/us-central1-a/instances/test-instance/addAccessConfig?network_interface=nic0&key={YOUR_API_KEY} Content-Type: application/json Authorization: Bearer ya29.AHES6ZRyNKVHwnMPUvZitAuA8mR8b0lcWh1bMI5UQ5bgsJ4j diff --git a/google-compute-engine/src/test/resources/instance_get.json b/google-compute-engine/src/test/resources/instance_get.json index 3111f93d6..7f7f5394a 100644 --- a/google-compute-engine/src/test/resources/instance_get.json +++ b/google-compute-engine/src/test/resources/instance_get.json @@ -3,18 +3,18 @@ "id": "13051190678907570425", "description": "desc", "creationTimestamp": "2012-11-25T23:48:20.758", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/test-0", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances/test-0", "name": "test-0", - "image": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/gcel-12-04-v20121106", - "machineType": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1", + "image": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images/gcel-12-04-v20121106", + "machineType": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1", "status": "RUNNING", - "zone": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a", + "zone": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a", "networkInterfaces": [ { "kind": "compute#instanceNetworkInterface", "name": "nic0", "networkIP": "10.240.121.115", - "network": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/default" + "network": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/default" } ], "disks": [ @@ -23,7 +23,7 @@ "type": "PERSISTENT", "mode": "READ_WRITE", "deviceName": "test", - "source": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/test", + "source": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/test", "index": 0 } ], diff --git a/google-compute-engine/src/test/resources/instance_insert.json b/google-compute-engine/src/test/resources/instance_insert.json index f62608261..ad9f8b3d1 100644 --- a/google-compute-engine/src/test/resources/instance_insert.json +++ b/google-compute-engine/src/test/resources/instance_insert.json @@ -1 +1 @@ -{"name":"test-0","description":"desc","machineType":"https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1","image":"https://www.googleapis.com/compute/v1beta15/projects/google/global/images/gcel-12-04-v20121106","serviceAccounts":[{"email":"default","scopes":["myscope"]}],"networkInterfaces":[{"network":"https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/default","accessConfigs":[{"type":"ONE_TO_ONE_NAT"}]}],"disks":[{"mode":"READ_WRITE","source":"https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/test","type":"PERSISTENT"}],"metadata":{"kind":"compute#metadata","items":[{"key":"aKey","value":"aValue"}]}} \ No newline at end of file +{"name":"test-0","description":"desc","machineType":"https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1","image":"https://www.googleapis.com/compute/v1beta16/projects/google/global/images/gcel-12-04-v20121106","serviceAccounts":[{"email":"default","scopes":["myscope"]}],"networkInterfaces":[{"network":"https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/default","accessConfigs":[{"type":"ONE_TO_ONE_NAT"}]}],"disks":[{"mode":"READ_WRITE","source":"https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/test","type":"PERSISTENT"}],"metadata":{"kind":"compute#metadata","items":[{"key":"aKey","value":"aValue"}]}} \ No newline at end of file diff --git a/google-compute-engine/src/test/resources/instance_insert_simple.json b/google-compute-engine/src/test/resources/instance_insert_simple.json index 83b2b7ae1..6d5bc2849 100644 --- a/google-compute-engine/src/test/resources/instance_insert_simple.json +++ b/google-compute-engine/src/test/resources/instance_insert_simple.json @@ -1 +1 @@ -{"name":"test-1","machineType":"https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1","image":"https://www.googleapis.com/compute/v1beta15/projects/google/global/images/gcel-12-04-v20121106","serviceAccounts":[],"networkInterfaces":[{"network":"https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/default","accessConfigs":[]}]} \ No newline at end of file +{"name":"test-1","machineType":"https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1","image":"https://www.googleapis.com/compute/v1beta16/projects/google/global/images/gcel-12-04-v20121106","serviceAccounts":[],"networkInterfaces":[{"network":"https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/default","accessConfigs":[]}]} \ No newline at end of file diff --git a/google-compute-engine/src/test/resources/instance_list.json b/google-compute-engine/src/test/resources/instance_list.json index 2df42a5d9..9ea7a914f 100644 --- a/google-compute-engine/src/test/resources/instance_list.json +++ b/google-compute-engine/src/test/resources/instance_list.json @@ -1,25 +1,25 @@ { "kind": "compute#instanceList", "id": "projects/myproject/zones/us-central1-a/instances", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances", "items": [ { "kind": "compute#instance", "id": "13051190678907570425", "description": "desc", "creationTimestamp": "2012-11-25T23:48:20.758", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/test-0", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances/test-0", "name": "test-0", - "image": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/gcel-12-04-v20121106", - "machineType": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1", + "image": "https://www.googleapis.com/compute/v1beta16/projects/google/global/images/gcel-12-04-v20121106", + "machineType": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1", "status": "RUNNING", - "zone": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a", + "zone": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a", "networkInterfaces": [ { "kind": "compute#instanceNetworkInterface", "name": "nic0", "networkIP": "10.240.121.115", - "network": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/default" + "network": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/default" } ], "disks": [ @@ -28,7 +28,7 @@ "type": "PERSISTENT", "mode": "READ_WRITE", "deviceName": "test", - "source": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/test", + "source": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/test", "index": 0 } ], diff --git a/google-compute-engine/src/test/resources/instance_list_central1b_empty.json b/google-compute-engine/src/test/resources/instance_list_central1b_empty.json index dcdc60915..e57923b9e 100644 --- a/google-compute-engine/src/test/resources/instance_list_central1b_empty.json +++ b/google-compute-engine/src/test/resources/instance_list_central1b_empty.json @@ -1,6 +1,6 @@ { "kind": "compute#instanceList", "id": "projects/myproject/zones/us-central1-b/instances", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-b/instances", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-b/instances", "items": [ ] } diff --git a/google-compute-engine/src/test/resources/kernel.json b/google-compute-engine/src/test/resources/kernel.json index e304e088c..4a0e52506 100644 --- a/google-compute-engine/src/test/resources/kernel.json +++ b/google-compute-engine/src/test/resources/kernel.json @@ -2,7 +2,7 @@ "kind": "compute#kernel", "id": "12941177846308850718", "creationTimestamp": "2012-07-16T21:42:16.950", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-20110524", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-20110524", "name": "gce-20110524", "description": "DEPRECATED. Created Tue, 24 May 2011 00:48:22 +0000" } \ No newline at end of file diff --git a/google-compute-engine/src/test/resources/kernel_list.json b/google-compute-engine/src/test/resources/kernel_list.json index 3fb0aa759..0612d6349 100644 --- a/google-compute-engine/src/test/resources/kernel_list.json +++ b/google-compute-engine/src/test/resources/kernel_list.json @@ -1,13 +1,13 @@ { "kind": "compute#kernelList", "id": "projects/google/global/kernels", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels", "items": [ { "kind": "compute#kernel", "id": "12941177846308850718", "creationTimestamp": "2012-07-16T21:42:16.950", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-20110524", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-20110524", "name": "gce-20110524", "description": "DEPRECATED. Created Tue, 24 May 2011 00:48:22 +0000" }, @@ -15,7 +15,7 @@ "kind": "compute#kernel", "id": "12941177983348179280", "creationTimestamp": "2012-07-16T21:42:31.166", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-20110728", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-20110728", "name": "gce-20110728", "description": "DEPRECATED. Created Thu, 28 Jul 2011 16:44:38 +0000" } diff --git a/google-compute-engine/src/test/resources/machinetype.json b/google-compute-engine/src/test/resources/machinetype.json index 5aa902a6d..5db7cba1b 100644 --- a/google-compute-engine/src/test/resources/machinetype.json +++ b/google-compute-engine/src/test/resources/machinetype.json @@ -2,7 +2,7 @@ "kind": "compute#machineType", "id": "12907738072351752276", "creationTimestamp": "2012-06-07T20:48:14.670", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1", "name": "n1-standard-1", "description": "1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk", "guestCpus": 1, diff --git a/google-compute-engine/src/test/resources/machinetype_list.json b/google-compute-engine/src/test/resources/machinetype_list.json index 0506a0e68..ba6a17373 100644 --- a/google-compute-engine/src/test/resources/machinetype_list.json +++ b/google-compute-engine/src/test/resources/machinetype_list.json @@ -1,7 +1,7 @@ { "kind": "compute#machineTypeList", "id": "projects/myproject/machineTypes", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes", "items": [ { "kind": "compute#machineType", @@ -15,13 +15,13 @@ "maximumPersistentDisks": 4, "maximumPersistentDisksSizeGb": "3072", "zone": "us-central1-a", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes/f1-micro" + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes/f1-micro" }, { "kind": "compute#machineType", "id": "12907738072351752276", "creationTimestamp": "2012-06-07T20:48:14.670", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1", "name": "n1-standard-1", "description": "1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk", "guestCpus": 1, @@ -35,7 +35,7 @@ "kind": "compute#machineType", "id": "12908560709887590691", "creationTimestamp": "2012-06-07T20:51:19.936", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-8-d", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-8-d", "name": "n1-standard-8-d", "description": "8 vCPUs, 30 GB RAM, a 10 GB ephemeral root disk, and 2 extra 1770 GB ephemeral disks", "guestCpus": 8, diff --git a/google-compute-engine/src/test/resources/machinetype_list_central1b.json b/google-compute-engine/src/test/resources/machinetype_list_central1b.json index cba2adfc3..9fad0aacf 100644 --- a/google-compute-engine/src/test/resources/machinetype_list_central1b.json +++ b/google-compute-engine/src/test/resources/machinetype_list_central1b.json @@ -1,13 +1,13 @@ { "kind": "compute#machineTypeList", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/abayer-jclouds-test1/zones/us-central1-b/machineTypes", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/abayer-jclouds-test1/zones/us-central1-b/machineTypes", "id": "projects/abayer-jclouds-test1/zones/us-central1-b/machineTypes", "items": [ { "kind": "compute#machineType", "id": "12907738072351752276", "creationTimestamp": "2012-06-07T20:48:14.670", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-b/machineTypes/n1-standard-0", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-b/machineTypes/n1-standard-0", "name": "n1-standard-0", "description": "1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk", "guestCpus": 1, @@ -21,7 +21,7 @@ "kind": "compute#machineType", "id": "12908560709887590691", "creationTimestamp": "2012-06-07T20:51:19.936", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-b/machineTypes/n1-standard-8-d", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-b/machineTypes/n1-standard-8-d", "name": "n1-standard-8-d", "description": "8 vCPUs, 30 GB RAM, a 10 GB ephemeral root disk, and 2 extra 1770 GB ephemeral disks", "guestCpus": 8, diff --git a/google-compute-engine/src/test/resources/machinetype_list_central1b_empty.json b/google-compute-engine/src/test/resources/machinetype_list_central1b_empty.json index 793c9ebfa..f30b8ee17 100644 --- a/google-compute-engine/src/test/resources/machinetype_list_central1b_empty.json +++ b/google-compute-engine/src/test/resources/machinetype_list_central1b_empty.json @@ -1,6 +1,6 @@ { "kind": "compute#machineTypeList", "id": "projects/myproject/zones/us-central1-b/machineTypes", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-b/machineTypes", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-b/machineTypes", "items": [] } \ No newline at end of file diff --git a/google-compute-engine/src/test/resources/network_get.json b/google-compute-engine/src/test/resources/network_get.json index 87f9e5620..1ba015cfc 100644 --- a/google-compute-engine/src/test/resources/network_get.json +++ b/google-compute-engine/src/test/resources/network_get.json @@ -2,7 +2,7 @@ "kind": "compute#network", "id": "13024414170909937976", "creationTimestamp": "2012-10-24T20:13:19.967", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/networks/jclouds-test", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/networks/jclouds-test", "name": "default", "description": "Default network for the project", "IPv4Range": "10.0.0.0/8", diff --git a/google-compute-engine/src/test/resources/network_list.json b/google-compute-engine/src/test/resources/network_list.json index 1cb72a1be..601ab7f38 100644 --- a/google-compute-engine/src/test/resources/network_list.json +++ b/google-compute-engine/src/test/resources/network_list.json @@ -1,14 +1,14 @@ { "kind": "compute#networkList", "id": "projects/myproject/networks", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/networks", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/networks", "items": [ { "kind": "compute#network", "id": "13024414170909937976", "creationTimestamp": "2012-10-24T20:13:19.967", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/networks/jclouds-test", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/networks/jclouds-test", "name": "default", "description": "Default network for the project", "IPv4Range": "10.0.0.0/8", diff --git a/google-compute-engine/src/test/resources/operation.json b/google-compute-engine/src/test/resources/operation.json index e173bac5b..d41287641 100644 --- a/google-compute-engine/src/test/resources/operation.json +++ b/google-compute-engine/src/test/resources/operation.json @@ -1,9 +1,9 @@ { "kind": "compute#operation", "id": "13053095055850848306", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", - "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance", + "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance", "targetId": "13053094017547040099", "status": "DONE", "user": "user@developer.gserviceaccount.com", @@ -12,6 +12,6 @@ "startTime": "2012-11-28T06:41:05.142", "endTime": "2012-11-28T06:41:06.142", "operationType": "insert", - "region": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1", - "zone": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a" + "region": "https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1", + "zone": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a" } \ No newline at end of file diff --git a/google-compute-engine/src/test/resources/operation_error.json b/google-compute-engine/src/test/resources/operation_error.json index b18ffbae2..f71376593 100644 --- a/google-compute-engine/src/test/resources/operation_error.json +++ b/google-compute-engine/src/test/resources/operation_error.json @@ -1,9 +1,9 @@ { "kind": "compute#operation", "id": "13053095055850848306", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", - "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance", + "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance", "targetId": "13053094017547040099", "status": "DONE", "user": "user@developer.gserviceaccount.com", @@ -21,6 +21,6 @@ ] }, "operationType": "insert", - "region": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1", - "zone": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a" + "region": "https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1", + "zone": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a" } \ No newline at end of file diff --git a/google-compute-engine/src/test/resources/operation_list.json b/google-compute-engine/src/test/resources/operation_list.json index 75850991e..76c53f30d 100644 --- a/google-compute-engine/src/test/resources/operation_list.json +++ b/google-compute-engine/src/test/resources/operation_list.json @@ -1,14 +1,14 @@ { "kind": "compute#operationList", "id": "projects/myproject/operations", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/operations", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/operations", "items": [ { "kind": "compute#operation", "id": "13053095055850848306", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", - "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance", + "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance", "targetId": "13053094017547040099", "status": "DONE", "user": "user@developer.gserviceaccount.com", @@ -17,8 +17,8 @@ "startTime": "2012-11-28T06:41:05.142", "endTime": "2012-11-28T06:41:06.142", "operationType": "insert", - "region": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1", - "zone": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a" + "region": "https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1", + "zone": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a" } ] } \ No newline at end of file diff --git a/google-compute-engine/src/test/resources/project.json b/google-compute-engine/src/test/resources/project.json index 50f6705a1..198e9ffc9 100644 --- a/google-compute-engine/src/test/resources/project.json +++ b/google-compute-engine/src/test/resources/project.json @@ -2,7 +2,7 @@ "kind": "compute#project", "id": "13024414184846275913", "creationTimestamp": "2012-10-24T20:13:16.252", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject", "name": "myproject", "description": "", "commonInstanceMetadata": { diff --git a/google-compute-engine/src/test/resources/region_operation.json b/google-compute-engine/src/test/resources/region_operation.json index 738e1761c..6afe2460a 100644 --- a/google-compute-engine/src/test/resources/region_operation.json +++ b/google-compute-engine/src/test/resources/region_operation.json @@ -1,9 +1,9 @@ { "kind": "compute#operation", "id": "13053095055850848306", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", - "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/addresses/test-address", + "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1/addresses/test-address", "targetId": "13053094017547040099", "status": "DONE", "user": "user@developer.gserviceaccount.com", @@ -12,5 +12,5 @@ "startTime": "2012-11-28T06:41:05.142", "endTime": "2012-11-28T06:41:06.142", "operationType": "insert", - "region": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1" + "region": "https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1" } \ No newline at end of file diff --git a/google-compute-engine/src/test/resources/region_operation_list.json b/google-compute-engine/src/test/resources/region_operation_list.json index 047d12ff6..b883615b1 100644 --- a/google-compute-engine/src/test/resources/region_operation_list.json +++ b/google-compute-engine/src/test/resources/region_operation_list.json @@ -1,14 +1,14 @@ { "kind": "compute#operationList", "id": "projects/myproject/regions/us-central1/operations", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/operations", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1/operations", "items": [ { "kind": "compute#operation", "id": "13053095055850848306", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", - "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/addresses/test-address", + "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1/addresses/test-address", "targetId": "13053094017547040099", "status": "DONE", "user": "user@developer.gserviceaccount.com", @@ -17,7 +17,7 @@ "startTime": "2012-11-28T06:41:05.142", "endTime": "2012-11-28T06:41:06.142", "operationType": "insert", - "region": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1" + "region": "https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1" } ] } \ No newline at end of file diff --git a/google-compute-engine/src/test/resources/snapshot_get.json b/google-compute-engine/src/test/resources/snapshot_get.json index 04ff50d60..487fd01b5 100644 --- a/google-compute-engine/src/test/resources/snapshot_get.json +++ b/google-compute-engine/src/test/resources/snapshot_get.json @@ -2,10 +2,10 @@ "kind": "compute#snapshot", "id": "13050421646334304999", "creationTimestamp": "2012-11-25T01:38:48.306", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/snapshots/testsnap1", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/snapshots/testsnap1", "name": "testsnap1", "sizeGb": "1", "status": "READY", - "sourceDisk": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/testimage1", + "sourceDisk": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/testimage1", "sourceDiskId": "13050421646334304115" } \ No newline at end of file diff --git a/google-compute-engine/src/test/resources/zone_get.json b/google-compute-engine/src/test/resources/zone_get.json index c64aeee78..7161e303f 100644 --- a/google-compute-engine/src/test/resources/zone_get.json +++ b/google-compute-engine/src/test/resources/zone_get.json @@ -2,7 +2,7 @@ "kind": "compute#zone", "id": "13020128040171887099", "creationTimestamp": "2012-10-19T16:42:54.131", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a", "name": "us-central1-a", "description": "us-central1-a", "status": "DOWN", diff --git a/google-compute-engine/src/test/resources/zone_list.json b/google-compute-engine/src/test/resources/zone_list.json index fb1a6df7d..e696196ec 100644 --- a/google-compute-engine/src/test/resources/zone_list.json +++ b/google-compute-engine/src/test/resources/zone_list.json @@ -1,13 +1,13 @@ { "kind": "compute#zoneList", "id": "projects/myproject/zones", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones", "items": [ { "kind": "compute#zone", "id": "13020128040171887099", "creationTimestamp": "2012-10-19T16:42:54.131", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a", "name": "us-central1-a", "description": "us-central1-a", "status": "DOWN", @@ -24,7 +24,7 @@ "kind": "compute#zone", "id": "13024414164050619686", "creationTimestamp": "2012-10-24T20:13:19.271", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-b", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-b", "name": "us-central1-b", "description": "us-central1-b", "status": "UP", diff --git a/google-compute-engine/src/test/resources/zone_list_short.json b/google-compute-engine/src/test/resources/zone_list_short.json index 5512aa0a8..e406cef5a 100644 --- a/google-compute-engine/src/test/resources/zone_list_short.json +++ b/google-compute-engine/src/test/resources/zone_list_short.json @@ -1,13 +1,13 @@ { "kind": "compute#zoneList", "id": "projects/myproject/zones", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones", "items": [ { "kind": "compute#zone", "id": "13020128040171887099", "creationTimestamp": "2012-10-19T16:42:54.131", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a", "name": "us-central1-a", "description": "us-central1-a", "status": "DOWN", diff --git a/google-compute-engine/src/test/resources/zone_operation.json b/google-compute-engine/src/test/resources/zone_operation.json index ab93cb9c3..4db38df84 100644 --- a/google-compute-engine/src/test/resources/zone_operation.json +++ b/google-compute-engine/src/test/resources/zone_operation.json @@ -1,9 +1,9 @@ { "kind": "compute#operation", "id": "13053095055850848306", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", - "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance", + "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance", "targetId": "13053094017547040099", "status": "DONE", "user": "user@developer.gserviceaccount.com", @@ -12,5 +12,5 @@ "startTime": "2012-11-28T06:41:05.142", "endTime": "2012-11-28T06:41:06.142", "operationType": "insert", - "zone": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a" + "zone": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a" } \ No newline at end of file diff --git a/google-compute-engine/src/test/resources/zone_operation_error.json b/google-compute-engine/src/test/resources/zone_operation_error.json index 10b547707..c942ae7e3 100644 --- a/google-compute-engine/src/test/resources/zone_operation_error.json +++ b/google-compute-engine/src/test/resources/zone_operation_error.json @@ -1,9 +1,9 @@ { "kind": "compute#operation", "id": "13053095055850848306", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", - "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance", + "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance", "targetId": "13053094017547040099", "status": "DONE", "user": "user@developer.gserviceaccount.com", @@ -21,5 +21,5 @@ ] }, "operationType": "insert", - "zone": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a" + "zone": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a" } \ No newline at end of file diff --git a/google-compute-engine/src/test/resources/zone_operation_list.json b/google-compute-engine/src/test/resources/zone_operation_list.json index 7a3137a1d..ef315427b 100644 --- a/google-compute-engine/src/test/resources/zone_operation_list.json +++ b/google-compute-engine/src/test/resources/zone_operation_list.json @@ -1,14 +1,14 @@ { "kind": "compute#operationList", "id": "projects/myproject/zones/us-central1-a/operations", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/operations", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/operations", "items": [ { "kind": "compute#operation", "id": "13053095055850848306", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb", "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", - "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance", + "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance", "targetId": "13053094017547040099", "status": "DONE", "user": "user@developer.gserviceaccount.com", @@ -17,7 +17,7 @@ "startTime": "2012-11-28T06:41:05.142", "endTime": "2012-11-28T06:41:06.142", "operationType": "insert", - "zone": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a" + "zone": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a" } ] } \ No newline at end of file