libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject [29/44] Test updates for v1 plus additional changes: Add snapshot support Add .get() to many locations to make the conversion from json dictionary to libcloud objects more robust.
Date Fri, 03 Jan 2014 14:59:41 GMT
http://git-wip-us.apache.org/repos/asf/libcloud/blob/adb9acaa/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 b8a3555..9fccb06 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
@@ -3,230 +3,53 @@
   "items": [
     {
       "canIpForward": false,
-      "creationTimestamp": "2013-06-26T15:00:12.021-07:00",
-      "disks": [
-        {
-          "index": 0,
-          "kind": "compute#attachedDisk",
-          "mode": "READ_WRITE",
-          "type": "SCRATCH"
-        }
-      ],
-      "id": "1845312225624811608",
-      "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/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1",
-      "metadata": {
-        "fingerprint": "42WmSpB8rSM=",
-        "kind": "compute#metadata"
-      },
-      "name": "node-name",
-      "networkInterfaces": [
-        {
-          "accessConfigs": [
-            {
-              "kind": "compute#accessConfig",
-              "name": "External NAT",
-              "natIP": "173.255.115.146",
-              "type": "ONE_TO_ONE_NAT"
-            }
-          ],
-          "name": "nic0",
-          "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
-          "networkIP": "10.240.113.94"
-        }
-      ],
-      "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/v1beta16/projects/project_name/zones/us-central1-a"
-    },
-    {
-      "canIpForward": false,
-      "creationTimestamp": "2013-06-26T15:11:19.247-07:00",
-      "disks": [
-        {
-          "index": 0,
-          "kind": "compute#attachedDisk",
-          "mode": "READ_WRITE",
-          "type": "SCRATCH"
-        }
-      ],
-      "id": "8573880455005118258",
-      "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/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1",
-      "metadata": {
-        "fingerprint": "42WmSpB8rSM=",
-        "kind": "compute#metadata"
-      },
-      "name": "libcloud-demo-multiple-nodes-000",
-      "networkInterfaces": [
-        {
-          "accessConfigs": [
-            {
-              "kind": "compute#accessConfig",
-              "name": "External NAT",
-              "natIP": "108.59.81.107",
-              "type": "ONE_TO_ONE_NAT"
-            }
-          ],
-          "name": "nic0",
-          "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
-          "networkIP": "10.240.224.165"
-        }
-      ],
-      "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=",
-        "items": [
-          "libcloud"
-        ]
-      },
-      "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"
-    },
-    {
-      "canIpForward": false,
-      "creationTimestamp": "2013-06-26T15:11:19.662-07:00",
-      "disks": [
-        {
-          "index": 0,
-          "kind": "compute#attachedDisk",
-          "mode": "READ_WRITE",
-          "type": "SCRATCH"
-        }
-      ],
-      "id": "17221721898919682654",
-      "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/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1",
-      "metadata": {
-        "fingerprint": "42WmSpB8rSM=",
-        "kind": "compute#metadata"
-      },
-      "name": "libcloud-demo-multiple-nodes-001",
-      "networkInterfaces": [
-        {
-          "accessConfigs": [
-            {
-              "kind": "compute#accessConfig",
-              "name": "External NAT",
-              "natIP": "108.59.81.166",
-              "type": "ONE_TO_ONE_NAT"
-            }
-          ],
-          "name": "nic0",
-          "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
-          "networkIP": "10.240.223.109"
-        }
-      ],
-      "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=",
-        "items": [
-          "libcloud"
-        ]
-      },
-      "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"
-    },
-    {
-      "canIpForward": false,
-      "creationTimestamp": "2013-06-26T15:10:09.700-07:00",
-      "disks": [
-        {
-          "index": 0,
-          "kind": "compute#attachedDisk",
-          "mode": "READ_WRITE",
-          "type": "SCRATCH"
-        }
-      ],
-      "id": "03138438763739542377",
-      "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/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1",
-      "metadata": {
-        "fingerprint": "42WmSpB8rSM=",
-        "kind": "compute#metadata"
-      },
-      "name": "libcloud-demo-np-node",
-      "networkInterfaces": [
-        {
-          "accessConfigs": [
-            {
-              "kind": "compute#accessConfig",
-              "name": "External NAT",
-              "natIP": "108.59.80.244",
-              "type": "ONE_TO_ONE_NAT"
-            }
-          ],
-          "name": "nic0",
-          "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
-          "networkIP": "10.240.147.18"
-        }
-      ],
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/libcloud-demo-np-node",
-      "status": "RUNNING",
-      "tags": {
-        "fingerprint": "W7t6ZyTyIrc=",
-        "items": [
-          "libcloud"
-        ]
-      },
-      "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"
-    },
-    {
-      "canIpForward": false,
-      "creationTimestamp": "2013-06-26T15:11:02.386-07:00",
+      "creationTimestamp": "2013-12-13T10:45:23.351-08:00",
       "disks": [
         {
           "boot": true,
-          "deviceName": "libcloud-demo-boot-disk",
+          "deviceName": "persistent-disk-0",
           "index": 0,
           "kind": "compute#attachedDisk",
           "mode": "READ_WRITE",
-          "source": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/disks/libcloud-demo-boot-disk",
+          "source": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/disks/node-name",
           "type": "PERSISTENT"
         }
       ],
-      "id": "2378270030714524465",
-      "kernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130603",
+      "id": "4006034190819017667",
       "kind": "compute#instance",
-      "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1",
+      "machineType": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1",
       "metadata": {
         "fingerprint": "42WmSpB8rSM=",
         "kind": "compute#metadata"
       },
-      "name": "libcloud-demo-persist-node",
+      "name": "node-name",
       "networkInterfaces": [
         {
           "accessConfigs": [
             {
               "kind": "compute#accessConfig",
               "name": "External NAT",
-              "natIP": "108.59.81.66",
+              "natIP": "23.236.58.15",
               "type": "ONE_TO_ONE_NAT"
             }
           ],
           "name": "nic0",
-          "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
-          "networkIP": "10.240.192.190"
+          "network": "https://www.googleapis.com/compute/v1/projects/project_name/global/networks/default",
+          "networkIP": "10.240.72.75"
         }
       ],
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/libcloud-demo-persist-node",
+      "scheduling": {
+        "automaticRestart": true,
+        "onHostMaintenance": "MIGRATE"
+      },
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/instances/node-name",
       "status": "RUNNING",
       "tags": {
-        "fingerprint": "W7t6ZyTyIrc=",
-        "items": [
-          "libcloud"
-        ]
+        "fingerprint": "42WmSpB8rSM="
       },
-      "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"
+      "zone": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a"
     }
   ],
   "kind": "compute#instanceList",
