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/09/06 19:39:51 UTC
[02/11] JCLOUDS-209. Move to GCE v1beta15 API,
with new features/methods included
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 3bc72bd..110e49c 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
@@ -16,13 +16,13 @@
*/
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.internal.BaseGoogleComputeEngineParseTest;
import org.testng.annotations.Test;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-
/**
* @author David Alves
*/
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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
new file mode 100644
index 0000000..cdbf67c
--- /dev/null
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java
@@ -0,0 +1,66 @@
+/*
+ * 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.parse;
+
+import java.net.URI;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.date.internal.SimpleDateFormatDateService;
+import org.jclouds.googlecomputeengine.domain.ListPage;
+import org.jclouds.googlecomputeengine.domain.Region;
+import org.jclouds.googlecomputeengine.domain.Resource;
+import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * @author Andrew Bayer
+ */
+@Test(groups = "unit")
+public class ParseRegionListTest extends BaseGoogleComputeEngineParseTest<ListPage<Region>> {
+
+ @Override
+ public String resource() {
+ return "/region_list.json";
+ }
+
+ @Override
+ @Consumes(MediaType.APPLICATION_JSON)
+ public ListPage<Region> expected() {
+ 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"))
+ .items(ImmutableSet.of(
+ new ParseRegionTest().expected(),
+ Region.builder()
+ .id("6396763663251190992")
+ .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"))
+ .name("us-central2")
+ .description("us-central2")
+ .status(Region.Status.UP)
+ .zone(URI.create("https://www.googleapis.com/compute/v1beta15/zones/us-central2-a"))
+ .build()))
+ .build();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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
new file mode 100644
index 0000000..746e51d
--- /dev/null
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionTest.java
@@ -0,0 +1,56 @@
+/*
+ * 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.parse;
+
+import java.net.URI;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.date.internal.SimpleDateFormatDateService;
+import org.jclouds.googlecomputeengine.domain.Region;
+import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * @author Andrew Bayer
+ */
+@Test(groups = "unit")
+public class ParseRegionTest extends BaseGoogleComputeEngineParseTest<Region> {
+
+ @Override
+ public String resource() {
+ return "/region_get.json";
+ }
+
+ @Override
+ @Consumes(MediaType.APPLICATION_JSON)
+ public Region expected() {
+ 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"))
+ .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")))
+ .build();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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
new file mode 100644
index 0000000..b7544cf
--- /dev/null
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteListTest.java
@@ -0,0 +1,65 @@
+/*
+ * 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.parse;
+
+import java.net.URI;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.date.internal.SimpleDateFormatDateService;
+import org.jclouds.googlecomputeengine.domain.ListPage;
+import org.jclouds.googlecomputeengine.domain.Resource.Kind;
+import org.jclouds.googlecomputeengine.domain.Route;
+import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * @author Andrew Bayer
+ */
+@Test(groups = "unit")
+public class ParseRouteListTest extends BaseGoogleComputeEngineParseTest<ListPage<Route>> {
+
+ @Override
+ public String resource() {
+ return "/route_list.json";
+ }
+
+ @Override
+ @Consumes(MediaType.APPLICATION_JSON)
+ public ListPage<Route> expected() {
+ 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"))
+ .items(ImmutableSet.of(new ParseRouteTest().expected(),
+ Route.builder()
+ .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/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"))
+ .destRange("0.0.0.0/0")
+ .priority(1000)
+ .nextHopGateway(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/gateways/default-internet-gateway"))
+ .build())
+ ).build();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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
new file mode 100644
index 0000000..d7d6d71
--- /dev/null
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteTest.java
@@ -0,0 +1,59 @@
+/*
+ * 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.parse;
+
+import java.net.URI;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.date.internal.SimpleDateFormatDateService;
+import org.jclouds.googlecomputeengine.domain.Route;
+import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * @author Andrew Bayer
+ */
+@Test(groups = "unit")
+public class ParseRouteTest extends BaseGoogleComputeEngineParseTest<Route> {
+
+ @Override
+ public String resource() {
+ return "/route_get.json";
+ }
+
+ @Override
+ @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"))
+ .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"))
+ .destRange("10.240.0.0/16")
+ .priority(1000)
+ .nextHopNetwork(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/default"))
+ .tags(ImmutableSet.of("fooTag", "barTag"))
+ .build();
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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
new file mode 100644
index 0000000..cc93a6b
--- /dev/null
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotListTest.java
@@ -0,0 +1,67 @@
+/*
+ * 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.parse;
+
+import java.net.URI;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.date.internal.SimpleDateFormatDateService;
+import org.jclouds.googlecomputeengine.domain.ListPage;
+import org.jclouds.googlecomputeengine.domain.Resource.Kind;
+import org.jclouds.googlecomputeengine.domain.Snapshot;
+import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * @author Andrew Bayer
+ */
+@Test(groups = "unit")
+public class ParseSnapshotListTest extends BaseGoogleComputeEngineParseTest<ListPage<Snapshot>> {
+
+ @Override
+ public String resource() {
+ return "/snapshot_list.json";
+ }
+
+ @Override
+ @Consumes(MediaType.APPLICATION_JSON)
+ public ListPage<Snapshot> expected() {
+ 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"))
+ .items(ImmutableSet.of(
+ new ParseSnapshotTest().expected(), Snapshot.builder()
+ .selfLink(URI.create("https://www.googleapis" +
+ ".com/compute/v1beta15/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"))
+ .name("test-snap2")
+ .description("")
+ .sourceDiskId("8243603669926824540")
+ .build()))
+ .build();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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
new file mode 100644
index 0000000..9c90255
--- /dev/null
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotTest.java
@@ -0,0 +1,55 @@
+/*
+ * 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.parse;
+
+import java.net.URI;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.date.internal.SimpleDateFormatDateService;
+import org.jclouds.googlecomputeengine.domain.Snapshot;
+import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author David Alves
+ */
+@Test(groups = "unit")
+public class ParseSnapshotTest extends BaseGoogleComputeEngineParseTest<Snapshot> {
+
+ @Override
+ public String resource() {
+ return "/snapshot_get.json";
+ }
+
+ @Override
+ @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"))
+ .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"))
+ .name("test-snap")
+ .description("")
+ .sourceDiskId("8243603669926824540")
+ .build();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 2dd7590..367cb63 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
@@ -16,7 +16,11 @@
*/
package org.jclouds.googlecomputeengine.parse;
-import com.google.common.collect.ImmutableSet;
+import java.net.URI;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.core.MediaType;
+
import org.jclouds.date.internal.SimpleDateFormatDateService;
import org.jclouds.googlecomputeengine.domain.ListPage;
import org.jclouds.googlecomputeengine.domain.Resource;
@@ -24,9 +28,7 @@ import org.jclouds.googlecomputeengine.domain.Zone;
import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest;
import org.testng.annotations.Test;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-import java.net.URI;
+import com.google.common.collect.ImmutableSet;
/**
* @author David Alves
@@ -45,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/v1beta13/projects/myproject/zones"))
+ .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/projects/myproject/zones"))
.items(ImmutableSet.of(
new ParseZoneTest().expected()
, Zone.builder()
@@ -53,9 +55,9 @@ public class ParseZoneListTest extends BaseGoogleComputeEngineParseTest<ListPage
.creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse
("2012-10-24T20:13:19.271"))
.selfLink(URI.create("https://www.googleapis" +
- ".com/compute/v1beta13/projects/myproject/zones/us-east1-a"))
- .name("us-east1-a")
- .description("us-east1-a")
+ ".com/compute/v1beta15/projects/myproject/zones/us-central1-b"))
+ .name("us-central1-b")
+ .description("us-central1-b")
.status(Zone.Status.UP)
.addMaintenanceWindow(Zone.MaintenanceWindow.builder()
.name("2013-02-17-planned-outage")
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 105bd01..60a0b04 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
@@ -16,15 +16,16 @@
*/
package org.jclouds.googlecomputeengine.parse;
+import java.net.URI;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.core.MediaType;
+
import org.jclouds.date.internal.SimpleDateFormatDateService;
import org.jclouds.googlecomputeengine.domain.Zone;
import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest;
import org.testng.annotations.Test;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-import java.net.URI;
-
/**
* @author David Alves
*/
@@ -42,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/v1beta13/projects/myproject/zones/us-central1-a"))
+ .selfLink(URI.create("https://www.googleapis.com/compute/v1beta15/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/53386380/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
new file mode 100644
index 0000000..a80793c
--- /dev/null
+++ b/google-compute-engine/src/test/resources/address_get.json
@@ -0,0 +1,12 @@
+{
+
+ "kind": "compute#address",
+ "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",
+ "name": "test-ip1",
+ "description": "",
+ "address": "173.255.115.190",
+ "selfLink": "https://www.googleapis.com/compute/v1beta15/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/53386380/google-compute-engine/src/test/resources/address_insert.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/address_insert.json b/google-compute-engine/src/test/resources/address_insert.json
new file mode 100644
index 0000000..4bccf63
--- /dev/null
+++ b/google-compute-engine/src/test/resources/address_insert.json
@@ -0,0 +1 @@
+{"name":"test-ip1"}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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
new file mode 100644
index 0000000..78f2bce
--- /dev/null
+++ b/google-compute-engine/src/test/resources/address_list.json
@@ -0,0 +1,31 @@
+{
+ "kind": "compute#addressList",
+ "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/addresses",
+ "id": "projects/myproject/regions/us-central1/addresses",
+ "items": [
+ {
+
+ "kind": "compute#address",
+ "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",
+ "name": "test-ip1",
+ "description": "",
+ "address": "173.255.115.190",
+ "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/addresses/test-ip1"
+ },
+ {
+
+ "kind": "compute#address",
+ "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",
+ "name": "test-ip2",
+ "description": "",
+ "address": "173.255.118.115",
+ "selfLink": "https://www.googleapis.com/compute/v1beta15/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/53386380/google-compute-engine/src/test/resources/disk_create_snapshot.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/disk_create_snapshot.json b/google-compute-engine/src/test/resources/disk_create_snapshot.json
new file mode 100644
index 0000000..6499744
--- /dev/null
+++ b/google-compute-engine/src/test/resources/disk_create_snapshot.json
@@ -0,0 +1 @@
+{"name":"test-snap"}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 5c7ce0c..4e351ce 100644
--- a/google-compute-engine/src/test/resources/disk_get.json
+++ b/google-compute-engine/src/test/resources/disk_get.json
@@ -1,10 +1,10 @@
{
- "kind": "compute#disk",
- "id": "13050421646334304115",
- "creationTimestamp": "2012-11-25T01:38:48.306",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/disks/testimage1",
- "name": "testimage1",
- "sizeGb": "1",
- "zone": "https://www.googleapis.com/compute/v1beta13/projects/myproject/zones/us-central1-a",
- "status": "READY"
+ "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",
+ "name": "testimage1",
+ "sizeGb": "1",
+ "zone": "https://www.googleapis.com/compute/v1beta15/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/53386380/google-compute-engine/src/test/resources/disk_insert.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/disk_insert.json b/google-compute-engine/src/test/resources/disk_insert.json
index 82522a7..8699cdd 100644
--- a/google-compute-engine/src/test/resources/disk_insert.json
+++ b/google-compute-engine/src/test/resources/disk_insert.json
@@ -1 +1 @@
-{"name":"testimage1","sizeGb":1,"zone":"https://www.googleapis.com/compute/v1beta13/projects/myproject/zones/us-central1-a"}
\ No newline at end of file
+{"name":"testimage1","sizeGb":1}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 8b09831..6836907 100644
--- a/google-compute-engine/src/test/resources/disk_list.json
+++ b/google-compute-engine/src/test/resources/disk_list.json
@@ -1,17 +1,17 @@
{
- "kind": "compute#diskList",
- "id": "projects/myproject/disks",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/disks",
- "items": [
- {
- "kind": "compute#disk",
- "id": "13050421646334304115",
- "creationTimestamp": "2012-11-25T01:38:48.306",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/disks/testimage1",
- "name": "testimage1",
- "sizeGb": "1",
- "zone": "https://www.googleapis.com/compute/v1beta13/projects/myproject/zones/us-central1-a",
- "status": "READY"
- }
- ]
+ "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",
+ "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",
+ "name": "testimage1",
+ "sizeGb": "1",
+ "zone": "https://www.googleapis.com/compute/v1beta15/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/53386380/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 cb981dd..dbf4e90 100644
--- a/google-compute-engine/src/test/resources/firewall_get.json
+++ b/google-compute-engine/src/test/resources/firewall_get.json
@@ -1,30 +1,30 @@
{
- "kind": "compute#firewall",
- "id": "12862241031274216284",
- "creationTimestamp": "2012-04-13T03:05:02.855",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/firewalls/jclouds-test",
- "name": "jclouds-test",
- "description": "Internal traffic from default allowed",
- "network": "https://www.googleapis.com/compute/v1beta13/projects/myproject/networks/jclouds-test",
- "sourceRanges": [
- "10.0.0.0/8"
- ],
- "allowed": [
- {
- "IPProtocol": "tcp",
- "ports": [
- "1-65535"
+ "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",
+ "name": "jclouds-test",
+ "description": "Internal traffic from default allowed",
+ "network": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/jclouds-test",
+ "sourceRanges": [
+ "10.0.0.0/8"
+ ],
+ "allowed": [
+ {
+ "IPProtocol": "tcp",
+ "ports": [
+ "1-65535"
+ ]
+ },
+ {
+ "IPProtocol": "udp",
+ "ports": [
+ "1-65535"
+ ]
+ },
+ {
+ "IPProtocol": "icmp"
+ }
]
- },
- {
- "IPProtocol": "udp",
- "ports": [
- "1-65535"
- ]
- },
- {
- "IPProtocol": "icmp"
- }
- ]
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 0f6ddfa..b9d0a9a 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/v1beta13/projects/myproject/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/v1beta15/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/53386380/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 3bb1b22..6fe7da8 100644
--- a/google-compute-engine/src/test/resources/firewall_list.json
+++ b/google-compute-engine/src/test/resources/firewall_list.json
@@ -1,58 +1,58 @@
{
- "kind": "compute#firewallList",
- "id": "projects/google/firewalls",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/firewalls",
- "items": [
- {
+ "kind": "compute#firewallList",
+ "id": "projects/google/firewalls",
+ "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/google/global/firewalls",
+ "items": [
+ {
- "kind": "compute#firewall",
- "id": "12862241031274216284",
- "creationTimestamp": "2012-04-13T03:05:02.855",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/firewalls/jclouds-test",
- "name": "jclouds-test",
- "description": "Internal traffic from default allowed",
- "network": "https://www.googleapis.com/compute/v1beta13/projects/myproject/networks/jclouds-test",
- "sourceRanges": [
- "10.0.0.0/8"
- ],
- "allowed": [
- {
- "IPProtocol": "tcp",
- "ports": [
- "1-65535"
- ]
- },
- {
- "IPProtocol": "udp",
- "ports": [
- "1-65535"
- ]
- },
- {
- "IPProtocol": "icmp"
- }
- ]
- },
- {
+ "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",
+ "name": "jclouds-test",
+ "description": "Internal traffic from default allowed",
+ "network": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/jclouds-test",
+ "sourceRanges": [
+ "10.0.0.0/8"
+ ],
+ "allowed": [
+ {
+ "IPProtocol": "tcp",
+ "ports": [
+ "1-65535"
+ ]
+ },
+ {
+ "IPProtocol": "udp",
+ "ports": [
+ "1-65535"
+ ]
+ },
+ {
+ "IPProtocol": "icmp"
+ }
+ ]
+ },
+ {
- "kind": "compute#firewall",
- "id": "12862241067393040785",
- "creationTimestamp": "2012-04-13T03:05:04.365",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/firewalls/default-ssh",
- "name": "default-ssh",
- "description": "SSH allowed from anywhere",
- "network": "https://www.googleapis.com/compute/v1beta13/projects/google/networks/default",
- "sourceRanges": [
- "0.0.0.0/0"
- ],
- "allowed": [
- {
- "IPProtocol": "tcp",
- "ports": [
- "22"
- ]
- }
+ "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",
+ "name": "default-ssh",
+ "description": "SSH allowed from anywhere",
+ "network": "https://www.googleapis.com/compute/v1beta15/projects/google/global/networks/default",
+ "sourceRanges": [
+ "0.0.0.0/0"
+ ],
+ "allowed": [
+ {
+ "IPProtocol": "tcp",
+ "ports": [
+ "22"
+ ]
+ }
+ ]
+ }
]
- }
- ]
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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
new file mode 100644
index 0000000..c949699
--- /dev/null
+++ b/google-compute-engine/src/test/resources/global_operation.json
@@ -0,0 +1,15 @@
+{
+ "kind": "compute#operation",
+ "id": "13053095055850848306",
+ "selfLink": "https://www.googleapis.com/compute/v1beta15/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",
+ "targetId": "13053094017547040099",
+ "status": "DONE",
+ "user": "user@developer.gserviceaccount.com",
+ "progress": 100,
+ "insertTime": "2012-11-28T06:41:05.060",
+ "startTime": "2012-11-28T06:41:05.142",
+ "endTime": "2012-11-28T06:41:06.142",
+ "operationType": "insert"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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
new file mode 100644
index 0000000..f3c6ecd
--- /dev/null
+++ b/google-compute-engine/src/test/resources/global_operation_list.json
@@ -0,0 +1,22 @@
+{
+ "kind": "compute#operationList",
+ "id": "projects/myproject/global/operations",
+ "selfLink": "https://www.googleapis.com/compute/v1beta15/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",
+ "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb",
+ "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/firewalls/jclouds-test-delete",
+ "targetId": "13053094017547040099",
+ "status": "DONE",
+ "user": "user@developer.gserviceaccount.com",
+ "progress": 100,
+ "insertTime": "2012-11-28T06:41:05.060",
+ "startTime": "2012-11-28T06:41:05.142",
+ "endTime": "2012-11-28T06:41:06.142",
+ "operationType": "insert"
+ }
+ ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 79d358e..eaadc4e 100644
--- a/google-compute-engine/src/test/resources/image_get.json
+++ b/google-compute-engine/src/test/resources/image_get.json
@@ -1,14 +1,14 @@
{
- "kind": "compute#image",
- "id": "12941197498378735318",
- "creationTimestamp": "2012-07-16T22:16:13.468",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/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/v1beta13/projects/google/kernels/gce-20120326",
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
-}
\ No newline at end of file
+ "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",
+ "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",
+ "rawDisk": {
+ "source": "",
+ "containerType": "TAR"
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/image_insert.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/image_insert.json b/google-compute-engine/src/test/resources/image_insert.json
index 787ffde..fd030a7 100644
--- a/google-compute-engine/src/test/resources/image_insert.json
+++ b/google-compute-engine/src/test/resources/image_insert.json
@@ -1 +1,4 @@
-{"sourceType":"RAW","rawDisk":{"source":"https://storage.googleapis.com/mybuket/myimage.image.tar.gz","containerType":"TAR"},"kind":"compute#image","name":"myimage"}
\ No newline at end of file
+{"sourceType": "RAW", "rawDisk": {
+ "source": "https://storage.googleapis.com/mybuket/myimage.image.tar.gz",
+ "containerType": "TAR"
+}, "kind": "compute#image", "name": "myimage"}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 6095b29..cb76533 100644
--- a/google-compute-engine/src/test/resources/image_list.json
+++ b/google-compute-engine/src/test/resources/image_list.json
@@ -1,21 +1,25 @@
{
- "kind": "compute#imageList",
- "id": "projects/google/images",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/images",
- "items": [
- {
- "kind": "compute#image",
- "id": "12941197498378735318",
- "creationTimestamp": "2012-07-16T22:16:13.468",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/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/v1beta13/projects/google/kernels/gce-20120326",
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- }
- ]
-}
\ No newline at end of file
+ "kind": "compute#imageList",
+ "id": "projects/google/global/images",
+ "selfLink": "https://www.googleapis.com/compute/v1beta15/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",
+ "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",
+ "deprecated": {
+ "state": "DEPRECATED",
+ "replacement": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-v20130104"
+ },
+ "rawDisk": {
+ "source": "",
+ "containerType": "TAR"
+ }
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 afb794c..950613d 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,50 +1,58 @@
{
- "kind": "compute#imageList",
- "id": "projects/google/images",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/images",
- "nextPageToken": "CgVJTUFHRRIbZ29vZ2xlLmNlbnRvcy02LTItdjIwMTIwNjIx",
- "items": [
- {
- "kind": "compute#image",
- "id": "12941197498378735318",
- "creationTimestamp": "2012-07-16T15:16:13.468-07:00",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/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/v1beta13/projects/google/kernels/gce-20120326",
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- },
- {
- "kind": "compute#image",
- "id": "12894486577628239762",
- "creationTimestamp": "2012-05-21T13:15:37.215-07:00",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/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/v1beta13/projects/google/kernels/gce-20120326",
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- },
- {
- "kind": "compute#image",
- "id": "12917726455664967299",
- "creationTimestamp": "2012-06-18T11:05:30.664-07:00",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/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/v1beta13/projects/google/kernels/gce-20120611",
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- }
- ]
-}
\ No newline at end of file
+ "kind": "compute#imageList",
+ "id": "projects/google/global/images",
+ "selfLink": "https://www.googleapis.com/compute/v1beta15/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",
+ "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",
+ "deprecated": {
+ "state": "DELETED",
+ "replacement": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-v20130104"
+ },
+ "rawDisk": {
+ "source": "",
+ "containerType": "TAR"
+ }
+ },
+ {
+ "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",
+ "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",
+ "rawDisk": {
+ "source": "",
+ "containerType": "TAR"
+ }
+ },
+ {
+ "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",
+ "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",
+ "deprecated": {
+ "state": "DEPRECATED",
+ "replacement": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-20130509"
+ },
+ "rawDisk": {
+ "source": "",
+ "containerType": "TAR"
+ }
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 71529d5..e489868 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,50 +1,50 @@
{
- "kind": "compute#imageList",
- "id": "projects/google/images",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/images",
- "nextPageToken": "CgVJTUFHRRIbZ29vZ2xlLmdjZWwtMTAtMDQtdjIwMTIxMTA2",
- "items": [
- {
- "kind": "compute#image",
- "id": "12920641029336858796",
- "creationTimestamp": "2012-06-21T22:59:56.392-07:00",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/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/v1beta13/projects/google/kernels/gce-20120621",
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- },
- {
- "kind": "compute#image",
- "id": "12994279803511049620",
- "creationTimestamp": "2012-09-18T08:52:47.584-07:00",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/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/v1beta13/projects/google/kernels/gce-v20120912",
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- },
- {
- "kind": "compute#image",
- "id": "13037720516378381209",
- "creationTimestamp": "2012-11-09T11:40:41.079-08:00",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/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/v1beta13/projects/google/kernels/gce-v20121106",
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- }
- ]
-}
\ No newline at end of file
+ "kind": "compute#imageList",
+ "id": "projects/google/global/images",
+ "selfLink": "https://www.googleapis.com/compute/v1beta15/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",
+ "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",
+ "rawDisk": {
+ "source": "",
+ "containerType": "TAR"
+ }
+ },
+ {
+ "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",
+ "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",
+ "rawDisk": {
+ "source": "",
+ "containerType": "TAR"
+ }
+ },
+ {
+ "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",
+ "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",
+ "rawDisk": {
+ "source": "",
+ "containerType": "TAR"
+ }
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 b28f9a6..ab11b0d 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,49 +1,53 @@
{
- "kind": "compute#imageList",
- "id": "projects/google/images",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/images",
- "items": [
- {
- "kind": "compute#image",
- "id": "13037722963789596520",
- "creationTimestamp": "2012-11-09T11:43:28.749-08:00",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/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/v1beta13/projects/google/kernels/gce-v20121106",
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- },
- {
- "kind": "compute#image",
- "id": "13037721421359523565",
- "creationTimestamp": "2012-11-09T11:40:51.994-08:00",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/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/v1beta13/projects/google/kernels/gce-v20121106",
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- },
- {
- "kind": "compute#image",
- "id": "12941198995845323366",
- "creationTimestamp": "2012-07-16T15:18:50.405-07:00",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/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/v1beta13/projects/google/kernels/gce-20110728",
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- }
- ]
-}
\ No newline at end of file
+ "kind": "compute#imageList",
+ "id": "projects/google/global/images",
+ "selfLink": "https://www.googleapis.com/compute/v1beta15/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",
+ "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",
+ "rawDisk": {
+ "source": "",
+ "containerType": "TAR"
+ }
+ },
+ {
+ "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",
+ "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",
+ "rawDisk": {
+ "source": "",
+ "containerType": "TAR"
+ }
+ },
+ {
+ "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",
+ "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",
+ "deprecated": {
+ "state": "DELETED",
+ "replacement": "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/gcel-10-04-v20130104"
+ },
+ "rawDisk": {
+ "source": "",
+ "containerType": "TAR"
+ }
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 7530a7e..8edaf8a 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,11 +1,11 @@
-POST https://www.googleapis.com/compute/v1beta13/projects/jclouds-gce/instances/test-instance/addAccessConfig?network_interface=nic0&key={YOUR_API_KEY}
+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}
Content-Type: application/json
Authorization: Bearer ya29.AHES6ZRyNKVHwnMPUvZitAuA8mR8b0lcWh1bMI5UQ5bgsJ4j
X-JavaScript-User-Agent: Google APIs Explorer
{
- "name": "config1",
- "natIP": "10.0.1.1",
- "type": "ONE_TO_ONE_NAT"
+"name": "config1",
+"natIP": "10.0.1.1",
+"type": "ONE_TO_ONE_NAT"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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
new file mode 100644
index 0000000..0db3332
--- /dev/null
+++ b/google-compute-engine/src/test/resources/instance_attach_disk.json
@@ -0,0 +1,6 @@
+{
+ "type": "PERSISTENT",
+ "mode": "READ_ONLY",
+ "source": "https://www.googleapis.com/compute/v1beta15/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/53386380/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 19ca0c3..b3f3723 100644
--- a/google-compute-engine/src/test/resources/instance_get.json
+++ b/google-compute-engine/src/test/resources/instance_get.json
@@ -1,50 +1,54 @@
{
- "kind": "compute#instance",
- "id": "13051190678907570425",
- "description": "desc",
- "creationTimestamp": "2012-11-25T23:48:20.758",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/instances/test-0",
- "name": "test-0",
- "image": "https://www.googleapis.com/compute/v1beta13/projects/google/images/gcel-12-04-v20121106",
- "machineType": "https://www.googleapis.com/compute/v1beta13/projects/myproject/machineTypes/n1-standard-1",
- "status": "RUNNING",
- "zone": "https://www.googleapis.com/compute/v1beta13/projects/myproject/zones/us-central1-a",
- "networkInterfaces": [
- {
- "kind": "compute#instanceNetworkInterface",
- "name": "nic0",
- "networkIP": "10.240.121.115",
- "network": "https://www.googleapis.com/compute/v1beta13/projects/myproject/networks/default"
- }
- ],
- "disks": [
- {
- "kind": "compute#instanceDisk",
- "type": "PERSISTENT",
- "mode": "READ_WRITE",
- "deviceName": "test",
- "source": "https://www.googleapis.com/compute/v1beta13/projects/myproject/disks/test",
- "index": 0
- }
- ],
- "serviceAccounts": [
- {
- "kind": "compute#serviceAccount",
- "email": "default",
- "scopes": [
- "myscope"
- ]
- }
- ],
- "metadata": {
- "items": [
- {
- "key": "aKey",
- "value": "aValue"
- }
- ]
- },
- "tags": [
- "aTag"
- ]
-}
\ No newline at end of file
+ "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",
+ "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",
+ "status": "RUNNING",
+ "zone": "https://www.googleapis.com/compute/v1beta15/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"
+ }
+ ],
+ "disks": [
+ {
+ "kind": "compute#instanceDisk",
+ "type": "PERSISTENT",
+ "mode": "READ_WRITE",
+ "deviceName": "test",
+ "source": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/test",
+ "index": 0
+ }
+ ],
+ "serviceAccounts": [
+ {
+ "kind": "compute#serviceAccount",
+ "email": "default",
+ "scopes": [
+ "myscope"
+ ]
+ }
+ ],
+ "metadata": {
+ "items": [
+ {
+ "key": "aKey",
+ "value": "aValue"
+ }
+ ],
+ "fingerprint": "efgh"
+ },
+ "tags": {
+ "items": [
+ "aTag"
+ ],
+ "fingerprint": "abcd"
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 6ec1efb..f626082 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/v1beta13/projects/myproject/machineTypes/n1-standard-1","zone":"https://www.googleapis.com/compute/v1beta13/projects/myproject/zones/us-central1-a","image":"https://www.googleapis.com/compute/v1beta13/projects/google/images/gcel-12-04-v20121106","tags":["aTag"],"serviceAccounts":[{"email":"default","scopes":["myscope"]}],"networkInterfaces":[{"network":"https://www.googleapis.com/compute/v1beta13/projects/myproject/networks/default","accessConfigs":[{"type":"ONE_TO_ONE_NAT"}]}],"disks":[{"mode":"READ_WRITE","source":"https://www.googleapis.com/compute/v1beta13/projects/myproject/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/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
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 78b3e05..83b2b7a 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/v1beta13/projects/myproject/machineTypes/n1-standard-1","zone":"https://www.googleapis.com/compute/v1beta13/projects/myproject/zones/us-central1-a","tags":[],"serviceAccounts":[],"networkInterfaces":[{"network":"https://www.googleapis.com/compute/v1beta13/projects/myproject/networks/default","accessConfigs":[]}]}
\ No newline at end of file
+{"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
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 fb3db8b..a66fa92 100644
--- a/google-compute-engine/src/test/resources/instance_list.json
+++ b/google-compute-engine/src/test/resources/instance_list.json
@@ -1,57 +1,61 @@
{
- "kind": "compute#instanceList",
- "id": "projects/myproject/instances",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/instances",
- "items": [
-{
- "kind": "compute#instance",
- "id": "13051190678907570425",
- "description": "desc",
- "creationTimestamp": "2012-11-25T23:48:20.758",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/instances/test-0",
- "name": "test-0",
- "image": "https://www.googleapis.com/compute/v1beta13/projects/google/images/gcel-12-04-v20121106",
- "machineType": "https://www.googleapis.com/compute/v1beta13/projects/myproject/machineTypes/n1-standard-1",
- "status": "RUNNING",
- "zone": "https://www.googleapis.com/compute/v1beta13/projects/myproject/zones/us-central1-a",
- "networkInterfaces": [
- {
- "kind": "compute#instanceNetworkInterface",
- "name": "nic0",
- "networkIP": "10.240.121.115",
- "network": "https://www.googleapis.com/compute/v1beta13/projects/myproject/networks/default"
- }
- ],
- "disks": [
- {
- "kind": "compute#instanceDisk",
- "type": "PERSISTENT",
- "mode": "READ_WRITE",
- "deviceName": "test",
- "source": "https://www.googleapis.com/compute/v1beta13/projects/myproject/disks/test",
- "index": 0
- }
- ],
- "serviceAccounts": [
- {
- "kind": "compute#serviceAccount",
- "email": "default",
- "scopes": [
- "myscope"
- ]
- }
- ],
- "metadata": {
+ "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",
"items": [
- {
- "key": "aKey",
- "value": "aValue"
- }
+ {
+ "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",
+ "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",
+ "status": "RUNNING",
+ "zone": "https://www.googleapis.com/compute/v1beta15/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"
+ }
+ ],
+ "disks": [
+ {
+ "kind": "compute#instanceDisk",
+ "type": "PERSISTENT",
+ "mode": "READ_WRITE",
+ "deviceName": "test",
+ "source": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/disks/test",
+ "index": 0
+ }
+ ],
+ "serviceAccounts": [
+ {
+ "kind": "compute#serviceAccount",
+ "email": "default",
+ "scopes": [
+ "myscope"
+ ]
+ }
+ ],
+ "metadata": {
+ "items": [
+ {
+ "key": "aKey",
+ "value": "aValue"
+ }
+ ],
+ "fingerprint": "efgh"
+ },
+ "tags": {
+ "items": [
+ "aTag"
+ ],
+ "fingerprint": "abcd"
+ }
+ }
]
- },
- "tags": [
- "aTag"
- ]
- }
- ]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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
new file mode 100644
index 0000000..dcdc609
--- /dev/null
+++ b/google-compute-engine/src/test/resources/instance_list_central1b_empty.json
@@ -0,0 +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",
+ "items": [ ]
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/instance_serial_port.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/instance_serial_port.json b/google-compute-engine/src/test/resources/instance_serial_port.json
index 5813ce9..03280cc 100644
--- a/google-compute-engine/src/test/resources/instance_serial_port.json
+++ b/google-compute-engine/src/test/resources/instance_serial_port.json
@@ -1,4 +1,4 @@
{
- "kind": "compute#serialPortOutput",
- "contents": "console output"
+ "kind": "compute#serialPortOutput",
+ "contents": "console output"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/instance_set_metadata.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/instance_set_metadata.json b/google-compute-engine/src/test/resources/instance_set_metadata.json
new file mode 100644
index 0000000..b39e983
--- /dev/null
+++ b/google-compute-engine/src/test/resources/instance_set_metadata.json
@@ -0,0 +1,10 @@
+{
+ "items": [
+ {
+ "key": "foo",
+ "value": "bar"
+ }
+ ],
+ "fingerprint": "efgh",
+ "kind": "compute#metadata"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 a30b7a7..e304e08 100644
--- a/google-compute-engine/src/test/resources/kernel.json
+++ b/google-compute-engine/src/test/resources/kernel.json
@@ -1,8 +1,8 @@
{
- "kind": "compute#kernel",
- "id": "12941177846308850718",
- "creationTimestamp": "2012-07-16T21:42:16.950",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/kernels/gce-20110524",
- "name": "gce-20110524",
- "description": "DEPRECATED. Created Tue, 24 May 2011 00:48:22 +0000"
+ "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",
+ "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/53386380/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 7c5ce61..7fd4343 100644
--- a/google-compute-engine/src/test/resources/kernel_list.json
+++ b/google-compute-engine/src/test/resources/kernel_list.json
@@ -1,23 +1,27 @@
{
- "kind": "compute#kernelList",
- "id": "projects/google/kernels",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/kernels",
- "items": [
- {
- "kind": "compute#kernel",
- "id": "12941177846308850718",
- "creationTimestamp": "2012-07-16T21:42:16.950",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/kernels/gce-20110524",
- "name": "gce-20110524",
- "description": "DEPRECATED. Created Tue, 24 May 2011 00:48:22 +0000"
- },
- {
- "kind": "compute#kernel",
- "id": "12941177983348179280",
- "creationTimestamp": "2012-07-16T21:42:31.166",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/google/kernels/gce-20110728",
- "name": "gce-20110728",
- "description": "DEPRECATED. Created Thu, 28 Jul 2011 16:44:38 +0000"
- }
- ]
+ "kind": "compute#kernelList",
+ "id": "projects/google/global/kernels",
+ "selfLink": "https://www.googleapis.com/compute/v1beta15/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",
+ "name": "gce-20110524",
+ "description": "DEPRECATED. Created Tue, 24 May 2011 00:48:22 +0000"
+ },
+ {
+ "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",
+ "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"
+ }
+ }
+ ]
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/logback.xml b/google-compute-engine/src/test/resources/logback.xml
index 6bd571e..864a5a5 100644
--- a/google-compute-engine/src/test/resources/logback.xml
+++ b/google-compute-engine/src/test/resources/logback.xml
@@ -34,23 +34,50 @@
</encoder>
</appender>
+ <appender name="COMPUTEFILE" class="ch.qos.logback.core.FileAppender">
+ <file>target/test-data/jclouds-compute.log</file>
+
+ <encoder>
+ <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+ </encoder>
+ </appender>
+
+ <appender name="SSHFILE" class="ch.qos.logback.core.FileAppender">
+ <file>target/test-data/jclouds-ssh.log</file>
+
+ <encoder>
+ <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+ </encoder>
+ </appender>
+
<root>
- <level value="warn"/>
+ <level value="warn" />
</root>
<logger name="org.jclouds">
- <level value="DEBUG"/>
- <appender-ref ref="FILE"/>
+ <level value="TRACE" />
+ <appender-ref ref="FILE" />
</logger>
<logger name="jclouds.wire">
- <level value="DEBUG"/>
- <appender-ref ref="WIREFILE"/>
+ <level value="TRACE" />
+ <appender-ref ref="WIREFILE" />
</logger>
<logger name="jclouds.headers">
- <level value="DEBUG"/>
- <appender-ref ref="WIREFILE"/>
+ <level value="TRACE" />
+ <appender-ref ref="WIREFILE" />
+ </logger>
+
+ <logger name="jclouds.compute">
+ <level value="TRACE" />
+ <appender-ref ref="COMPUTEFILE" />
+ </logger>
+
+ <logger name="jclouds.ssh">
+ <level value="TRACE" />
+ <appender-ref ref="SSHFILE" />
</logger>
</configuration>
+
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 6f22572..5aa902a 100644
--- a/google-compute-engine/src/test/resources/machinetype.json
+++ b/google-compute-engine/src/test/resources/machinetype.json
@@ -1,21 +1,22 @@
{
- "kind": "compute#machineType",
- "id": "12907738072351752276",
- "creationTimestamp": "2012-06-07T20:48:14.670",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/machineTypes/n1-standard-1",
- "name": "n1-standard-1",
- "description": "1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk",
- "guestCpus": 1,
- "memoryMb": 3840,
- "imageSpaceGb": 10,
- "ephemeralDisks": [
- {
- "diskGb": 1770
- },
- {
- "diskGb": 1770
- }
- ],
- "maximumPersistentDisks": 16,
- "maximumPersistentDisksSizeGb": "128"
+ "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",
+ "name": "n1-standard-1",
+ "description": "1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk",
+ "guestCpus": 1,
+ "memoryMb": 3840,
+ "imageSpaceGb": 10,
+ "scratchDisks": [
+ {
+ "diskGb": 1770
+ },
+ {
+ "diskGb": 1770
+ }
+ ],
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "128",
+ "zone": "us-central1-a"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 14e7318..0506a0e 100644
--- a/google-compute-engine/src/test/resources/machinetype_list.json
+++ b/google-compute-engine/src/test/resources/machinetype_list.json
@@ -1,41 +1,57 @@
{
- "kind": "compute#machineTypeList",
- "id": "projects/myproject/machineTypes",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/machineTypes",
- "items": [
- {
- "kind": "compute#machineType",
- "id": "12907738072351752276",
- "creationTimestamp": "2012-06-07T20:48:14.670",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/machineTypes/n1-standard-1",
- "name": "n1-standard-1",
- "description": "1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk",
- "guestCpus": 1,
- "memoryMb": 3840,
- "imageSpaceGb": 10,
- "maximumPersistentDisks": 16,
- "maximumPersistentDisksSizeGb": "128"
- },
- {
- "kind": "compute#machineType",
- "id": "12908560709887590691",
- "creationTimestamp": "2012-06-07T20:51:19.936",
- "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/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,
- "memoryMb": 30720,
- "imageSpaceGb": 10,
- "ephemeralDisks": [
- {
- "diskGb": 1770
- },
- {
- "diskGb": 1770
- }
- ],
- "maximumPersistentDisks": 16,
- "maximumPersistentDisksSizeGb": "1024"
- }
- ]
+ "kind": "compute#machineTypeList",
+ "id": "projects/myproject/machineTypes",
+ "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/machineTypes",
+ "items": [
+ {
+ "kind": "compute#machineType",
+ "id": "4618642685664990776",
+ "creationTimestamp": "2013-04-25T13:32:49.088-07:00",
+ "name": "f1-micro",
+ "description": "1 vCPU (shared physical core) and 0.6 GB RAM",
+ "guestCpus": 1,
+ "memoryMb": 614,
+ "imageSpaceGb": 0,
+ "maximumPersistentDisks": 4,
+ "maximumPersistentDisksSizeGb": "3072",
+ "zone": "us-central1-a",
+ "selfLink": "https://www.googleapis.com/compute/v1beta15/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",
+ "name": "n1-standard-1",
+ "description": "1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk",
+ "guestCpus": 1,
+ "memoryMb": 3840,
+ "imageSpaceGb": 10,
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "128",
+ "zone": "us-central1-a"
+ },
+ {
+ "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",
+ "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,
+ "memoryMb": 30720,
+ "imageSpaceGb": 10,
+ "scratchDisks": [
+ {
+ "diskGb": 1770
+ },
+ {
+ "diskGb": 1770
+ }
+ ],
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "1024",
+ "zone": "us-central1-a"
+ }
+ ]
}
\ No newline at end of file