http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances.json index 1cbb5c6..b8a3555 100644 --- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances.json +++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances.json @@ -13,9 +13,9 @@ } ], "id": "1845312225624811608", - "image": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130617";, + "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130617";, "kind": "compute#instance", - "machineType": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, + "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, "metadata": { "fingerprint": "42WmSpB8rSM=", "kind": "compute#metadata" @@ -32,16 +32,16 @@ } ], "name": "nic0", - "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default";, + "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default";, "networkIP": "10.240.113.94" } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/instances/node-name";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/node-name";, "status": "RUNNING", "tags": { "fingerprint": "42WmSpB8rSM=" }, - "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"; }, { "canIpForward": false, @@ -55,9 +55,9 @@ } ], "id": "8573880455005118258", - "image": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130617";, + "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130617";, "kind": "compute#instance", - "machineType": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, + "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, "metadata": { "fingerprint": "42WmSpB8rSM=", "kind": "compute#metadata" @@ -74,11 +74,11 @@ } ], "name": "nic0", - "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default";, + "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default";, "networkIP": "10.240.224.165" } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/instances/libcloud-demo-multiple-nodes-000";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/libcloud-demo-multiple-nodes-000";, "status": "RUNNING", "tags": { "fingerprint": "W7t6ZyTyIrc=", @@ -86,7 +86,7 @@ "libcloud" ] }, - "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"; }, { "canIpForward": false, @@ -100,9 +100,9 @@ } ], "id": "17221721898919682654", - "image": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130617";, + "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130617";, "kind": "compute#instance", - "machineType": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, + "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, "metadata": { "fingerprint": "42WmSpB8rSM=", "kind": "compute#metadata" @@ -119,11 +119,11 @@ } ], "name": "nic0", - "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default";, + "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default";, "networkIP": "10.240.223.109" } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/instances/libcloud-demo-multiple-nodes-001";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/libcloud-demo-multiple-nodes-001";, "status": "RUNNING", "tags": { "fingerprint": "W7t6ZyTyIrc=", @@ -131,7 +131,7 @@ "libcloud" ] }, - "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"; }, { "canIpForward": false, @@ -145,9 +145,9 @@ } ], "id": "03138438763739542377", - "image": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130617";, + "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130617";, "kind": "compute#instance", - "machineType": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, + "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, "metadata": { "fingerprint": "42WmSpB8rSM=", "kind": "compute#metadata" @@ -164,11 +164,11 @@ } ], "name": "nic0", - "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default";, + "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default";, "networkIP": "10.240.147.18" } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/instances/libcloud-demo-np-node";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/libcloud-demo-np-node";, "status": "RUNNING", "tags": { "fingerprint": "W7t6ZyTyIrc=", @@ -176,7 +176,7 @@ "libcloud" ] }, - "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"; }, { "canIpForward": false, @@ -188,14 +188,14 @@ "index": 0, "kind": "compute#attachedDisk", "mode": "READ_WRITE", - "source": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/disks/libcloud-demo-boot-disk";, + "source": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/disks/libcloud-demo-boot-disk";, "type": "PERSISTENT" } ], "id": "2378270030714524465", - "kernel": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130603";, + "kernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130603";, "kind": "compute#instance", - "machineType": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, + "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, "metadata": { "fingerprint": "42WmSpB8rSM=", "kind": "compute#metadata" @@ -212,11 +212,11 @@ } ], "name": "nic0", - "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default";, + "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default";, "networkIP": "10.240.192.190" } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/instances/libcloud-demo-persist-node";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/libcloud-demo-persist-node";, "status": "RUNNING", "tags": { "fingerprint": "W7t6ZyTyIrc=", @@ -224,9 +224,9 @@ "libcloud" ] }, - "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"; } ], "kind": "compute#instanceList", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/instances"; + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances"; }
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-000.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-000.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-000.json index 0e5ef0d..eaefc2a 100644 --- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-000.json +++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-000.json @@ -10,9 +10,9 @@ } ], "id": "5390075309006132922", - "image": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130617";, + "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130617";, "kind": "compute#instance", - "machineType": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, + "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, "metadata": { "fingerprint": "42WmSpB8rSM=", "kind": "compute#metadata" @@ -29,14 +29,14 @@ } ], "name": "nic0", - "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default";, + "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default";, "networkIP": "10.240.106.153" } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/instances/lcnode-000";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/lcnode-000";, "status": "RUNNING", "tags": { "fingerprint": "42WmSpB8rSM=" }, - "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-000_delete.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-000_delete.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-000_delete.json index b588ffe..e1e5072 100644 --- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-000_delete.json +++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-000_delete.json @@ -5,11 +5,11 @@ "name": "operation-zones_us-central1-a_instances_lcnode-000_delete", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_lcnode-000_delete";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_lcnode-000_delete";, "startTime": "2013-06-26T16:13:12.948-07:00", "status": "PENDING", "targetId": "5390075309006132922", - "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/instances/lcnode-000";, + "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/lcnode-000";, "user": "[email protected]", - "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-001.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-001.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-001.json index 203e261..b4a670d 100644 --- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-001.json +++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-001.json @@ -10,9 +10,9 @@ } ], "id": "16630486471904253898", - "image": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130617";, + "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130617";, "kind": "compute#instance", - "machineType": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, + "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, "metadata": { "fingerprint": "42WmSpB8rSM=", "kind": "compute#metadata" @@ -29,14 +29,14 @@ } ], "name": "nic0", - "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default";, + "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default";, "networkIP": "10.240.96.232" } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/instances/lcnode-001";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/lcnode-001";, "status": "RUNNING", "tags": { "fingerprint": "42WmSpB8rSM=" }, - "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-001_delete.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-001_delete.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-001_delete.json index dcbed4c..f52765d 100644 --- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-001_delete.json +++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_lcnode-001_delete.json @@ -5,11 +5,11 @@ "name": "operation-zones_us-central1-a_instances_lcnode-001_delete", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_lcnode-001_delete";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_lcnode-001_delete";, "startTime": "2013-06-26T16:13:40.620-07:00", "status": "PENDING", "targetId": "16630486471904253898", - "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/instances/lcnode-001";, + "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/lcnode-001";, "user": "[email protected]", - "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name.json index 396cff1..7845777 100644 --- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name.json +++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name.json @@ -10,9 +10,9 @@ } ], "id": "1845312225624811608", - "image": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130617";, + "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130617";, "kind": "compute#instance", - "machineType": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, + "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, "metadata": { "fingerprint": "42WmSpB8rSM=", "kind": "compute#metadata" @@ -29,14 +29,14 @@ } ], "name": "nic0", - "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default";, + "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default";, "networkIP": "10.240.113.94" } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/instances/node-name";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/node-name";, "status": "RUNNING", "tags": { "fingerprint": "42WmSpB8rSM=" }, - "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_attachDisk_post.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_attachDisk_post.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_attachDisk_post.json index 01b756b..e9e4964 100644 --- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_attachDisk_post.json +++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_attachDisk_post.json @@ -5,11 +5,11 @@ "name": "operation-zones_us-central1-a_instances_node-name_attachDisk_post", "operationType": "attachDisk", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_node-name_attachDisk_post";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_node-name_attachDisk_post";, "startTime": "2013-06-26T16:48:27.762-07:00", "status": "PENDING", "targetId": "1845312225624811608", - "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/instances/node-name";, + "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/node-name";, "user": "[email protected]", - "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_delete.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_delete.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_delete.json index a6542aa..0df1b9a 100644 --- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_delete.json +++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_delete.json @@ -5,11 +5,11 @@ "name": "operation-zones_us-central1-a_instances_node-name_delete", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_node-name_delete";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_node-name_delete";, "startTime": "2013-06-26T10:05:40.405-07:00", "status": "PENDING", "targetId": "07410051435384876224", - "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/instances/node-name";, + "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/node-name";, "user": "[email protected]", - "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_detachDisk_post.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_detachDisk_post.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_detachDisk_post.json index 2595e52..36ded09 100644 --- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_detachDisk_post.json +++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_detachDisk_post.json @@ -5,11 +5,11 @@ "name": "operation-zones_us-central1-a_instances_node-name_detachDisk_post", "operationType": "detachDisk", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_node-name_detachDisk_post";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_node-name_detachDisk_post";, "startTime": "2013-06-26T16:48:35.398-07:00", "status": "PENDING", "targetId": "1845312225624811608", - "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/instances/node-name";, + "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/node-name";, "user": "[email protected]", - "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_reset_post.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_reset_post.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_reset_post.json index 94bc8dd..d095030 100644 --- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_reset_post.json +++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_reset_post.json @@ -5,11 +5,11 @@ "name": "operation-zones_us-central1-a_instances_node-name_reset_post", "operationType": "reset", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_node-name_reset_post";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_node-name_reset_post";, "startTime": "2013-06-26T15:03:02.813-07:00", "status": "PENDING", "targetId": "1845312225624811608", - "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/instances/node-name";, + "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/node-name";, "user": "[email protected]", - "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_setTags_post.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_setTags_post.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_setTags_post.json index 23ee9cc..87e67ec 100644 --- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_setTags_post.json +++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_node-name_setTags_post.json @@ -5,11 +5,11 @@ "name": "operation-zones_us-central1-a_instances_node-name_setTags_post", "operationType": "setTags", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_node-name_setTags_post";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_node-name_setTags_post";, "startTime": "2013-06-26T21:20:04.103-07:00", "status": "PENDING", "targetId": "1845312225624811608", - "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/instances/node-name";, + "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/node-name";, "user": "[email protected]", - "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_post.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_post.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_post.json index d03c4b0..d6b8ad7 100644 --- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_post.json +++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_instances_post.json @@ -5,10 +5,10 @@ "name": "operation-zones_us-central1-a_instances_post", "operationType": "insert", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_post";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_post";, "startTime": "2013-06-26T16:12:51.537-07:00", "status": "PENDING", - "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/instances/lcnode-001";, + "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/lcnode-001";, "user": "[email protected]", - "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a"; + "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_us-central1-a_machineTypes.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_machineTypes.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_machineTypes.json index 3b0b2a5..b4e795b 100644 --- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_machineTypes.json +++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_machineTypes.json @@ -12,7 +12,7 @@ "maximumPersistentDisksSizeGb": "3072", "memoryMb": 614, "name": "f1-micro", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/f1-micro";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/f1-micro";, "zone": "us-central1-a" }, { @@ -26,7 +26,7 @@ "maximumPersistentDisksSizeGb": "3072", "memoryMb": 1740, "name": "g1-small", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/g1-small";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/g1-small";, "zone": "us-central1-a" }, { @@ -40,7 +40,7 @@ "maximumPersistentDisksSizeGb": "10240", "memoryMb": 1843, "name": "n1-highcpu-2", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-2";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-2";, "zone": "us-central1-a" }, { @@ -59,7 +59,7 @@ "diskGb": 870 } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-2-d";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-2-d";, "zone": "us-central1-a" }, { @@ -73,7 +73,7 @@ "maximumPersistentDisksSizeGb": "10240", "memoryMb": 3686, "name": "n1-highcpu-4", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-4";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-4";, "zone": "us-central1-a" }, { @@ -92,7 +92,7 @@ "diskGb": 1770 } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-4-d";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-4-d";, "zone": "us-central1-a" }, { @@ -106,7 +106,7 @@ "maximumPersistentDisksSizeGb": "10240", "memoryMb": 7373, "name": "n1-highcpu-8", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-8";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-8";, "zone": "us-central1-a" }, { @@ -128,7 +128,7 @@ "diskGb": 1770 } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-8-d";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-8-d";, "zone": "us-central1-a" }, { @@ -142,7 +142,7 @@ "maximumPersistentDisksSizeGb": "10240", "memoryMb": 13312, "name": "n1-highmem-2", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-2";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-2";, "zone": "us-central1-a" }, { @@ -161,7 +161,7 @@ "diskGb": 870 } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-2-d";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-2-d";, "zone": "us-central1-a" }, { @@ -175,7 +175,7 @@ "maximumPersistentDisksSizeGb": "10240", "memoryMb": 26624, "name": "n1-highmem-4", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-4";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-4";, "zone": "us-central1-a" }, { @@ -194,7 +194,7 @@ "diskGb": 1770 } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-4-d";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-4-d";, "zone": "us-central1-a" }, { @@ -208,7 +208,7 @@ "maximumPersistentDisksSizeGb": "10240", "memoryMb": 53248, "name": "n1-highmem-8", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-8";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-8";, "zone": "us-central1-a" }, { @@ -230,7 +230,7 @@ "diskGb": 1770 } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-8-d";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-8-d";, "zone": "us-central1-a" }, { @@ -244,7 +244,7 @@ "maximumPersistentDisksSizeGb": "10240", "memoryMb": 3840, "name": "n1-standard-1", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, "zone": "us-central1-a" }, { @@ -263,7 +263,7 @@ "diskGb": 420 } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1-d";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1-d";, "zone": "us-central1-a" }, { @@ -277,7 +277,7 @@ "maximumPersistentDisksSizeGb": "10240", "memoryMb": 7680, "name": "n1-standard-2", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-2";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-2";, "zone": "us-central1-a" }, { @@ -296,7 +296,7 @@ "diskGb": 870 } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-2-d";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-2-d";, "zone": "us-central1-a" }, { @@ -310,7 +310,7 @@ "maximumPersistentDisksSizeGb": "10240", "memoryMb": 15360, "name": "n1-standard-4", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-4";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-4";, "zone": "us-central1-a" }, { @@ -329,7 +329,7 @@ "diskGb": 1770 } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-4-d";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-4-d";, "zone": "us-central1-a" }, { @@ -343,7 +343,7 @@ "maximumPersistentDisksSizeGb": "10240", "memoryMb": 30720, "name": "n1-standard-8", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-8";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-8";, "zone": "us-central1-a" }, { @@ -365,10 +365,10 @@ "diskGb": 1770 } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-8-d";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-8-d";, "zone": "us-central1-a" } ], "kind": "compute#machineTypeList", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes"; + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes"; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_us-central1-a_machineTypes_n1-standard-1.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_machineTypes_n1-standard-1.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_machineTypes_n1-standard-1.json index 736f4bb..961aa26 100644 --- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_machineTypes_n1-standard-1.json +++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_machineTypes_n1-standard-1.json @@ -9,6 +9,6 @@ "maximumPersistentDisksSizeGb": "10240", "memoryMb": 3840, "name": "n1-standard-1", - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1";, "zone": "us-central1-a" } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_us-central1-b_instances_libcloud-lb-demo-www-000.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-b_instances_libcloud-lb-demo-www-000.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-b_instances_libcloud-lb-demo-www-000.json index 6a3e984..ad229a5 100644 --- a/libcloud/test/compute/fixtures/gce/zones_us-central1-b_instances_libcloud-lb-demo-www-000.json +++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-b_instances_libcloud-lb-demo-www-000.json @@ -10,10 +10,10 @@ } ], "id": "16051209904934263688", - "image": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130723";, - "kernel": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130603";, + "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130723";, + "kernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130603";, "kind": "compute#instance", - "machineType": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-1";, + "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-1";, "metadata": { "fingerprint": "n9EGknQZPSA=", "items": [ @@ -36,11 +36,11 @@ } ], "name": "nic0", - "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default";, + "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default";, "networkIP": "10.240.138.154" } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-000";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-000";, "status": "RUNNING", "tags": { "fingerprint": "XI0he92M8l8=", @@ -48,5 +48,5 @@ "libcloud-lb-demo-www" ] }, - "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b"; + "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b"; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_us-central1-b_instances_libcloud-lb-demo-www-001.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-b_instances_libcloud-lb-demo-www-001.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-b_instances_libcloud-lb-demo-www-001.json index 29d4b4b..3cc0dae 100644 --- a/libcloud/test/compute/fixtures/gce/zones_us-central1-b_instances_libcloud-lb-demo-www-001.json +++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-b_instances_libcloud-lb-demo-www-001.json @@ -10,10 +10,10 @@ } ], "id": "11204787063927654129", - "image": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130723";, - "kernel": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130603";, + "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130723";, + "kernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130603";, "kind": "compute#instance", - "machineType": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-1";, + "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-1";, "metadata": { "fingerprint": "n9EGknQZPSA=", "items": [ @@ -36,11 +36,11 @@ } ], "name": "nic0", - "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default";, + "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default";, "networkIP": "10.240.0.123" } ], - "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-001";, + "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-001";, "status": "RUNNING", "tags": { "fingerprint": "XI0he92M8l8=", @@ -48,5 +48,5 @@ "libcloud-lb-demo-www" ] }, - "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b"; + "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b"; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/test_gce.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_gce.py b/libcloud/test/compute/test_gce.py index 2585e73..cbb6811 100644 --- a/libcloud/test/compute/test_gce.py +++ b/libcloud/test/compute/test_gce.py @@ -85,7 +85,7 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin): def test_find_zone_or_region(self): zone1 = self.driver._find_zone_or_region('libcloud-demo-np-node', 'instances') - self.assertEqual(zone1.name, 'us-central1-a') + self.assertEqual(zone1.name, 'us-central2-a') zone2 = self.driver._find_zone_or_region( 'libcloud-demo-europe-np-node', 'instances') self.assertEqual(zone2.name, 'europe-west1-a') @@ -96,9 +96,9 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin): def test_match_images(self): project = 'debian-cloud' image = self.driver._match_images(project, 'debian-7') - self.assertEqual(image.name, 'debian-7-wheezy-v20130617') + self.assertEqual(image.name, 'debian-7-wheezy-v20131014') image = self.driver._match_images(project, 'debian-6') - self.assertEqual(image.name, 'debian-6-squeeze-v20130617') + self.assertEqual(image.name, 'debian-6-squeeze-v20130926') def test_ex_list_addresses(self): address_list = self.driver.ex_list_addresses() @@ -118,7 +118,7 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin): def test_ex_list_firewalls(self): firewalls = self.driver.ex_list_firewalls() - self.assertEqual(len(firewalls), 4) + self.assertEqual(len(firewalls), 5) self.assertEqual(firewalls[0].name, 'default-allow-internal') def test_ex_list_forwarding_rules(self): @@ -137,7 +137,7 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin): local_images = self.driver.list_images() debian_images = self.driver.list_images(ex_project='debian-cloud') self.assertEqual(len(local_images), 1) - self.assertEqual(len(debian_images), 10) + self.assertEqual(len(debian_images), 17) self.assertEqual(local_images[0].name, 'debian-7-wheezy-v20130617') def test_list_locations(self): @@ -194,12 +194,12 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin): volumes_all = self.driver.list_volumes('all') volumes_uc1a = self.driver.list_volumes('us-central1-a') self.assertEqual(len(volumes), 3) - self.assertEqual(len(volumes_all), 3) + self.assertEqual(len(volumes_all), 5) self.assertEqual(len(volumes_uc1a), 3) self.assertEqual(volumes[0].name, 'lcdisk') self.assertEqual(volumes_uc1a[0].name, 'lcdisk') names = [v.name for v in volumes_all] - self.assertTrue('test-disk' in names) + self.assertTrue('libcloud-demo-europe-boot-disk' in names) def test_ex_list_zones(self): zones = self.driver.ex_list_zones() @@ -480,7 +480,7 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin): partial_name = 'debian-6' image = self.driver.ex_get_image(partial_name) - self.assertEqual(image.name, 'debian-6-squeeze-v20130617') + self.assertEqual(image.name, 'debian-6-squeeze-v20130926') self.assertTrue(image.extra['description'].startswith('Debian')) def test_ex_get_network(self): @@ -506,9 +506,10 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin): def test_ex_get_project(self): project = self.driver.ex_get_project() self.assertEqual(project.name, 'project_name') - instances_quota = project.quotas[0] - self.assertEqual(instances_quota['usage'], 7.0) - self.assertEqual(instances_quota['limit'], 8.0) + networks_quota = project.quotas[1] + self.assertEqual(networks_quota['usage'], 3.0) + self.assertEqual(networks_quota['limit'], 5.0) + self.assertEqual(networks_quota['metric'], 'NETWORKS') def test_ex_get_region(self): region_name = 'us-central1' @@ -541,14 +542,17 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin): self.assertEqual(volume.extra['status'], 'READY') def test_ex_get_zone(self): - zone_name = 'us-central1-a' - expected_time_until = datetime.timedelta(days=52) - expected_duration = datetime.timedelta(days=15) + zone_name = 'us-central1-b' + expected_time_until = datetime.timedelta(days=129) + expected_duration = datetime.timedelta(days=8, hours=1) zone = self.driver.ex_get_zone(zone_name) self.assertEqual(zone.name, zone_name) self.assertEqual(zone.time_until_mw, expected_time_until) self.assertEqual(zone.next_mw_duration, expected_duration) + zone_no_mw = self.driver.ex_get_zone('us-central1-a') + self.assertEqual(zone_no_mw.time_until_mw, None) + class GCEMockHttp(MockHttpTestCase): fixtures = ComputeFileFixtures('gce') http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/loadbalancer/test_gce.py ---------------------------------------------------------------------- diff --git a/libcloud/test/loadbalancer/test_gce.py b/libcloud/test/loadbalancer/test_gce.py index 89c11e1..55e29cc 100644 --- a/libcloud/test/loadbalancer/test_gce.py +++ b/libcloud/test/loadbalancer/test_gce.py @@ -50,7 +50,7 @@ class GCELoadBalancerTest(LibcloudTestCase): self.driver = GCELBDriver(*GCE_PARAMS, **kwargs) def test_get_node_from_ip(self): - ip = '173.255.115.146' + ip = '8.35.197.91' expected_name = 'node-name' node = self.driver._get_node_from_ip(ip) self.assertEqual(node.name, expected_name)