-  "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances"
-}
+  "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/instances"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/adb9acaa/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 eaefc2a..43661c2 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
@@ -1,18 +1,20 @@
 {
   "canIpForward": false,
-  "creationTimestamp": "2013-06-26T16:12:30.443-07:00",
+  "creationTimestamp": "2013-12-13T10:54:07.687-08:00",
   "disks": [
     {
+      "boot": true,
+      "deviceName": "lcnode-000",
       "index": 0,
       "kind": "compute#attachedDisk",
       "mode": "READ_WRITE",
-      "type": "SCRATCH"
+      "source": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/disks/lcnode-000",
+      "type": "PERSISTENT"
     }
   ],
-  "id": "5390075309006132922",
-  "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130617",
+  "id": "17170905942674172532",
   "kind": "compute#instance",
-  "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1",
+  "machineType": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1",
   "metadata": {
     "fingerprint": "42WmSpB8rSM=",
     "kind": "compute#metadata"
@@ -24,19 +26,23 @@
         {
           "kind": "compute#accessConfig",
           "name": "External NAT",
-          "natIP": "108.59.81.107",
+          "natIP": "173.255.114.35",
           "type": "ONE_TO_ONE_NAT"
         }
       ],
       "name": "nic0",
-      "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
-      "networkIP": "10.240.106.153"
+      "network": "https://www.googleapis.com/compute/v1/projects/project_name/global/networks/default",
+      "networkIP": "10.240.160.66"
     }
   ],
-  "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/lcnode-000",
+  "scheduling": {
+    "automaticRestart": true,
+    "onHostMaintenance": "MIGRATE"
+  },
+  "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/instances/lcnode-000",
   "status": "RUNNING",
   "tags": {
     "fingerprint": "42WmSpB8rSM="
   },
-  "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"
-}
\ No newline at end of file
+  "zone": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a"
+}

