You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/11/09 19:17:01 UTC
[2/8] jclouds-labs-google git commit: * Rewrites InstanceTemplate as
NewInstance,
strictly from docs. * Rewrites Metadata to have the same shape as in json,
avoid really complicated json parser. * Rewrites
GoogleComputeEngineServiceAdapter.createNodeW
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionOperationTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionOperationTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionOperationTest.java
index dfb2111..dca6c8d 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionOperationTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionOperationTest.java
@@ -38,11 +38,10 @@ public class ParseRegionOperationTest extends BaseGoogleComputeEngineParseTest<O
public Operation expected() {
return Operation.create( //
"13053095055850848306", // id
- URI.create(BASE_URL
- + "/myproject/regions/us-central1/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb"),
- "operation-1354084865060-4cf88735faeb8-bbbb12cb", // name
+ URI.create(BASE_URL + "/party/regions/us-central1/operations/operation-1354084865060"), // selfLink
+ "operation-1354084865060", // name
null, // description
- URI.create(BASE_URL + "/myproject/regions/us-central1/addresses/test-address"), // targetLink
+ URI.create(BASE_URL + "/party/regions/us-central1/addresses/test-address"), // targetLink
"13053094017547040099", // targetId
null, // clientOperationId
Operation.Status.DONE, // status
@@ -56,7 +55,7 @@ public class ParseRegionOperationTest extends BaseGoogleComputeEngineParseTest<O
null, // httpErrorMessage
"insert", // operationType
null, // errors
- URI.create(BASE_URL + "/myproject/regions/us-central1"), // region
+ URI.create(BASE_URL + "/party/regions/us-central1"), // region
null // zone
);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 f34b132..fab2746 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
@@ -41,13 +41,13 @@ public class ParseRegionTest extends BaseGoogleComputeEngineParseTest<Region> {
public Region expected() {
return Region.create( //
"12912210600542709766", // id
- URI.create(BASE_URL + "/myproject/regions/us-central1"), // selfLink
+ URI.create(BASE_URL + "/party/regions/us-central1"), // selfLink
"us-central1", // name
"us-central1", // description
Region.Status.UP, // status
ImmutableList.of(//
- URI.create(BASE_URL + "/myproject/zones/us-central1-a"),
- URI.create(BASE_URL + "/myproject/zones/us-central1-b")), // zones
+ URI.create(BASE_URL + "/party/zones/us-central1-a"),
+ URI.create(BASE_URL + "/party/zones/us-central1-b")), // zones
ImmutableList.of( //
Quota.create("INSTANCES", 0, 8), //
Quota.create("CPUS", 0, 8), //
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 cd425a6..f6c23a5 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
@@ -41,17 +41,17 @@ public class ParseRouteListTest extends BaseGoogleComputeEngineParseTest<ListPag
Route route1 = new ParseRouteTest().expected();
Route route2 = Route.create( //
"507025480040058551", // id
- URI.create(BASE_URL + "/myproject/global/routes/default-route-fc92a41ecb5a8d17"), // selfLink
+ URI.create(BASE_URL + "/party/global/routes/default-route-fc92a41ecb5a8d17"), // selfLink
"default-route-fc92a41ecb5a8d17", // name
"Default route to the Internet.", // description
- URI.create(BASE_URL + "/myproject/global/networks/default"), // network
+ URI.create(BASE_URL + "/party/global/networks/default"), // network
null, // tags
"0.0.0.0/0", // destRange
1000, // priority
null, // nextHopInstance
null, // nextHopIp
null, // nextHopNetwork
- URI.create(BASE_URL + "/myproject/global/gateways/default-internet-gateway"), // nextHopGateway
+ URI.create(BASE_URL + "/party/global/gateways/default-internet-gateway"), // nextHopGateway
null // warnings
);
return ListPage.create( //
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 82d0e83..b5f0c42 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
@@ -40,16 +40,16 @@ public class ParseRouteTest extends BaseGoogleComputeEngineParseTest<Route> {
public Route expected() {
return Route.create( //
"7241926205630356071", // id
- URI.create(BASE_URL + "/myproject/global/routes/default-route-c99ebfbed0e1f375"), // selfLink
+ URI.create(BASE_URL + "/party/global/routes/default-route-c99ebfbed0e1f375"), // selfLink
"default-route-c99ebfbed0e1f375", // name
"Default route to the virtual network.", // description
- URI.create(BASE_URL + "/myproject/global/networks/default"), // network
+ URI.create(BASE_URL + "/party/global/networks/default"), // network
ImmutableList.of("fooTag", "barTag"), // tags
"10.240.0.0/16", // destRange
1000, // priority
null, // nextHopInstance
null, // nextHopIp
- URI.create(BASE_URL + "/myproject/global/networks/default"), // nextHopNetwork
+ URI.create(BASE_URL + "/party/global/networks/default"), // nextHopNetwork
null, // nextHopGateway
null // warnings
);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 96d5564..27d28ba 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
@@ -42,12 +42,12 @@ public class ParseSnapshotListTest extends BaseGoogleComputeEngineParseTest<List
Snapshot snapshot1 = new ParseSnapshotTest().expected();
Snapshot snapshot2 = Snapshot.create( //
"13895715048576107883", // id
- URI.create(BASE_URL + "/myproject/global/snapshots/test-snap2"), // selfLink
+ URI.create(BASE_URL + "/party/global/snapshots/test-snap2"), // selfLink
"test-snap2", // name
"", // description
10, // sizeGb
"READY", // status
- URI.create(BASE_URL + "/myproject/zones/us-central1-a/disks/testimage1"), // sourceDisk
+ URI.create(BASE_URL + "/party/zones/us-central1-a/disks/testimage1"), // sourceDisk
"8243603669926824540"// sourceDiskId
);
return ListPage.create( //
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 f8af42e..77f39e0 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
@@ -38,12 +38,12 @@ public class ParseSnapshotTest extends BaseGoogleComputeEngineParseTest<Snapshot
public Snapshot expected() {
return Snapshot.create( //
"9734455566806191190", // id
- URI.create(BASE_URL + "/myproject/global/snapshots/test-snap"), // selfLink
+ URI.create(BASE_URL + "/party/global/snapshots/test-snap"), // selfLink
"test-snap", // name
"", // description
10, // sizeGb
"READY", // status
- URI.create(BASE_URL + "/myproject/zones/us-central1-a/disks/testimage1"), // sourceDisk
+ URI.create(BASE_URL + "/party/zones/us-central1-a/disks/testimage1"), // sourceDisk
"8243603669926824540"// sourceDiskId
);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetPoolTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetPoolTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetPoolTest.java
index 7f705a7..81f357c 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetPoolTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetPoolTest.java
@@ -38,10 +38,10 @@ public class ParseTargetPoolTest extends BaseGoogleComputeEngineParseTest<Target
public TargetPool expected() {
return TargetPool.create( //
"5199309593612841404", // id
- URI.create(BASE_URL + "/myproject/regions/us-central1/targetPools/test-targetpool"), // selfLink
+ URI.create(BASE_URL + "/party/regions/us-central1/targetPools/test-targetpool"), // selfLink
"test-targetpool", // name
null, // description
- URI.create(BASE_URL + "/myproject/regions/us-central1"), // region
+ URI.create(BASE_URL + "/party/regions/us-central1"), // region
null, // healthChecks
null, // instances
SessionAffinityValue.NONE, // sessionAffinity
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 5fd45d3..47019b4 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
@@ -42,7 +42,7 @@ public class ParseZoneListTest extends BaseGoogleComputeEngineParseTest<ListPage
Zone zone1 = new ParseZoneTest().expected();
Zone zone2 = Zone.create( //
"13024414164050619686", // id
- URI.create(BASE_URL + "/myproject/zones/us-central1-b"), // selfLink
+ URI.create(BASE_URL + "/party/zones/us-central1-b"), // selfLink
"us-central1-b", // name
"us-central1-b", // description
Zone.Status.UP, // status
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneOperationTest.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneOperationTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneOperationTest.java
index 8c2e006..5856687 100644
--- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneOperationTest.java
+++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneOperationTest.java
@@ -38,10 +38,10 @@ public class ParseZoneOperationTest extends BaseGoogleComputeEngineParseTest<Ope
public Operation expected() {
return Operation.create( //
"13053095055850848306", // id
- URI.create(BASE_URL + "/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb"),
- "operation-1354084865060-4cf88735faeb8-bbbb12cb", // name
+ URI.create(BASE_URL + "/party/zones/us-central1-a/operations/operation-1354084865060"),
+ "operation-1354084865060", // name
null, // description
- URI.create(BASE_URL + "/myproject/zones/us-central1-a/instances/test-1"),
+ URI.create(BASE_URL + "/party/zones/us-central1-a/instances/test-1"),
"13053094017547040099", // targetId
null, // clientOperationId
Operation.Status.DONE, // status
@@ -56,7 +56,7 @@ public class ParseZoneOperationTest extends BaseGoogleComputeEngineParseTest<Ope
"insert", // operationType
null, // errors
null, // region
- URI.create(BASE_URL + "/myproject/zones/us-central1-a") // zone
+ URI.create(BASE_URL + "/party/zones/us-central1-a") // zone
);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 2201039..b2fd488 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
@@ -40,7 +40,7 @@ public class ParseZoneTest extends BaseGoogleComputeEngineParseTest<Zone> {
public Zone expected() {
return Zone.create( //
"13020128040171887099", // id
- URI.create(BASE_URL + "/myproject/zones/us-central1-a"), // selfLink
+ URI.create(BASE_URL + "/party/zones/us-central1-a"), // selfLink
"us-central1-a", // name
"us-central1-a", // description
Zone.Status.DOWN, // status
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 52e09d1..f43bd8c 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
@@ -41,10 +41,10 @@ public class NetworkFirewallPredicatesTest {
public static Firewall getFwForTestSourceTags() {
return Firewall.create( //
"abcd", // id
- URI.create(BASE_URL + "/myproject/global/firewalls/jclouds-test"), // selfLink
+ URI.create(BASE_URL + "/party/global/firewalls/jclouds-test"), // selfLink
"jclouds-test", // name
null, // description
- URI.create(BASE_URL + "/myproject/global/networks/jclouds-test"), // network
+ URI.create(BASE_URL + "/party/global/networks/jclouds-test"), // network
null, // sourceRanges
ImmutableList.of("tag-1"), // sourceTags
null, // targetTags
@@ -57,10 +57,10 @@ public class NetworkFirewallPredicatesTest {
public static Firewall getFwForTestSourceTagsExact() {
return Firewall.create( //
"abcd", // id
- URI.create(BASE_URL + "/myproject/global/firewalls/jclouds-test"), // selfLink
+ URI.create(BASE_URL + "/party/global/firewalls/jclouds-test"), // selfLink
"jclouds-test", // name
null, // description
- URI.create(BASE_URL + "/myproject/global/networks/jclouds-test"), // network
+ URI.create(BASE_URL + "/party/global/networks/jclouds-test"), // network
null, // sourceRanges
ImmutableList.of("tag-1"), // sourceTags
null, // targetTags
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/resources/GoogleComputeEngineServiceExpectTest/firewall_list.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/GoogleComputeEngineServiceExpectTest/firewall_list.json b/google-compute-engine/src/test/resources/GoogleComputeEngineServiceExpectTest/firewall_list.json
index c965349..f549d2a 100644
--- a/google-compute-engine/src/test/resources/GoogleComputeEngineServiceExpectTest/firewall_list.json
+++ b/google-compute-engine/src/test/resources/GoogleComputeEngineServiceExpectTest/firewall_list.json
@@ -8,10 +8,10 @@
"kind": "compute#firewall",
"id": "12862241031274216284",
"creationTimestamp": "2012-04-13T03:05:02.855",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/firewalls/jclouds-test-delete",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/global/firewalls/jclouds-test-delete",
"name": "jclouds-test-delete",
"description": "Internal traffic from default allowed",
- "network": "https://www.googleapis.com/compute/v1/projects/myproject/global/networks/jclouds-test-delete",
+ "network": "https://www.googleapis.com/compute/v1/projects/party/global/networks/jclouds-test-delete",
"sourceRanges": [
"10.0.0.0/8"
],
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/resources/GoogleComputeEngineServiceExpectTest/network_get.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/GoogleComputeEngineServiceExpectTest/network_get.json b/google-compute-engine/src/test/resources/GoogleComputeEngineServiceExpectTest/network_get.json
index e9308f0..c16b959 100644
--- a/google-compute-engine/src/test/resources/GoogleComputeEngineServiceExpectTest/network_get.json
+++ b/google-compute-engine/src/test/resources/GoogleComputeEngineServiceExpectTest/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/v1/projects/myproject/global/networks/jclouds-test-delete",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/global/networks/jclouds-test-delete",
"name": "jclouds-test-delete",
"description": "Default network for the project",
"IPv4Range": "10.0.0.0/8",
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 f93e497..24047a4 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/v1/projects/myproject/regions/us-central1",
+ "region": "https://www.googleapis.com/compute/v1/projects/party/regions/us-central1",
"name": "test-ip1",
"description": "",
"address": "173.255.115.190",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1/addresses/test-ip1"
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/regions/us-central1/addresses/test-ip1"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 cbfa9d5..2b53868 100644
--- a/google-compute-engine/src/test/resources/address_list.json
+++ b/google-compute-engine/src/test/resources/address_list.json
@@ -1,7 +1,7 @@
{
"kind": "compute#addressList",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1/addresses",
- "id": "projects/myproject/regions/us-central1/addresses",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/regions/us-central1/addresses",
+ "id": "projects/party/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/v1/projects/myproject/regions/us-central1",
+ "region": "https://www.googleapis.com/compute/v1/projects/party/regions/us-central1",
"name": "test-ip1",
"description": "",
"address": "173.255.115.190",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1/addresses/test-ip1"
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/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/v1/projects/myproject/regions/us-central1",
+ "region": "https://www.googleapis.com/compute/v1/projects/party/regions/us-central1",
"name": "test-ip2",
"description": "",
"address": "173.255.118.115",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1/addresses/test-ip2"
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/regions/us-central1/addresses/test-ip2"
}
]
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/resources/aggregated_instance_list.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/aggregated_instance_list.json b/google-compute-engine/src/test/resources/aggregated_instance_list.json
new file mode 100644
index 0000000..a1b31ac
--- /dev/null
+++ b/google-compute-engine/src/test/resources/aggregated_instance_list.json
@@ -0,0 +1,170 @@
+{
+ "kind": "compute#instanceAggregatedList",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/aggregated/instances",
+ "id": "projects/party/aggregated/instances",
+ "items": {
+ "zones/asia-east1-a": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "message": "There are no results for scope 'zones/asia-east1-a' on this page.",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/asia-east1-a"
+ }
+ ]
+ }
+ },
+ "zones/asia-east1-b": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "message": "There are no results for scope 'zones/asia-east1-b' on this page.",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/asia-east1-b"
+ }
+ ]
+ }
+ },
+ "zones/asia-east1-c": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "message": "There are no results for scope 'zones/asia-east1-c' on this page.",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/asia-east1-c"
+ }
+ ]
+ }
+ },
+ "zones/europe-west1-a": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "message": "There are no results for scope 'zones/europe-west1-a' on this page.",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/europe-west1-a"
+ }
+ ]
+ }
+ },
+ "zones/europe-west1-b": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "message": "There are no results for scope 'zones/europe-west1-b' on this page.",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/europe-west1-b"
+ }
+ ]
+ }
+ },
+ "zones/europe-west1-c": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "message": "There are no results for scope 'zones/europe-west1-c' on this page.",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/europe-west1-c"
+ }
+ ]
+ }
+ },
+ "zones/us-central1-a": {
+ "instances": [
+ {
+ "kind": "compute#instance",
+ "id": "13051190678907570425",
+ "description": "desc",
+ "creationTimestamp": "2012-11-25T23:48:20.758",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/instances/test-0",
+ "name": "test-0",
+ "machineType": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/machineTypes/n1-standard-1",
+ "status": "RUNNING",
+ "zone": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a",
+ "networkInterfaces": [
+ {
+ "kind": "compute#instanceNetworkInterface",
+ "name": "nic0",
+ "networkIP": "10.240.121.115",
+ "network": "https://www.googleapis.com/compute/v1/projects/party/global/networks/default"
+ }
+ ],
+ "disks": [
+ {
+ "kind": "compute#instanceDisk",
+ "type": "PERSISTENT",
+ "mode": "READ_WRITE",
+ "deviceName": "test",
+ "source": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/disks/test",
+ "index": 0,
+ "boot": true
+ }
+ ],
+ "serviceAccounts": [
+ {
+ "kind": "compute#serviceAccount",
+ "email": "default",
+ "scopes": [
+ "myscope"
+ ]
+ }
+ ],
+ "metadata": {
+ "items": [
+ {
+ "key": "aKey",
+ "value": "aValue"
+ },
+ {
+ "key": "jclouds-image",
+ "value": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140718"
+ },
+ {
+ "key": "jclouds-delete-boot-disk",
+ "value": "true"
+ }
+ ],
+ "fingerprint": "efgh"
+ },
+ "tags": {
+ "items": [
+ "aTag",
+ "Group-port-42"
+ ],
+ "fingerprint": "abcd"
+ }
+ }
+ ]
+ },
+ "zones/us-central1-b": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "message": "There are no results for scope 'zones/us-central1-b' on this page.",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/us-central1-b"
+ }
+ ]
+ }
+ },
+ "zones/us-central1-f": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "message": "There are no results for scope 'zones/us-central1-f' on this page.",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/us-central1-f"
+ }
+ ]
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/resources/aggregated_instance_list_empty.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/aggregated_instance_list_empty.json b/google-compute-engine/src/test/resources/aggregated_instance_list_empty.json
new file mode 100644
index 0000000..8cc7c2f
--- /dev/null
+++ b/google-compute-engine/src/test/resources/aggregated_instance_list_empty.json
@@ -0,0 +1,115 @@
+{
+ "kind": "compute#instanceAggregatedList",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/aggregated/instances",
+ "id": "projects/party/aggregated/instances",
+ "items": {
+ "zones/asia-east1-a": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "message": "There are no results for scope 'zones/asia-east1-a' on this page.",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/asia-east1-a"
+ }
+ ]
+ }
+ },
+ "zones/asia-east1-b": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "message": "There are no results for scope 'zones/asia-east1-b' on this page.",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/asia-east1-b"
+ }
+ ]
+ }
+ },
+ "zones/asia-east1-c": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "message": "There are no results for scope 'zones/asia-east1-c' on this page.",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/asia-east1-c"
+ }
+ ]
+ }
+ },
+ "zones/europe-west1-a": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "message": "There are no results for scope 'zones/europe-west1-a' on this page.",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/europe-west1-a"
+ }
+ ]
+ }
+ },
+ "zones/europe-west1-b": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "message": "There are no results for scope 'zones/europe-west1-b' on this page.",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/europe-west1-b"
+ }
+ ]
+ }
+ },
+ "zones/europe-west1-c": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "message": "There are no results for scope 'zones/europe-west1-c' on this page.",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/europe-west1-c"
+ }
+ ]
+ }
+ },
+ "zones/us-central1-a": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "message": "There are no results for scope 'zones/us-central1-a' on this page.",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/us-central1-a"
+ }
+ ]
+ }
+ },
+ "zones/us-central1-b": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "message": "There are no results for scope 'zones/us-central1-b' on this page.",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/us-central1-b"
+ }
+ ]
+ }
+ },
+ "zones/us-central1-f": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "message": "There are no results for scope 'zones/us-central1-f' on this page.",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/us-central1-f"
+ }
+ ]
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/resources/aggregated_machinetype_list.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/aggregated_machinetype_list.json b/google-compute-engine/src/test/resources/aggregated_machinetype_list.json
new file mode 100644
index 0000000..f9ae87c
--- /dev/null
+++ b/google-compute-engine/src/test/resources/aggregated_machinetype_list.json
@@ -0,0 +1,58 @@
+{
+ "kind": "compute#machineTypeAggregatedList",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/aggregated/machineTypes",
+ "id": "projects/party/aggregated/machineTypes",
+ "items": {
+ "zones/us-central1-a": {
+ "machineTypes": [
+ {
+ "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,
+ "maximumPersistentDisks": 4,
+ "maximumPersistentDisksSizeGb": "3072",
+ "zone": "us-central1-a",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/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/v1/projects/party/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,
+ "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/v1/projects/party/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,
+ "scratchDisks": [
+ {
+ "diskGb": 1770
+ },
+ {
+ "diskGb": 1770
+ }
+ ],
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "1024",
+ "zone": "us-central1-a"
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 afd25d8..8b3db5b 100644
--- a/google-compute-engine/src/test/resources/disk_get.json
+++ b/google-compute-engine/src/test/resources/disk_get.json
@@ -2,10 +2,10 @@
"kind": "compute#disk",
"id": "13050421646334304115",
"creationTimestamp": "2012-11-25T01:38:48.306",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/testimage1",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/disks/testimage1",
"name": "testimage1",
"sizeGb": "1",
- "zone": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a",
+ "zone": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a",
"status": "READY",
"type": "https://www.googleapis.com/compute/v1/projects/studied-point-720/zones/us-central1-a/diskTypes/pd-standard"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/resources/disk_insert_sourceImage.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/disk_insert_sourceImage.json b/google-compute-engine/src/test/resources/disk_insert_sourceImage.json
index 625dd48..b2fddca 100644
--- a/google-compute-engine/src/test/resources/disk_insert_sourceImage.json
+++ b/google-compute-engine/src/test/resources/disk_insert_sourceImage.json
@@ -1 +1 @@
-{"name":"testimage1","sizeGb":1,"sourceImage":"https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/images/foo"}
\ No newline at end of file
+{"name":"testimage1","sizeGb":1,"sourceImage":"https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/images/foo"}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/resources/disk_insert_ssd.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/disk_insert_ssd.json b/google-compute-engine/src/test/resources/disk_insert_ssd.json
index 2bc914f..a8c7eb5 100644
--- a/google-compute-engine/src/test/resources/disk_insert_ssd.json
+++ b/google-compute-engine/src/test/resources/disk_insert_ssd.json
@@ -1 +1 @@
-{"name":"testimage1","sizeGb":1,"type":"https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/diskTypes/pd-ssd"}
\ No newline at end of file
+{"name":"testimage1","sizeGb":1,"type":"https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/diskTypes/pd-ssd"}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 4d864c3..6752144 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/v1/projects/myproject/zones/us-central1-a/disks",
+ "id": "projects/party/zones/us-central1-a/disks",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/disks",
"items": [
{
"kind": "compute#disk",
"id": "13050421646334304115",
"creationTimestamp": "2012-11-25T01:38:48.306",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/testimage1",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/disks/testimage1",
"name": "testimage1",
"sizeGb": "1",
- "zone": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a",
+ "zone": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a",
"status": "READY",
"type": "https://www.googleapis.com/compute/v1/projects/studied-point-720/zones/us-central1-a/diskTypes/pd-standard"
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 74ced74..89b4fd2 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/v1/projects/myproject/global/firewalls/jclouds-test",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/global/firewalls/jclouds-test",
"name": "jclouds-test",
"description": "Internal traffic from default allowed",
- "network": "https://www.googleapis.com/compute/v1/projects/myproject/global/networks/jclouds-test",
+ "network": "https://www.googleapis.com/compute/v1/projects/party/global/networks/jclouds-test",
"sourceRanges": [
"10.0.0.0/8"
],
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 fabe1bd..8742a10 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/v1/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/v1/projects/party/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/jclouds-labs-google/blob/6b5643c9/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 ab7d0b7..a98b99a 100644
--- a/google-compute-engine/src/test/resources/firewall_list.json
+++ b/google-compute-engine/src/test/resources/firewall_list.json
@@ -8,10 +8,10 @@
"kind": "compute#firewall",
"id": "12862241031274216284",
"creationTimestamp": "2012-04-13T03:05:02.855",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/firewalls/jclouds-test",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/global/firewalls/jclouds-test",
"name": "jclouds-test",
"description": "Internal traffic from default allowed",
- "network": "https://www.googleapis.com/compute/v1/projects/myproject/global/networks/jclouds-test",
+ "network": "https://www.googleapis.com/compute/v1/projects/party/global/networks/jclouds-test",
"sourceRanges": [
"10.0.0.0/8"
],
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/resources/forwardingrule_get.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/forwardingrule_get.json b/google-compute-engine/src/test/resources/forwardingrule_get.json
index b6775bf..2bad412 100644
--- a/google-compute-engine/src/test/resources/forwardingrule_get.json
+++ b/google-compute-engine/src/test/resources/forwardingrule_get.json
@@ -3,10 +3,10 @@
"id": "6732523704970219884",
"creationTimestamp": "2014-01-08T06:51:10.809-08:00",
"name": "test-forwarding-rule",
- "region": "https://www.googleapis.com/compute/v1/projects/myproject/regions/europe-west1",
+ "region": "https://www.googleapis.com/compute/v1/projects/party/regions/europe-west1",
"IPAddress": "23.251.129.77",
"IPProtocol": "TCP",
"portRange": "1-65535",
- "target": "https://www.googleapis.com/compute/v1/projects/myproject/regions/europe-west1/targetPools/test-target-pool",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions/europe-west1/forwardingRules/test-forwarding-rule"
+ "target": "https://www.googleapis.com/compute/v1/projects/party/regions/europe-west1/targetPools/test-target-pool",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/regions/europe-west1/forwardingRules/test-forwarding-rule"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/resources/forwardingrule_insert.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/forwardingrule_insert.json b/google-compute-engine/src/test/resources/forwardingrule_insert.json
index 62c6090..4a335be 100644
--- a/google-compute-engine/src/test/resources/forwardingrule_insert.json
+++ b/google-compute-engine/src/test/resources/forwardingrule_insert.json
@@ -1,4 +1,4 @@
{
"name": "test-forwarding-rule",
-"target": "https://www.googleapis.com/compute/v1/projects/myproject/regions/europe-west1/targetPools/test-target-pool"
+"target": "https://www.googleapis.com/compute/v1/projects/party/regions/europe-west1/targetPools/test-target-pool"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/resources/forwardingrule_list.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/forwardingrule_list.json b/google-compute-engine/src/test/resources/forwardingrule_list.json
index 59f1204..71e9450 100644
--- a/google-compute-engine/src/test/resources/forwardingrule_list.json
+++ b/google-compute-engine/src/test/resources/forwardingrule_list.json
@@ -1,19 +1,19 @@
{
"kind": "compute#forwardingRuleList",
-"selfLink": "https://content.googleapis.com/compute/v1/projects/myproject/regions/europe-west1/forwardingRules",
-"id": "projects/myproject/regions/europe-west1/forwardingRules",
+"selfLink": "https://content.googleapis.com/compute/v1/projects/party/regions/europe-west1/forwardingRules",
+"id": "projects/party/regions/europe-west1/forwardingRules",
"items": [
{
"kind": "compute#forwardingRule",
"id": "6732523704970219884",
"creationTimestamp": "2014-01-08T06:51:10.809-08:00",
"name": "test-forwarding-rule",
-"region": "https://www.googleapis.com/compute/v1/projects/myproject/regions/europe-west1",
+"region": "https://www.googleapis.com/compute/v1/projects/party/regions/europe-west1",
"IPAddress": "23.251.129.77",
"IPProtocol": "TCP",
"portRange": "1-65535",
-"target": "https://www.googleapis.com/compute/v1/projects/myproject/regions/europe-west1/targetPools/test-target-pool",
-"selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions/europe-west1/forwardingRules/test-forwarding-rule"
+"target": "https://www.googleapis.com/compute/v1/projects/party/regions/europe-west1/targetPools/test-target-pool",
+"selfLink": "https://www.googleapis.com/compute/v1/projects/party/regions/europe-west1/forwardingRules/test-forwarding-rule"
}
]
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/resources/forwardingrule_set_target.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/forwardingrule_set_target.json b/google-compute-engine/src/test/resources/forwardingrule_set_target.json
index 67e7a8e..d21327e 100644
--- a/google-compute-engine/src/test/resources/forwardingrule_set_target.json
+++ b/google-compute-engine/src/test/resources/forwardingrule_set_target.json
@@ -1 +1 @@
-{"target":"https://www.googleapis.com/compute/v1/projects/myproject/regions/europe-west1/targetPools/test-target-pool"}
\ No newline at end of file
+{"target":"https://www.googleapis.com/compute/v1/projects/party/regions/europe-west1/targetPools/test-target-pool"}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 17d7748..f85b7ea 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/v1/projects/myproject/global/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "targetLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/firewalls/jclouds-test-delete",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/global/operations/operation-1354084865060",
+ "name": "operation-1354084865060",
+ "targetLink": "https://www.googleapis.com/compute/v1/projects/party/global/firewalls/jclouds-test-delete",
"targetId": "13053094017547040099",
"status": "DONE",
"user": "user@developer.gserviceaccount.com",
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 32b881a..d5cede0 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/v1/projects/myproject/global/operations",
+ "id": "projects/party/global/operations",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/global/operations",
"items": [
{
"kind": "compute#operation",
"id": "13053095055850848306",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "targetLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/firewalls/jclouds-test-delete",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/global/operations/operation-1354084865060",
+ "name": "operation-1354084865060",
+ "targetLink": "https://www.googleapis.com/compute/v1/projects/party/global/firewalls/jclouds-test-delete",
"targetId": "13053094017547040099",
"status": "DONE",
"user": "user@developer.gserviceaccount.com",
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/resources/httphealthcheck_get.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/httphealthcheck_get.json b/google-compute-engine/src/test/resources/httphealthcheck_get.json
index 4a7cd84..37f09d8 100644
--- a/google-compute-engine/src/test/resources/httphealthcheck_get.json
+++ b/google-compute-engine/src/test/resources/httphealthcheck_get.json
@@ -1,6 +1,6 @@
{
"kind": "compute#httpHealthCheck",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/jclouds-gce/global/httpHealthChecks/http-health-check-api-live-test",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party-gce/global/httpHealthChecks/http-health-check-api-live-test",
"id": "2761502483700014319",
"creationTimestamp": "2014-01-14T05:55:54.910-08:00",
"name": "http-health-check-api-live-test"
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/resources/httphealthcheck_list.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/httphealthcheck_list.json b/google-compute-engine/src/test/resources/httphealthcheck_list.json
index 4436a26..cc74e80 100644
--- a/google-compute-engine/src/test/resources/httphealthcheck_list.json
+++ b/google-compute-engine/src/test/resources/httphealthcheck_list.json
@@ -1,18 +1,18 @@
{
"kind": "compute#httpHealthCheckList",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/jclouds-gce/global/httpHealthChecks",
- "id": "projects/jclouds-gce/global/httpHealthChecks",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party-gce/global/httpHealthChecks",
+ "id": "projects/party-gce/global/httpHealthChecks",
"items": [
{
"kind": "compute#httpHealthCheck",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/jclouds-gce/global/httpHealthChecks/http-health-check-api-live-test",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party-gce/global/httpHealthChecks/http-health-check-api-live-test",
"id": "2761502483700014319",
"creationTimestamp": "2014-01-14T05:55:54.910-08:00",
"name": "http-health-check-api-live-test"
},
{
"kind": "compute#httpHealthCheck",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/jclouds-gce/global/httpHealthChecks/myname-andrea-kmzmi1bh-http-health-check",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party-gce/global/httpHealthChecks/myname-andrea-kmzmi1bh-http-health-check",
"id": "1035854271083519643",
"creationTimestamp": "2014-01-08T14:38:29.363-08:00",
"name": "myname-andrea-kmzmi1bh-http-health-check",
@@ -21,7 +21,7 @@
},
{
"kind": "compute#httpHealthCheck",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/jclouds-gce/global/httpHealthChecks/myname-andrea-zk7gadwq-http-health-check",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party-gce/global/httpHealthChecks/myname-andrea-zk7gadwq-http-health-check",
"id": "7006563292274658743",
"creationTimestamp": "2014-01-08T14:48:03.276-08:00",
"name": "myname-andrea-zk7gadwq-http-health-check",
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/resources/image_insert_from_pd.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/image_insert_from_pd.json b/google-compute-engine/src/test/resources/image_insert_from_pd.json
index 0fa2a01..6f72d62 100644
--- a/google-compute-engine/src/test/resources/image_insert_from_pd.json
+++ b/google-compute-engine/src/test/resources/image_insert_from_pd.json
@@ -1 +1 @@
-{"name":"my-image","sourceDisk":"https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/mydisk"}
\ No newline at end of file
+{"name":"my-image","sourceDisk":"https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/disks/mydisk"}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 fe4fcf0..cee3131 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/v1/projects/jclouds-gce/zones/us-central1-a/instances/test-instance/addAccessConfig?network_interface=nic0&key={YOUR_API_KEY}
+POST https://www.googleapis.com/compute/v1/projects/party-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/jclouds-labs-google/blob/6b5643c9/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 8fc35bc..dc6c707 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/v1/projects/myproject/zones/us-central1-a/disks/testimage1",
+ "source": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/disks/testimage1",
"boot": false
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 3d6ce02..e8fac93 100644
--- a/google-compute-engine/src/test/resources/instance_get.json
+++ b/google-compute-engine/src/test/resources/instance_get.json
@@ -3,17 +3,17 @@
"id": "13051190678907570425",
"description": "desc",
"creationTimestamp": "2012-11-25T23:48:20.758",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-0",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/instances/test-0",
"name": "test-0",
- "machineType": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1",
+ "machineType": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/machineTypes/n1-standard-1",
"status": "RUNNING",
- "zone": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a",
+ "zone": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a",
"networkInterfaces": [
{
"kind": "compute#instanceNetworkInterface",
"name": "nic0",
"networkIP": "10.240.121.115",
- "network": "https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default"
+ "network": "https://www.googleapis.com/compute/v1/projects/party/global/networks/default"
}
],
"disks": [
@@ -22,7 +22,7 @@
"type": "PERSISTENT",
"mode": "READ_WRITE",
"deviceName": "test",
- "source": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/test",
+ "source": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/disks/test",
"index": 0,
"boot": true
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 4c59302..2ce8f0b 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/v1/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1","serviceAccounts":[{"email":"default","scopes":["myscope"]}],"disks":[{"type":"PERSISTENT","mode":"READ_WRITE","source":"https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/test","autoDelete":true,"boot":false}],"networkInterfaces":[{"network":"https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default","accessConfigs":[{"type":"ONE_TO_ONE_NAT"}]}],"metadata":{"kind":"compute#metadata","items":[{"key":"aKey","value":"aValue"}]}}
\ No newline at end of file
+{"machineType":"https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/machineTypes/n1-standard-1","name":"test-1","networkInterfaces":[{"network":"https://www.googleapis.com/compute/v1/projects/party/global/networks/default","accessConfigs":["ONE_TO_ONE_NAT"]}],"disks":[{"type":"PERSISTENT","source":"https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/disks/test","boot":true,"autoDelete":false}],"description":"desc","tags":{"items":[]},"metadata":{"items":[{"key":"aKey","value":"aValue"}]}}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 990b009..99e37f4 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/v1/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1","serviceAccounts":[],"disks":[],"networkInterfaces":[{"network":"https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default"}],"metadata":{}}
\ No newline at end of file
+{"machineType":"https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/machineTypes/n1-standard-1","name":"test-1","networkInterfaces":[{"network":"https://www.googleapis.com/compute/v1/projects/party/global/networks/default","accessConfigs":["ONE_TO_ONE_NAT"]}],"disks":[{"type":"PERSISTENT","source":"https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/disks/test","boot":true,"autoDelete":false}],"tags":{"items":[]},"metadata":{"items":[]}}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 0192eb8..7a35c25 100644
--- a/google-compute-engine/src/test/resources/instance_list.json
+++ b/google-compute-engine/src/test/resources/instance_list.json
@@ -1,24 +1,24 @@
{
"kind": "compute#instanceList",
- "id": "projects/myproject/zones/us-central1-a/instances",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances",
+ "id": "projects/party/zones/us-central1-a/instances",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/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/v1/projects/myproject/zones/us-central1-a/instances/test-0",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/instances/test-0",
"name": "test-0",
- "machineType": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1",
+ "machineType": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/machineTypes/n1-standard-1",
"status": "RUNNING",
- "zone": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a",
+ "zone": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a",
"networkInterfaces": [
{
"kind": "compute#instanceNetworkInterface",
"name": "nic0",
"networkIP": "10.240.121.115",
- "network": "https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default"
+ "network": "https://www.googleapis.com/compute/v1/projects/party/global/networks/default"
}
],
"disks": [
@@ -27,7 +27,7 @@
"type": "PERSISTENT",
"mode": "READ_WRITE",
"deviceName": "test",
- "source": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/test",
+ "source": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/disks/test",
"index": 0,
"boot": true
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 51c8793..97ee44c 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/v1/projects/myproject/zones/us-central1-b/instances",
+ "id": "projects/party/zones/us-central1-b/instances",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-b/instances",
"items": [ ]
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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
index b39e983..f6377eb 100644
--- a/google-compute-engine/src/test/resources/instance_set_metadata.json
+++ b/google-compute-engine/src/test/resources/instance_set_metadata.json
@@ -1,10 +1 @@
-{
- "items": [
- {
- "key": "foo",
- "value": "bar"
- }
- ],
- "fingerprint": "efgh",
- "kind": "compute#metadata"
-}
\ No newline at end of file
+{"fingerprint":"efgh","items":[{"key":"foo","value":"bar"}]}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 f02f334..73f71ad 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/v1/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/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/jclouds-labs-google/blob/6b5643c9/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 cb20853..3d3ba93 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/v1/projects/myproject/zones/us-central1-a/machineTypes",
+ "id": "projects/party/machineTypes",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/machineTypes",
"items": [
{
"kind": "compute#machineType",
@@ -14,13 +14,13 @@
"maximumPersistentDisks": 4,
"maximumPersistentDisksSizeGb": "3072",
"zone": "us-central1-a",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes/f1-micro"
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/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/v1/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/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,
@@ -33,7 +33,7 @@
"kind": "compute#machineType",
"id": "12908560709887590691",
"creationTimestamp": "2012-06-07T20:51:19.936",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-8-d",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/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/jclouds-labs-google/blob/6b5643c9/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 8cbbc48..8ec63be 100644
--- a/google-compute-engine/src/test/resources/machinetype_list_central1b.json
+++ b/google-compute-engine/src/test/resources/machinetype_list_central1b.json
@@ -7,7 +7,7 @@
"kind": "compute#machineType",
"id": "12907738072351752276",
"creationTimestamp": "2012-06-07T20:48:14.670",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-b/machineTypes/n1-standard-0",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/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,
@@ -20,7 +20,7 @@
"kind": "compute#machineType",
"id": "12908560709887590691",
"creationTimestamp": "2012-06-07T20:51:19.936",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-b/machineTypes/n1-standard-8-d",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/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/jclouds-labs-google/blob/6b5643c9/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 73fe582..670ca20 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/v1/projects/myproject/zones/us-central1-b/machineTypes",
+ "id": "projects/party/zones/us-central1-b/machineTypes",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-b/machineTypes",
"items": []
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/resources/metadata.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/metadata.json b/google-compute-engine/src/test/resources/metadata.json
index 5014270..22b1826 100644
--- a/google-compute-engine/src/test/resources/metadata.json
+++ b/google-compute-engine/src/test/resources/metadata.json
@@ -1 +1 @@
-{"kind":"compute#metadata","items":[{"key":"propA","value":"valueA"},{"key":"propB","value":"valueB"}],"fingerprint":"efgh"}
\ No newline at end of file
+{"fingerprint":"efgh","items":[{"key":"propA","value":"valueA"},{"key":"propB","value":"valueB"}]}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 4a7a9cc..a1a6203 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/v1/projects/myproject/networks/jclouds-test",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/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/jclouds-labs-google/blob/6b5643c9/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 1d15f6e..eb4249a 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/v1/projects/myproject/networks",
+ "id": "projects/party/networks",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/networks",
"items": [
{
"kind": "compute#network",
"id": "13024414170909937976",
"creationTimestamp": "2012-10-24T20:13:19.967",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/networks/jclouds-test",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/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/jclouds-labs-google/blob/6b5643c9/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 421fb2f..9683b67 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/v1/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "targetLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-1",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/operations/operation-1354084865060",
+ "name": "operation-1354084865060",
+ "targetLink": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/instances/test-1",
"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/v1/projects/myproject/regions/us-central1",
- "zone": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a"
+ "region": "https://www.googleapis.com/compute/v1/projects/party/regions/us-central1",
+ "zone": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 f72e18c..f6067b7 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/v1/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "targetLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-1",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/operations/operation-1354084865060",
+ "name": "operation-1354084865060",
+ "targetLink": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/instances/test-1",
"targetId": "13053094017547040099",
"status": "DONE",
"user": "user@developer.gserviceaccount.com",
@@ -16,11 +16,11 @@
"errors": [
{
"code": "RESOURCE_ALREADY_EXISTS",
- "message": "The resource 'projects/myproject/zones/us-central1-a/instances/test-1' already exists"
+ "message": "The resource 'projects/party/zones/us-central1-a/instances/test-1' already exists"
}
]
},
"operationType": "insert",
- "region": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1",
- "zone": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a"
+ "region": "https://www.googleapis.com/compute/v1/projects/party/regions/us-central1",
+ "zone": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 fd30768..ee4b5ec 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/v1/projects/myproject/operations",
+ "id": "projects/party/operations",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/operations",
"items": [
{
"kind": "compute#operation",
"id": "13053095055850848306",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "targetLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-1",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/operations/operation-1354084865060",
+ "name": "operation-1354084865060",
+ "targetLink": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a/instances/test-1",
"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/v1/projects/myproject/regions/us-central1",
- "zone": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a"
+ "region": "https://www.googleapis.com/compute/v1/projects/party/regions/us-central1",
+ "zone": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a"
}
]
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/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 c195062..a49bf7d 100644
--- a/google-compute-engine/src/test/resources/project.json
+++ b/google-compute-engine/src/test/resources/project.json
@@ -2,8 +2,8 @@
"kind": "compute#project",
"id": "13024414184846275913",
"creationTimestamp": "2012-10-24T20:13:16.252",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject",
- "name": "myproject",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party",
+ "name": "party",
"description": "",
"commonInstanceMetadata": {
"kind": "compute#metadata",
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/resources/region_get.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/region_get.json b/google-compute-engine/src/test/resources/region_get.json
index a058f5a..ce33d23 100644
--- a/google-compute-engine/src/test/resources/region_get.json
+++ b/google-compute-engine/src/test/resources/region_get.json
@@ -1,14 +1,14 @@
{
"kind": "compute#region",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/regions/us-central1",
"id": "12912210600542709766",
"creationTimestamp": "2013-07-08T14:40:37.939-07:00",
"name": "us-central1",
"description": "us-central1",
"status": "UP",
"zones": [
- "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a",
- "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-b"
+ "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a",
+ "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-b"
],
"quotas": [
{
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/6b5643c9/google-compute-engine/src/test/resources/region_list.json
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/region_list.json b/google-compute-engine/src/test/resources/region_list.json
index 902d1b2..c9edc33 100644
--- a/google-compute-engine/src/test/resources/region_list.json
+++ b/google-compute-engine/src/test/resources/region_list.json
@@ -1,19 +1,19 @@
{
"kind": "compute#regionList",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions",
- "id": "projects/myproject/regions",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/regions",
+ "id": "projects/party/regions",
"items": [
{
"kind": "compute#region",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/regions/us-central1",
"id": "12912210600542709766",
"creationTimestamp": "2013-07-08T14:40:37.939-07:00",
"name": "us-central1",
"description": "us-central1",
"status": "UP",
"zones": [
- "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a",
- "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-b"
+ "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a",
+ "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-b"
],
"quotas": [
{
@@ -65,14 +65,14 @@
},
{
"kind": "compute#region",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central2",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/regions/us-central2",
"id": "6396763663251190992",
"creationTimestamp": "2013-07-08T14:40:37.939-07:00",
"name": "us-central2",
"description": "us-central2",
"status": "UP",
"zones": [
- "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central2-a"
+ "https://www.googleapis.com/compute/v1/projects/party/zones/us-central2-a"
],
"quotas": [
{