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:56 UTC
[2/4] JCLOUDS-336. Move to GCE v1beta16 API
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java
----------------------------------------------------------------------
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 e55cd5c..5fb2128 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 class ParseMachineTypeTest extends BaseGoogleComputeEngineParseTest<Machi
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")
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkListTest.java
----------------------------------------------------------------------
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 b271e91..b1f6d71 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 class ParseNetworkListTest extends BaseGoogleComputeEngineParseTest<ListP
return ListPage.<Network>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();
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkTest.java
----------------------------------------------------------------------
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 da6992a..223955e 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 class ParseNetworkTest extends BaseGoogleComputeEngineParseTest<Network>
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")
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseOperationListTest.java
----------------------------------------------------------------------
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 c62b49a..1a5520d 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 class ParseOperationListTest extends BaseGoogleComputeEngineParseTest<Lis
return ListPage.<Operation>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();
}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseOperationTest.java
----------------------------------------------------------------------
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 c3b1e90..21203fc 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 class ParseOperationTest extends BaseGoogleComputeEngineParseTest<Operati
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")
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseProjectTest.java
----------------------------------------------------------------------
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 76acc08..b9fc5c1 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
@@ -46,7 +46,7 @@ public class ParseProjectTest extends BaseGoogleComputeEngineParseTest<Project>
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(Metadata.builder()
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseQuotaTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseQuotaTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseQuotaTest.java
index 110e49c..401bc3a 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseQuotaTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseQuotaTest.java
@@ -19,7 +19,7 @@ package org.jclouds.googlecomputeengine.parse;
import javax.ws.rs.Consumes;
import javax.ws.rs.core.MediaType;
-import org.jclouds.googlecomputeengine.domain.Project;
+import org.jclouds.googlecomputeengine.domain.Quota;
import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest;
import org.testng.annotations.Test;
@@ -27,7 +27,7 @@ import org.testng.annotations.Test;
* @author David Alves
*/
@Test(groups = "unit")
-public class ParseQuotaTest extends BaseGoogleComputeEngineParseTest<Project.Quota> {
+public class ParseQuotaTest extends BaseGoogleComputeEngineParseTest<Quota> {
@Override
public String resource() {
@@ -36,7 +36,7 @@ public class ParseQuotaTest extends BaseGoogleComputeEngineParseTest<Project.Quo
@Override
@Consumes(MediaType.APPLICATION_JSON)
- public Project.Quota expected() {
- return Project.Quota.builder().metric("INSTANCES").usage(0.0).limit(8.0).build();
+ public Quota expected() {
+ return Quota.builder().metric("INSTANCES").usage(0.0).limit(8.0).build();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java
index cdbf67c..9745748 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java
@@ -47,7 +47,7 @@ public class ParseRegionListTest extends BaseGoogleComputeEngineParseTest<ListPa
return ListPage.<Region>builder()
.kind(Resource.Kind.REGION_LIST)
.id("projects/myproject/regions")
- .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/regions"))
+ .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/regions"))
.items(ImmutableSet.of(
new ParseRegionTest().expected(),
Region.builder()
@@ -55,11 +55,20 @@ public class ParseRegionListTest extends BaseGoogleComputeEngineParseTest<ListPa
.creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse
("2013-07-08T14:40:37.939-07:00"))
.selfLink(URI.create("https://www.googleapis" +
- ".com/compute/v1beta15/projects/myproject/regions/us-central2"))
+ ".com/compute/v1beta16/projects/myproject/regions/us-central2"))
.name("us-central2")
.description("us-central2")
.status(Region.Status.UP)
- .zone(URI.create("https://www.googleapis.com/compute/v1beta15/zones/us-central2-a"))
+ .zone(URI.create("https://www.googleapis.com/compute/v1beta16/zones/us-central2-a"))
+ .addQuota("INSTANCES", 0, 8)
+ .addQuota("CPUS", 0, 8)
+ .addQuota("EPHEMERAL_ADDRESSES", 0, 8)
+ .addQuota("DISKS", 0, 8)
+ .addQuota("DISKS_TOTAL_GB", 0, 100)
+ .addQuota("SNAPSHOTS", 0, 1000)
+ .addQuota("NETWORKS", 1, 5)
+ .addQuota("FIREWALLS", 2, 100)
+ .addQuota("IMAGES", 0, 100)
.build()))
.build();
}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionTest.java
index 746e51d..8edfbcb 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionTest.java
@@ -45,12 +45,21 @@ public class ParseRegionTest extends BaseGoogleComputeEngineParseTest<Region> {
return Region.builder()
.id("12912210600542709766")
.creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse("2013-07-08T14:40:37.939-07:00"))
- .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1"))
+ .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1"))
.name("us-central1")
.description("us-central1")
.status(Region.Status.UP)
- .zones(ImmutableSet.of(URI.create("https://www.googleapis.com/compute/v1beta15/zones/us-central1-a"),
- URI.create("https://www.googleapis.com/compute/v1beta15/zones/us-central1-b")))
+ .zones(ImmutableSet.of(URI.create("https://www.googleapis.com/compute/v1beta16/zones/us-central1-a"),
+ URI.create("https://www.googleapis.com/compute/v1beta16/zones/us-central1-b")))
+ .addQuota("INSTANCES", 0, 8)
+ .addQuota("CPUS", 0, 8)
+ .addQuota("EPHEMERAL_ADDRESSES", 0, 8)
+ .addQuota("DISKS", 0, 8)
+ .addQuota("DISKS_TOTAL_GB", 0, 100)
+ .addQuota("SNAPSHOTS", 0, 1000)
+ .addQuota("NETWORKS", 1, 5)
+ .addQuota("FIREWALLS", 2, 100)
+ .addQuota("IMAGES", 0, 100)
.build();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteListTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteListTest.java
index b7544cf..6f9783b 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteListTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteListTest.java
@@ -47,18 +47,18 @@ public class ParseRouteListTest extends BaseGoogleComputeEngineParseTest<ListPag
return ListPage.<Route>builder()
.kind(Kind.ROUTE_LIST)
.id("projects/myproject/global/routes")
- .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/routes"))
+ .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/routes"))
.items(ImmutableSet.of(new ParseRouteTest().expected(),
Route.builder()
- .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/routes/default-route-fc92a41ecb5a8d17"))
+ .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/routes/default-route-fc92a41ecb5a8d17"))
.id("507025480040058551")
.creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse("2013-07-08T14:40:38.502-07:00"))
.name("default-route-fc92a41ecb5a8d17")
.description("Default route to the Internet.")
- .network(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/default"))
+ .network(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/default"))
.destRange("0.0.0.0/0")
.priority(1000)
- .nextHopGateway(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/gateways/default-internet-gateway"))
+ .nextHopGateway(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/gateways/default-internet-gateway"))
.build())
).build();
}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteTest.java
index d7d6d71..1f76d5f 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteTest.java
@@ -43,15 +43,15 @@ public class ParseRouteTest extends BaseGoogleComputeEngineParseTest<Route> {
@Consumes(MediaType.APPLICATION_JSON)
public Route expected() {
return Route.builder()
- .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/routes/default-route-c99ebfbed0e1f375"))
+ .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/routes/default-route-c99ebfbed0e1f375"))
.id("7241926205630356071")
.name("default-route-c99ebfbed0e1f375")
.creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse("2013-07-08T14:40:38.502-07:00"))
.description("Default route to the virtual network.")
- .network(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/default"))
+ .network(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/default"))
.destRange("10.240.0.0/16")
.priority(1000)
- .nextHopNetwork(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/default"))
+ .nextHopNetwork(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/default"))
.tags(ImmutableSet.of("fooTag", "barTag"))
.build();
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotListTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotListTest.java
index cc93a6b..5df12f4 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotListTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotListTest.java
@@ -47,17 +47,17 @@ public class ParseSnapshotListTest extends BaseGoogleComputeEngineParseTest<List
return ListPage.<Snapshot>builder()
.kind(Kind.SNAPSHOT_LIST)
.id("projects/myproject/global/snapshots")
- .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/snapshots"))
+ .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/snapshots"))
.items(ImmutableSet.of(
new ParseSnapshotTest().expected(), Snapshot.builder()
.selfLink(URI.create("https://www.googleapis" +
- ".com/compute/v1beta15/projects/myproject/global/snapshots/test-snap2"))
+ ".com/compute/v1beta16/projects/myproject/global/snapshots/test-snap2"))
.id("13895715048576107883")
.creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse
("2013-07-26T12:57:01.927-07:00"))
.status("READY")
.sizeGb(10)
- .sourceDisk(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/testimage1"))
+ .sourceDisk(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/testimage1"))
.name("test-snap2")
.description("")
.sourceDiskId("8243603669926824540")
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotTest.java
index 9c90255..7c07a09 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotTest.java
@@ -41,12 +41,12 @@ public class ParseSnapshotTest extends BaseGoogleComputeEngineParseTest<Snapshot
@Consumes(MediaType.APPLICATION_JSON)
public Snapshot expected() {
return Snapshot.builder()
- .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/snapshots/test-snap"))
+ .selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/snapshots/test-snap"))
.id("9734455566806191190")
.creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse("2013-07-26T12:54:23.173-07:00"))
.status("READY")
.sizeGb(10)
- .sourceDisk(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/testimage1"))
+ .sourceDisk(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/testimage1"))
.name("test-snap")
.description("")
.sourceDiskId("8243603669926824540")
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneListTest.java
----------------------------------------------------------------------
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 367cb63..293c86f 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 class ParseZoneListTest extends BaseGoogleComputeEngineParseTest<ListPage
return ListPage.<Zone>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 class ParseZoneListTest extends BaseGoogleComputeEngineParseTest<ListPage
.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)
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneTest.java
----------------------------------------------------------------------
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 60a0b04..ad6017f 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 class ParseZoneTest extends BaseGoogleComputeEngineParseTest<Zone> {
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)
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/predicates/NetworkFirewallPredicatesTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/predicates/NetworkFirewallPredicatesTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/predicates/NetworkFirewallPredicatesTest.java
index a7c43f2..8ad72a0 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/predicates/NetworkFirewallPredicatesTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/predicates/NetworkFirewallPredicatesTest.java
@@ -42,8 +42,8 @@ public class NetworkFirewallPredicatesTest {
public static Firewall getFwForTestSourceTags() {
Firewall.Builder builder = Firewall.builder();
- 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/v1beta15/projects/myproject/global/firewalls/jclouds-test"));
+ builder.network(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/jclouds-test"));
+ builder.selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/firewalls/jclouds-test"));
builder.addSourceTag("tag-1");
builder.addAllowed(Firewall.Rule.builder().IpProtocol(IpProtocol.TCP)
.addPortRange(1, 10).build());
@@ -60,8 +60,8 @@ public class NetworkFirewallPredicatesTest {
public static Firewall getFwForTestSourceTagsExact() {
Firewall.Builder builder = Firewall.builder();
- 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/v1beta15/projects/myproject/global/firewalls/jclouds-test"));
+ builder.network(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/jclouds-test"));
+ builder.selfLink(URI.create("https://www.googleapis.com/compute/v1beta16/projects/myproject/global/firewalls/jclouds-test"));
builder.addSourceTag("tag-1");
builder.addAllowed(Firewall.Rule.builder().IpProtocol(IpProtocol.TCP)
.addPortRange(1, 10).build());
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/address_get.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/address_get.json b/google-compute-engine/src/test/resources/address_get.json
index a80793c..8aabc69 100644
--- a/google-compute-engine/src/test/resources/address_get.json
+++ b/google-compute-engine/src/test/resources/address_get.json
@@ -4,9 +4,9 @@
"id": "4439373783165447583",
"creationTimestamp": "2013-07-26T13:57:20.204-07:00",
"status": "RESERVED",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1",
"name": "test-ip1",
"description": "",
"address": "173.255.115.190",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/addresses/test-ip1"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1/addresses/test-ip1"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/address_list.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/address_list.json b/google-compute-engine/src/test/resources/address_list.json
index 78f2bce..8a2be5c 100644
--- a/google-compute-engine/src/test/resources/address_list.json
+++ b/google-compute-engine/src/test/resources/address_list.json
@@ -1,6 +1,6 @@
{
"kind": "compute#addressList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/addresses",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1/addresses",
"id": "projects/myproject/regions/us-central1/addresses",
"items": [
{
@@ -9,11 +9,11 @@
"id": "4439373783165447583",
"creationTimestamp": "2013-07-26T13:57:20.204-07:00",
"status": "RESERVED",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1",
"name": "test-ip1",
"description": "",
"address": "173.255.115.190",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/addresses/test-ip1"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1/addresses/test-ip1"
},
{
@@ -21,11 +21,11 @@
"id": "4881363978908129158",
"creationTimestamp": "2013-07-26T14:08:21.552-07:00",
"status": "RESERVED",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1",
"name": "test-ip2",
"description": "",
"address": "173.255.118.115",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/addresses/test-ip2"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/regions/us-central1/addresses/test-ip2"
}
]
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/disk_get.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/disk_get.json b/google-compute-engine/src/test/resources/disk_get.json
index 4e351ce..b895279 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
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/disk_list.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/disk_list.json b/google-compute-engine/src/test/resources/disk_list.json
index 6836907..e0db200 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"
}
]
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/firewall_get.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/firewall_get.json b/google-compute-engine/src/test/resources/firewall_get.json
index dbf4e90..62f8a42 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"
],
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/firewall_insert.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/firewall_insert.json b/google-compute-engine/src/test/resources/firewall_insert.json
index b9d0a9a..da4d5e8 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
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/firewall_list.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/firewall_list.json b/google-compute-engine/src/test/resources/firewall_list.json
index 6fe7da8..95d6a41 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"
],
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/global_operation.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/global_operation.json b/google-compute-engine/src/test/resources/global_operation.json
index c949699..a54aaf1 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",
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/global_operation_list.json
----------------------------------------------------------------------
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 f3c6ecd..fcc106e 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",
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/image_get.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/image_get.json b/google-compute-engine/src/test/resources/image_get.json
index eaadc4e..25fab88 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"
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/image_list.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/image_list.json b/google-compute-engine/src/test/resources/image_list.json
index cb76533..4078c04 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": "",
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/image_list_multiple_page_1.json
----------------------------------------------------------------------
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 950613d..224d0be 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": "",
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/image_list_multiple_page_2.json
----------------------------------------------------------------------
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 e489868..c993ff1 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"
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/image_list_single_page.json
----------------------------------------------------------------------
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 ab11b0d..06296c1 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": "",
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/instance_add_access_config.json
----------------------------------------------------------------------
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 8edaf8a..9c70956 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
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/instance_attach_disk.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/instance_attach_disk.json b/google-compute-engine/src/test/resources/instance_attach_disk.json
index 0db3332..f38e4c1 100644
--- a/google-compute-engine/src/test/resources/instance_attach_disk.json
+++ b/google-compute-engine/src/test/resources/instance_attach_disk.json
@@ -1,6 +1,6 @@
{
"type": "PERSISTENT",
"mode": "READ_ONLY",
- "source": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/testimage1",
+ "source": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/testimage1",
"boot": false
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/instance_get.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/instance_get.json b/google-compute-engine/src/test/resources/instance_get.json
index b3f3723..215e73d 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
}
],
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/instance_insert.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/instance_insert.json b/google-compute-engine/src/test/resources/instance_insert.json
index f626082..ad9f8b3 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
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/instance_insert_simple.json
----------------------------------------------------------------------
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 83b2b7a..6d5bc28 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
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/instance_list.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/instance_list.json b/google-compute-engine/src/test/resources/instance_list.json
index a66fa92..f50f022 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
}
],
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/instance_list_central1b_empty.json
----------------------------------------------------------------------
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 dcdc609..e57923b 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": [ ]
}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/kernel.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/kernel.json b/google-compute-engine/src/test/resources/kernel.json
index e304e08..4a0e525 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
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/kernel_list.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/kernel_list.json b/google-compute-engine/src/test/resources/kernel_list.json
index 7fd4343..5f1a155 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,12 +15,12 @@
"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",
"deprecated": {
"state": "OBSOLETE",
- "replacement": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130603"
+ "replacement": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130603"
}
}
]
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/machinetype.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/machinetype.json b/google-compute-engine/src/test/resources/machinetype.json
index 5aa902a..5db7cba 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,
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/machinetype_list.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/machinetype_list.json b/google-compute-engine/src/test/resources/machinetype_list.json
index 0506a0e..ba6a173 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,
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/machinetype_list_central1b.json
----------------------------------------------------------------------
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 cba2adf..9fad0aa 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,
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/machinetype_list_central1b_empty.json
----------------------------------------------------------------------
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 793c9eb..f30b8ee 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
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/network_get.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/network_get.json b/google-compute-engine/src/test/resources/network_get.json
index 87f9e56..1ba015c 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",
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/network_list.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/network_list.json b/google-compute-engine/src/test/resources/network_list.json
index 1cb72a1..601ab7f 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",
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/operation.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/operation.json b/google-compute-engine/src/test/resources/operation.json
index e173bac..d412876 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
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/operation_error.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/operation_error.json b/google-compute-engine/src/test/resources/operation_error.json
index b18ffba..f713765 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
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/operation_list.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/operation_list.json b/google-compute-engine/src/test/resources/operation_list.json
index 7585099..76c53f3 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
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/c7e93692/google-compute-engine/src/test/resources/project.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/project.json b/google-compute-engine/src/test/resources/project.json
index cef57d8..ab67638 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": {