You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ab...@apache.org on 2013/10/04 22:05:58 UTC
[4/4] git commit: JCLOUDS-336. Move to GCE v1beta16 API
JCLOUDS-336. Move to GCE v1beta16 API
Also add region-level quotas.
Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/commit/c7e93692
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/tree/c7e93692
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/diff/c7e93692
Branch: refs/heads/master
Commit: c7e936926d6786ebfcfa30b2196a35417e2b3e94
Parents: f31d908
Author: Andrew Bayer <an...@gmail.com>
Authored: Fri Oct 4 11:44:39 2013 -0700
Committer: Andrew Bayer <an...@gmail.com>
Committed: Fri Oct 4 11:44:39 2013 -0700
----------------------------------------------------------------------
google-compute-engine/pom.xml | 2 +-
.../GoogleComputeEngineApi.java | 2 +-
.../GoogleComputeEngineApiMetadata.java | 6 +-
.../config/GoogleComputeEngineParserModule.java | 3 +-
.../domain/AbstractDisk.java | 2 +-
.../googlecomputeengine/domain/Address.java | 2 +-
.../googlecomputeengine/domain/Disk.java | 2 +-
.../googlecomputeengine/domain/Firewall.java | 4 +-
.../googlecomputeengine/domain/Image.java | 4 +-
.../googlecomputeengine/domain/Instance.java | 10 +-
.../googlecomputeengine/domain/Kernel.java | 2 +-
.../googlecomputeengine/domain/MachineType.java | 2 +-
.../googlecomputeengine/domain/Network.java | 2 +-
.../googlecomputeengine/domain/Operation.java | 2 +-
.../googlecomputeengine/domain/Project.java | 129 ----------------
.../googlecomputeengine/domain/Quota.java | 152 +++++++++++++++++++
.../googlecomputeengine/domain/Region.java | 41 ++++-
.../googlecomputeengine/domain/Route.java | 2 +-
.../googlecomputeengine/domain/Snapshot.java | 2 +-
.../googlecomputeengine/domain/Zone.java | 4 +-
.../features/AddressApi.java | 2 +-
.../googlecomputeengine/features/DiskApi.java | 2 +-
.../features/FirewallApi.java | 2 +-
.../features/GlobalOperationApi.java | 2 +-
.../googlecomputeengine/features/ImageApi.java | 2 +-
.../features/InstanceApi.java | 2 +-
.../googlecomputeengine/features/KernelApi.java | 2 +-
.../features/MachineTypeApi.java | 2 +-
.../features/NetworkApi.java | 2 +-
.../features/ProjectApi.java | 2 +-
.../googlecomputeengine/features/RegionApi.java | 2 +-
.../features/RegionOperationApi.java | 2 +-
.../googlecomputeengine/features/RouteApi.java | 2 +-
.../features/SnapshotApi.java | 2 +-
.../googlecomputeengine/features/ZoneApi.java | 2 +-
.../features/ZoneOperationApi.java | 2 +-
.../options/ListOptions.java | 2 +-
.../PageSystemExpectTest.java | 8 +-
.../GoogleComputeEngineServiceExpectTest.java | 26 ++--
.../functions/FirewallToIpPermissionTest.java | 4 +-
.../functions/NetworkToSecurityGroupTest.java | 4 +-
.../loaders/FindNetworkOrCreateTest.java | 4 +-
.../features/AddressApiExpectTest.java | 14 +-
.../features/DiskApiExpectTest.java | 18 +--
.../features/FirewallApiExpectTest.java | 24 +--
.../features/GlobalOperationApiExpectTest.java | 2 +-
.../features/ImageApiExpectTest.java | 12 +-
.../features/InstanceApiExpectTest.java | 48 +++---
.../features/KernelApiExpectTest.java | 8 +-
.../features/MachineTypeApiExpectTest.java | 8 +-
.../features/NetworkApiExpectTest.java | 14 +-
.../features/ProjectApiExpectTest.java | 2 +-
.../features/RegionApiExpectTest.java | 2 +-
.../features/RegionOperationApiExpectTest.java | 12 +-
.../features/RouteApiExpectTest.java | 18 +--
.../features/SnapshotApiExpectTest.java | 2 +-
.../features/ZoneApiExpectTest.java | 2 +-
.../features/ZoneOperationApiExpectTest.java | 10 +-
.../functions/CreateNetworkIfNeededTest.java | 4 +-
.../GoogleComputeEngineErrorHandlerTest.java | 2 +-
.../BaseGoogleComputeEngineApiLiveTest.java | 2 +-
.../parse/ParseAddressListTest.java | 6 +-
.../parse/ParseAddressTest.java | 4 +-
.../parse/ParseDiskListTest.java | 6 +-
.../parse/ParseDiskTest.java | 4 +-
.../parse/ParseFirewallListTest.java | 6 +-
.../parse/ParseFirewallTest.java | 4 +-
.../parse/ParseImageListTest.java | 8 +-
.../parse/ParseImageTest.java | 4 +-
.../parse/ParseInstanceListTest.java | 2 +-
.../parse/ParseInstanceTest.java | 12 +-
.../parse/ParseKernelListTest.java | 8 +-
.../parse/ParseKernelTest.java | 2 +-
.../parse/ParseMachineTypeListTest.java | 8 +-
.../parse/ParseMachineTypeTest.java | 2 +-
.../parse/ParseNetworkListTest.java | 2 +-
.../parse/ParseNetworkTest.java | 2 +-
.../parse/ParseOperationListTest.java | 2 +-
.../parse/ParseOperationTest.java | 4 +-
.../parse/ParseProjectTest.java | 2 +-
.../parse/ParseQuotaTest.java | 8 +-
.../parse/ParseRegionListTest.java | 15 +-
.../parse/ParseRegionTest.java | 15 +-
.../parse/ParseRouteListTest.java | 8 +-
.../parse/ParseRouteTest.java | 6 +-
.../parse/ParseSnapshotListTest.java | 6 +-
.../parse/ParseSnapshotTest.java | 4 +-
.../parse/ParseZoneListTest.java | 4 +-
.../parse/ParseZoneTest.java | 2 +-
.../NetworkFirewallPredicatesTest.java | 8 +-
.../src/test/resources/address_get.json | 4 +-
.../src/test/resources/address_list.json | 10 +-
.../src/test/resources/disk_get.json | 4 +-
.../src/test/resources/disk_list.json | 6 +-
.../src/test/resources/firewall_get.json | 4 +-
.../src/test/resources/firewall_insert.json | 2 +-
.../src/test/resources/firewall_list.json | 10 +-
.../src/test/resources/global_operation.json | 4 +-
.../test/resources/global_operation_list.json | 6 +-
.../src/test/resources/image_get.json | 4 +-
.../src/test/resources/image_list.json | 8 +-
.../resources/image_list_multiple_page_1.json | 18 +--
.../resources/image_list_multiple_page_2.json | 14 +-
.../test/resources/image_list_single_page.json | 16 +-
.../resources/instance_add_access_config.json | 2 +-
.../test/resources/instance_attach_disk.json | 2 +-
.../src/test/resources/instance_get.json | 12 +-
.../src/test/resources/instance_insert.json | 2 +-
.../test/resources/instance_insert_simple.json | 2 +-
.../src/test/resources/instance_list.json | 14 +-
.../instance_list_central1b_empty.json | 2 +-
.../src/test/resources/kernel.json | 2 +-
.../src/test/resources/kernel_list.json | 8 +-
.../src/test/resources/machinetype.json | 2 +-
.../src/test/resources/machinetype_list.json | 8 +-
.../resources/machinetype_list_central1b.json | 6 +-
.../machinetype_list_central1b_empty.json | 2 +-
.../src/test/resources/network_get.json | 2 +-
.../src/test/resources/network_list.json | 4 +-
.../src/test/resources/operation.json | 8 +-
.../src/test/resources/operation_error.json | 8 +-
.../src/test/resources/operation_list.json | 10 +-
.../src/test/resources/project.json | 2 +-
.../src/test/resources/region_get.json | 53 ++++++-
.../src/test/resources/region_list.json | 106 ++++++++++++-
.../src/test/resources/region_operation.json | 6 +-
.../test/resources/region_operation_list.json | 8 +-
.../src/test/resources/route_get.json | 6 +-
.../src/test/resources/route_insert.json | 2 +-
.../src/test/resources/route_list.json | 14 +-
.../src/test/resources/snapshot_get.json | 4 +-
.../src/test/resources/snapshot_list.json | 10 +-
.../src/test/resources/zone_get.json | 2 +-
.../src/test/resources/zone_list.json | 6 +-
.../src/test/resources/zone_list_short.json | 4 +-
.../src/test/resources/zone_operation.json | 6 +-
.../test/resources/zone_operation_error.json | 6 +-
.../src/test/resources/zone_operation_list.json | 8 +-
138 files changed, 742 insertions(+), 530 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/pom.xml
----------------------------------------------------------------------
diff --git a/google-compute-engine/pom.xml b/google-compute-engine/pom.xml
index 375192c..f440a0f 100644
--- a/google-compute-engine/pom.xml
+++ b/google-compute-engine/pom.xml
@@ -37,7 +37,7 @@
</test.google-compute-engine.identity>
<test.google-compute-engine.credential>Private key (PKCS12 file) associated with the Google API client_id
</test.google-compute-engine.credential>
- <test.google-compute-engine.api-version>v1beta15</test.google-compute-engine.api-version>
+ <test.google-compute-engine.api-version>v1beta16</test.google-compute-engine.api-version>
<test.google-compute-engine.build-version/>
<test.google-compute-engine.template>osFamily=GCEL,osVersionMatches=1[012].[01][04],locationId=us-central1-a,minRam=2048</test.google-compute-engine.template>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApi.java
----------------------------------------------------------------------
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 1f49bcc..6589c4d 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
@@ -47,7 +47,7 @@ import com.google.common.annotations.Beta;
* <p/>
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15">api doc</a>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16">api doc</a>
*/
@Beta
public interface GoogleComputeEngineApi extends Closeable {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApiMetadata.java
----------------------------------------------------------------------
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 0333f6c..f2281c7 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.common.collect.ImmutableSet;
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 @@ public class GoogleComputeEngineApiMetadata extends BaseHttpApiMetadata<GoogleCo
.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.<Class<? extends Module>>builder()
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineParserModule.java
----------------------------------------------------------------------
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 ef9d7d6..6dc0160 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
@@ -33,6 +33,7 @@ import org.jclouds.googlecomputeengine.domain.InstanceTemplate;
import org.jclouds.googlecomputeengine.domain.Metadata;
import org.jclouds.googlecomputeengine.domain.Operation;
import org.jclouds.googlecomputeengine.domain.Project;
+import org.jclouds.googlecomputeengine.domain.Quota;
import org.jclouds.googlecomputeengine.options.FirewallOptions;
import org.jclouds.googlecomputeengine.options.RouteOptions;
import org.jclouds.json.config.GsonModule;
@@ -86,7 +87,7 @@ public class GoogleComputeEngineParserModule extends AbstractModule {
/**
* Parser for operations that unwraps errors avoiding an extra intermediate object.
*
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/operations"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/operations"/>
*/
@Singleton
private static class OperationTypeAdapter implements JsonDeserializer<Operation> {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AbstractDisk.java
----------------------------------------------------------------------
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 fda65ec..44e13a2 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 @@ import com.google.common.base.Objects;
* A persistent disk resource
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/disks"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/disks"/>
*/
@Beta
public abstract class AbstractDisk extends Resource {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Address.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Address.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Address.java
index 7f97ec0..03e6fab 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Address.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Address.java
@@ -32,7 +32,7 @@ import com.google.common.base.Optional;
* Represents an Address resource.
*
* @author Andrew Bayer
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/addresses"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/addresses"/>
*/
@Beta
public final class Address extends Resource {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Disk.java
----------------------------------------------------------------------
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 df5e38c..a986eba 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 @@ import com.google.common.base.Objects;
* A persistent disk resource
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/disks"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/disks"/>
*/
@Beta
public final class Disk extends AbstractDisk {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Firewall.java
----------------------------------------------------------------------
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 78874bc..b450729 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
@@ -40,7 +40,7 @@ import com.google.common.collect.TreeRangeSet;
* Represents a network firewall
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/firewalls"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/firewalls"/>
* @see <a href="https://developers.google.com/compute/docs/networking#firewalls"/>
*/
@Beta
@@ -243,7 +243,7 @@ public final class Firewall extends Resource {
* permitted connection.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/firewalls"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/firewalls"/>
*/
public static final class Rule {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java
----------------------------------------------------------------------
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 8bbfa98..b48afee 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 @@ import com.google.common.base.Optional;
* Represents a disk image to use on an instance.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/images"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/images"/>
*/
@Beta
public final class Image extends Resource {
@@ -175,7 +175,7 @@ public final class Image extends Resource {
* A raw disk image, usually the base for an image.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/images"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/images"/>
*/
public static class RawDisk {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java
----------------------------------------------------------------------
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 12b3237..19c9e52 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
@@ -37,7 +37,7 @@ import com.google.common.collect.ImmutableSet;
* Represents a virtual machine.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/instances"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/instances"/>
*/
@Beta
public class Instance extends Resource {
@@ -469,7 +469,7 @@ public class Instance extends Resource {
/**
* A disk attached to an Instance.
*
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/instances"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/instances"/>
*/
public static class AttachedDisk {
@@ -658,7 +658,7 @@ public class Instance extends Resource {
/**
* A network interface for an Instance.
*
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/instances"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/instances"/>
*/
public static final class NetworkInterface {
@@ -952,7 +952,7 @@ public class Instance extends Resource {
* The output of an instance's serial port;
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/instances/serialPort"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/instances/serialPort"/>
*/
public static final class SerialPortOutput {
@@ -1060,7 +1060,7 @@ public class Instance extends Resource {
* A service account for which access tokens are to be made available to the instance through metadata queries.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/instances"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/instances"/>
*/
public static final class ServiceAccount {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Kernel.java
----------------------------------------------------------------------
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 1834078..127ebdd 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
@@ -30,7 +30,7 @@ import com.google.common.base.Optional;
* Represents a kernel.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/kernels"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/kernels"/>
*/
@Beta
public final class Kernel extends Resource {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java
----------------------------------------------------------------------
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 fd1aa58..86b1a2c 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 @@ import com.google.common.collect.ImmutableList;
* Represents a machine type used to host an instance.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/machineTypes"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/machineTypes"/>
*/
@Beta
public final class MachineType extends Resource {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Network.java
----------------------------------------------------------------------
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 2fe913c..2235873 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 @@ import com.google.common.base.Optional;
* Represents a network used to enable instance communication.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/networks"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/networks"/>
*/
@Beta
public final class Network extends Resource {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Operation.java
----------------------------------------------------------------------
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 f387aee..b3547ce 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 @@ import com.google.common.collect.ImmutableList;
* Describes an operation being executed on some Resource
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/operations"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/operations"/>
*/
@Beta
public class Operation extends Resource {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Project.java
----------------------------------------------------------------------
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 24a139a..d23e8e5 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
@@ -16,11 +16,8 @@
*/
package org.jclouds.googlecomputeengine.domain;
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
-import java.beans.ConstructorProperties;
import java.net.URI;
import java.util.Date;
import java.util.Set;
@@ -163,130 +160,4 @@ public class Project extends Resource {
}
}
- /**
- * Quotas assigned to a given project
- *
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/projects#resource"/>
- */
- public static final class Quota {
-
- private String metric;
- private double usage;
- private double limit;
-
- @ConstructorProperties({
- "metric", "usage", "limit"
- })
- protected Quota(String metric, Double usage, Double limit) {
- this.metric = metric != null ? metric : "undefined";
- this.usage = checkNotNull(usage, "usage");
- this.limit = checkNotNull(limit, "limit");
- }
-
- /**
- * @return name of the quota metric.
- */
- public String getMetric() {
- return metric;
- }
-
- /**
- * @return current usage of this metric.
- */
- public Double getUsage() {
- return usage;
- }
-
- /**
- * @return quota limit for this metric.
- */
- public Double getLimit() {
- return limit;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int hashCode() {
- return Objects.hashCode(metric);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- Quota that = Quota.class.cast(obj);
- return equal(this.metric, that.metric);
- }
-
- /**
- * {@inheritDoc}
- */
- protected Objects.ToStringHelper string() {
- return toStringHelper(this)
- .omitNullValues()
- .add("metric", metric)
- .add("usage", usage)
- .add("limit", limit);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String toString() {
- return string().toString();
- }
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return builder().fromQuota(this);
- }
-
- public static class Builder {
-
- private String metric;
- private Double usage;
- private Double limit;
-
- /**
- * @see org.jclouds.googlecomputeengine.domain.Project.Quota#getMetric()
- */
- public Builder metric(String metric) {
- this.metric = checkNotNull(metric, "metric");
- return this;
- }
-
- /**
- * @see org.jclouds.googlecomputeengine.domain.Project.Quota#getUsage()
- */
- public Builder usage(Double usage) {
- this.usage = usage;
- return this;
- }
-
- /**
- * @see org.jclouds.googlecomputeengine.domain.Project.Quota#getLimit()
- */
- public Builder limit(Double limit) {
- this.limit = limit;
- return this;
- }
-
- public Quota build() {
- return new Quota(metric, usage, limit);
- }
-
- public Builder fromQuota(Quota quota) {
- return new Builder().metric(quota.getMetric()).usage(quota.getUsage()).limit(quota.getLimit());
- }
- }
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java
new file mode 100644
index 0000000..9aec605
--- /dev/null
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java
@@ -0,0 +1,152 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.googlecomputeengine.domain;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.beans.ConstructorProperties;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
+
+/**
+ * Quotas assigned to a given project or region.
+ *
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/projects#resource"/>
+ */
+@Beta
+public class Quota {
+ private String metric;
+ private double usage;
+ private double limit;
+
+ @ConstructorProperties({
+ "metric", "usage", "limit"
+ })
+ public Quota(String metric, Double usage, Double limit) {
+ this.metric = metric != null ? metric : "undefined";
+ this.usage = checkNotNull(usage, "usage");
+ this.limit = checkNotNull(limit, "limit");
+ }
+
+ /**
+ * @return name of the quota metric.
+ */
+ public String getMetric() {
+ return metric;
+ }
+
+ /**
+ * @return current usage of this metric.
+ */
+ public Double getUsage() {
+ return usage;
+ }
+
+ /**
+ * @return quota limit for this metric.
+ */
+ public Double getLimit() {
+ return limit;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(metric);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null || this.getClass() != obj.getClass()) return false;
+ Quota that = Quota.class.cast(obj);
+ return Objects.equal(this.metric, that.metric);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ToStringHelper string() {
+ return Objects.toStringHelper(this)
+ .omitNullValues()
+ .add("metric", metric)
+ .add("usage", usage)
+ .add("limit", limit);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ return string().toString();
+ }
+
+ public static Builder builder() {
+ return new Builder();
+ }
+
+ public Builder toBuilder() {
+ return builder().fromQuota(this);
+ }
+
+ public static class Builder {
+
+ private String metric;
+ private Double usage;
+ private Double limit;
+
+ /**
+ * @see org.jclouds.googlecomputeengine.domain.Quota#getMetric()
+ */
+ public Builder metric(String metric) {
+ this.metric = checkNotNull(metric, "metric");
+ return this;
+ }
+
+ /**
+ * @see org.jclouds.googlecomputeengine.domain.Quota#getUsage()
+ */
+ public Builder usage(Double usage) {
+ this.usage = usage;
+ return this;
+ }
+
+ /**
+ * @see org.jclouds.googlecomputeengine.domain.Quota#getLimit()
+ */
+ public Builder limit(Double limit) {
+ this.limit = limit;
+ return this;
+ }
+
+ public Quota build() {
+ return new Quota(metric, usage, limit);
+ }
+
+ public Builder fromQuota(Quota quota) {
+ return new Builder().metric(quota.getMetric()).usage(quota.getUsage()).limit(quota.getLimit());
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Region.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Region.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Region.java
index 582cca2..4bd260b 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Region.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Region.java
@@ -33,7 +33,7 @@ import com.google.common.collect.ImmutableSet;
* Represents a region resource.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/regions"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/regions"/>
*/
@Beta
public final class Region extends Resource {
@@ -45,17 +45,19 @@ public final class Region extends Resource {
private final Status status;
private final Set<URI> zones;
+ private final Set<Quota> quotas;
@ConstructorProperties({
"id", "creationTimestamp", "selfLink", "name", "description", "status",
- "zones"
+ "zones", "quotas"
})
private Region(String id, Date creationTimestamp, URI selfLink, String name, String description,
- Status status, Set<URI> zones) {
+ Status status, Set<URI> zones, Set<Quota> quotas) {
super(Kind.REGION, id, creationTimestamp, selfLink, name, description);
this.status = checkNotNull(status, "status of %name", name);
this.zones = zones == null ? ImmutableSet.<URI>of() : ImmutableSet
.copyOf(zones);
+ this.quotas = quotas == null ? ImmutableSet.<Quota>of() : ImmutableSet.copyOf(quotas);
}
/**
@@ -74,12 +76,21 @@ public final class Region extends Resource {
}
/**
+ * @return quotas assigned to this project.
+ */
+ public Set<Quota> getQuotas() {
+ return quotas;
+ }
+
+
+ /**
* {@inheritDoc}
*/
protected Objects.ToStringHelper string() {
return super.string()
.add("status", status)
- .add("zones", zones);
+ .add("zones", zones)
+ .add("quotas", quotas);
}
/**
@@ -102,6 +113,7 @@ public final class Region extends Resource {
private Status status;
private ImmutableSet.Builder<URI> zones = ImmutableSet.builder();
+ private ImmutableSet.Builder<Quota> quotas = ImmutableSet.builder();
/**
* @see org.jclouds.googlecomputeengine.domain.Region#getStatus()
@@ -127,6 +139,22 @@ public final class Region extends Resource {
return this;
}
+ /**
+ * @see Region#getQuotas()
+ */
+ public Builder addQuota(String metric, double usage, double limit) {
+ this.quotas.add(Quota.builder().metric(metric).usage(usage).limit(limit).build());
+ return this;
+ }
+
+ /**
+ * @see Region#getQuotas()
+ */
+ public Builder quotas(Set<Quota> quotas) {
+ this.quotas.addAll(checkNotNull(quotas));
+ return this;
+ }
+
@Override
protected Builder self() {
return this;
@@ -134,13 +162,14 @@ public final class Region extends Resource {
public Region build() {
return new Region(super.id, super.creationTimestamp, super.selfLink, super.name,
- super.description, status, zones.build());
+ super.description, status, zones.build(), quotas.build());
}
public Builder fromRegion(Region in) {
return super.fromResource(in)
.status(in.getStatus())
- .zones(in.getZones());
+ .zones(in.getZones())
+ .quotas(in.getQuotas());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Route.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Route.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Route.java
index b15f986..73acd26 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Route.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Route.java
@@ -37,7 +37,7 @@ import com.google.common.collect.ImmutableSet;
* Represents a route resource.
*
* @author Andrew Bayer
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/routes"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/routes"/>
*/
@Beta
public final class Route extends Resource {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Snapshot.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Snapshot.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Snapshot.java
index c487b7c..5528047 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Snapshot.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Snapshot.java
@@ -31,7 +31,7 @@ import com.google.common.base.Optional;
* A Persistent Disk Snapshot resource.
*
* @author Andrew Bayer
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/snapshots"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/snapshots"/>
*/
@Beta
public final class Snapshot extends AbstractDisk {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Zone.java
----------------------------------------------------------------------
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 254b83d..c672222 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 @@ import com.google.common.collect.ImmutableSet;
* Represents a zone resource.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/zones"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/zones"/>
*/
@Beta
public final class Zone extends Resource {
@@ -182,7 +182,7 @@ public final class Zone extends Resource {
* 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 <a href="https://developers.google.com/compute/docs/reference/v1beta15/zones"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/zones"/>
*/
public static final class MaintenanceWindow {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AddressApi.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AddressApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AddressApi.java
index 795f150..042fc59 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AddressApi.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AddressApi.java
@@ -55,7 +55,7 @@ import org.jclouds.rest.binders.BindToJsonPayload;
* Provides access to Addresses via their REST API.
*
* @author Andrew Bayer
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/addresses"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/addresses"/>
*/
@SkipEncoding({'/', '='})
@RequestFilters(OAuthAuthenticator.class)
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskApi.java
----------------------------------------------------------------------
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 b771c74..5c49de1 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 @@ import org.jclouds.rest.binders.BindToJsonPayload;
* Provides access to Disks via their REST API.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/disks"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/disks"/>
*/
@SkipEncoding({'/', '='})
@RequestFilters(OAuthAuthenticator.class)
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/FirewallApi.java
----------------------------------------------------------------------
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 0c25b5b..df034e4 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 @@ import org.jclouds.rest.binders.BindToJsonPayload;
* <p/>
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/firewalls"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/firewalls"/>
*/
@SkipEncoding({'/', '='})
@RequestFilters(OAuthAuthenticator.class)
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/GlobalOperationApi.java
----------------------------------------------------------------------
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 0b1b4d1..7a9a5b4 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 @@ import org.jclouds.rest.annotations.Transform;
* Provides access to Global Operations via their REST API.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/globalOperations"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/globalOperations"/>
*/
@SkipEncoding({'/', '='})
@RequestFilters(OAuthAuthenticator.class)
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ImageApi.java
----------------------------------------------------------------------
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 d3475e8..ff55184 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 @@ import org.jclouds.rest.annotations.Transform;
* <p/>
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/images"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/images"/>
*/
@SkipEncoding({'/', '='})
@RequestFilters(OAuthAuthenticator.class)
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java
----------------------------------------------------------------------
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 7d123a6..88a4f83 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 @@ import org.jclouds.rest.binders.BindToJsonPayload;
* Provides access to Instances via their REST API.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/instances"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/instances"/>
* @see InstanceApi
*/
@SkipEncoding({'/', '='})
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/KernelApi.java
----------------------------------------------------------------------
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 76acf9c..99df99c 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 @@ import org.jclouds.rest.annotations.Transform;
* Provides access to Kernels via their REST API.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/kernels"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/kernels"/>
*/
@SkipEncoding({'/', '='})
@RequestFilters(OAuthAuthenticator.class)
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java
----------------------------------------------------------------------
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 acdd24f..8d4aa53 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 @@ import org.jclouds.rest.annotations.Transform;
* Provides access to MachineTypes via their REST API.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/machineTypes"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/machineTypes"/>
*/
@SkipEncoding({'/', '='})
@RequestFilters(OAuthAuthenticator.class)
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java
----------------------------------------------------------------------
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 5a04ccd..b4de2ac 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 @@ import org.jclouds.rest.binders.BindToJsonPayload;
* Provides access to Networks via their REST API.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/networks"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/networks"/>
*/
@SkipEncoding({'/', '='})
@RequestFilters(OAuthAuthenticator.class)
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java
----------------------------------------------------------------------
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 acabab3..84d47ad 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
@@ -46,7 +46,7 @@ import org.jclouds.rest.annotations.SkipEncoding;
* Provides access to Projects via their REST API.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/projects"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/projects"/>
*/
@SkipEncoding({'/', '='})
@RequestFilters(OAuthAuthenticator.class)
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionApi.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionApi.java
index dcc81ad..33a9494 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionApi.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionApi.java
@@ -45,7 +45,7 @@ import org.jclouds.rest.annotations.Transform;
* Provides access to Regions via their REST API.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/regions"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/regions"/>
*/
@SkipEncoding({'/', '='})
@RequestFilters(OAuthAuthenticator.class)
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionOperationApi.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionOperationApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionOperationApi.java
index 0707f79..b2bd6d8 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionOperationApi.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionOperationApi.java
@@ -49,7 +49,7 @@ import org.jclouds.rest.annotations.Transform;
* Provides access to Operations via their REST API.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/operations"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/operations"/>
*/
@SkipEncoding({'/', '='})
@RequestFilters(OAuthAuthenticator.class)
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RouteApi.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RouteApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RouteApi.java
index 1eac669..231f813 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RouteApi.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RouteApi.java
@@ -57,7 +57,7 @@ import org.jclouds.rest.annotations.Transform;
* Provides access to Routes via their REST API.
*
* @author Andrew Bayer
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/routess"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/routess"/>
*/
@SkipEncoding({'/', '='})
@RequestFilters(OAuthAuthenticator.class)
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SnapshotApi.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SnapshotApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SnapshotApi.java
index 6af9a9f..e3de540 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SnapshotApi.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SnapshotApi.java
@@ -50,7 +50,7 @@ import org.jclouds.rest.annotations.Transform;
* Provides access to Snapshots via their REST API.
*
* @author Andrew Bayer
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/snapshots"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/snapshots"/>
*/
@SkipEncoding({'/', '='})
@RequestFilters(OAuthAuthenticator.class)
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java
----------------------------------------------------------------------
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 0542842..c3c01e2 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 @@ import org.jclouds.rest.annotations.Transform;
* Provides access to Zones via their REST API.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/zones"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/zones"/>
*/
@SkipEncoding({'/', '='})
@RequestFilters(OAuthAuthenticator.class)
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneOperationApi.java
----------------------------------------------------------------------
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 e96bd6e..b23ee13 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 @@ import org.jclouds.rest.annotations.Transform;
* Provides access to Operations via their REST API.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/operations"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/operations"/>
*/
@SkipEncoding({'/', '='})
@RequestFilters(OAuthAuthenticator.class)
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/options/ListOptions.java
----------------------------------------------------------------------
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 2f79f0f..4305579 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 @@ import org.jclouds.http.options.BaseHttpRequestOptions;
* Allows to optionally specify a filter, max results and a page token for <code>listFirstPage()</code> REST methods.
*
* @author David Alves
- * @see <a href="https://developers.google.com/compute/docs/reference/v1beta15/operations/listFirstPage"/>
+ * @see <a href="https://developers.google.com/compute/docs/reference/v1beta16/operations/listFirstPage"/>
*/
public class ListOptions extends BaseHttpRequestOptions {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/PageSystemExpectTest.java
----------------------------------------------------------------------
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 c9d9c70..880252a 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 class PageSystemExpectTest 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();
@@ -66,7 +66,7 @@ public class PageSystemExpectTest extends BaseGoogleComputeEngineApiExpectTest {
.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 class PageSystemExpectTest extends BaseGoogleComputeEngineApiExpectTest {
.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 class PageSystemExpectTest extends BaseGoogleComputeEngineApiExpectTest {
.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();
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java
----------------------------------------------------------------------
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 925ac6a..ff8e435 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\"],\"sourceTags\":[\"aTag\"],\"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 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
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 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
.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 class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
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();
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/FirewallToIpPermissionTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/FirewallToIpPermissionTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/FirewallToIpPermissionTest.java
index 4970357..78089e6 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/FirewallToIpPermissionTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/FirewallToIpPermissionTest.java
@@ -62,8 +62,8 @@ public class FirewallToIpPermissionTest {
.addPort(33).build());
builder.addAllowed(Firewall.Rule.builder().IpProtocol(IpProtocol.ICMP).build());
builder.id("abcd");
- builder.selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/firewalls/jclouds-test"));
- builder.network(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/jclouds-test"));
+ builder.selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/firewalls/jclouds-test"));
+ builder.network(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/jclouds-test"));
builder.creationTimestamp(new Date());
builder.name("jclouds-test");
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/NetworkToSecurityGroupTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/NetworkToSecurityGroupTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/NetworkToSecurityGroupTest.java
index 79a9da0..6f655c1 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/NetworkToSecurityGroupTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/NetworkToSecurityGroupTest.java
@@ -68,7 +68,7 @@ public class NetworkToSecurityGroupTest {
Network.Builder builder = Network.builder();
builder.id("abcd");
- builder.selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/jclouds-test"));
+ builder.selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/jclouds-test"));
builder.creationTimestamp(new Date());
builder.description("some description");
builder.gatewayIPv4("1.2.3.4");
@@ -82,7 +82,7 @@ public class NetworkToSecurityGroupTest {
SecurityGroup group = netToSg.apply(network);
assertEquals(group.getId(), "jclouds-test");
- assertEquals(group.getUri(), URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/jclouds-test"));
+ assertEquals(group.getUri(), URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/jclouds-test"));
assertEquals(group.getIpPermissions().size(), 3);
assertTrue(Iterables.any(group.getIpPermissions(), Predicates.and(hasProtocol(IpProtocol.TCP),
hasStartAndEndPort(1, 10))), "No permission found for TCP, ports 1-10");
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/loaders/FindNetworkOrCreateTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/loaders/FindNetworkOrCreateTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/loaders/FindNetworkOrCreateTest.java
index af384a5..0384792 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/loaders/FindNetworkOrCreateTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/loaders/FindNetworkOrCreateTest.java
@@ -52,7 +52,7 @@ public class FindNetworkOrCreateTest {
Network network = Network.builder().IPv4Range("0.0.0.0/0")
.id("abcd").name("this-network")
- .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/this-network"))
+ .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/this-network"))
.build();
final Supplier<String> userProject = new Supplier<String>() {
@@ -94,7 +94,7 @@ public class FindNetworkOrCreateTest {
Network network = Network.builder().IPv4Range("0.0.0.0/0")
.id("abcd").name("this-network")
- .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/this-network"))
+ .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/this-network"))
.build();
Operation createOp = createMock(Operation.class);
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/AddressApiExpectTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/AddressApiExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/AddressApiExpectTest.java
index 5ec5be9..d29a2a0 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/AddressApiExpectTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/AddressApiExpectTest.java
@@ -42,7 +42,7 @@ public class AddressApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
HttpRequest get = HttpRequest
.builder()
.method("GET")
- .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/addresses/test-ip1")
+ .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1/addresses/test-ip1")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN).build();
@@ -60,7 +60,7 @@ public class AddressApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
HttpRequest get = HttpRequest
.builder()
.method("GET")
- .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/addresses/test-ip1")
+ .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1/addresses/test-ip1")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN).build();
@@ -76,7 +76,7 @@ public class AddressApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
HttpRequest insert = HttpRequest
.builder()
.method("POST")
- .endpoint("https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/addresses")
+ .endpoint("https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1/addresses")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
.payload(payloadFromResourceWithContentType("/address_insert.json", MediaType.APPLICATION_JSON))
@@ -97,7 +97,7 @@ public class AddressApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
.builder()
.method("DELETE")
.endpoint("https://www.googleapis" +
- ".com/compute/v1beta15/projects/myproject/regions/us-central1/addresses/test-ip1")
+ ".com/compute/v1beta16/projects/myproject/regions/us-central1/addresses/test-ip1")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN).build();
@@ -116,7 +116,7 @@ public class AddressApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
.builder()
.method("DELETE")
.endpoint("https://www.googleapis" +
- ".com/compute/v1beta15/projects/myproject/regions/us-central1/addresses/test-ip1")
+ ".com/compute/v1beta16/projects/myproject/regions/us-central1/addresses/test-ip1")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN).build();
@@ -133,7 +133,7 @@ public class AddressApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
.builder()
.method("GET")
.endpoint("https://www.googleapis" +
- ".com/compute/v1beta15/projects/myproject/regions/us-central1/addresses")
+ ".com/compute/v1beta16/projects/myproject/regions/us-central1/addresses")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN).build();
@@ -152,7 +152,7 @@ public class AddressApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
.builder()
.method("GET")
.endpoint("https://www.googleapis" +
- ".com/compute/v1beta15/projects/myproject/regions/us-central1/addresses")
+ ".com/compute/v1beta16/projects/myproject/regions/us-central1/addresses")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN).build();
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/DiskApiExpectTest.java
----------------------------------------------------------------------
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 4627f9a..60f3479 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 class DiskApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
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 class DiskApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
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 class DiskApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
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))
@@ -96,7 +96,7 @@ public class DiskApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
HttpRequest createSnapshotRequest = 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"
+ "/testimage1/createSnapshot")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
@@ -117,7 +117,7 @@ public class DiskApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
HttpRequest createSnapshotRequest = 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"
+ "/testimage1/createSnapshot")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
@@ -138,7 +138,7 @@ public class DiskApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
.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();
@@ -157,7 +157,7 @@ public class DiskApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
.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();
@@ -174,7 +174,7 @@ public class DiskApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
.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();
@@ -193,7 +193,7 @@ public class DiskApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
.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();