http://git-wip-us.apache.org/repos/asf/libcloud/blob/adb9acaa/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 e1e5072..ffbf152 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/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_lcnode-000_delete",
+  "selfLink": "https://www.googleapis.com/compute/v1/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/v1beta16/projects/project_name/zones/us-central1-a/instances/lcnode-000",
+  "targetLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/instances/lcnode-000",
   "user": "897001307951@developer.gserviceaccount.com",
-  "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"
+  "zone": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/adb9acaa/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 b4a670d..7cd6be9 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
@@ -1,18 +1,20 @@
 {
   "canIpForward": false,
-  "creationTimestamp": "2013-06-26T16:12:51.782-07:00",
+  "creationTimestamp": "2013-12-13T10:54:08.639-08:00",
   "disks": [
     {
+      "boot": true,
+      "deviceName": "lcnode-001",
       "index": 0,
       "kind": "compute#attachedDisk",
       "mode": "READ_WRITE",
-      "type": "SCRATCH"
+      "source": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/disks/lcnode-001",
+      "type": "PERSISTENT"
     }
   ],
-  "id": "16630486471904253898",
-  "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130617",
+  "id": "09356229693786319079",
   "kind": "compute#instance",
-  "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1",
+  "machineType": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1",
   "metadata": {
     "fingerprint": "42WmSpB8rSM=",
     "kind": "compute#metadata"
@@ -24,19 +26,23 @@
         {
           "kind": "compute#accessConfig",
           "name": "External NAT",
-          "natIP": "108.59.81.166",
+          "natIP": "173.255.117.19",
           "type": "ONE_TO_ONE_NAT"
         }
       ],
       "name": "nic0",
-      "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
-      "networkIP": "10.240.96.232"
+      "network": "https://www.googleapis.com/compute/v1/projects/project_name/global/networks/default",
+      "networkIP": "10.240.168.208"
     }
   ],
-  "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/lcnode-001",
+  "scheduling": {
+    "automaticRestart": true,
+    "onHostMaintenance": "MIGRATE"
+  },
+  "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/instances/lcnode-001",
   "status": "RUNNING",
   "tags": {
     "fingerprint": "42WmSpB8rSM="
   },
-  "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"
+  "zone": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/adb9acaa/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 f52765d..fa887ce 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/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_lcnode-001_delete",
+  "selfLink": "https://www.googleapis.com/compute/v1/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/v1beta16/projects/project_name/zones/us-central1-a/instances/lcnode-001",
+  "targetLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/instances/lcnode-001",
   "user": "897001307951@developer.gserviceaccount.com",
-  "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"
+  "zone": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/adb9acaa/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 7845777..439e00b 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
@@ -1,18 +1,20 @@
 {
   "canIpForward": false,
-  "creationTimestamp": "2013-06-26T15:00:12.021-07:00",
+  "creationTimestamp": "2013-12-13T10:45:23.351-08:00",
   "disks": [
     {
+      "boot": true,
+      "deviceName": "persistent-disk-0",
       "index": 0,
       "kind": "compute#attachedDisk",
       "mode": "READ_WRITE",
-      "type": "SCRATCH"
+      "source": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/disks/node-name",
+      "type": "PERSISTENT"
     }
   ],
-  "id": "1845312225624811608",
-  "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130617",
+  "id": "4006034190819017667",
   "kind": "compute#instance",
-  "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1",
+  "machineType": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1",
   "metadata": {
     "fingerprint": "42WmSpB8rSM=",
     "kind": "compute#metadata"
@@ -24,19 +26,23 @@
         {
           "kind": "compute#accessConfig",
           "name": "External NAT",
-          "natIP": "173.255.115.146",
+          "natIP": "23.236.58.15",
           "type": "ONE_TO_ONE_NAT"
         }
       ],
       "name": "nic0",
-      "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
-      "networkIP": "10.240.113.94"
+      "network": "https://www.googleapis.com/compute/v1/projects/project_name/global/networks/default",
+      "networkIP": "10.240.72.75"
     }
   ],
-  "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/instances/node-name",
+  "scheduling": {
+    "automaticRestart": true,
+    "onHostMaintenance": "MIGRATE"
+  },
+  "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/instances/node-name",
   "status": "RUNNING",
   "tags": {
     "fingerprint": "42WmSpB8rSM="
   },
