Updated Branches: refs/heads/master 2c45acab6 -> 533863808
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 new file mode 100644 index 0000000..cba2adf --- /dev/null +++ b/google-compute-engine/src/test/resources/machinetype_list_central1b.json @@ -0,0 +1,43 @@ +{ + "kind": "compute#machineTypeList", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/abayer-jclouds-test1/zones/us-central1-b/machineTypes";, + "id": "projects/abayer-jclouds-test1/zones/us-central1-b/machineTypes", + "items": [ + { + "kind": "compute#machineType", + "id": "12907738072351752276", + "creationTimestamp": "2012-06-07T20:48:14.670", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-b/machineTypes/n1-standard-0";, + "name": "n1-standard-0", + "description": "1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk", + "guestCpus": 1, + "memoryMb": 3840, + "imageSpaceGb": 10, + "maximumPersistentDisks": 16, + "maximumPersistentDisksSizeGb": "128", + "zone": "us-central1-b" + }, + { + "kind": "compute#machineType", + "id": "12908560709887590691", + "creationTimestamp": "2012-06-07T20:51:19.936", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-b/machineTypes/n1-standard-8-d";, + "name": "n1-standard-8-d", + "description": "8 vCPUs, 30 GB RAM, a 10 GB ephemeral root disk, and 2 extra 1770 GB ephemeral disks", + "guestCpus": 8, + "memoryMb": 30720, + "imageSpaceGb": 10, + "scratchDisks": [ + { + "diskGb": 1770 + }, + { + "diskGb": 1770 + } + ], + "maximumPersistentDisks": 16, + "maximumPersistentDisksSizeGb": "1024", + "zone": "us-central1-b" + } + ] +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/machinetype_list_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 new file mode 100644 index 0000000..793c9eb --- /dev/null +++ b/google-compute-engine/src/test/resources/machinetype_list_central1b_empty.json @@ -0,0 +1,6 @@ +{ + "kind": "compute#machineTypeList", + "id": "projects/myproject/zones/us-central1-b/machineTypes", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-b/machineTypes";, + "items": [] +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/metadata.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/metadata.json b/google-compute-engine/src/test/resources/metadata.json index 6901331..5014270 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"}]} \ No newline at end of file +{"kind":"compute#metadata","items":[{"key":"propA","value":"valueA"},{"key":"propB","value":"valueB"}],"fingerprint":"efgh"} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/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 1a6a4b1..87f9e56 100644 --- a/google-compute-engine/src/test/resources/network_get.json +++ b/google-compute-engine/src/test/resources/network_get.json @@ -1,10 +1,10 @@ { - "kind": "compute#network", - "id": "13024414170909937976", - "creationTimestamp": "2012-10-24T20:13:19.967", - "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/networks/jclouds-test";, - "name": "default", - "description": "Default network for the project", - "IPv4Range": "10.0.0.0/8", - "gatewayIPv4": "10.0.0.1" + "kind": "compute#network", + "id": "13024414170909937976", + "creationTimestamp": "2012-10-24T20:13:19.967", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/networks/jclouds-test";, + "name": "default", + "description": "Default network for the project", + "IPv4Range": "10.0.0.0/8", + "gatewayIPv4": "10.0.0.1" } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/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 99ccc49..1cb72a1 100644 --- a/google-compute-engine/src/test/resources/network_list.json +++ b/google-compute-engine/src/test/resources/network_list.json @@ -1,18 +1,18 @@ { - "kind": "compute#networkList", - "id": "projects/myproject/networks", - "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/networks";, - "items": [ - { + "kind": "compute#networkList", + "id": "projects/myproject/networks", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/networks";, + "items": [ + { - "kind": "compute#network", - "id": "13024414170909937976", - "creationTimestamp": "2012-10-24T20:13:19.967", - "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/networks/jclouds-test";, - "name": "default", - "description": "Default network for the project", - "IPv4Range": "10.0.0.0/8", - "gatewayIPv4": "10.0.0.1" - } - ] + "kind": "compute#network", + "id": "13024414170909937976", + "creationTimestamp": "2012-10-24T20:13:19.967", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/networks/jclouds-test";, + "name": "default", + "description": "Default network for the project", + "IPv4Range": "10.0.0.0/8", + "gatewayIPv4": "10.0.0.1" + } + ] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/operation.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/operation.json b/google-compute-engine/src/test/resources/operation.json index 68b16fb..e173bac 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/v1beta13/projects/myproject/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb";, + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb";, "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", - "targetLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/instances/instance-api-live-test-instance";, + "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance";, "targetId": "13053094017547040099", "status": "DONE", "user": "[email protected]", @@ -11,5 +11,7 @@ "insertTime": "2012-11-28T06:41:05.060", "startTime": "2012-11-28T06:41:05.142", "endTime": "2012-11-28T06:41:06.142", - "operationType": "insert" - } \ No newline at end of file + "operationType": "insert", + "region": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1";, + "zone": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a"; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/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 f7f8e23..b18ffba 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/v1beta13/projects/myproject/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb";, + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb";, "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", - "targetLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/instances/instance-api-live-test-instance";, + "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance";, "targetId": "13053094017547040099", "status": "DONE", "user": "[email protected]", @@ -13,12 +13,14 @@ "httpErrorStatusCode": 400, "httpErrorMessage": "BAD REQUEST", "error": { - "errors": [ - { - "code": "RESOURCE_ALREADY_EXISTS", - "message": "The resource 'projects/myproject/instances/instance-api-live-test-instance' already exists" - } - ] + "errors": [ + { + "code": "RESOURCE_ALREADY_EXISTS", + "message": "The resource 'projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance' already exists" + } + ] }, - "operationType": "insert" - } \ No newline at end of file + "operationType": "insert", + "region": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1";, + "zone": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a"; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/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 8bc3111..7585099 100644 --- a/google-compute-engine/src/test/resources/operation_list.json +++ b/google-compute-engine/src/test/resources/operation_list.json @@ -1,22 +1,24 @@ { - "kind": "compute#operationList", - "id": "projects/myproject/operations", - "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/operations";, - "items": [ - { - "kind": "compute#operation", - "id": "13053095055850848306", - "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb";, - "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", - "targetLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/instances/instance-api-live-test-instance";, - "targetId": "13053094017547040099", - "status": "DONE", - "user": "[email protected]", - "progress": 100, - "insertTime": "2012-11-28T06:41:05.060", - "startTime": "2012-11-28T06:41:05.142", - "endTime": "2012-11-28T06:41:06.142", - "operationType": "insert" - } - ] + "kind": "compute#operationList", + "id": "projects/myproject/operations", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/operations";, + "items": [ + { + "kind": "compute#operation", + "id": "13053095055850848306", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb";, + "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", + "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance";, + "targetId": "13053094017547040099", + "status": "DONE", + "user": "[email protected]", + "progress": 100, + "insertTime": "2012-11-28T06:41:05.060", + "startTime": "2012-11-28T06:41:05.142", + "endTime": "2012-11-28T06:41:06.142", + "operationType": "insert", + "region": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1";, + "zone": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a"; + } + ] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/project.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/project.json b/google-compute-engine/src/test/resources/project.json index 6129ac4..cef57d8 100644 --- a/google-compute-engine/src/test/resources/project.json +++ b/google-compute-engine/src/test/resources/project.json @@ -1,68 +1,69 @@ { - "kind": "compute#project", - "id": "13024414184846275913", - "creationTimestamp": "2012-10-24T20:13:16.252", - "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject";, - "name": "myproject", - "description": "", - "commonInstanceMetadata": { - "kind": "compute#metadata", - "items": [ - { - "key": "propA", - "value": "valueA" + "kind": "compute#project", + "id": "13024414184846275913", + "creationTimestamp": "2012-10-24T20:13:16.252", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject";, + "name": "myproject", + "description": "", + "commonInstanceMetadata": { + "kind": "compute#metadata", + "items": [ + { + "key": "propA", + "value": "valueA" + }, + { + "key": "propB", + "value": "valueB" + } + ], + "fingerprint": "efgh" }, - { - "key": "propB", - "value": "valueB" - } - ] - }, - "quotas": [ - { - "metric": "INSTANCES", - "usage": 0, - "limit": 8 - }, - { - "metric": "CPUS", - "usage": 0, - "limit": 8 - }, - { - "metric": "EPHEMERAL_ADDRESSES", - "usage": 0, - "limit": 8 - }, - { - "metric": "DISKS", - "usage": 0, - "limit": 8 - }, - { - "metric": "DISKS_TOTAL_GB", - "usage": 0, - "limit": 100 - }, - { - "metric": "SNAPSHOTS", - "usage": 0, - "limit": 1000 - }, - { - "metric": "NETWORKS", - "usage": 1, - "limit": 5 - }, - { - "metric": "FIREWALLS", - "usage": 2, - "limit": 100 - }, - { - "metric": "IMAGES", - "usage": 0, - "limit": 100 - } - ] + "quotas": [ + { + "metric": "INSTANCES", + "usage": 0, + "limit": 8 + }, + { + "metric": "CPUS", + "usage": 0, + "limit": 8 + }, + { + "metric": "EPHEMERAL_ADDRESSES", + "usage": 0, + "limit": 8 + }, + { + "metric": "DISKS", + "usage": 0, + "limit": 8 + }, + { + "metric": "DISKS_TOTAL_GB", + "usage": 0, + "limit": 100 + }, + { + "metric": "SNAPSHOTS", + "usage": 0, + "limit": 1000 + }, + { + "metric": "NETWORKS", + "usage": 1, + "limit": 5 + }, + { + "metric": "FIREWALLS", + "usage": 2, + "limit": 100 + }, + { + "metric": "IMAGES", + "usage": 0, + "limit": 100 + } + ] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/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 new file mode 100644 index 0000000..f48e6de --- /dev/null +++ b/google-compute-engine/src/test/resources/region_get.json @@ -0,0 +1,13 @@ +{ + "kind": "compute#region", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/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/v1beta15/zones/us-central1-a";, + "https://www.googleapis.com/compute/v1beta15/zones/us-central1-b"; + ] +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/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 new file mode 100644 index 0000000..6e5df45 --- /dev/null +++ b/google-compute-engine/src/test/resources/region_list.json @@ -0,0 +1,32 @@ +{ + "kind": "compute#regionList", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions";, + "id": "projects/myproject/regions", + "items": [ + { + "kind": "compute#region", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/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/v1beta15/zones/us-central1-a";, + "https://www.googleapis.com/compute/v1beta15/zones/us-central1-b"; + ] + }, + { + "kind": "compute#region", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/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/v1beta15/zones/us-central2-a"; + ] + } + ] +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/region_operation.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/region_operation.json b/google-compute-engine/src/test/resources/region_operation.json new file mode 100644 index 0000000..738e176 --- /dev/null +++ b/google-compute-engine/src/test/resources/region_operation.json @@ -0,0 +1,16 @@ +{ + "kind": "compute#operation", + "id": "13053095055850848306", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb";, + "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", + "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/addresses/test-address";, + "targetId": "13053094017547040099", + "status": "DONE", + "user": "[email protected]", + "progress": 100, + "insertTime": "2012-11-28T06:41:05.060", + "startTime": "2012-11-28T06:41:05.142", + "endTime": "2012-11-28T06:41:06.142", + "operationType": "insert", + "region": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1"; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/region_operation_list.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/region_operation_list.json b/google-compute-engine/src/test/resources/region_operation_list.json new file mode 100644 index 0000000..047d12f --- /dev/null +++ b/google-compute-engine/src/test/resources/region_operation_list.json @@ -0,0 +1,23 @@ +{ + "kind": "compute#operationList", + "id": "projects/myproject/regions/us-central1/operations", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/operations";, + "items": [ + { + "kind": "compute#operation", + "id": "13053095055850848306", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb";, + "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", + "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1/addresses/test-address";, + "targetId": "13053094017547040099", + "status": "DONE", + "user": "[email protected]", + "progress": 100, + "insertTime": "2012-11-28T06:41:05.060", + "startTime": "2012-11-28T06:41:05.142", + "endTime": "2012-11-28T06:41:06.142", + "operationType": "insert", + "region": "https://www.googleapis.com/compute/v1beta15/projects/myproject/regions/us-central1"; + } + ] +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/route_get.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/route_get.json b/google-compute-engine/src/test/resources/route_get.json new file mode 100644 index 0000000..994f0b1 --- /dev/null +++ b/google-compute-engine/src/test/resources/route_get.json @@ -0,0 +1,14 @@ +{ + + "kind": "compute#route", + "selfLink": "https://www.googleapis.com/compute/v1beta15/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/v1beta15/projects/myproject/global/networks/default";, + "destRange": "10.240.0.0/16", + "priority": 1000, + "nextHopNetwork": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/default";, + "tags": [ "fooTag", "barTag" ] +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/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 new file mode 100644 index 0000000..6f0bc30 --- /dev/null +++ b/google-compute-engine/src/test/resources/route_insert.json @@ -0,0 +1 @@ +{"name":"default-route-c99ebfbed0e1f375","description":"Default route to the virtual network.","network":"https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/default","destRange":"10.240.0.0/16","priority":1000,"nextHopNetwork":"https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/default","tags":["fooTag","barTag"]} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/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 new file mode 100644 index 0000000..a8ffc2e --- /dev/null +++ b/google-compute-engine/src/test/resources/route_list.json @@ -0,0 +1,34 @@ +{ + "kind": "compute#routeList", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/routes";, + "id": "projects/myproject/global/routes", + "items": [ + { + + "kind": "compute#route", + "selfLink": "https://www.googleapis.com/compute/v1beta15/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/v1beta15/projects/myproject/global/networks/default";, + "destRange": "10.240.0.0/16", + "priority": 1000, + "nextHopNetwork": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/networks/default";, + "tags": [ "fooTag", "barTag" ] + }, + { + + "kind": "compute#route", + "selfLink": "https://www.googleapis.com/compute/v1beta15/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/v1beta15/projects/myproject/global/networks/default";, + "destRange": "0.0.0.0/0", + "priority": 1000, + "nextHopGateway": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/gateways/default-internet-gateway"; + } + ] +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/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 new file mode 100644 index 0000000..6ec8ee4 --- /dev/null +++ b/google-compute-engine/src/test/resources/snapshot_get.json @@ -0,0 +1,13 @@ +{ + + "kind": "compute#snapshot", + "selfLink": "https://www.googleapis.com/compute/v1beta15/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/v1beta15/projects/myproject/zones/us-central1-a/disks/testimage1";, + "name": "test-snap", + "description": "", + "sourceDiskId": "8243603669926824540" +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/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 new file mode 100644 index 0000000..9db2e3d --- /dev/null +++ b/google-compute-engine/src/test/resources/snapshot_list.json @@ -0,0 +1,33 @@ +{ + "kind": "compute#snapshotList", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/global/snapshots";, + "id": "projects/myproject/global/snapshots", + "items": [ + { + + "kind": "compute#snapshot", + "selfLink": "https://www.googleapis.com/compute/v1beta15/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/v1beta15/projects/myproject/zones/us-central1-a/disks/testimage1";, + "name": "test-snap", + "description": "", + "sourceDiskId": "8243603669926824540" + }, + { + + "kind": "compute#snapshot", + "selfLink": "https://www.googleapis.com/compute/v1beta15/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/v1beta15/projects/myproject/zones/us-central1-a/disks/testimage1";, + "name": "test-snap2", + "description": "", + "sourceDiskId": "8243603669926824540" + } + ] +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/tag_insert.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/tag_insert.json b/google-compute-engine/src/test/resources/tag_insert.json new file mode 100644 index 0000000..61ade71 --- /dev/null +++ b/google-compute-engine/src/test/resources/tag_insert.json @@ -0,0 +1 @@ +{"items":["aTag"],"fingerprint":"abcd"} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/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 cf3dc09..c64aeee 100644 --- a/google-compute-engine/src/test/resources/zone_get.json +++ b/google-compute-engine/src/test/resources/zone_get.json @@ -1,17 +1,17 @@ { - "kind": "compute#zone", - "id": "13020128040171887099", - "creationTimestamp": "2012-10-19T16:42:54.131", - "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/zones/us-central1-a";, - "name": "us-central1-a", - "description": "us-central1-a", - "status": "DOWN", - "maintenanceWindows": [ - { - "name": "2012-11-10-planned-outage", - "description": "maintenance zone", - "beginTime": "2012-11-10T20:00:00.000", - "endTime": "2012-12-02T20:00:00.000" - } - ] + "kind": "compute#zone", + "id": "13020128040171887099", + "creationTimestamp": "2012-10-19T16:42:54.131", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a";, + "name": "us-central1-a", + "description": "us-central1-a", + "status": "DOWN", + "maintenanceWindows": [ + { + "name": "2012-11-10-planned-outage", + "description": "maintenance zone", + "beginTime": "2012-11-10T20:00:00.000", + "endTime": "2012-12-02T20:00:00.000" + } + ] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/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 8d11f0d..fb1a6df 100644 --- a/google-compute-engine/src/test/resources/zone_list.json +++ b/google-compute-engine/src/test/resources/zone_list.json @@ -1,41 +1,41 @@ { - "kind": "compute#zoneList", - "id": "projects/myproject/zones", - "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/zones";, - "items": [ - { - "kind": "compute#zone", - "id": "13020128040171887099", - "creationTimestamp": "2012-10-19T16:42:54.131", - "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/zones/us-central1-a";, - "name": "us-central1-a", - "description": "us-central1-a", - "status": "DOWN", - "maintenanceWindows": [ - { - "name": "2012-11-10-planned-outage", - "description": "maintenance zone", - "beginTime": "2012-11-10T20:00:00.000", - "endTime": "2012-12-02T20:00:00.000" - } + "kind": "compute#zoneList", + "id": "projects/myproject/zones", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones";, + "items": [ + { + "kind": "compute#zone", + "id": "13020128040171887099", + "creationTimestamp": "2012-10-19T16:42:54.131", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a";, + "name": "us-central1-a", + "description": "us-central1-a", + "status": "DOWN", + "maintenanceWindows": [ + { + "name": "2012-11-10-planned-outage", + "description": "maintenance zone", + "beginTime": "2012-11-10T20:00:00.000", + "endTime": "2012-12-02T20:00:00.000" + } + ] + }, + { + "kind": "compute#zone", + "id": "13024414164050619686", + "creationTimestamp": "2012-10-24T20:13:19.271", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-b";, + "name": "us-central1-b", + "description": "us-central1-b", + "status": "UP", + "maintenanceWindows": [ + { + "name": "2013-02-17-planned-outage", + "description": "maintenance zone", + "beginTime": "2013-02-17T08:00:00.000", + "endTime": "2013-03-03T08:00:00.000" + } + ] + } ] - }, - { - "kind": "compute#zone", - "id": "13024414164050619686", - "creationTimestamp": "2012-10-24T20:13:19.271", - "selfLink": "https://www.googleapis.com/compute/v1beta13/projects/myproject/zones/us-east1-a";, - "name": "us-east1-a", - "description": "us-east1-a", - "status": "UP", - "maintenanceWindows": [ - { - "name": "2013-02-17-planned-outage", - "description": "maintenance zone", - "beginTime": "2013-02-17T08:00:00.000", - "endTime": "2013-03-03T08:00:00.000" - } - ] - } - ] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/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 new file mode 100644 index 0000000..5512aa0 --- /dev/null +++ b/google-compute-engine/src/test/resources/zone_list_short.json @@ -0,0 +1,24 @@ +{ + "kind": "compute#zoneList", + "id": "projects/myproject/zones", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones";, + "items": [ + { + "kind": "compute#zone", + "id": "13020128040171887099", + "creationTimestamp": "2012-10-19T16:42:54.131", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a";, + "name": "us-central1-a", + "description": "us-central1-a", + "status": "DOWN", + "maintenanceWindows": [ + { + "name": "2012-11-10-planned-outage", + "description": "maintenance zone", + "beginTime": "2012-11-10T20:00:00.000", + "endTime": "2012-12-02T20:00:00.000" + } + ] + } + ] +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/google-compute-engine/src/test/resources/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 new file mode 100644 index 0000000..ab93cb9 --- /dev/null +++ b/google-compute-engine/src/test/resources/zone_operation.json @@ -0,0 +1,16 @@ +{ + "kind": "compute#operation", + "id": "13053095055850848306", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb";, + "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", + "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance";, + "targetId": "13053094017547040099", + "status": "DONE", + "user": "[email protected]", + "progress": 100, + "insertTime": "2012-11-28T06:41:05.060", + "startTime": "2012-11-28T06:41:05.142", + "endTime": "2012-11-28T06:41:06.142", + "operationType": "insert", + "zone": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a"; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 new file mode 100644 index 0000000..10b5477 --- /dev/null +++ b/google-compute-engine/src/test/resources/zone_operation_error.json @@ -0,0 +1,25 @@ +{ + "kind": "compute#operation", + "id": "13053095055850848306", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb";, + "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", + "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance";, + "targetId": "13053094017547040099", + "status": "DONE", + "user": "[email protected]", + "progress": 100, + "insertTime": "2012-11-28T06:41:05.060", + "startTime": "2012-11-28T06:41:05.142", + "httpErrorStatusCode": 400, + "httpErrorMessage": "BAD REQUEST", + "error": { + "errors": [ + { + "code": "RESOURCE_ALREADY_EXISTS", + "message": "The resource 'projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance' already exists" + } + ] + }, + "operationType": "insert", + "zone": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a"; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/53386380/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 new file mode 100644 index 0000000..7a3137a --- /dev/null +++ b/google-compute-engine/src/test/resources/zone_operation_list.json @@ -0,0 +1,23 @@ +{ + "kind": "compute#operationList", + "id": "projects/myproject/zones/us-central1-a/operations", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/operations";, + "items": [ + { + "kind": "compute#operation", + "id": "13053095055850848306", + "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb";, + "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb", + "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance";, + "targetId": "13053094017547040099", + "status": "DONE", + "user": "[email protected]", + "progress": 100, + "insertTime": "2012-11-28T06:41:05.060", + "startTime": "2012-11-28T06:41:05.142", + "endTime": "2012-11-28T06:41:06.142", + "operationType": "insert", + "zone": "https://www.googleapis.com/compute/v1beta15/projects/myproject/zones/us-central1-a"; + } + ] +} \ No newline at end of file
