Updated Branches: refs/heads/jclouds-393 [created] feff6cd31
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/2d927019/google-compute-engine/src/test/resources/route_insert.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/route_insert.json b/google-compute-engine/src/test/resources/route_insert.json index 2c15020..68fff7d 100644 --- a/google-compute-engine/src/test/resources/route_insert.json +++ b/google-compute-engine/src/test/resources/route_insert.json @@ -1 +1 @@ -{"name":"default-route-c99ebfbed0e1f375","description":"Default route to the virtual network.","network":"https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/default","destRange":"10.240.0.0/16","priority":1000,"nextHopNetwork":"https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/default","tags":["fooTag","barTag"]} \ No newline at end of file +{"name":"default-route-c99ebfbed0e1f375","description":"Default route to the virtual network.","network":"https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default","destRange":"10.240.0.0/16","priority":1000,"nextHopNetwork":"https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default","tags":["fooTag","barTag"]} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/2d927019/google-compute-engine/src/test/resources/route_list.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/route_list.json b/google-compute-engine/src/test/resources/route_list.json index bbb54dd..5126ff1 100644 --- a/google-compute-engine/src/test/resources/route_list.json +++ b/google-compute-engine/src/test/resources/route_list.json @@ -1,34 +1,34 @@ { "kind": "compute#routeList", - "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/routes";, + "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/routes";, "id": "projects/myproject/global/routes", "items": [ { "kind": "compute#route", - "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/routes/default-route-c99ebfbed0e1f375";, + "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/routes/default-route-c99ebfbed0e1f375";, "id": "7241926205630356071", "creationTimestamp": "2013-07-08T14:40:38.502-07:00", "name": "default-route-c99ebfbed0e1f375", "description": "Default route to the virtual network.", - "network": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/default";, + "network": "https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default";, "destRange": "10.240.0.0/16", "priority": 1000, - "nextHopNetwork": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/default";, + "nextHopNetwork": "https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default";, "tags": [ "fooTag", "barTag" ] }, { "kind": "compute#route", - "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/routes/default-route-fc92a41ecb5a8d17";, + "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/routes/default-route-fc92a41ecb5a8d17";, "id": "507025480040058551", "creationTimestamp": "2013-07-08T14:40:38.502-07:00", "name": "default-route-fc92a41ecb5a8d17", "description": "Default route to the Internet.", - "network": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/networks/default";, + "network": "https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default";, "destRange": "0.0.0.0/0", "priority": 1000, - "nextHopGateway": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/gateways/default-internet-gateway"; + "nextHopGateway": "https://www.googleapis.com/compute/v1/projects/myproject/global/gateways/default-internet-gateway"; } ] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/2d927019/google-compute-engine/src/test/resources/snapshot_get.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/snapshot_get.json b/google-compute-engine/src/test/resources/snapshot_get.json index 16c89d2..3ba287f 100644 --- a/google-compute-engine/src/test/resources/snapshot_get.json +++ b/google-compute-engine/src/test/resources/snapshot_get.json @@ -1,12 +1,12 @@ { "kind": "compute#snapshot", - "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/snapshots/test-snap";, + "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/snapshots/test-snap";, "id": "9734455566806191190", "creationTimestamp": "2013-07-26T12:54:23.173-07:00", "status": "READY", "diskSizeGb": "10", - "sourceDisk": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/testimage1";, + "sourceDisk": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/testimage1";, "name": "test-snap", "description": "", "sourceDiskId": "8243603669926824540" http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/2d927019/google-compute-engine/src/test/resources/snapshot_list.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/snapshot_list.json b/google-compute-engine/src/test/resources/snapshot_list.json index 13f0f99..431460f 100644 --- a/google-compute-engine/src/test/resources/snapshot_list.json +++ b/google-compute-engine/src/test/resources/snapshot_list.json @@ -1,17 +1,17 @@ { "kind": "compute#snapshotList", - "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/snapshots";, + "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/snapshots";, "id": "projects/myproject/global/snapshots", "items": [ { "kind": "compute#snapshot", - "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/snapshots/test-snap";, + "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/snapshots/test-snap";, "id": "9734455566806191190", "creationTimestamp": "2013-07-26T12:54:23.173-07:00", "status": "READY", "diskSizeGb": "10", - "sourceDisk": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/testimage1";, + "sourceDisk": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/testimage1";, "name": "test-snap", "description": "", "sourceDiskId": "8243603669926824540" @@ -19,12 +19,12 @@ { "kind": "compute#snapshot", - "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/global/snapshots/test-snap2";, + "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/snapshots/test-snap2";, "id": "13895715048576107883", "creationTimestamp": "2013-07-26T12:57:01.927-07:00", "status": "READY", "diskSizeGb": "10", - "sourceDisk": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/disks/testimage1";, + "sourceDisk": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/testimage1";, "name": "test-snap2", "description": "", "sourceDiskId": "8243603669926824540" http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/2d927019/google-compute-engine/src/test/resources/zone_get.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/zone_get.json b/google-compute-engine/src/test/resources/zone_get.json index 7161e30..50cb375 100644 --- a/google-compute-engine/src/test/resources/zone_get.json +++ b/google-compute-engine/src/test/resources/zone_get.json @@ -2,7 +2,7 @@ "kind": "compute#zone", "id": "13020128040171887099", "creationTimestamp": "2012-10-19T16:42:54.131", - "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a";, + "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a";, "name": "us-central1-a", "description": "us-central1-a", "status": "DOWN", http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/2d927019/google-compute-engine/src/test/resources/zone_list.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/zone_list.json b/google-compute-engine/src/test/resources/zone_list.json index e696196..ee4e17b 100644 --- a/google-compute-engine/src/test/resources/zone_list.json +++ b/google-compute-engine/src/test/resources/zone_list.json @@ -1,13 +1,13 @@ { "kind": "compute#zoneList", "id": "projects/myproject/zones", - "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones";, + "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones";, "items": [ { "kind": "compute#zone", "id": "13020128040171887099", "creationTimestamp": "2012-10-19T16:42:54.131", - "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a";, + "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a";, "name": "us-central1-a", "description": "us-central1-a", "status": "DOWN", @@ -24,7 +24,7 @@ "kind": "compute#zone", "id": "13024414164050619686", "creationTimestamp": "2012-10-24T20:13:19.271", - "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-b";, + "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-b";, "name": "us-central1-b", "description": "us-central1-b", "status": "UP", http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/2d927019/google-compute-engine/src/test/resources/zone_list_short.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/zone_list_short.json b/google-compute-engine/src/test/resources/zone_list_short.json index e406cef..711af99 100644 --- a/google-compute-engine/src/test/resources/zone_list_short.json +++ b/google-compute-engine/src/test/resources/zone_list_short.json @@ -1,13 +1,13 @@ { "kind": "compute#zoneList", "id": "projects/myproject/zones", - "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones";, + "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones";, "items": [ { "kind": "compute#zone", "id": "13020128040171887099", "creationTimestamp": "2012-10-19T16:42:54.131", - "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a";, + "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a";, "name": "us-central1-a", "description": "us-central1-a", "status": "DOWN", http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/2d927019/google-compute-engine/src/test/resources/zone_operation.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/zone_operation.json b/google-compute-engine/src/test/resources/zone_operation.json index 4db38df..c0c5b56 100644 --- a/google-compute-engine/src/test/resources/zone_operation.json +++ b/google-compute-engine/src/test/resources/zone_operation.json @@ -1,9 +1,9 @@ { "kind": "compute#operation", "id": "13053095055850848306", - "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb";, + "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/v1beta16/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance";, + "targetLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance";, "targetId": "13053094017547040099", "status": "DONE", "user": "[email protected]", @@ -12,5 +12,5 @@ "startTime": "2012-11-28T06:41:05.142", "endTime": "2012-11-28T06:41:06.142", "operationType": "insert", - "zone": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a"; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/2d927019/google-compute-engine/src/test/resources/zone_operation_error.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/zone_operation_error.json b/google-compute-engine/src/test/resources/zone_operation_error.json index c942ae7..d6d054a 100644 --- a/google-compute-engine/src/test/resources/zone_operation_error.json +++ b/google-compute-engine/src/test/resources/zone_operation_error.json @@ -1,9 +1,9 @@ { "kind": "compute#operation", "id": "13053095055850848306", - "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb";, + "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/v1beta16/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance";, + "targetLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance";, "targetId": "13053094017547040099", "status": "DONE", "user": "[email protected]", @@ -21,5 +21,5 @@ ] }, "operationType": "insert", - "zone": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a"; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/2d927019/google-compute-engine/src/test/resources/zone_operation_list.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/zone_operation_list.json b/google-compute-engine/src/test/resources/zone_operation_list.json index ef31542..77f1656 100644 --- a/google-compute-engine/src/test/resources/zone_operation_list.json +++ b/google-compute-engine/src/test/resources/zone_operation_list.json @@ -1,14 +1,14 @@ { "kind": "compute#operationList", "id": "projects/myproject/zones/us-central1-a/operations", - "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/operations";, + "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/operations";, "items": [ { "kind": "compute#operation", "id": "13053095055850848306", - "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb";, + "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/v1beta16/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance";, + "targetLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance";, "targetId": "13053094017547040099", "status": "DONE", "user": "[email protected]", @@ -17,7 +17,7 @@ "startTime": "2012-11-28T06:41:05.142", "endTime": "2012-11-28T06:41:06.142", "operationType": "insert", - "zone": "https://www.googleapis.com/compute/v1beta16/projects/myproject/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a"; } ] } \ No newline at end of file