-  "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"
+  "zone": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/adb9acaa/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 e9e4964..e6167b5 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/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_node-name_attachDisk_post",
+  "selfLink": "https://www.googleapis.com/compute/v1/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/v1beta16/projects/project_name/zones/us-central1-a/instances/node-name",
+  "targetLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/instances/node-name",
   "user": "897001307951@developer.gserviceaccount.com",
-  "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"
+  "zone": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/adb9acaa/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 0df1b9a..e74dbba 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/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_node-name_delete",
+  "selfLink": "https://www.googleapis.com/compute/v1/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/v1beta16/projects/project_name/zones/us-central1-a/instances/node-name",
+  "targetLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/instances/node-name",
   "user": "897001307951@developer.gserviceaccount.com",
-  "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"
-}
\ No newline at end of file
+  "zone": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a"
+}

http://git-wip-us.apache.org/repos/asf/libcloud/blob/adb9acaa/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 36ded09..d8d2e63 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/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_node-name_detachDisk_post",
+  "selfLink": "https://www.googleapis.com/compute/v1/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/v1beta16/projects/project_name/zones/us-central1-a/instances/node-name",
+  "targetLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/instances/node-name",
   "user": "897001307951@developer.gserviceaccount.com",
-  "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"
+  "zone": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/adb9acaa/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 d095030..240a255 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/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_node-name_reset_post",
+  "selfLink": "https://www.googleapis.com/compute/v1/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/v1beta16/projects/project_name/zones/us-central1-a/instances/node-name",
+  "targetLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/instances/node-name",
   "user": "897001307951@developer.gserviceaccount.com",
-  "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"
+  "zone": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/adb9acaa/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 87e67ec..2dfdcd4 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/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_node-name_setTags_post",
+  "selfLink": "https://www.googleapis.com/compute/v1/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/v1beta16/projects/project_name/zones/us-central1-a/instances/node-name",
+  "targetLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/instances/node-name",
   "user": "897001307951@developer.gserviceaccount.com",
-  "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"
+  "zone": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/adb9acaa/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 d6b8ad7..77c95e8 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/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_instances_post",
+  "selfLink": "https://www.googleapis.com/compute/v1/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/v1beta16/projects/project_name/zones/us-central1-a/instances/lcnode-001",
+  "targetLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/instances/lcnode-001",
   "user": "897001307951@developer.gserviceaccount.com",
-  "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a"
+  "zone": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/adb9acaa/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 b4e795b..7cbae6f 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/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/f1-micro",
+      "selfLink": "https://www.googleapis.com/compute/v1/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/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/g1-small",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/g1-small",
       "zone": "us-central1-a"
     },
     {
@@ -40,11 +40,16 @@
       "maximumPersistentDisksSizeGb": "10240",
       "memoryMb": 1843,
       "name": "n1-highcpu-2",
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-2",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-2",
       "zone": "us-central1-a"
     },
     {
       "creationTimestamp": "2012-11-16T11:47:07.825-08:00",
+      "deprecated": {
+        "deprecated": "2013-12-02T20:00:00-08:00",
+        "replacement": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-2",
+        "state": "DEPRECATED"
+      },
       "description": "2 vCPUs, 1.8 GB RAM, 1 scratch disk (870 GB)",
       "guestCpus": 2,
       "id": "15178384466070744001",
@@ -59,7 +64,7 @@
           "diskGb": 870
         }
       ],
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-2-d",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-2-d",
       "zone": "us-central1-a"
     },
     {
@@ -73,11 +78,16 @@
       "maximumPersistentDisksSizeGb": "10240",
       "memoryMb": 3686,
       "name": "n1-highcpu-4",
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-4",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-4",
       "zone": "us-central1-a"
     },
     {
       "creationTimestamp": "2012-11-16T11:49:07.563-08:00",
+      "deprecated": {
+        "deprecated": "2013-12-02T20:00:00-08:00",
+        "replacement": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-4",
+        "state": "DEPRECATED"
+      },
       "description": "4 vCPUS, 3.6 GB RAM, 1 scratch disk (1770 GB)",
       "guestCpus": 4,
       "id": "01151097524490134507",
@@ -92,7 +102,7 @@
           "diskGb": 1770
         }
       ],
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-4-d",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-4-d",
       "zone": "us-central1-a"
     },
     {
@@ -106,11 +116,16 @@
       "maximumPersistentDisksSizeGb": "10240",
       "memoryMb": 7373,
       "name": "n1-highcpu-8",
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-8",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-8",
       "zone": "us-central1-a"
     },
     {
       "creationTimestamp": "2012-11-16T11:51:04.549-08:00",
+      "deprecated": {
+        "deprecated": "2013-12-02T20:00:00-08:00",
+        "replacement": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-8",
+        "state": "DEPRECATED"
+      },
       "description": "8 vCPUS, 7.2 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
       "guestCpus": 8,
       "id": "02507333096579477005",
@@ -128,7 +143,7 @@
           "diskGb": 1770
         }
       ],
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-8-d",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-8-d",
       "zone": "us-central1-a"
     },
     {
@@ -142,11 +157,16 @@
       "maximumPersistentDisksSizeGb": "10240",
       "memoryMb": 13312,
       "name": "n1-highmem-2",
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-2",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-2",
       "zone": "us-central1-a"
     },
     {
       "creationTimestamp": "2012-11-16T11:40:59.630-08:00",
+      "deprecated": {
+        "deprecated": "2013-12-02T20:00:00-08:00",
+        "replacement": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-2",
+        "state": "DEPRECATED"
+      },
       "description": "2 vCPUs, 13 GB RAM, 1 scratch disk (870 GB)",
       "guestCpus": 2,
       "id": "00770157291441082211",
@@ -161,7 +181,7 @@
           "diskGb": 870
         }
       ],
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-2-d",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-2-d",
       "zone": "us-central1-a"
     },
     {
@@ -175,11 +195,16 @@
       "maximumPersistentDisksSizeGb": "10240",
       "memoryMb": 26624,
       "name": "n1-highmem-4",
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-4",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-4",
       "zone": "us-central1-a"
     },
     {
       "creationTimestamp": "2012-11-16T11:43:17.400-08:00",
+      "deprecated": {
+        "deprecated": "2013-12-02T20:00:00-08:00",
+        "replacement": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-4",
+        "state": "DEPRECATED"
+      },
       "description": "4 vCPUs, 26 GB RAM, 1 scratch disk (1770 GB)",
       "guestCpus": 4,
       "id": "05095504563332567951",
@@ -194,7 +219,7 @@
           "diskGb": 1770
         }
       ],
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-4-d",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-4-d",
       "zone": "us-central1-a"
     },
     {
@@ -208,11 +233,16 @@
       "maximumPersistentDisksSizeGb": "10240",
       "memoryMb": 53248,
       "name": "n1-highmem-8",
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-8",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-8",
       "zone": "us-central1-a"
     },
     {
       "creationTimestamp": "2012-11-16T11:45:08.195-08:00",
+      "deprecated": {
+        "deprecated": "2013-12-02T20:00:00-08:00",
+        "replacement": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-8",
+        "state": "DEPRECATED"
+      },
       "description": "8 vCPUs, 52 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
       "guestCpus": 8,
       "id": "07181827135536388552",
@@ -230,7 +260,7 @@
           "diskGb": 1770
         }
       ],
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-8-d",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-8-d",
       "zone": "us-central1-a"
     },
     {
@@ -244,11 +274,16 @@
       "maximumPersistentDisksSizeGb": "10240",
       "memoryMb": 3840,
       "name": "n1-standard-1",
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1",
       "zone": "us-central1-a"
     },
     {
       "creationTimestamp": "2012-06-07T13:48:34.258-07:00",
+      "deprecated": {
+        "deprecated": "2013-12-02T20:00:00-08:00",
+        "replacement": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1",
+        "state": "DEPRECATED"
+      },
       "description": "1 vCPU, 3.75 GB RAM, 1 scratch disk (420 GB)",
       "guestCpus": 1,
       "id": "10583029372018866711",
@@ -263,7 +298,7 @@
           "diskGb": 420
         }
       ],
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1-d",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1-d",
       "zone": "us-central1-a"
     },
     {
@@ -277,11 +312,16 @@
       "maximumPersistentDisksSizeGb": "10240",
       "memoryMb": 7680,
       "name": "n1-standard-2",
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-2",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-2",
       "zone": "us-central1-a"
     },
     {
       "creationTimestamp": "2012-06-07T13:49:19.448-07:00",
+      "deprecated": {
+        "deprecated": "2013-12-02T20:00:00-08:00",
+        "replacement": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-2",
+        "state": "DEPRECATED"
+      },
       "description": "2 vCPUs, 7.5 GB RAM, 1 scratch disk (870 GB)",
       "guestCpus": 2,
       "id": "06313284160910191442",
@@ -296,7 +336,7 @@
           "diskGb": 870
         }
       ],
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-2-d",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-2-d",
       "zone": "us-central1-a"
     },
     {
@@ -310,11 +350,16 @@
       "maximumPersistentDisksSizeGb": "10240",
       "memoryMb": 15360,
       "name": "n1-standard-4",
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-4",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-4",
       "zone": "us-central1-a"
     },
     {
       "creationTimestamp": "2012-06-07T13:50:05.677-07:00",
+      "deprecated": {
+        "deprecated": "2013-12-02T20:00:00-08:00",
+        "replacement": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-4",
+        "state": "DEPRECATED"
+      },
       "description": "4 vCPUs, 15 GB RAM, 1 scratch disk (1770 GB)",
       "guestCpus": 4,
       "id": "00523085164784013586",
@@ -329,7 +374,7 @@
           "diskGb": 1770
         }
       ],
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-4-d",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-4-d",
       "zone": "us-central1-a"
     },
     {
@@ -343,11 +388,16 @@
       "maximumPersistentDisksSizeGb": "10240",
       "memoryMb": 30720,
       "name": "n1-standard-8",
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-8",
+      "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-8",
       "zone": "us-central1-a"
     },
     {
       "creationTimestamp": "2012-06-07T13:51:19.936-07:00",
+      "deprecated": {
+        "deprecated": "2013-12-02T20:00:00-08:00",
+        "replacement": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-8",
+        "state": "DEPRECATED"
+      },
       "description": "8 vCPUs, 30 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
       "guestCpus": 8,
       "id": "00035824420671580077",
@@ -365,10 +415,10 @@
           "diskGb": 1770
         }
       ],
-      "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-8-d",
+      "selfLink": "https://www.googleapis.com/compute/v1/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/v1beta16/projects/project_name/zones/us-central1-a/machineTypes"
+  "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-a/machineTypes"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/adb9acaa/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 961aa26..d1b3d74 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/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-1",
+  "selfLink": "https://www.googleapis.com/compute/v1/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/adb9acaa/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 ad229a5..858b0de 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
@@ -1,21 +1,22 @@
 {
   "canIpForward": false,
-  "creationTimestamp": "2013-09-02T22:25:15.878-07:00",
+  "creationTimestamp": "2013-12-13T10:51:24.339-08:00",
   "disks": [
     {
+      "boot": true,
+      "deviceName": "libcloud-lb-demo-www-000",
       "index": 0,
       "kind": "compute#attachedDisk",
       "mode": "READ_WRITE",
-      "type": "SCRATCH"
+      "source": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-b/disks/libcloud-lb-demo-www-000",
+      "type": "PERSISTENT"
     }
   ],
-  "id": "16051209904934263688",
-  "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",
+  "id": "08447900841145802741",
   "kind": "compute#instance",
-  "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-1",
+  "machineType": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-1",
   "metadata": {
-    "fingerprint": "n9EGknQZPSA=",
+    "fingerprint": "IZjMMp0A_8k=",
     "items": [
       {
         "key": "startup-script",
@@ -31,16 +32,20 @@
         {
           "kind": "compute#accessConfig",
           "name": "External NAT",
-          "natIP": "173.255.113.234",
+          "natIP": "23.236.58.15",
           "type": "ONE_TO_ONE_NAT"
         }
       ],
       "name": "nic0",
-      "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
-      "networkIP": "10.240.138.154"
+      "network": "https://www.googleapis.com/compute/v1/projects/project_name/global/networks/default",
+      "networkIP": "10.240.104.11"
     }
   ],
-  "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-000",
+  "scheduling": {
+    "automaticRestart": true,
+    "onHostMaintenance": "MIGRATE"
+  },
+  "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-000",
   "status": "RUNNING",
   "tags": {
     "fingerprint": "XI0he92M8l8=",
@@ -48,5 +53,5 @@
       "libcloud-lb-demo-www"
     ]
   },
-  "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b"
+  "zone": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-b"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/adb9acaa/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 3cc0dae..df6b0c6 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
@@ -1,21 +1,22 @@
 {
   "canIpForward": false,
-  "creationTimestamp": "2013-09-02T22:25:16.253-07:00",
+  "creationTimestamp": "2013-12-13T10:51:25.165-08:00",
   "disks": [
     {
+      "boot": true,
+      "deviceName": "libcloud-lb-demo-www-001",
       "index": 0,
       "kind": "compute#attachedDisk",
       "mode": "READ_WRITE",
-      "type": "SCRATCH"
+      "source": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-b/disks/libcloud-lb-demo-www-001",
+      "type": "PERSISTENT"
     }
   ],
-  "id": "11204787063927654129",
-  "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",
+  "id": "11523404878553997348",
   "kind": "compute#instance",
-  "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-1",
+  "machineType": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-1",
   "metadata": {
-    "fingerprint": "n9EGknQZPSA=",
+    "fingerprint": "09vSzO6KXcw=",
     "items": [
       {
         "key": "startup-script",
@@ -31,16 +32,20 @@
         {
           "kind": "compute#accessConfig",
           "name": "External NAT",
-          "natIP": "173.255.114.210",
+          "natIP": "23.236.58.59",
           "type": "ONE_TO_ONE_NAT"
         }
       ],
       "name": "nic0",
-      "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
-      "networkIP": "10.240.0.123"
+      "network": "https://www.googleapis.com/compute/v1/projects/project_name/global/networks/default",
+      "networkIP": "10.240.94.107"
     }
   ],
-  "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-001",
+  "scheduling": {
+    "automaticRestart": true,
+    "onHostMaintenance": "MIGRATE"
+  },
+  "selfLink": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-001",
   "status": "RUNNING",
   "tags": {
     "fingerprint": "XI0he92M8l8=",
@@ -48,5 +53,5 @@
       "libcloud-lb-demo-www"
     ]
   },
-  "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b"
-}
\ No newline at end of file
+  "zone": "https://www.googleapis.com/compute/v1/projects/project_name/zones/us-central1-b"
+}

http://git-wip-us.apache.org/repos/asf/libcloud/blob/adb9acaa/libcloud/test/compute/test_gce.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_gce.py b/libcloud/test/compute/test_gce.py
index 52c462a..3462f64 100644
--- a/libcloud/test/compute/test_gce.py
+++ b/libcloud/test/compute/test_gce.py
@@ -96,7 +96,7 @@ 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-v20131014')
+        self.assertEqual(image.name, 'debian-7-wheezy-v20131120')
         image = self.driver._match_images(project, 'debian-6')
         self.assertEqual(image.name, 'debian-6-squeeze-v20130926')
 
@@ -113,7 +113,7 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin):
 
     def test_ex_list_healthchecks(self):
         healthchecks = self.driver.ex_list_healthchecks()
-        self.assertEqual(len(healthchecks), 2)
+        self.assertEqual(len(healthchecks), 3)
         self.assertEqual(healthchecks[0].name, 'basic-check')
 
     def test_ex_list_firewalls(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), 2)
-        self.assertEqual(len(debian_images), 17)
+        self.assertEqual(len(debian_images), 19)
         self.assertEqual(local_images[0].name, 'debian-7-wheezy-v20130617')
         self.assertEqual(local_images[1].name, 'centos-6-v20131118')
 
@@ -155,9 +155,9 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin):
         nodes = self.driver.list_nodes()
         nodes_all = self.driver.list_nodes(ex_zone='all')
         nodes_uc1a = self.driver.list_nodes(ex_zone='us-central1-a')
-        self.assertEqual(len(nodes), 5)
+        self.assertEqual(len(nodes), 1)
         self.assertEqual(len(nodes_all), 8)
-        self.assertEqual(len(nodes_uc1a), 5)
+        self.assertEqual(len(nodes_uc1a), 1)
         self.assertEqual(nodes[0].name, 'node-name')
         self.assertEqual(nodes_uc1a[0].name, 'node-name')
         names = [n.name for n in nodes_all]
@@ -194,9 +194,9 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin):
         volumes = self.driver.list_volumes()
         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), 5)
-        self.assertEqual(len(volumes_uc1a), 3)
+        self.assertEqual(len(volumes), 2)
+        self.assertEqual(len(volumes_all), 10)
+        self.assertEqual(len(volumes_uc1a), 2)
         self.assertEqual(volumes[0].name, 'lcdisk')
         self.assertEqual(volumes_uc1a[0].name, 'lcdisk')
         names = [v.name for v in volumes_all]
@@ -544,12 +544,10 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin):
 
     def test_ex_get_zone(self):
         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)
+        self.assertFalse(zone.time_until_mw)
+        self.assertFalse(zone.next_mw_duration)
 
         zone_no_mw = self.driver.ex_get_zone('us-central1-a')
         self.assertEqual(zone_no_mw.time_until_mw, None)
@@ -972,6 +970,77 @@ class GCEMockHttp(MockHttpTestCase):
             body = self.fixtures.load('zones_us-central1-a_disks_lcdisk.json')
         return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
 
+    def _zones_us_central1_a_disks_node_name(self, method, url, body, headers):
+        body = self.fixtures.load('generic_disk.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _zones_us_central1_a_disks_lcnode_000(
+            self, method, url, body, headers):
+        body = self.fixtures.load('generic_disk.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _zones_us_central1_a_disks_lcnode_001(
+            self, method, url, body, headers):
+        body = self.fixtures.load('generic_disk.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _zones_us_central1_b_disks_libcloud_lb_demo_www_000(
+            self, method, url, body, headers):
+        body = self.fixtures.load('generic_disk.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _zones_us_central1_b_disks_libcloud_lb_demo_www_001(
+            self, method, url, body, headers):
+        body = self.fixtures.load('generic_disk.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _zones_us_central1_b_disks_libcloud_lb_demo_www_002(
+            self, method, url, body, headers):
+        body = self.fixtures.load('generic_disk.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _zones_us_central2_a_disks_libcloud_demo_boot_disk(
+            self, method, url, body, headers):
+        body = self.fixtures.load('generic_disk.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _zones_us_central2_a_disks_libcloud_demo_np_node(
+            self, method, url, body, headers):
+        body = self.fixtures.load('generic_disk.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _zones_us_central2_a_disks_libcloud_demo_multiple_nodes_000(
+            self, method, url, body, headers):
+        body = self.fixtures.load('generic_disk.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _zones_us_central2_a_disks_libcloud_demo_multiple_nodes_001(
+            self, method, url, body, headers):
+        body = self.fixtures.load('generic_disk.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _zones_europe_west1_a_disks(self, method, url, body, headers):
+        if method == 'POST':
+            body = self.fixtures.load('zones_us-central1-a_disks_post.json')
+        else:
+            body = self.fixtures.load('zones_us-central1-a_disks.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _zones_europe_west1_a_disks_libcloud_demo_europe_np_node(
+            self, method, url, body, headers):
+        body = self.fixtures.load('generic_disk.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _zones_europe_west1_a_disks_libcloud_demo_europe_boot_disk(
+            self, method, url, body, headers):
+        body = self.fixtures.load('generic_disk.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _zones_europe_west1_a_disks_libcloud_demo_europe_multiple_nodes_000(
+            self, method, url, body, headers):
+        body = self.fixtures.load('generic_disk.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
     def _zones_europe_west1_a_instances(self, method, url, body, headers):
         if method == 'POST':
             body = self.fixtures.load(

http://git-wip-us.apache.org/repos/asf/libcloud/blob/adb9acaa/libcloud/test/loadbalancer/test_gce.py
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/test_gce.py b/libcloud/test/loadbalancer/test_gce.py
index 55e29cc..9b55a2a 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 = '8.35.197.91'
+        ip = '23.236.58.15'
         expected_name = 'node-name'
         node = self.driver._get_node_from_ip(ip)
         self.assertEqual(node.name, expected_name)
@@ -139,7 +139,7 @@ class GCELoadBalancerTest(LibcloudTestCase):
         members = balancer.list_members()
         self.assertEqual(len(members), 2)
         member_ips = [m.ip for m in members]
-        self.assertTrue('173.255.113.234' in member_ips)
+        self.assertTrue('23.236.58.15' in member_ips)
 
     def test_ex_create_healthcheck(self):
         healthcheck_name = 'lchealthcheck'
@@ -158,7 +158,7 @@ class GCELoadBalancerTest(LibcloudTestCase):
 
     def test_ex_list_healthchecks(self):
         healthchecks = self.driver.ex_list_healthchecks()
-        self.assertEqual(len(healthchecks), 2)
+        self.assertEqual(len(healthchecks), 3)
         self.assertEqual(healthchecks[0].name, 'basic-check')
 
     def test_ex_balancer_detach_attach_healthcheck(self):


Mime
View raw message