You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2013/11/03 10:15:19 UTC
[1/9] git commit: Add a script for generating a collage of provider
logo files.
Updated Branches:
refs/heads/trunk fbe62425c -> 69c5429c1
Add a script for generating a collage of provider logo files.
This image can be used on the homepage and inside documentation.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/4c23c97a
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/4c23c97a
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/4c23c97a
Branch: refs/heads/trunk
Commit: 4c23c97a286632ca9644f16d7c333929975adab0
Parents: fbe6242
Author: Tomaz Muraus <to...@apache.org>
Authored: Sat Nov 2 21:23:20 2013 +0000
Committer: Tomaz Muraus <to...@apache.org>
Committed: Sat Nov 2 21:23:20 2013 +0000
----------------------------------------------------------------------
.../generate_provider_logos_collage_image.py | 124 +++++++++++++++++++
1 file changed, 124 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/4c23c97a/contrib/generate_provider_logos_collage_image.py
----------------------------------------------------------------------
diff --git a/contrib/generate_provider_logos_collage_image.py b/contrib/generate_provider_logos_collage_image.py
new file mode 100644
index 0000000..a5c0064
--- /dev/null
+++ b/contrib/generate_provider_logos_collage_image.py
@@ -0,0 +1,124 @@
+#!/usr/bin/env python
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+# Script which generates a collage of provider logos from multiple provider
+# logo files.
+#
+# It works in two steps:
+#
+# 1. Resize all the provider logo files (reduce the dimensions)
+# 2. Assemble a final image from the resized images
+
+import os
+import sys
+import argparse
+import subprocess
+
+from os.path import join as pjoin
+
+DIMENSIONS = '150x150' # Dimensions of the resized image (<width>x<height>)
+GEOMETRY = '+4+4' # How to arrange images (+<rows>+<columns>)
+
+TO_CREATE_DIRS = ['resized/', 'final/']
+
+
+def setup(output_path):
+ """
+ Create missing directories.
+ """
+ for directory in TO_CREATE_DIRS:
+ final_path = pjoin(output_path, directory)
+
+ if not os.path.exists(final_path):
+ os.makedirs(final_path)
+
+
+def get_logo_files(input_path):
+ logo_files = os.listdir(input_path)
+ logo_files = [name for name in logo_files if
+ 'resized' not in name and name.endswith('png')]
+ logo_files = [pjoin(input_path, name) for name in logo_files]
+
+ return logo_files
+
+
+def resize_images(logo_files, output_path):
+ resized_images = []
+
+ for logo_file in logo_files:
+ name, ext = os.path.splitext(os.path.basename(logo_file))
+ new_name = '%s%s' % (name, ext)
+ out_name = pjoin(output_path, 'resized/', new_name)
+
+ print 'Resizing image: %(name)s' % {'name': logo_file}
+
+ values = {'name': logo_file, 'out_name': out_name,
+ 'dimensions': DIMENSIONS}
+ cmd = 'convert %(name)s -resize %(dimensions)s %(out_name)s'
+ cmd = cmd % values
+ subprocess.call(cmd, shell=True)
+
+ resized_images.append(new_name)
+
+ return resized_images
+
+
+def assemble_final_image(resized_images, output_path):
+ final_name = 'final/logos.png'
+ values = {'images': ' '.join(resized_images), 'geometry': GEOMETRY,
+ 'out_name': final_name}
+ cmd = 'montage %(images)s -geometry %(geometry)s %(out_name)s'
+ cmd = cmd % values
+
+ print 'Generating final image: %(name)s' % {'name': final_name}
+ subprocess.call(cmd, shell=True)
+
+
+def main(input_path, output_path):
+ if not os.path.exists(input_path):
+ print('Path doesn\'t exist: %s' % (input_path))
+ sys.exit(2)
+
+ if not os.path.exists(output_path):
+ print('Path doesn\'t exist: %s' % (output_path))
+ sys.exit(2)
+
+ logo_files = get_logo_files(input_path=input_path)
+
+ setup(output_path=output_path)
+ resized_images = resize_images(logo_files=logo_files,
+ output_path=output_path)
+ assemble_final_image(resized_images=resized_images,
+ output_path=output_path)
+
+if __name__ == '__main__':
+ parser = argparse.ArgumentParser(description='Assemble provider logos '
+ ' in a single image')
+ parser.add_argument('--input-path', action='store',
+ help='Path to directory which contains provider '
+ 'logo files')
+ parser.add_argument('--output-path', action='store',
+ help='Path where the new files will be written')
+ args = parser.parse_args()
+
+ input_path = os.path.abspath(args.input_path)
+ output_path = os.path.abspath(args.output_path)
+
+ main(input_path=input_path, output_path=output_path)
[2/9] git commit: Fix long line
Posted by to...@apache.org.
Fix long line
Signed-off-by: Tomaz Muraus <to...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/b8447912
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/b8447912
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/b8447912
Branch: refs/heads/trunk
Commit: b844791268864253f10cbc94344837366c6c1b6a
Parents: ac04f36
Author: Rick Wright <ri...@google.com>
Authored: Sat Nov 2 22:17:09 2013 -0700
Committer: Tomaz Muraus <to...@apache.org>
Committed: Sun Nov 3 08:21:07 2013 +0000
----------------------------------------------------------------------
demos/gce_lb_demo.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b8447912/demos/gce_lb_demo.py
----------------------------------------------------------------------
diff --git a/demos/gce_lb_demo.py b/demos/gce_lb_demo.py
index 76bfeda..3c2cdac 100755
--- a/demos/gce_lb_demo.py
+++ b/demos/gce_lb_demo.py
@@ -296,7 +296,8 @@ def main():
firewalls = gce.ex_list_firewalls()
print('Cleaning up %s resources created.' % DEMO_BASE_NAME)
- clean_up(gce, DEMO_BASE_NAME, nodes, balancers + healthchecks + firewalls)
+ clean_up(gce, DEMO_BASE_NAME, nodes,
+ balancers + healthchecks + firewalls)
if __name__ == '__main__':
main()
[9/9] git commit: Update tox config.
Posted by to...@apache.org.
Update tox config.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/69c5429c
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/69c5429c
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/69c5429c
Branch: refs/heads/trunk
Commit: 69c5429c1822407dcc7c34b934dbc56a56ebfbd0
Parents: ba72041
Author: Tomaz Muraus <to...@apache.org>
Authored: Sun Nov 3 08:31:41 2013 +0000
Committer: Tomaz Muraus <to...@apache.org>
Committed: Sun Nov 3 08:31:41 2013 +0000
----------------------------------------------------------------------
tox.ini | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/69c5429c/tox.ini
----------------------------------------------------------------------
diff --git a/tox.ini b/tox.ini
index d2931fc..428b2ab 100644
--- a/tox.ini
+++ b/tox.ini
@@ -48,6 +48,6 @@ commands = python ../contrib/generate_provider_feature_matrix_table.py
[testenv:lint]
deps = flake8
commands = flake8 --exclude="test/" libcloud/
- flake8 --max-line-length=160 libcloud/
+ flake8 --max-line-length=160 libcloud/test/
flake8 demos/
flake8 docs/examples/
[6/9] Update GCE driver to API version v1beta16 Most of the changes
are in the test fixtures, some were regenerated,
some were just had URLs updated as necessary. In addition,
there were some changes made to the tests to use the regenerated test fixtures
Posted by to...@apache.org.
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/aggregated_machineTypes.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/aggregated_machineTypes.json b/libcloud/test/compute/fixtures/gce/aggregated_machineTypes.json
index 54f8e23..b92af77 100644
--- a/libcloud/test/compute/fixtures/gce/aggregated_machineTypes.json
+++ b/libcloud/test/compute/fixtures/gce/aggregated_machineTypes.json
@@ -4,6 +4,72 @@
"zones/europe-west1-a": {
"machineTypes": [
{
+ "creationTimestamp": "2012-11-16T11:50:15.128-08:00",
+ "description": "8 vCPUs, 7.2 GB RAM",
+ "guestCpus": 8,
+ "id": "01206886442411821831",
+ "imageSpaceGb": 10,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "10240",
+ "memoryMb": 7373,
+ "name": "n1-highcpu-8",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-highcpu-8",
+ "zone": "europe-west1-a"
+ },
+ {
+ "creationTimestamp": "2012-06-07T13:50:05.677-07:00",
+ "description": "4 vCPUs, 15 GB RAM, 1 scratch disk (1770 GB)",
+ "guestCpus": 4,
+ "id": "00523085164784013586",
+ "imageSpaceGb": 10,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "10240",
+ "memoryMb": 15360,
+ "name": "n1-standard-4-d",
+ "scratchDisks": [
+ {
+ "diskGb": 1770
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-4-d",
+ "zone": "europe-west1-a"
+ },
+ {
+ "creationTimestamp": "2012-06-07T13:48:34.258-07:00",
+ "description": "1 vCPU, 3.75 GB RAM, 1 scratch disk (420 GB)",
+ "guestCpus": 1,
+ "id": "10583029372018866711",
+ "imageSpaceGb": 10,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "10240",
+ "memoryMb": 3840,
+ "name": "n1-standard-1-d",
+ "scratchDisks": [
+ {
+ "diskGb": 420
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-1-d",
+ "zone": "europe-west1-a"
+ },
+ {
+ "creationTimestamp": "2012-11-16T11:40:06.129-08:00",
+ "description": "2 vCPUs, 13 GB RAM",
+ "guestCpus": 2,
+ "id": "05438694236916301519",
+ "imageSpaceGb": 10,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "10240",
+ "memoryMb": 13312,
+ "name": "n1-highmem-2",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-highmem-2",
+ "zone": "europe-west1-a"
+ },
+ {
"creationTimestamp": "2012-11-16T11:40:59.630-08:00",
"description": "2 vCPUs, 13 GB RAM, 1 scratch disk (870 GB)",
"guestCpus": 2,
@@ -19,40 +85,48 @@
"diskGb": 870
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-highmem-2-d",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-highmem-2-d",
"zone": "europe-west1-a"
},
{
- "creationTimestamp": "2012-06-07T13:49:19.448-07:00",
- "description": "2 vCPUs, 7.5 GB RAM, 1 scratch disk (870 GB)",
- "guestCpus": 2,
- "id": "06313284160910191442",
+ "creationTimestamp": "2012-11-16T11:45:08.195-08:00",
+ "description": "8 vCPUs, 52 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
+ "guestCpus": 8,
+ "id": "07181827135536388552",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 7680,
- "name": "n1-standard-2-d",
+ "memoryMb": 53248,
+ "name": "n1-highmem-8-d",
"scratchDisks": [
{
- "diskGb": 870
+ "diskGb": 1770
+ },
+ {
+ "diskGb": 1770
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-2-d",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-highmem-8-d",
"zone": "europe-west1-a"
},
{
- "creationTimestamp": "2012-11-16T11:46:10.572-08:00",
- "description": "2 vCPUs, 1.8 GB RAM",
+ "creationTimestamp": "2012-11-16T11:47:07.825-08:00",
+ "description": "2 vCPUs, 1.8 GB RAM, 1 scratch disk (870 GB)",
"guestCpus": 2,
- "id": "16898271314080235997",
+ "id": "15178384466070744001",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
"memoryMb": 1843,
- "name": "n1-highcpu-2",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-highcpu-2",
+ "name": "n1-highcpu-2-d",
+ "scratchDisks": [
+ {
+ "diskGb": 870
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-highcpu-2-d",
"zone": "europe-west1-a"
},
{
@@ -74,21 +148,63 @@
"diskGb": 1770
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-highcpu-8-d",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-highcpu-8-d",
"zone": "europe-west1-a"
},
{
- "creationTimestamp": "2012-06-07T13:49:40.050-07:00",
- "description": "4 vCPUs, 15 GB RAM",
+ "creationTimestamp": "2013-04-25T13:32:45.550-07:00",
+ "description": "1 vCPU (shared physical core) and 1.7 GB RAM",
+ "guestCpus": 1,
+ "id": "1500265464823777597",
+ "imageSpaceGb": 0,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 4,
+ "maximumPersistentDisksSizeGb": "3072",
+ "memoryMb": 1740,
+ "name": "g1-small",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/g1-small",
+ "zone": "europe-west1-a"
+ },
+ {
+ "creationTimestamp": "2012-11-16T11:46:10.572-08:00",
+ "description": "2 vCPUs, 1.8 GB RAM",
+ "guestCpus": 2,
+ "id": "16898271314080235997",
+ "imageSpaceGb": 10,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "10240",
+ "memoryMb": 1843,
+ "name": "n1-highcpu-2",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-highcpu-2",
+ "zone": "europe-west1-a"
+ },
+ {
+ "creationTimestamp": "2012-11-16T11:42:08.983-08:00",
+ "description": "4 vCPUs, 26 GB RAM",
"guestCpus": 4,
- "id": "09494636486174545828",
+ "id": "11556032176405786676",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 15360,
- "name": "n1-standard-4",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-4",
+ "memoryMb": 26624,
+ "name": "n1-highmem-4",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-highmem-4",
+ "zone": "europe-west1-a"
+ },
+ {
+ "creationTimestamp": "2013-04-25T13:32:49.088-07:00",
+ "description": "1 vCPU (shared physical core) and 0.6 GB RAM",
+ "guestCpus": 1,
+ "id": "1133568312750571513",
+ "imageSpaceGb": 0,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 4,
+ "maximumPersistentDisksSizeGb": "3072",
+ "memoryMb": 614,
+ "name": "f1-micro",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/f1-micro",
"zone": "europe-west1-a"
},
{
@@ -102,21 +218,45 @@
"maximumPersistentDisksSizeGb": "10240",
"memoryMb": 7680,
"name": "n1-standard-2",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-2",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-2",
"zone": "europe-west1-a"
},
{
- "creationTimestamp": "2012-11-16T11:50:15.128-08:00",
- "description": "8 vCPUs, 7.2 GB RAM",
- "guestCpus": 8,
- "id": "01206886442411821831",
+ "creationTimestamp": "2012-06-07T13:49:19.448-07:00",
+ "description": "2 vCPUs, 7.5 GB RAM, 1 scratch disk (870 GB)",
+ "guestCpus": 2,
+ "id": "06313284160910191442",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 7373,
- "name": "n1-highcpu-8",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-highcpu-8",
+ "memoryMb": 7680,
+ "name": "n1-standard-2-d",
+ "scratchDisks": [
+ {
+ "diskGb": 870
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-2-d",
+ "zone": "europe-west1-a"
+ },
+ {
+ "creationTimestamp": "2012-11-16T11:49:07.563-08:00",
+ "description": "4 vCPUS, 3.6 GB RAM, 1 scratch disk (1770 GB)",
+ "guestCpus": 4,
+ "id": "01151097524490134507",
+ "imageSpaceGb": 10,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "10240",
+ "memoryMb": 3686,
+ "name": "n1-highcpu-4-d",
+ "scratchDisks": [
+ {
+ "diskGb": 1770
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-highcpu-4-d",
"zone": "europe-west1-a"
},
{
@@ -130,21 +270,21 @@
"maximumPersistentDisksSizeGb": "10240",
"memoryMb": 53248,
"name": "n1-highmem-8",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-highmem-8",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-highmem-8",
"zone": "europe-west1-a"
},
{
- "creationTimestamp": "2012-11-16T11:42:08.983-08:00",
- "description": "4 vCPUs, 26 GB RAM",
+ "creationTimestamp": "2012-06-07T13:49:40.050-07:00",
+ "description": "4 vCPUs, 15 GB RAM",
"guestCpus": 4,
- "id": "11556032176405786676",
+ "id": "09494636486174545828",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 26624,
- "name": "n1-highmem-4",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-highmem-4",
+ "memoryMb": 15360,
+ "name": "n1-standard-4",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-4",
"zone": "europe-west1-a"
},
{
@@ -158,21 +298,7 @@
"maximumPersistentDisksSizeGb": "10240",
"memoryMb": 3840,
"name": "n1-standard-1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-1",
- "zone": "europe-west1-a"
- },
- {
- "creationTimestamp": "2012-11-16T11:40:06.129-08:00",
- "description": "2 vCPUs, 13 GB RAM",
- "guestCpus": 2,
- "id": "05438694236916301519",
- "imageSpaceGb": 10,
- "kind": "compute#machineType",
- "maximumPersistentDisks": 16,
- "maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 13312,
- "name": "n1-highmem-2",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-highmem-2",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-1",
"zone": "europe-west1-a"
},
{
@@ -191,7 +317,7 @@
"diskGb": 1770
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-highmem-4-d",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-highmem-4-d",
"zone": "europe-west1-a"
},
{
@@ -205,49 +331,26 @@
"maximumPersistentDisksSizeGb": "10240",
"memoryMb": 3686,
"name": "n1-highcpu-4",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-highcpu-4",
- "zone": "europe-west1-a"
- },
- {
- "creationTimestamp": "2012-06-07T13:48:34.258-07:00",
- "description": "1 vCPU, 3.75 GB RAM, 1 scratch disk (420 GB)",
- "guestCpus": 1,
- "id": "10583029372018866711",
- "imageSpaceGb": 10,
- "kind": "compute#machineType",
- "maximumPersistentDisks": 16,
- "maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 3840,
- "name": "n1-standard-1-d",
- "scratchDisks": [
- {
- "diskGb": 420
- }
- ],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-1-d",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-highcpu-4",
"zone": "europe-west1-a"
- },
+ }
+ ]
+ },
+ "zones/europe-west1-b": {
+ "machineTypes": [
{
- "creationTimestamp": "2012-11-16T11:45:08.195-08:00",
- "description": "8 vCPUs, 52 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
- "guestCpus": 8,
- "id": "07181827135536388552",
+ "creationTimestamp": "2012-06-07T13:49:40.050-07:00",
+ "description": "4 vCPUs, 15 GB RAM",
+ "guestCpus": 4,
+ "id": "09494636486174545828",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 53248,
- "name": "n1-highmem-8-d",
- "scratchDisks": [
- {
- "diskGb": 1770
- },
- {
- "diskGb": 1770
- }
- ],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-highmem-8-d",
- "zone": "europe-west1-a"
+ "memoryMb": 15360,
+ "name": "n1-standard-4",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/n1-standard-4",
+ "zone": "europe-west1-b"
},
{
"creationTimestamp": "2012-11-16T11:47:07.825-08:00",
@@ -265,27 +368,8 @@
"diskGb": 870
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-highcpu-2-d",
- "zone": "europe-west1-a"
- },
- {
- "creationTimestamp": "2012-06-07T13:50:05.677-07:00",
- "description": "4 vCPUs, 15 GB RAM, 1 scratch disk (1770 GB)",
- "guestCpus": 4,
- "id": "00523085164784013586",
- "imageSpaceGb": 10,
- "kind": "compute#machineType",
- "maximumPersistentDisks": 16,
- "maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 15360,
- "name": "n1-standard-4-d",
- "scratchDisks": [
- {
- "diskGb": 1770
- }
- ],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-4-d",
- "zone": "europe-west1-a"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/n1-highcpu-2-d",
+ "zone": "europe-west1-b"
},
{
"creationTimestamp": "2013-04-25T13:32:45.550-07:00",
@@ -298,94 +382,63 @@
"maximumPersistentDisksSizeGb": "3072",
"memoryMb": 1740,
"name": "g1-small",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/g1-small",
- "zone": "europe-west1-a"
- },
- {
- "creationTimestamp": "2013-04-25T13:32:49.088-07:00",
- "description": "1 vCPU (shared physical core) and 0.6 GB RAM",
- "guestCpus": 1,
- "id": "1133568312750571513",
- "imageSpaceGb": 0,
- "kind": "compute#machineType",
- "maximumPersistentDisks": 4,
- "maximumPersistentDisksSizeGb": "3072",
- "memoryMb": 614,
- "name": "f1-micro",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/f1-micro",
- "zone": "europe-west1-a"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/g1-small",
+ "zone": "europe-west1-b"
},
{
- "creationTimestamp": "2012-11-16T11:49:07.563-08:00",
- "description": "4 vCPUS, 3.6 GB RAM, 1 scratch disk (1770 GB)",
- "guestCpus": 4,
- "id": "01151097524490134507",
+ "creationTimestamp": "2012-11-16T11:50:15.128-08:00",
+ "description": "8 vCPUs, 7.2 GB RAM",
+ "guestCpus": 8,
+ "id": "01206886442411821831",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 3686,
- "name": "n1-highcpu-4-d",
- "scratchDisks": [
- {
- "diskGb": 1770
- }
- ],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-highcpu-4-d",
- "zone": "europe-west1-a"
- }
- ]
- },
- "zones/europe-west1-b": {
- "machineTypes": [
+ "memoryMb": 7373,
+ "name": "n1-highcpu-8",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/n1-highcpu-8",
+ "zone": "europe-west1-b"
+ },
{
- "creationTimestamp": "2012-11-16T11:44:25.985-08:00",
- "description": "8 vCPUs, 52 GB RAM",
- "guestCpus": 8,
- "id": "01717932668777642040",
+ "creationTimestamp": "2012-06-07T13:48:14.670-07:00",
+ "description": "1 vCPU, 3.75 GB RAM",
+ "guestCpus": 1,
+ "id": "11077240422128681563",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 53248,
- "name": "n1-highmem-8",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/n1-highmem-8",
+ "memoryMb": 3840,
+ "name": "n1-standard-1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/n1-standard-1",
"zone": "europe-west1-b"
},
{
- "creationTimestamp": "2012-11-16T11:45:08.195-08:00",
- "description": "8 vCPUs, 52 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
- "guestCpus": 8,
- "id": "07181827135536388552",
+ "creationTimestamp": "2012-11-16T11:42:08.983-08:00",
+ "description": "4 vCPUs, 26 GB RAM",
+ "guestCpus": 4,
+ "id": "11556032176405786676",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 53248,
- "name": "n1-highmem-8-d",
- "scratchDisks": [
- {
- "diskGb": 1770
- },
- {
- "diskGb": 1770
- }
- ],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/n1-highmem-8-d",
+ "memoryMb": 26624,
+ "name": "n1-highmem-4",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/n1-highmem-4",
"zone": "europe-west1-b"
},
{
- "creationTimestamp": "2012-11-16T11:50:15.128-08:00",
- "description": "8 vCPUs, 7.2 GB RAM",
- "guestCpus": 8,
- "id": "01206886442411821831",
+ "creationTimestamp": "2012-11-16T11:40:06.129-08:00",
+ "description": "2 vCPUs, 13 GB RAM",
+ "guestCpus": 2,
+ "id": "05438694236916301519",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 7373,
- "name": "n1-highcpu-8",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/n1-highcpu-8",
+ "memoryMb": 13312,
+ "name": "n1-highmem-2",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/n1-highmem-2",
"zone": "europe-west1-b"
},
{
@@ -404,54 +457,65 @@
"diskGb": 1770
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/n1-highmem-4-d",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/n1-highmem-4-d",
"zone": "europe-west1-b"
},
{
- "creationTimestamp": "2012-11-16T11:40:59.630-08:00",
- "description": "2 vCPUs, 13 GB RAM, 1 scratch disk (870 GB)",
- "guestCpus": 2,
- "id": "00770157291441082211",
+ "creationTimestamp": "2012-11-16T11:45:08.195-08:00",
+ "description": "8 vCPUs, 52 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
+ "guestCpus": 8,
+ "id": "07181827135536388552",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 13312,
- "name": "n1-highmem-2-d",
+ "memoryMb": 53248,
+ "name": "n1-highmem-8-d",
"scratchDisks": [
{
- "diskGb": 870
+ "diskGb": 1770
+ },
+ {
+ "diskGb": 1770
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/n1-highmem-2-d",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/n1-highmem-8-d",
"zone": "europe-west1-b"
},
{
- "creationTimestamp": "2012-11-16T11:48:06.087-08:00",
- "description": "4 vCPUs, 3.6 GB RAM",
- "guestCpus": 4,
- "id": "04759000181765218034",
+ "creationTimestamp": "2012-11-16T11:46:10.572-08:00",
+ "description": "2 vCPUs, 1.8 GB RAM",
+ "guestCpus": 2,
+ "id": "16898271314080235997",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 3686,
- "name": "n1-highcpu-4",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/n1-highcpu-4",
+ "memoryMb": 1843,
+ "name": "n1-highcpu-2",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/n1-highcpu-2",
"zone": "europe-west1-b"
},
{
- "creationTimestamp": "2013-04-25T13:32:49.088-07:00",
- "description": "1 vCPU (shared physical core) and 0.6 GB RAM",
- "guestCpus": 1,
- "id": "1133568312750571513",
- "imageSpaceGb": 0,
+ "creationTimestamp": "2012-11-16T11:51:04.549-08:00",
+ "description": "8 vCPUS, 7.2 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
+ "guestCpus": 8,
+ "id": "02507333096579477005",
+ "imageSpaceGb": 10,
"kind": "compute#machineType",
- "maximumPersistentDisks": 4,
- "maximumPersistentDisksSizeGb": "3072",
- "memoryMb": 614,
- "name": "f1-micro",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/f1-micro",
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "10240",
+ "memoryMb": 7373,
+ "name": "n1-highcpu-8-d",
+ "scratchDisks": [
+ {
+ "diskGb": 1770
+ },
+ {
+ "diskGb": 1770
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/n1-highcpu-8-d",
"zone": "europe-west1-b"
},
{
@@ -470,73 +534,106 @@
"diskGb": 420
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/n1-standard-1-d",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/n1-standard-1-d",
"zone": "europe-west1-b"
},
{
- "creationTimestamp": "2012-06-07T13:49:19.448-07:00",
- "description": "2 vCPUs, 7.5 GB RAM, 1 scratch disk (870 GB)",
+ "creationTimestamp": "2012-06-07T13:48:56.867-07:00",
+ "description": "2 vCPUs, 7.5 GB RAM",
"guestCpus": 2,
- "id": "06313284160910191442",
+ "id": "17936898073622676356",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
"memoryMb": 7680,
- "name": "n1-standard-2-d",
+ "name": "n1-standard-2",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/n1-standard-2",
+ "zone": "europe-west1-b"
+ },
+ {
+ "creationTimestamp": "2012-11-16T11:49:07.563-08:00",
+ "description": "4 vCPUS, 3.6 GB RAM, 1 scratch disk (1770 GB)",
+ "guestCpus": 4,
+ "id": "01151097524490134507",
+ "imageSpaceGb": 10,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "10240",
+ "memoryMb": 3686,
+ "name": "n1-highcpu-4-d",
"scratchDisks": [
{
- "diskGb": 870
+ "diskGb": 1770
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/n1-standard-2-d",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/n1-highcpu-4-d",
"zone": "europe-west1-b"
},
{
- "creationTimestamp": "2012-11-16T11:40:06.129-08:00",
- "description": "2 vCPUs, 13 GB RAM",
+ "creationTimestamp": "2012-11-16T11:44:25.985-08:00",
+ "description": "8 vCPUs, 52 GB RAM",
+ "guestCpus": 8,
+ "id": "01717932668777642040",
+ "imageSpaceGb": 10,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "10240",
+ "memoryMb": 53248,
+ "name": "n1-highmem-8",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/n1-highmem-8",
+ "zone": "europe-west1-b"
+ },
+ {
+ "creationTimestamp": "2012-11-16T11:40:59.630-08:00",
+ "description": "2 vCPUs, 13 GB RAM, 1 scratch disk (870 GB)",
"guestCpus": 2,
- "id": "05438694236916301519",
+ "id": "00770157291441082211",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
"memoryMb": 13312,
- "name": "n1-highmem-2",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/n1-highmem-2",
+ "name": "n1-highmem-2-d",
+ "scratchDisks": [
+ {
+ "diskGb": 870
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/n1-highmem-2-d",
"zone": "europe-west1-b"
},
{
- "creationTimestamp": "2012-11-16T11:47:07.825-08:00",
- "description": "2 vCPUs, 1.8 GB RAM, 1 scratch disk (870 GB)",
+ "creationTimestamp": "2012-06-07T13:49:19.448-07:00",
+ "description": "2 vCPUs, 7.5 GB RAM, 1 scratch disk (870 GB)",
"guestCpus": 2,
- "id": "15178384466070744001",
+ "id": "06313284160910191442",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 1843,
- "name": "n1-highcpu-2-d",
+ "memoryMb": 7680,
+ "name": "n1-standard-2-d",
"scratchDisks": [
{
"diskGb": 870
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/n1-highcpu-2-d",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/n1-standard-2-d",
"zone": "europe-west1-b"
},
{
- "creationTimestamp": "2012-11-16T11:42:08.983-08:00",
- "description": "4 vCPUs, 26 GB RAM",
+ "creationTimestamp": "2012-11-16T11:48:06.087-08:00",
+ "description": "4 vCPUs, 3.6 GB RAM",
"guestCpus": 4,
- "id": "11556032176405786676",
+ "id": "04759000181765218034",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 26624,
- "name": "n1-highmem-4",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/n1-highmem-4",
+ "memoryMb": 3686,
+ "name": "n1-highcpu-4",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/n1-highcpu-4",
"zone": "europe-west1-b"
},
{
@@ -555,22 +652,45 @@
"diskGb": 1770
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/n1-standard-4-d",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/n1-standard-4-d",
"zone": "europe-west1-b"
},
{
- "creationTimestamp": "2013-04-25T13:32:45.550-07:00",
- "description": "1 vCPU (shared physical core) and 1.7 GB RAM",
+ "creationTimestamp": "2013-04-25T13:32:49.088-07:00",
+ "description": "1 vCPU (shared physical core) and 0.6 GB RAM",
"guestCpus": 1,
- "id": "1500265464823777597",
+ "id": "1133568312750571513",
"imageSpaceGb": 0,
"kind": "compute#machineType",
"maximumPersistentDisks": 4,
"maximumPersistentDisksSizeGb": "3072",
- "memoryMb": 1740,
- "name": "g1-small",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/g1-small",
+ "memoryMb": 614,
+ "name": "f1-micro",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b/machineTypes/f1-micro",
"zone": "europe-west1-b"
+ }
+ ]
+ },
+ "zones/us-central1-a": {
+ "machineTypes": [
+ {
+ "creationTimestamp": "2012-11-16T11:47:07.825-08:00",
+ "description": "2 vCPUs, 1.8 GB RAM, 1 scratch disk (870 GB)",
+ "guestCpus": 2,
+ "id": "15178384466070744001",
+ "imageSpaceGb": 10,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "10240",
+ "memoryMb": 1843,
+ "name": "n1-highcpu-2-d",
+ "scratchDisks": [
+ {
+ "diskGb": 870
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-2-d",
+ "zone": "us-central1-a"
},
{
"creationTimestamp": "2012-11-16T11:46:10.572-08:00",
@@ -583,226 +703,87 @@
"maximumPersistentDisksSizeGb": "10240",
"memoryMb": 1843,
"name": "n1-highcpu-2",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/n1-highcpu-2",
- "zone": "europe-west1-b"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-2",
+ "zone": "us-central1-a"
},
{
- "creationTimestamp": "2012-06-07T13:49:40.050-07:00",
- "description": "4 vCPUs, 15 GB RAM",
+ "creationTimestamp": "2012-06-07T13:50:05.677-07:00",
+ "description": "4 vCPUs, 15 GB RAM, 1 scratch disk (1770 GB)",
"guestCpus": 4,
- "id": "09494636486174545828",
+ "id": "00523085164784013586",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
"memoryMb": 15360,
- "name": "n1-standard-4",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/n1-standard-4",
- "zone": "europe-west1-b"
- },
- {
- "creationTimestamp": "2012-11-16T11:51:04.549-08:00",
- "description": "8 vCPUS, 7.2 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
- "guestCpus": 8,
- "id": "02507333096579477005",
- "imageSpaceGb": 10,
- "kind": "compute#machineType",
- "maximumPersistentDisks": 16,
- "maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 7373,
- "name": "n1-highcpu-8-d",
- "scratchDisks": [
- {
- "diskGb": 1770
- },
- {
- "diskGb": 1770
- }
- ],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/n1-highcpu-8-d",
- "zone": "europe-west1-b"
- },
- {
- "creationTimestamp": "2012-06-07T13:48:14.670-07:00",
- "description": "1 vCPU, 3.75 GB RAM",
- "guestCpus": 1,
- "id": "11077240422128681563",
- "imageSpaceGb": 10,
- "kind": "compute#machineType",
- "maximumPersistentDisks": 16,
- "maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 3840,
- "name": "n1-standard-1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/n1-standard-1",
- "zone": "europe-west1-b"
- },
- {
- "creationTimestamp": "2012-11-16T11:49:07.563-08:00",
- "description": "4 vCPUS, 3.6 GB RAM, 1 scratch disk (1770 GB)",
- "guestCpus": 4,
- "id": "01151097524490134507",
- "imageSpaceGb": 10,
- "kind": "compute#machineType",
- "maximumPersistentDisks": 16,
- "maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 3686,
- "name": "n1-highcpu-4-d",
+ "name": "n1-standard-4-d",
"scratchDisks": [
{
"diskGb": 1770
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/n1-highcpu-4-d",
- "zone": "europe-west1-b"
- },
- {
- "creationTimestamp": "2012-06-07T13:48:56.867-07:00",
- "description": "2 vCPUs, 7.5 GB RAM",
- "guestCpus": 2,
- "id": "17936898073622676356",
- "imageSpaceGb": 10,
- "kind": "compute#machineType",
- "maximumPersistentDisks": 16,
- "maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 7680,
- "name": "n1-standard-2",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b/machineTypes/n1-standard-2",
- "zone": "europe-west1-b"
- }
- ]
- },
- "zones/us-central1-a": {
- "machineTypes": [
- {
- "creationTimestamp": "2012-11-16T11:44:25.985-08:00",
- "description": "8 vCPUs, 52 GB RAM",
- "guestCpus": 8,
- "id": "01717932668777642040",
- "imageSpaceGb": 10,
- "kind": "compute#machineType",
- "maximumPersistentDisks": 16,
- "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-standard-4-d",
"zone": "us-central1-a"
},
{
- "creationTimestamp": "2012-11-16T11:43:17.400-08:00",
- "description": "4 vCPUs, 26 GB RAM, 1 scratch disk (1770 GB)",
+ "creationTimestamp": "2012-11-16T11:48:06.087-08:00",
+ "description": "4 vCPUs, 3.6 GB RAM",
"guestCpus": 4,
- "id": "05095504563332567951",
+ "id": "04759000181765218034",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 26624,
- "name": "n1-highmem-4-d",
- "scratchDisks": [
- {
- "diskGb": 1770
- }
- ],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-4-d",
+ "memoryMb": 3686,
+ "name": "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"
},
{
- "creationTimestamp": "2012-11-16T11:47:07.825-08:00",
- "description": "2 vCPUs, 1.8 GB RAM, 1 scratch disk (870 GB)",
- "guestCpus": 2,
- "id": "15178384466070744001",
+ "creationTimestamp": "2012-06-07T13:48:34.258-07:00",
+ "description": "1 vCPU, 3.75 GB RAM, 1 scratch disk (420 GB)",
+ "guestCpus": 1,
+ "id": "10583029372018866711",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 1843,
- "name": "n1-highcpu-2-d",
+ "memoryMb": 3840,
+ "name": "n1-standard-1-d",
"scratchDisks": [
{
- "diskGb": 870
+ "diskGb": 420
}
],
- "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-standard-1-d",
"zone": "us-central1-a"
},
{
- "creationTimestamp": "2012-06-07T13:49:40.050-07:00",
- "description": "4 vCPUs, 15 GB RAM",
- "guestCpus": 4,
- "id": "09494636486174545828",
- "imageSpaceGb": 10,
+ "creationTimestamp": "2013-04-25T13:32:49.088-07:00",
+ "description": "1 vCPU (shared physical core) and 0.6 GB RAM",
+ "guestCpus": 1,
+ "id": "1133568312750571513",
+ "imageSpaceGb": 0,
"kind": "compute#machineType",
- "maximumPersistentDisks": 16,
- "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",
+ "maximumPersistentDisks": 4,
+ "maximumPersistentDisksSizeGb": "3072",
+ "memoryMb": 614,
+ "name": "f1-micro",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/f1-micro",
"zone": "us-central1-a"
},
{
- "creationTimestamp": "2012-11-16T11:40:59.630-08:00",
- "description": "2 vCPUs, 13 GB RAM, 1 scratch disk (870 GB)",
+ "creationTimestamp": "2012-11-16T11:40:06.129-08:00",
+ "description": "2 vCPUs, 13 GB RAM",
"guestCpus": 2,
- "id": "00770157291441082211",
+ "id": "05438694236916301519",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
"memoryMb": 13312,
- "name": "n1-highmem-2-d",
- "scratchDisks": [
- {
- "diskGb": 870
- }
- ],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-highmem-2-d",
- "zone": "us-central1-a"
- },
- {
- "creationTimestamp": "2012-06-07T13:50:05.677-07:00",
- "description": "4 vCPUs, 15 GB RAM, 1 scratch disk (1770 GB)",
- "guestCpus": 4,
- "id": "00523085164784013586",
- "imageSpaceGb": 10,
- "kind": "compute#machineType",
- "maximumPersistentDisks": 16,
- "maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 15360,
- "name": "n1-standard-4-d",
- "scratchDisks": [
- {
- "diskGb": 1770
- }
- ],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/n1-standard-4-d",
- "zone": "us-central1-a"
- },
- {
- "creationTimestamp": "2012-11-16T11:50:15.128-08:00",
- "description": "8 vCPUs, 7.2 GB RAM",
- "guestCpus": 8,
- "id": "01206886442411821831",
- "imageSpaceGb": 10,
- "kind": "compute#machineType",
- "maximumPersistentDisks": 16,
- "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",
- "zone": "us-central1-a"
- },
- {
- "creationTimestamp": "2012-11-16T11:46:10.572-08:00",
- "description": "2 vCPUs, 1.8 GB RAM",
- "guestCpus": 2,
- "id": "16898271314080235997",
- "imageSpaceGb": 10,
- "kind": "compute#machineType",
- "maximumPersistentDisks": 16,
- "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",
+ "name": "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"
},
{
@@ -821,21 +802,29 @@
"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"
},
{
- "creationTimestamp": "2012-06-07T13:48:56.867-07:00",
- "description": "2 vCPUs, 7.5 GB RAM",
- "guestCpus": 2,
- "id": "17936898073622676356",
+ "creationTimestamp": "2012-11-16T11:51:04.549-08:00",
+ "description": "8 vCPUS, 7.2 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
+ "guestCpus": 8,
+ "id": "02507333096579477005",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"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",
+ "memoryMb": 7373,
+ "name": "n1-highcpu-8-d",
+ "scratchDisks": [
+ {
+ "diskGb": 1770
+ },
+ {
+ "diskGb": 1770
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/machineTypes/n1-highcpu-8-d",
"zone": "us-central1-a"
},
{
@@ -849,35 +838,35 @@
"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"
},
{
- "creationTimestamp": "2012-06-07T13:48:14.670-07:00",
- "description": "1 vCPU, 3.75 GB RAM",
- "guestCpus": 1,
- "id": "11077240422128681563",
+ "creationTimestamp": "2012-06-07T13:49:40.050-07:00",
+ "description": "4 vCPUs, 15 GB RAM",
+ "guestCpus": 4,
+ "id": "09494636486174545828",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"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",
+ "memoryMb": 15360,
+ "name": "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"
},
{
- "creationTimestamp": "2012-11-16T11:48:06.087-08:00",
- "description": "4 vCPUs, 3.6 GB RAM",
- "guestCpus": 4,
- "id": "04759000181765218034",
+ "creationTimestamp": "2012-06-07T13:48:14.670-07:00",
+ "description": "1 vCPU, 3.75 GB RAM",
+ "guestCpus": 1,
+ "id": "11077240422128681563",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"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",
+ "memoryMb": 3840,
+ "name": "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"
},
{
@@ -891,54 +880,40 @@
"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"
},
{
- "creationTimestamp": "2013-04-25T13:32:49.088-07:00",
- "description": "1 vCPU (shared physical core) and 0.6 GB RAM",
- "guestCpus": 1,
- "id": "1133568312750571513",
- "imageSpaceGb": 0,
- "kind": "compute#machineType",
- "maximumPersistentDisks": 4,
- "maximumPersistentDisksSizeGb": "3072",
- "memoryMb": 614,
- "name": "f1-micro",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/machineTypes/f1-micro",
- "zone": "us-central1-a"
- },
- {
- "creationTimestamp": "2012-11-16T11:40:06.129-08:00",
- "description": "2 vCPUs, 13 GB RAM",
- "guestCpus": 2,
- "id": "05438694236916301519",
+ "creationTimestamp": "2012-11-16T11:50:15.128-08:00",
+ "description": "8 vCPUs, 7.2 GB RAM",
+ "guestCpus": 8,
+ "id": "01206886442411821831",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"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",
+ "memoryMb": 7373,
+ "name": "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"
},
{
- "creationTimestamp": "2012-06-07T13:48:34.258-07:00",
- "description": "1 vCPU, 3.75 GB RAM, 1 scratch disk (420 GB)",
- "guestCpus": 1,
- "id": "10583029372018866711",
+ "creationTimestamp": "2012-11-16T11:43:17.400-08:00",
+ "description": "4 vCPUs, 26 GB RAM, 1 scratch disk (1770 GB)",
+ "guestCpus": 4,
+ "id": "05095504563332567951",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 3840,
- "name": "n1-standard-1-d",
+ "memoryMb": 26624,
+ "name": "n1-highmem-4-d",
"scratchDisks": [
{
- "diskGb": 420
+ "diskGb": 1770
}
],
- "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-highmem-4-d",
"zone": "us-central1-a"
},
{
@@ -957,42 +932,67 @@
"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"
},
{
- "creationTimestamp": "2012-11-16T11:45:08.195-08:00",
- "description": "8 vCPUs, 52 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
+ "creationTimestamp": "2012-11-16T11:44:25.985-08:00",
+ "description": "8 vCPUs, 52 GB RAM",
"guestCpus": 8,
- "id": "07181827135536388552",
+ "id": "01717932668777642040",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
"memoryMb": 53248,
- "name": "n1-highmem-8-d",
+ "name": "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"
+ },
+ {
+ "creationTimestamp": "2012-11-16T11:40:59.630-08:00",
+ "description": "2 vCPUs, 13 GB RAM, 1 scratch disk (870 GB)",
+ "guestCpus": 2,
+ "id": "00770157291441082211",
+ "imageSpaceGb": 10,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "10240",
+ "memoryMb": 13312,
+ "name": "n1-highmem-2-d",
"scratchDisks": [
{
- "diskGb": 1770
- },
- {
- "diskGb": 1770
+ "diskGb": 870
}
],
- "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-2-d",
"zone": "us-central1-a"
},
{
- "creationTimestamp": "2012-11-16T11:51:04.549-08:00",
- "description": "8 vCPUS, 7.2 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
+ "creationTimestamp": "2012-06-07T13:48:56.867-07:00",
+ "description": "2 vCPUs, 7.5 GB RAM",
+ "guestCpus": 2,
+ "id": "17936898073622676356",
+ "imageSpaceGb": 10,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 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",
+ "zone": "us-central1-a"
+ },
+ {
+ "creationTimestamp": "2012-11-16T11:45:08.195-08:00",
+ "description": "8 vCPUs, 52 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
"guestCpus": 8,
- "id": "02507333096579477005",
+ "id": "07181827135536388552",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 7373,
- "name": "n1-highcpu-8-d",
+ "memoryMb": 53248,
+ "name": "n1-highmem-8-d",
"scratchDisks": [
{
"diskGb": 1770
@@ -1001,7 +1001,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-highmem-8-d",
"zone": "us-central1-a"
}
]
@@ -1009,55 +1009,73 @@
"zones/us-central1-b": {
"machineTypes": [
{
- "creationTimestamp": "2012-06-07T13:50:05.677-07:00",
- "description": "4 vCPUs, 15 GB RAM, 1 scratch disk (1770 GB)",
- "guestCpus": 4,
- "id": "00523085164784013586",
+ "creationTimestamp": "2012-06-07T13:48:56.867-07:00",
+ "description": "2 vCPUs, 7.5 GB RAM",
+ "guestCpus": 2,
+ "id": "17936898073622676356",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 15360,
- "name": "n1-standard-4-d",
- "scratchDisks": [
- {
- "diskGb": 1770
- }
- ],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-4-d",
+ "memoryMb": 7680,
+ "name": "n1-standard-2",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-2",
"zone": "us-central1-b"
},
{
- "creationTimestamp": "2012-11-16T11:49:07.563-08:00",
- "description": "4 vCPUS, 3.6 GB RAM, 1 scratch disk (1770 GB)",
- "guestCpus": 4,
- "id": "01151097524490134507",
+ "creationTimestamp": "2012-11-16T11:40:06.129-08:00",
+ "description": "2 vCPUs, 13 GB RAM",
+ "guestCpus": 2,
+ "id": "05438694236916301519",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 3686,
- "name": "n1-highcpu-4-d",
- "scratchDisks": [
- {
- "diskGb": 1770
- }
- ],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-highcpu-4-d",
+ "memoryMb": 13312,
+ "name": "n1-highmem-2",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-highmem-2",
"zone": "us-central1-b"
},
{
- "creationTimestamp": "2012-11-16T11:44:25.985-08:00",
- "description": "8 vCPUs, 52 GB RAM",
+ "creationTimestamp": "2012-06-07T13:48:14.670-07:00",
+ "description": "1 vCPU, 3.75 GB RAM",
+ "guestCpus": 1,
+ "id": "11077240422128681563",
+ "imageSpaceGb": 10,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "10240",
+ "memoryMb": 3840,
+ "name": "n1-standard-1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-1",
+ "zone": "us-central1-b"
+ },
+ {
+ "creationTimestamp": "2012-11-16T11:50:15.128-08:00",
+ "description": "8 vCPUs, 7.2 GB RAM",
"guestCpus": 8,
- "id": "01717932668777642040",
+ "id": "01206886442411821831",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 53248,
- "name": "n1-highmem-8",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-highmem-8",
+ "memoryMb": 7373,
+ "name": "n1-highcpu-8",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-highcpu-8",
+ "zone": "us-central1-b"
+ },
+ {
+ "creationTimestamp": "2012-11-16T11:46:10.572-08:00",
+ "description": "2 vCPUs, 1.8 GB RAM",
+ "guestCpus": 2,
+ "id": "16898271314080235997",
+ "imageSpaceGb": 10,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "10240",
+ "memoryMb": 1843,
+ "name": "n1-highcpu-2",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-highcpu-2",
"zone": "us-central1-b"
},
{
@@ -1076,7 +1094,21 @@
"diskGb": 870
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-highcpu-2-d",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-highcpu-2-d",
+ "zone": "us-central1-b"
+ },
+ {
+ "creationTimestamp": "2013-04-25T13:32:49.088-07:00",
+ "description": "1 vCPU (shared physical core) and 0.6 GB RAM",
+ "guestCpus": 1,
+ "id": "1133568312750571513",
+ "imageSpaceGb": 0,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 4,
+ "maximumPersistentDisksSizeGb": "3072",
+ "memoryMb": 614,
+ "name": "f1-micro",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/f1-micro",
"zone": "us-central1-b"
},
{
@@ -1098,49 +1130,26 @@
"diskGb": 1770
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-highcpu-8-d",
- "zone": "us-central1-b"
- },
- {
- "creationTimestamp": "2012-11-16T11:50:15.128-08:00",
- "description": "8 vCPUs, 7.2 GB RAM",
- "guestCpus": 8,
- "id": "01206886442411821831",
- "imageSpaceGb": 10,
- "kind": "compute#machineType",
- "maximumPersistentDisks": 16,
- "maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 7373,
- "name": "n1-highcpu-8",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-highcpu-8",
- "zone": "us-central1-b"
- },
- {
- "creationTimestamp": "2013-04-25T13:32:45.550-07:00",
- "description": "1 vCPU (shared physical core) and 1.7 GB RAM",
- "guestCpus": 1,
- "id": "1500265464823777597",
- "imageSpaceGb": 0,
- "kind": "compute#machineType",
- "maximumPersistentDisks": 4,
- "maximumPersistentDisksSizeGb": "3072",
- "memoryMb": 1740,
- "name": "g1-small",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/g1-small",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-highcpu-8-d",
"zone": "us-central1-b"
},
{
- "creationTimestamp": "2012-11-16T11:48:06.087-08:00",
- "description": "4 vCPUs, 3.6 GB RAM",
+ "creationTimestamp": "2012-06-07T13:50:05.677-07:00",
+ "description": "4 vCPUs, 15 GB RAM, 1 scratch disk (1770 GB)",
"guestCpus": 4,
- "id": "04759000181765218034",
+ "id": "00523085164784013586",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 3686,
- "name": "n1-highcpu-4",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-highcpu-4",
+ "memoryMb": 15360,
+ "name": "n1-standard-4-d",
+ "scratchDisks": [
+ {
+ "diskGb": 1770
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-4-d",
"zone": "us-central1-b"
},
{
@@ -1159,184 +1168,175 @@
"diskGb": 420
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-1-d",
- "zone": "us-central1-b"
- },
- {
- "creationTimestamp": "2012-11-16T11:42:08.983-08:00",
- "description": "4 vCPUs, 26 GB RAM",
- "guestCpus": 4,
- "id": "11556032176405786676",
- "imageSpaceGb": 10,
- "kind": "compute#machineType",
- "maximumPersistentDisks": 16,
- "maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 26624,
- "name": "n1-highmem-4",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-highmem-4",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-1-d",
"zone": "us-central1-b"
},
{
- "creationTimestamp": "2012-06-07T13:48:14.670-07:00",
- "description": "1 vCPU, 3.75 GB RAM",
- "guestCpus": 1,
- "id": "11077240422128681563",
+ "creationTimestamp": "2012-11-16T11:45:08.195-08:00",
+ "description": "8 vCPUs, 52 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
+ "guestCpus": 8,
+ "id": "07181827135536388552",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 3840,
- "name": "n1-standard-1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-1",
+ "memoryMb": 53248,
+ "name": "n1-highmem-8-d",
+ "scratchDisks": [
+ {
+ "diskGb": 1770
+ },
+ {
+ "diskGb": 1770
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-highmem-8-d",
"zone": "us-central1-b"
},
{
- "creationTimestamp": "2013-04-25T13:32:49.088-07:00",
- "description": "1 vCPU (shared physical core) and 0.6 GB RAM",
+ "creationTimestamp": "2013-04-25T13:32:45.550-07:00",
+ "description": "1 vCPU (shared physical core) and 1.7 GB RAM",
"guestCpus": 1,
- "id": "1133568312750571513",
+ "id": "1500265464823777597",
"imageSpaceGb": 0,
"kind": "compute#machineType",
"maximumPersistentDisks": 4,
"maximumPersistentDisksSizeGb": "3072",
- "memoryMb": 614,
- "name": "f1-micro",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/f1-micro",
+ "memoryMb": 1740,
+ "name": "g1-small",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/g1-small",
"zone": "us-central1-b"
},
{
- "creationTimestamp": "2012-11-16T11:40:59.630-08:00",
- "description": "2 vCPUs, 13 GB RAM, 1 scratch disk (870 GB)",
- "guestCpus": 2,
- "id": "00770157291441082211",
+ "creationTimestamp": "2012-11-16T11:44:25.985-08:00",
+ "description": "8 vCPUs, 52 GB RAM",
+ "guestCpus": 8,
+ "id": "01717932668777642040",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 13312,
- "name": "n1-highmem-2-d",
- "scratchDisks": [
- {
- "diskGb": 870
- }
- ],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-highmem-2-d",
+ "memoryMb": 53248,
+ "name": "n1-highmem-8",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-highmem-8",
"zone": "us-central1-b"
},
{
- "creationTimestamp": "2012-11-16T11:40:06.129-08:00",
- "description": "2 vCPUs, 13 GB RAM",
- "guestCpus": 2,
- "id": "05438694236916301519",
+ "creationTimestamp": "2012-06-07T13:49:40.050-07:00",
+ "description": "4 vCPUs, 15 GB RAM",
+ "guestCpus": 4,
+ "id": "09494636486174545828",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 13312,
- "name": "n1-highmem-2",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-highmem-2",
+ "memoryMb": 15360,
+ "name": "n1-standard-4",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-4",
"zone": "us-central1-b"
},
{
- "creationTimestamp": "2012-06-07T13:49:19.448-07:00",
- "description": "2 vCPUs, 7.5 GB RAM, 1 scratch disk (870 GB)",
- "guestCpus": 2,
- "id": "06313284160910191442",
+ "creationTimestamp": "2012-11-16T11:43:17.400-08:00",
+ "description": "4 vCPUs, 26 GB RAM, 1 scratch disk (1770 GB)",
+ "guestCpus": 4,
+ "id": "05095504563332567951",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 7680,
- "name": "n1-standard-2-d",
+ "memoryMb": 26624,
+ "name": "n1-highmem-4-d",
"scratchDisks": [
{
- "diskGb": 870
+ "diskGb": 1770
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-2-d",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-highmem-4-d",
"zone": "us-central1-b"
},
{
- "creationTimestamp": "2012-06-07T13:48:56.867-07:00",
- "description": "2 vCPUs, 7.5 GB RAM",
+ "creationTimestamp": "2012-06-07T13:49:19.448-07:00",
+ "description": "2 vCPUs, 7.5 GB RAM, 1 scratch disk (870 GB)",
"guestCpus": 2,
- "id": "17936898073622676356",
+ "id": "06313284160910191442",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
"memoryMb": 7680,
- "name": "n1-standard-2",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-2",
+ "name": "n1-standard-2-d",
+ "scratchDisks": [
+ {
+ "diskGb": 870
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-2-d",
"zone": "us-central1-b"
},
{
- "creationTimestamp": "2012-11-16T11:46:10.572-08:00",
- "description": "2 vCPUs, 1.8 GB RAM",
+ "creationTimestamp": "2012-11-16T11:40:59.630-08:00",
+ "description": "2 vCPUs, 13 GB RAM, 1 scratch disk (870 GB)",
"guestCpus": 2,
- "id": "16898271314080235997",
+ "id": "00770157291441082211",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 1843,
- "name": "n1-highcpu-2",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-highcpu-2",
+ "memoryMb": 13312,
+ "name": "n1-highmem-2-d",
+ "scratchDisks": [
+ {
+ "diskGb": 870
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-highmem-2-d",
"zone": "us-central1-b"
},
{
- "creationTimestamp": "2012-11-16T11:43:17.400-08:00",
- "description": "4 vCPUs, 26 GB RAM, 1 scratch disk (1770 GB)",
+ "creationTimestamp": "2012-11-16T11:42:08.983-08:00",
+ "description": "4 vCPUs, 26 GB RAM",
"guestCpus": 4,
- "id": "05095504563332567951",
+ "id": "11556032176405786676",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
"memoryMb": 26624,
- "name": "n1-highmem-4-d",
- "scratchDisks": [
- {
- "diskGb": 1770
- }
- ],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-highmem-4-d",
+ "name": "n1-highmem-4",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-highmem-4",
"zone": "us-central1-b"
},
{
- "creationTimestamp": "2012-11-16T11:45:08.195-08:00",
- "description": "8 vCPUs, 52 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
- "guestCpus": 8,
- "id": "07181827135536388552",
+ "creationTimestamp": "2012-11-16T11:49:07.563-08:00",
+ "description": "4 vCPUS, 3.6 GB RAM, 1 scratch disk (1770 GB)",
+ "guestCpus": 4,
+ "id": "01151097524490134507",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 53248,
- "name": "n1-highmem-8-d",
+ "memoryMb": 3686,
+ "name": "n1-highcpu-4-d",
"scratchDisks": [
{
"diskGb": 1770
- },
- {
- "diskGb": 1770
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-highmem-8-d",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-highcpu-4-d",
"zone": "us-central1-b"
},
{
- "creationTimestamp": "2012-06-07T13:49:40.050-07:00",
- "description": "4 vCPUs, 15 GB RAM",
+ "creationTimestamp": "2012-11-16T11:48:06.087-08:00",
+ "description": "4 vCPUs, 3.6 GB RAM",
"guestCpus": 4,
- "id": "09494636486174545828",
+ "id": "04759000181765218034",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 15360,
- "name": "n1-standard-4",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/machineTypes/n1-standard-4",
+ "memoryMb": 3686,
+ "name": "n1-highcpu-4",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/machineTypes/n1-highcpu-4",
"zone": "us-central1-b"
}
]
@@ -1359,7 +1359,48 @@
"diskGb": 1770
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central2-a/machineTypes/n1-highcpu-4-d",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a/machineTypes/n1-highcpu-4-d",
+ "zone": "us-central2-a"
+ },
+ {
+ "creationTimestamp": "2012-11-16T11:51:04.549-08:00",
+ "description": "8 vCPUS, 7.2 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
+ "guestCpus": 8,
+ "id": "02507333096579477005",
+ "imageSpaceGb": 10,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "10240",
+ "memoryMb": 7373,
+ "name": "n1-highcpu-8-d",
+ "scratchDisks": [
+ {
+ "diskGb": 1770
+ },
+ {
+ "diskGb": 1770
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a/machineTypes/n1-highcpu-8-d",
+ "zone": "us-central2-a"
+ },
+ {
+ "creationTimestamp": "2012-11-16T11:40:59.630-08:00",
+ "description": "2 vCPUs, 13 GB RAM, 1 scratch disk (870 GB)",
+ "guestCpus": 2,
+ "id": "00770157291441082211",
+ "imageSpaceGb": 10,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 16,
+ "maximumPersistentDisksSizeGb": "10240",
+ "memoryMb": 13312,
+ "name": "n1-highmem-2-d",
+ "scratchDisks": [
+ {
+ "diskGb": 870
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a/machineTypes/n1-highmem-2-d",
"zone": "us-central2-a"
},
{
@@ -1378,21 +1419,35 @@
"diskGb": 1770
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central2-a/machineTypes/n1-highmem-4-d",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a/machineTypes/n1-highmem-4-d",
"zone": "us-central2-a"
},
{
- "creationTimestamp": "2012-06-07T13:49:40.050-07:00",
- "description": "4 vCPUs, 15 GB RAM",
- "guestCpus": 4,
- "id": "09494636486174545828",
+ "creationTimestamp": "2013-04-25T13:32:49.088-07:00",
+ "description": "1 vCPU (shared physical core) and 0.6 GB RAM",
+ "guestCpus": 1,
+ "id": "1133568312750571513",
+ "imageSpaceGb": 0,
+ "kind": "compute#machineType",
+ "maximumPersistentDisks": 4,
+ "maximumPersistentDisksSizeGb": "3072",
+ "memoryMb": 614,
+ "name": "f1-micro",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a/machineTypes/f1-micro",
+ "zone": "us-central2-a"
+ },
+ {
+ "creationTimestamp": "2012-06-07T13:48:14.670-07:00",
+ "description": "1 vCPU, 3.75 GB RAM",
+ "guestCpus": 1,
+ "id": "11077240422128681563",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 15360,
- "name": "n1-standard-4",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central2-a/machineTypes/n1-standard-4",
+ "memoryMb": 3840,
+ "name": "n1-standard-1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a/machineTypes/n1-standard-1",
"zone": "us-central2-a"
},
{
@@ -1406,7 +1461,7 @@
"maximumPersistentDisksSizeGb": "10240",
"memoryMb": 13312,
"name": "n1-highmem-2",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central2-a/machineTypes/n1-highmem-2",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a/machineTypes/n1-highmem-2",
"zone": "us-central2-a"
},
{
@@ -1420,21 +1475,7 @@
"maximumPersistentDisksSizeGb": "10240",
"memoryMb": 7680,
"name": "n1-standard-2",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central2-a/machineTypes/n1-standard-2",
- "zone": "us-central2-a"
- },
- {
- "creationTimestamp": "2013-04-25T13:32:49.088-07:00",
- "description": "1 vCPU (shared physical core) and 0.6 GB RAM",
- "guestCpus": 1,
- "id": "1133568312750571513",
- "imageSpaceGb": 0,
- "kind": "compute#machineType",
- "maximumPersistentDisks": 4,
- "maximumPersistentDisksSizeGb": "3072",
- "memoryMb": 614,
- "name": "f1-micro",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central2-a/machineTypes/f1-micro",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a/machineTypes/n1-standard-2",
"zone": "us-central2-a"
},
{
@@ -1448,43 +1489,35 @@
"maximumPersistentDisksSizeGb": "10240",
"memoryMb": 7373,
"name": "n1-highcpu-8",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central2-a/machineTypes/n1-highcpu-8",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a/machineTypes/n1-highcpu-8",
"zone": "us-central2-a"
},
{
- "creationTimestamp": "2012-11-16T11:42:08.983-08:00",
- "description": "4 vCPUs, 26 GB RAM",
+ "creationTimestamp": "2012-06-07T13:49:40.050-07:00",
+ "description": "4 vCPUs, 15 GB RAM",
"guestCpus": 4,
- "id": "11556032176405786676",
+ "id": "09494636486174545828",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 26624,
- "name": "n1-highmem-4",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central2-a/machineTypes/n1-highmem-4",
+ "memoryMb": 15360,
+ "name": "n1-standard-4",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a/machineTypes/n1-standard-4",
"zone": "us-central2-a"
},
{
- "creationTimestamp": "2012-11-16T11:45:08.195-08:00",
- "description": "8 vCPUs, 52 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
- "guestCpus": 8,
- "id": "07181827135536388552",
+ "creationTimestamp": "2012-11-16T11:42:08.983-08:00",
+ "description": "4 vCPUs, 26 GB RAM",
+ "guestCpus": 4,
+ "id": "11556032176405786676",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 53248,
- "name": "n1-highmem-8-d",
- "scratchDisks": [
- {
- "diskGb": 1770
- },
- {
- "diskGb": 1770
- }
- ],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central2-a/machineTypes/n1-highmem-8-d",
+ "memoryMb": 26624,
+ "name": "n1-highmem-4",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a/machineTypes/n1-highmem-4",
"zone": "us-central2-a"
},
{
@@ -1498,100 +1531,95 @@
"maximumPersistentDisksSizeGb": "10240",
"memoryMb": 53248,
"name": "n1-highmem-8",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central2-a/machineTypes/n1-highmem-8",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a/machineTypes/n1-highmem-8",
"zone": "us-central2-a"
},
{
- "creationTimestamp": "2012-06-07T13:48:34.258-07:00",
- "description": "1 vCPU, 3.75 GB RAM, 1 scratch disk (420 GB)",
- "guestCpus": 1,
- "id": "10583029372018866711",
+ "creationTimestamp": "2012-11-16T11:45:08.195-08:00",
+ "description": "8 vCPUs, 52 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
+ "guestCpus": 8,
+ "id": "07181827135536388552",
"imageSpaceGb": 10,
"kind": "compute#machineType",
"maximumPersistentDisks": 16,
"maximumPersistentDisksSizeGb": "10240",
- "memoryMb": 3840,
- "name": "n1-standard-1-d",
+ "memoryMb": 53248,
+ "name": "n1-highmem-8-d",
"scratchDisks": [
{
- "diskGb": 420
+ "diskGb": 1770
+ },
+ {
+ "diskGb": 1770
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central2-a/machineTypes/n1-standard-1-d",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a/machineTypes/n1-highmem-8-d",
"zone": "us-central2-a"
},
{
- "creationTimestamp": "2012-11-16T11:47:07.825-08:00",
- "description":
<TRUNCATED>
[8/9] git commit: Update CHANGES.
Posted by to...@apache.org.
Update CHANGES.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/ba72041d
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/ba72041d
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/ba72041d
Branch: refs/heads/trunk
Commit: ba72041d0b82655f0c5fa9c72dae6136edf39e40
Parents: b844791
Author: Tomaz Muraus <to...@apache.org>
Authored: Sun Nov 3 08:31:36 2013 +0000
Committer: Tomaz Muraus <to...@apache.org>
Committed: Sun Nov 3 08:31:36 2013 +0000
----------------------------------------------------------------------
CHANGES | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ba72041d/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 81ba2d3..158b070 100644
--- a/CHANGES
+++ b/CHANGES
@@ -42,6 +42,9 @@ Changes with Apache Libcloud in development
driver and enable it only for Rackspace first-gen driver.
[Tomaz Muraus]
+ - Update Google Compute Engine driver to v1beta16.
+ [Rick Wright]
+
*) DNS
- Update issue with inexistent zone / record handling in the get_zone and
[7/9] git commit: Update GCE driver to API version v1beta16 Most of
the changes are in the test fixtures, some were regenerated,
some were just had URLs updated as necessary. In addition,
there were some changes made to the tests to use the regenerated t
Posted by to...@apache.org.
Update GCE driver to API version v1beta16 Most of the changes are in the test fixtures, some were regenerated, some were just had URLs updated as necessary. In addition, there were some changes made to the tests to use the regenerated test fixtures.
Signed-off-by: Tomaz Muraus <to...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/ac04f363
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/ac04f363
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/ac04f363
Branch: refs/heads/trunk
Commit: ac04f3631affa4c54c1df79ffe804c18619ede71
Parents: 4c23c97
Author: Rick Wright <ri...@google.com>
Authored: Fri Nov 1 16:42:34 2013 -0700
Committer: Tomaz Muraus <to...@apache.org>
Committed: Sun Nov 3 08:21:07 2013 +0000
----------------------------------------------------------------------
demos/gce_demo.py | 4 +-
demos/gce_lb_demo.py | 4 +-
libcloud/common/google.py | 2 +-
libcloud/compute/drivers/gce.py | 31 +-
.../fixtures/gce/aggregated_addresses.json | 18 +-
.../compute/fixtures/gce/aggregated_disks.json | 91 +-
.../gce/aggregated_forwardingRules.json | 10 +-
.../fixtures/gce/aggregated_instances.json | 260 +--
.../fixtures/gce/aggregated_machineTypes.json | 1536 +++++++++---------
.../fixtures/gce/aggregated_targetPools.json | 47 +-
.../compute/fixtures/gce/global_firewalls.json | 55 +-
.../gce/global_firewalls_lcfirewall.json | 4 +-
.../gce/global_firewalls_lcfirewall_delete.json | 4 +-
.../gce/global_firewalls_lcfirewall_put.json | 4 +-
.../fixtures/gce/global_firewalls_post.json | 4 +-
.../fixtures/gce/global_httpHealthChecks.json | 6 +-
.../global_httpHealthChecks_basic-check.json | 2 +-
.../global_httpHealthChecks_lchealthcheck.json | 2 +-
...l_httpHealthChecks_lchealthcheck_delete.json | 4 +-
...obal_httpHealthChecks_lchealthcheck_put.json | 4 +-
...althChecks_libcloud-lb-demo-healthcheck.json | 2 +-
.../gce/global_httpHealthChecks_post.json | 4 +-
.../compute/fixtures/gce/global_images.json | 6 +-
.../fixtures/gce/global_images.json.save | 22 -
.../compute/fixtures/gce/global_networks.json | 8 +-
.../fixtures/gce/global_networks_default.json | 2 +-
.../fixtures/gce/global_networks_lcnetwork.json | 2 +-
.../gce/global_networks_lcnetwork_delete.json | 4 +-
...l_networks_libcloud-demo-europe-network.json | 2 +-
.../global_networks_libcloud-demo-network.json | 2 +-
.../fixtures/gce/global_networks_post.json | 4 +-
...tion_global_firewalls_lcfirewall_delete.json | 4 +-
...eration_global_firewalls_lcfirewall_put.json | 4 +-
...rations_operation_global_firewalls_post.json | 4 +-
...l_httpHealthChecks_lchealthcheck_delete.json | 4 +-
...obal_httpHealthChecks_lchealthcheck_put.json | 4 +-
..._operation_global_httpHealthChecks_post.json | 4 +-
...ration_global_networks_lcnetwork_delete.json | 4 +-
...erations_operation_global_networks_post.json | 4 +-
..._us-central1_addresses_lcaddress_delete.json | 6 +-
...tion_regions_us-central1_addresses_post.json | 6 +-
...forwardingRules_lcforwardingrule_delete.json | 6 +-
...egions_us-central1_forwardingRules_post.json | 6 +-
...tPools_lctargetpool_addHealthCheck_post.json | 6 +-
...rgetPools_lctargetpool_addInstance_post.json | 6 +-
...entral1_targetPools_lctargetpool_delete.json | 6 +-
...ols_lctargetpool_removeHealthCheck_post.json | 6 +-
...tPools_lctargetpool_removeInstance_post.json | 6 +-
...on_regions_us-central1_targetPools_post.json | 6 +-
...ion_zones_europe-west1-a_instances_post.json | 6 +-
...zones_us-central1-a_disks_lcdisk_delete.json | 6 +-
...peration_zones_us-central1-a_disks_post.json | 6 +-
...-central1-a_instances_lcnode-000_delete.json | 6 +-
...-central1-a_instances_lcnode-001_delete.json | 6 +-
...1-a_instances_node-name_attachDisk_post.json | 6 +-
...s-central1-a_instances_node-name_delete.json | 6 +-
...1-a_instances_node-name_detachDisk_post.json | 6 +-
...ntral1-a_instances_node-name_reset_post.json | 6 +-
...ral1-a_instances_node-name_setTags_post.json | 6 +-
...tion_zones_us-central1-a_instances_post.json | 6 +-
libcloud/test/compute/fixtures/gce/project.json | 49 +-
.../projects_debian-cloud_global_images.json | 164 +-
libcloud/test/compute/fixtures/gce/regions.json | 84 +-
.../gce/regions_us-central1_addresses.json | 10 +-
...regions_us-central1_addresses_lcaddress.json | 4 +-
..._us-central1_addresses_lcaddress_delete.json | 6 +-
.../gce/regions_us-central1_addresses_post.json | 6 +-
.../regions_us-central1_forwardingRules.json | 14 +-
...ntral1_forwardingRules_lcforwardingrule.json | 6 +-
...forwardingRules_lcforwardingrule_delete.json | 6 +-
...al1_forwardingRules_libcloud-lb-demo-lb.json | 6 +-
...egions_us-central1_forwardingRules_post.json | 6 +-
.../gce/regions_us-central1_targetPools.json | 24 +-
...ns_us-central1_targetPools_lctargetpool.json | 10 +-
...tPools_lctargetpool_addHealthCheck_post.json | 6 +-
...rgetPools_lctargetpool_addInstance_post.json | 6 +-
...entral1_targetPools_lctargetpool_delete.json | 6 +-
...ols_lctargetpool_removeHealthCheck_post.json | 6 +-
...tPools_lctargetpool_removeInstance_post.json | 6 +-
...ral1_targetPools_libcloud-lb-demo-lb-tp.json | 12 +-
.../regions_us-central1_targetPools_post.json | 6 +-
...egions_us-central1_targetPools_www-pool.json | 12 +-
libcloud/test/compute/fixtures/gce/zones.json | 169 +-
.../gce/zones_europe-west1-a_instances.json | 73 +-
.../zones_europe-west1-a_instances_post.json | 6 +-
...rope-west1-a_machineTypes_n1-standard-1.json | 2 +-
.../fixtures/gce/zones_us-central1-a.json | 34 +-
.../fixtures/gce/zones_us-central1-a_disks.json | 14 +-
.../gce/zones_us-central1-a_disks_lcdisk.json | 4 +-
...zones_us-central1-a_disks_lcdisk_delete.json | 6 +-
.../gce/zones_us-central1-a_disks_post.json | 6 +-
.../gce/zones_us-central1-a_instances.json | 54 +-
...ones_us-central1-a_instances_lcnode-000.json | 10 +-
...-central1-a_instances_lcnode-000_delete.json | 6 +-
...ones_us-central1-a_instances_lcnode-001.json | 10 +-
...-central1-a_instances_lcnode-001_delete.json | 6 +-
...zones_us-central1-a_instances_node-name.json | 10 +-
...1-a_instances_node-name_attachDisk_post.json | 6 +-
...s-central1-a_instances_node-name_delete.json | 6 +-
...1-a_instances_node-name_detachDisk_post.json | 6 +-
...ntral1-a_instances_node-name_reset_post.json | 6 +-
...ral1-a_instances_node-name_setTags_post.json | 6 +-
.../gce/zones_us-central1-a_instances_post.json | 6 +-
.../gce/zones_us-central1-a_machineTypes.json | 46 +-
...s-central1-a_machineTypes_n1-standard-1.json | 2 +-
...l1-b_instances_libcloud-lb-demo-www-000.json | 12 +-
...l1-b_instances_libcloud-lb-demo-www-001.json | 12 +-
libcloud/test/compute/test_gce.py | 32 +-
libcloud/test/loadbalancer/test_gce.py | 2 +-
109 files changed, 1709 insertions(+), 1606 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/demos/gce_demo.py
----------------------------------------------------------------------
diff --git a/demos/gce_demo.py b/demos/gce_demo.py
index ef44254..b6f2cb4 100755
--- a/demos/gce_demo.py
+++ b/demos/gce_demo.py
@@ -64,7 +64,7 @@ MAX_NODES = 5
DEMO_BASE_NAME = 'libcloud-demo'
# Datacenter to create resources in
-DATACENTER = 'us-central2-a'
+DATACENTER = 'us-central1-a'
# Clean up resources at the end (can be set to false in order to
# inspect resources at the end of the run). Resources will be cleaned
@@ -284,7 +284,7 @@ def main():
if CLEANUP:
print('Cleaning up %s resources created.' % DEMO_BASE_NAME)
- clean_up(DEMO_BASE_NAME, nodes,
+ clean_up(gce, DEMO_BASE_NAME, nodes,
addresses + volumes + firewalls + networks)
if __name__ == '__main__':
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/demos/gce_lb_demo.py
----------------------------------------------------------------------
diff --git a/demos/gce_lb_demo.py b/demos/gce_lb_demo.py
index 0862a69..76bfeda 100755
--- a/demos/gce_lb_demo.py
+++ b/demos/gce_lb_demo.py
@@ -72,7 +72,7 @@ from libcloud.loadbalancer.providers import get_driver as get_driver_lb
DEMO_BASE_NAME = 'libcloud-lb-demo'
# Datacenter to create resources in
-DATACENTER = 'us-central1-b'
+DATACENTER = 'us-central1-a'
# Clean up resources at the end (can be set to false in order to
# inspect resources at the end of the run). Resources will be cleaned
@@ -296,7 +296,7 @@ def main():
firewalls = gce.ex_list_firewalls()
print('Cleaning up %s resources created.' % DEMO_BASE_NAME)
- clean_up(DEMO_BASE_NAME, nodes, balancers + healthchecks + firewalls)
+ clean_up(gce, DEMO_BASE_NAME, nodes, balancers + healthchecks + firewalls)
if __name__ == '__main__':
main()
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/common/google.py
----------------------------------------------------------------------
diff --git a/libcloud/common/google.py b/libcloud/common/google.py
index 575bc6b..549ba8b 100644
--- a/libcloud/common/google.py
+++ b/libcloud/common/google.py
@@ -447,7 +447,7 @@ class GoogleBaseConnection(ConnectionUserAndKey, PollingConnection):
responseCls = GoogleResponse
host = 'www.googleapis.com'
poll_interval = 2.0
- timeout = 120
+ timeout = 180
def __init__(self, user_id, key, auth_type=None,
credential_file=None, **kwargs):
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/compute/drivers/gce.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/gce.py b/libcloud/compute/drivers/gce.py
index 7f3a8b3..c0ee559 100644
--- a/libcloud/compute/drivers/gce.py
+++ b/libcloud/compute/drivers/gce.py
@@ -30,7 +30,7 @@ from libcloud.compute.base import NodeSize, StorageVolume, UuidMixin
from libcloud.compute.providers import Provider
from libcloud.compute.types import NodeState
-API_VERSION = 'v1beta15'
+API_VERSION = 'v1beta16'
DEFAULT_TASK_COMPLETION_TIMEOUT = 180
@@ -359,11 +359,10 @@ class GCETargetPool(UuidMixin):
class GCEZone(NodeLocation):
"""Subclass of NodeLocation to provide additional information."""
- def __init__(self, id, name, status, maintenance_windows, quotas,
- deprecated, driver, extra=None):
+ def __init__(self, id, name, status, maintenance_windows, deprecated,
+ driver, extra=None):
self.status = status
self.maintenance_windows = maintenance_windows
- self.quotas = quotas
self.deprecated = deprecated
self.extra = extra
country = name.split('-')[0]
@@ -382,16 +381,19 @@ class GCEZone(NodeLocation):
"""
Returns the next Maintenance Window.
- :return: A dictionary containing maintenance window info
+ :return: A dictionary containing maintenance window info (or None if
+ no maintenance windows are scheduled)
The dictionary contains 4 keys with values of type ``str``
- name: The name of the maintence window
- description: Description of the maintenance window
- beginTime: RFC3339 Timestamp
- endTime: RFC3339 Timestamp
- :rtype: ``dict``
+ :rtype: ``dict`` or ``None``
"""
begin = None
next_window = None
+ if not self.maintenance_windows:
+ return None
if len(self.maintenance_windows) == 1:
return self.maintenance_windows[0]
for mw in self.maintenance_windows:
@@ -405,10 +407,13 @@ class GCEZone(NodeLocation):
"""
Returns time until next maintenance window.
- :return: Time until next maintenance window
- :rtype: :class:`datetime.timedelta`
+ :return: Time until next maintenance window (or None if no
+ maintenance windows are scheduled)
+ :rtype: :class:`datetime.timedelta` or ``None``
"""
next_window = self._get_next_maint()
+ if not next_window:
+ return None
now = self._now()
next_begin = timestamp_to_datetime(next_window['beginTime'])
return next_begin - now
@@ -417,10 +422,13 @@ class GCEZone(NodeLocation):
"""
Returns the duration of the next maintenance window.
- :return: Duration of next maintenance window
- :rtype: :class:`datetime.timedelta`
+ :return: Duration of next maintenance window (or None if no
+ maintenance windows are scheduled)
+ :rtype: :class:`datetime.timedelta` or ``None``
"""
next_window = self._get_next_maint()
+ if not next_window:
+ return None
next_begin = timestamp_to_datetime(next_window['beginTime'])
next_end = timestamp_to_datetime(next_window['endTime'])
return next_end - next_begin
@@ -2677,5 +2685,4 @@ class GCENodeDriver(NodeDriver):
return GCEZone(id=zone['id'], name=zone['name'], status=zone['status'],
maintenance_windows=zone.get('maintenanceWindows'),
- quotas=zone['quotas'], deprecated=deprecated,
- driver=self, extra=extra)
+ deprecated=deprecated, driver=self, extra=extra)
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/aggregated_addresses.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/aggregated_addresses.json b/libcloud/test/compute/fixtures/gce/aggregated_addresses.json
index 6ac222e..eee3552 100644
--- a/libcloud/test/compute/fixtures/gce/aggregated_addresses.json
+++ b/libcloud/test/compute/fixtures/gce/aggregated_addresses.json
@@ -10,8 +10,8 @@
"id": "10955781597205896134",
"kind": "compute#address",
"name": "libcloud-demo-europe-address",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/europe-west1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/europe-west1/addresses/libcloud-demo-europe-address",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/europe-west1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/europe-west1/addresses/libcloud-demo-europe-address",
"status": "RESERVED"
}
]
@@ -25,8 +25,8 @@
"id": "01531551729918243104",
"kind": "compute#address",
"name": "lcaddress",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/addresses/lcaddress",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/addresses/lcaddress",
"status": "RESERVED"
},
{
@@ -36,8 +36,8 @@
"id": "17634862894218443422",
"kind": "compute#address",
"name": "libcloud-demo-address",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/addresses/libcloud-demo-address",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/addresses/libcloud-demo-address",
"status": "RESERVED"
},
{
@@ -47,8 +47,8 @@
"id": "11879548153827627972",
"kind": "compute#address",
"name": "testaddress",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/addresses/testaddress",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/addresses/testaddress",
"status": "RESERVED"
}
]
@@ -67,5 +67,5 @@
}
},
"kind": "compute#addressAggregatedList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/aggregated/addresses"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/aggregated/addresses"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/aggregated_disks.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/aggregated_disks.json b/libcloud/test/compute/fixtures/gce/aggregated_disks.json
index 1190ab4..00d9112 100644
--- a/libcloud/test/compute/fixtures/gce/aggregated_disks.json
+++ b/libcloud/test/compute/fixtures/gce/aggregated_disks.json
@@ -4,14 +4,25 @@
"zones/europe-west1-a": {
"disks": [
{
- "creationTimestamp": "2013-06-26T09:50:22.508-07:00",
- "id": "0811494794539478718",
+ "creationTimestamp": "2013-11-01T14:45:38.422-07:00",
+ "description": "Image: https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20131014",
+ "id": "4294778976520895166",
"kind": "compute#disk",
"name": "libcloud-demo-europe-boot-disk",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/disks/libcloud-demo-europe-boot-disk",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/disks/libcloud-demo-europe-boot-disk",
"sizeGb": "10",
"status": "READY",
- "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a"
+ "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a"
+ },
+ {
+ "creationTimestamp": "2013-11-01T14:45:27.063-07:00",
+ "id": "2488119868186709482",
+ "kind": "compute#disk",
+ "name": "libcloud-demo-europe-attach-disk",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/disks/libcloud-demo-europe-attach-disk",
+ "sizeGb": "1",
+ "status": "READY",
+ "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a"
}
]
},
@@ -28,54 +39,58 @@
}
},
"zones/us-central1-a": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/us-central1-a"
+ }
+ ],
+ "message": "There are no results for scope 'zones/us-central1-a' on this page."
+ }
+ },
+ "zones/us-central1-b": {
"disks": [
{
- "creationTimestamp": "2013-06-25T10:57:34.305-07:00",
- "id": "14383387450728762434",
+ "creationTimestamp": "2013-09-04T11:03:54.122-07:00",
+ "description": "Persistent boot disk created from https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130723.",
+ "id": "8658241308250794904",
"kind": "compute#disk",
- "name": "test-disk",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/disks/test-disk",
+ "name": "test1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/disks/test1",
"sizeGb": "10",
"status": "READY",
- "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-b"
+ }
+ ]
+ },
+ "zones/us-central2-a": {
+ "disks": [
+ {
+ "creationTimestamp": "2013-11-01T14:43:36.763-07:00",
+ "id": "01690270691106097961",
+ "kind": "compute#disk",
+ "name": "libcloud-demo-attach-disk",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a/disks/libcloud-demo-attach-disk",
+ "sizeGb": "1",
+ "status": "READY",
+ "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a"
},
{
- "creationTimestamp": "2013-06-26T09:47:09.178-07:00",
- "id": "10880026303683859871",
+ "creationTimestamp": "2013-11-01T14:43:46.039-07:00",
+ "description": "Image: https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20131014",
+ "id": "01805374214887472027",
"kind": "compute#disk",
"name": "libcloud-demo-boot-disk",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/disks/libcloud-demo-boot-disk",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a/disks/libcloud-demo-boot-disk",
"sizeGb": "10",
"status": "READY",
- "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-central2-a"
}
]
- },
- "zones/us-central1-b": {
- "warning": {
- "code": "NO_RESULTS_ON_PAGE",
- "data": [
- {
- "key": "scope",
- "value": "zones/us-central1-b"
- }
- ],
- "message": "There are no results for scope 'zones/us-central1-b' on this page."
- }
- },
- "zones/us-central2-a": {
- "warning": {
- "code": "NO_RESULTS_ON_PAGE",
- "data": [
- {
- "key": "scope",
- "value": "zones/us-central2-a"
- }
- ],
- "message": "There are no results for scope 'zones/us-central2-a' on this page."
- }
}
},
"kind": "compute#diskAggregatedList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/aggregated/disks"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/aggregated/disks"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/aggregated_forwardingRules.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/aggregated_forwardingRules.json b/libcloud/test/compute/fixtures/gce/aggregated_forwardingRules.json
index c6f648a..fd3827b 100644
--- a/libcloud/test/compute/fixtures/gce/aggregated_forwardingRules.json
+++ b/libcloud/test/compute/fixtures/gce/aggregated_forwardingRules.json
@@ -23,8 +23,8 @@
"kind": "compute#forwardingRule",
"name": "lcforwardingrule",
"portRange": "8000-8500",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "target": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/libcloud-lb-demo-lb-tp"
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "target": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/libcloud-lb-demo-lb-tp"
},
{
"IPAddress": "173.255.119.185",
@@ -34,8 +34,8 @@
"kind": "compute#forwardingRule",
"name": "libcloud-lb-demo-lb",
"portRange": "80-80",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "target": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/libcloud-lb-demo-lb-tp"
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "target": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/libcloud-lb-demo-lb-tp"
}
]
},
@@ -53,5 +53,5 @@
}
},
"kind": "compute#forwardingRuleAggregatedList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/aggregated/forwardingRules"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/aggregated/forwardingRules"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/aggregated_instances.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/aggregated_instances.json b/libcloud/test/compute/fixtures/gce/aggregated_instances.json
index 3e72aff..056cbb2 100644
--- a/libcloud/test/compute/fixtures/gce/aggregated_instances.json
+++ b/libcloud/test/compute/fixtures/gce/aggregated_instances.json
@@ -5,88 +5,90 @@
"instances": [
{
"canIpForward": false,
- "creationTimestamp": "2013-06-26T15:13:38.295-07:00",
+ "creationTimestamp": "2013-11-01T14:45:44.186-07:00",
"disks": [
{
+ "boot": true,
+ "deviceName": "libcloud-demo-europe-boot-disk",
"index": 0,
"kind": "compute#attachedDisk",
"mode": "READ_WRITE",
- "type": "SCRATCH"
+ "source": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/disks/libcloud-demo-europe-boot-disk",
+ "type": "PERSISTENT"
}
],
- "id": "4658881585544531189",
- "image": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130617",
+ "id": "8051468456709756069",
+ "kernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-no-conn-track-v20130813",
"kind": "compute#instance",
- "machineType": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-1",
+ "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-1",
"metadata": {
"fingerprint": "42WmSpB8rSM=",
"kind": "compute#metadata"
},
- "name": "libcloud-demo-europe-multiple-nodes-000",
+ "name": "libcloud-demo-europe-persist-node",
"networkInterfaces": [
{
"accessConfigs": [
{
"kind": "compute#accessConfig",
"name": "External NAT",
- "natIP": "192.158.29.167",
+ "natIP": "8.34.211.23",
"type": "ONE_TO_ONE_NAT"
}
],
"name": "nic0",
- "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default",
- "networkIP": "10.240.144.78"
+ "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
+ "networkIP": "10.240.188.108"
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/instances/libcloud-demo-europe-multiple-nodes-000",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/instances/libcloud-demo-europe-persist-node",
"status": "RUNNING",
"tags": {
- "fingerprint": "W7t6ZyTyIrc=",
+ "fingerprint": "EbZdwVRtKyg=",
"items": [
- "libcloud"
+ "libcloud",
+ "newtag"
]
},
- "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a"
+ "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a"
},
{
"canIpForward": false,
- "creationTimestamp": "2013-06-26T15:13:21.549-07:00",
+ "creationTimestamp": "2013-11-01T14:46:02.933-07:00",
"disks": [
{
- "boot": true,
- "deviceName": "libcloud-demo-europe-boot-disk",
"index": 0,
"kind": "compute#attachedDisk",
"mode": "READ_WRITE",
- "source": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/disks/libcloud-demo-europe-boot-disk",
- "type": "PERSISTENT"
+ "type": "SCRATCH"
}
],
- "id": "0681789716029574243",
- "kernel": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130603",
+ "id": "04184465693678804555",
+ "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20131014",
+ "kernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-no-conn-track-v20130813",
"kind": "compute#instance",
- "machineType": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-1",
+ "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-1",
"metadata": {
"fingerprint": "42WmSpB8rSM=",
"kind": "compute#metadata"
},
- "name": "libcloud-demo-europe-persist-node",
+ "name": "libcloud-demo-europe-multiple-nodes-000",
"networkInterfaces": [
{
"accessConfigs": [
{
"kind": "compute#accessConfig",
"name": "External NAT",
- "natIP": "192.158.29.121",
+ "natIP": "8.34.211.48",
"type": "ONE_TO_ONE_NAT"
}
],
"name": "nic0",
- "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default",
- "networkIP": "10.240.206.91"
+ "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
+ "networkIP": "10.240.141.92"
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/instances/libcloud-demo-europe-persist-node",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/instances/libcloud-demo-europe-multiple-nodes-000",
"status": "RUNNING",
"tags": {
"fingerprint": "W7t6ZyTyIrc=",
@@ -94,23 +96,32 @@
"libcloud"
]
},
- "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a"
+ "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a"
},
{
"canIpForward": false,
- "creationTimestamp": "2013-06-26T15:12:29.726-07:00",
+ "creationTimestamp": "2013-11-01T14:44:57.127-07:00",
"disks": [
{
"index": 0,
"kind": "compute#attachedDisk",
"mode": "READ_WRITE",
"type": "SCRATCH"
+ },
+ {
+ "deviceName": "libcloud-demo-europe-attach-disk",
+ "index": 1,
+ "kind": "compute#attachedDisk",
+ "mode": "READ_WRITE",
+ "source": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/disks/libcloud-demo-europe-attach-disk",
+ "type": "PERSISTENT"
}
],
- "id": "14308265828754333159",
- "image": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130617",
+ "id": "4450078356274958103",
+ "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20131014",
+ "kernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-no-conn-track-v20130813",
"kind": "compute#instance",
- "machineType": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-1",
+ "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-1",
"metadata": {
"fingerprint": "42WmSpB8rSM=",
"kind": "compute#metadata"
@@ -122,16 +133,16 @@
{
"kind": "compute#accessConfig",
"name": "External NAT",
- "natIP": "192.158.29.88",
+ "natIP": "8.34.208.52",
"type": "ONE_TO_ONE_NAT"
}
],
"name": "nic0",
- "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default",
- "networkIP": "10.240.66.77"
+ "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
+ "networkIP": "10.240.48.164"
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/instances/libcloud-demo-europe-np-node",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/instances/libcloud-demo-europe-np-node",
"status": "RUNNING",
"tags": {
"fingerprint": "W7t6ZyTyIrc=",
@@ -139,7 +150,7 @@
"libcloud"
]
},
- "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a"
+ "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a"
}
]
},
@@ -159,55 +170,66 @@
"instances": [
{
"canIpForward": false,
- "creationTimestamp": "2013-06-26T15:11:02.386-07:00",
+ "creationTimestamp": "2013-11-01T14:47:29.154-07:00",
"disks": [
{
- "boot": true,
- "deviceName": "libcloud-demo-boot-disk",
"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",
- "type": "PERSISTENT"
+ "type": "SCRATCH"
}
],
- "id": "2378270030714524465",
- "kernel": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130603",
+ "id": "10348912619288589086",
+ "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130617",
+ "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"
},
- "name": "libcloud-demo-persist-node",
+ "name": "node-name",
"networkInterfaces": [
{
"accessConfigs": [
{
"kind": "compute#accessConfig",
"name": "External NAT",
- "natIP": "108.59.81.66",
+ "natIP": "8.35.197.91",
"type": "ONE_TO_ONE_NAT"
}
],
"name": "nic0",
- "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default",
- "networkIP": "10.240.192.190"
+ "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
+ "networkIP": "10.240.123.204"
}
],
- "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/node-name",
"status": "RUNNING",
"tags": {
- "fingerprint": "W7t6ZyTyIrc=",
- "items": [
- "libcloud"
- ]
+ "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"
+ }
+ ]
+ },
+ "zones/us-central1-b": {
+ "warning": {
+ "code": "NO_RESULTS_ON_PAGE",
+ "data": [
+ {
+ "key": "scope",
+ "value": "zones/us-central1-b"
+ }
+ ],
+ "message": "There are no results for scope 'zones/us-central1-b' on this page."
+ }
+ },
+ "zones/us-central2-a": {
+ "instances": [
{
"canIpForward": false,
- "creationTimestamp": "2013-06-26T15:11:19.247-07:00",
+ "creationTimestamp": "2013-11-01T14:44:03.801-07:00",
"disks": [
{
"index": 0,
@@ -216,31 +238,32 @@
"type": "SCRATCH"
}
],
- "id": "8573880455005118258",
- "image": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130617",
+ "id": "8843444782291050664",
+ "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20131014",
+ "kernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-no-conn-track-v20130813",
"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-central2-a/machineTypes/n1-standard-1",
"metadata": {
"fingerprint": "42WmSpB8rSM=",
"kind": "compute#metadata"
},
- "name": "libcloud-demo-multiple-nodes-000",
+ "name": "libcloud-demo-multiple-nodes-001",
"networkInterfaces": [
{
"accessConfigs": [
{
"kind": "compute#accessConfig",
"name": "External NAT",
- "natIP": "108.59.81.107",
+ "natIP": "173.255.121.180",
"type": "ONE_TO_ONE_NAT"
}
],
"name": "nic0",
- "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default",
- "networkIP": "10.240.224.165"
+ "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
+ "networkIP": "10.240.167.120"
}
],
- "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-central2-a/instances/libcloud-demo-multiple-nodes-001",
"status": "RUNNING",
"tags": {
"fingerprint": "W7t6ZyTyIrc=",
@@ -248,53 +271,60 @@
"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-central2-a"
},
{
"canIpForward": false,
- "creationTimestamp": "2013-06-26T15:00:12.021-07:00",
+ "creationTimestamp": "2013-11-01T14:43:49.457-07:00",
"disks": [
{
+ "boot": true,
+ "deviceName": "libcloud-demo-boot-disk",
"index": 0,
"kind": "compute#attachedDisk",
"mode": "READ_WRITE",
- "type": "SCRATCH"
+ "source": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a/disks/libcloud-demo-boot-disk",
+ "type": "PERSISTENT"
}
],
- "id": "1845312225624811608",
- "image": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130617",
+ "id": "2278280472037226745",
+ "kernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-no-conn-track-v20130813",
"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-central2-a/machineTypes/n1-standard-1",
"metadata": {
"fingerprint": "42WmSpB8rSM=",
"kind": "compute#metadata"
},
- "name": "node-name",
+ "name": "libcloud-demo-persist-node",
"networkInterfaces": [
{
"accessConfigs": [
{
"kind": "compute#accessConfig",
"name": "External NAT",
- "natIP": "173.255.115.146",
+ "natIP": "173.255.121.109",
"type": "ONE_TO_ONE_NAT"
}
],
"name": "nic0",
- "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default",
- "networkIP": "10.240.113.94"
+ "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
+ "networkIP": "10.240.102.153"
}
],
- "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-central2-a/instances/libcloud-demo-persist-node",
"status": "RUNNING",
"tags": {
- "fingerprint": "42WmSpB8rSM="
+ "fingerprint": "EbZdwVRtKyg=",
+ "items": [
+ "libcloud",
+ "newtag"
+ ]
},
- "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-central2-a"
},
{
"canIpForward": false,
- "creationTimestamp": "2013-06-26T15:10:09.700-07:00",
+ "creationTimestamp": "2013-11-01T14:44:03.256-07:00",
"disks": [
{
"index": 0,
@@ -303,31 +333,32 @@
"type": "SCRATCH"
}
],
- "id": "03138438763739542377",
- "image": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130617",
+ "id": "0994482023759804723",
+ "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20131014",
+ "kernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-no-conn-track-v20130813",
"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-central2-a/machineTypes/n1-standard-1",
"metadata": {
"fingerprint": "42WmSpB8rSM=",
"kind": "compute#metadata"
},
- "name": "libcloud-demo-np-node",
+ "name": "libcloud-demo-multiple-nodes-000",
"networkInterfaces": [
{
"accessConfigs": [
{
"kind": "compute#accessConfig",
"name": "External NAT",
- "natIP": "108.59.80.244",
+ "natIP": "173.255.121.133",
"type": "ONE_TO_ONE_NAT"
}
],
"name": "nic0",
- "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default",
- "networkIP": "10.240.147.18"
+ "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
+ "networkIP": "10.240.164.41"
}
],
- "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-central2-a/instances/libcloud-demo-multiple-nodes-000",
"status": "RUNNING",
"tags": {
"fingerprint": "W7t6ZyTyIrc=",
@@ -335,44 +366,53 @@
"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-central2-a"
},
{
"canIpForward": false,
- "creationTimestamp": "2013-06-26T15:11:19.662-07:00",
+ "creationTimestamp": "2013-11-01T14:43:15.485-07:00",
"disks": [
{
"index": 0,
"kind": "compute#attachedDisk",
"mode": "READ_WRITE",
"type": "SCRATCH"
+ },
+ {
+ "deviceName": "libcloud-demo-attach-disk",
+ "index": 1,
+ "kind": "compute#attachedDisk",
+ "mode": "READ_WRITE",
+ "source": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a/disks/libcloud-demo-attach-disk",
+ "type": "PERSISTENT"
}
],
- "id": "17221721898919682654",
- "image": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130617",
+ "id": "08480381647283539833",
+ "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20131014",
+ "kernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-no-conn-track-v20130813",
"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-central2-a/machineTypes/n1-standard-1",
"metadata": {
"fingerprint": "42WmSpB8rSM=",
"kind": "compute#metadata"
},
- "name": "libcloud-demo-multiple-nodes-001",
+ "name": "libcloud-demo-np-node",
"networkInterfaces": [
{
"accessConfigs": [
{
"kind": "compute#accessConfig",
"name": "External NAT",
- "natIP": "108.59.81.166",
+ "natIP": "173.255.121.95",
"type": "ONE_TO_ONE_NAT"
}
],
"name": "nic0",
- "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default",
- "networkIP": "10.240.223.109"
+ "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
+ "networkIP": "10.240.37.226"
}
],
- "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-central2-a/instances/libcloud-demo-np-node",
"status": "RUNNING",
"tags": {
"fingerprint": "W7t6ZyTyIrc=",
@@ -380,35 +420,11 @@
"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-central2-a"
}
]
- },
- "zones/us-central1-b": {
- "warning": {
- "code": "NO_RESULTS_ON_PAGE",
- "data": [
- {
- "key": "scope",
- "value": "zones/us-central1-b"
- }
- ],
- "message": "There are no results for scope 'zones/us-central1-b' on this page."
- }
- },
- "zones/us-central2-a": {
- "warning": {
- "code": "NO_RESULTS_ON_PAGE",
- "data": [
- {
- "key": "scope",
- "value": "zones/us-central2-a"
- }
- ],
- "message": "There are no results for scope 'zones/us-central2-a' on this page."
- }
}
},
"kind": "compute#instanceAggregatedList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/aggregated/instances"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/aggregated/instances"
}
\ No newline at end of file
[5/9] Update GCE driver to API version v1beta16 Most of the changes
are in the test fixtures, some were regenerated,
some were just had URLs updated as necessary. In addition,
there were some changes made to the tests to use the regenerated test fixtures
Posted by to...@apache.org.
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/aggregated_targetPools.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/aggregated_targetPools.json b/libcloud/test/compute/fixtures/gce/aggregated_targetPools.json
index f57aad5..99195da 100644
--- a/libcloud/test/compute/fixtures/gce/aggregated_targetPools.json
+++ b/libcloud/test/compute/fixtures/gce/aggregated_targetPools.json
@@ -16,33 +16,46 @@
"regions/us-central1": {
"targetPools": [
{
- "creationTimestamp": "2013-09-03T00:51:05.300-07:00",
+ "creationTimestamp": "2013-11-01T14:50:04.620-07:00",
"healthChecks": [
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/httpHealthChecks/libcloud-lb-demo-healthcheck"
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/httpHealthChecks/libcloud-lb-demo-healthcheck"
],
- "id": "11690726329826021866",
+ "id": "6918395933376220338",
"instances": [
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-000",
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-001"
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-000",
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-001"
],
"kind": "compute#targetPool",
- "name": "lctargetpool",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1"
+ "name": "libcloud-lb-demo-lb-tp",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/libcloud-lb-demo-lb-tp"
},
{
- "creationTimestamp": "2013-09-02T22:25:45.817-07:00",
+ "creationTimestamp": "2013-11-01T14:51:45.822-07:00",
"healthChecks": [
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/httpHealthChecks/libcloud-lb-demo-healthcheck"
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/httpHealthChecks/libcloud-lb-demo-healthcheck"
],
- "id": "16605251746746338499",
+ "id": "2277093827336176997",
"instances": [
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-002",
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-001",
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-000"
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-000",
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-001"
],
"kind": "compute#targetPool",
- "name": "libcloud-lb-demo-lb-tp",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1"
+ "name": "lctargetpool",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/lctargetpool"
+ },
+ {
+ "creationTimestamp": "2013-11-01T12:09:45.831-07:00",
+ "healthChecks": [
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/httpHealthChecks/basic-check"
+ ],
+ "id": "03531496913089065061",
+ "kind": "compute#targetPool",
+ "name": "www-pool",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/www-pool",
+ "sessionAffinity": "NONE"
}
]
},
@@ -60,5 +73,5 @@
}
},
"kind": "compute#targetPoolAggregatedList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/aggregated/targetPools"
-}
\ No newline at end of file
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/aggregated/targetPools"
+}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_firewalls.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_firewalls.json b/libcloud/test/compute/fixtures/gce/global_firewalls.json
index c25af7a..e678e7d 100644
--- a/libcloud/test/compute/fixtures/gce/global_firewalls.json
+++ b/libcloud/test/compute/fixtures/gce/global_firewalls.json
@@ -18,8 +18,8 @@
"id": "5399576268464751692",
"kind": "compute#firewall",
"name": "default-allow-internal",
- "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/firewalls/default-allow-internal",
+ "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/firewalls/default-allow-internal",
"sourceRanges": [
"10.240.0.0/16"
]
@@ -38,8 +38,8 @@
"id": "8063006729705804986",
"kind": "compute#firewall",
"name": "default-ssh",
- "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/firewalls/default-ssh",
+ "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/firewalls/default-ssh",
"sourceRanges": [
"0.0.0.0/0"
]
@@ -53,12 +53,15 @@
]
}
],
- "creationTimestamp": "2013-06-26T09:51:41.593-07:00",
- "id": "14041102034246553251",
+ "creationTimestamp": "2013-11-01T14:46:25.155-07:00",
+ "id": "13827675544891616808",
"kind": "compute#firewall",
"name": "libcloud-demo-europe-firewall",
- "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/libcloud-demo-europe-network",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/firewalls/libcloud-demo-europe-firewall",
+ "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/libcloud-demo-europe-network",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/firewalls/libcloud-demo-europe-firewall",
+ "sourceRanges": [
+ "0.0.0.0/0"
+ ],
"sourceTags": [
"libcloud"
]
@@ -72,17 +75,43 @@
]
}
],
- "creationTimestamp": "2013-06-26T09:48:23.268-07:00",
- "id": "0716768890200439066",
+ "creationTimestamp": "2013-11-01T14:44:31.284-07:00",
+ "id": "1648761630208029546",
"kind": "compute#firewall",
"name": "libcloud-demo-firewall",
- "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/libcloud-demo-network",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/firewalls/libcloud-demo-firewall",
+ "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/libcloud-demo-network",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/firewalls/libcloud-demo-firewall",
+ "sourceRanges": [
+ "0.0.0.0/0"
+ ],
"sourceTags": [
"libcloud"
]
+ },
+ {
+ "allowed": [
+ {
+ "IPProtocol": "tcp",
+ "ports": [
+ "80"
+ ]
+ }
+ ],
+ "creationTimestamp": "2013-08-19T14:40:22.562-07:00",
+ "description": "",
+ "id": "01326795494450101956",
+ "kind": "compute#firewall",
+ "name": "www-firewall",
+ "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/firewalls/www-firewall",
+ "sourceRanges": [
+ "0.0.0.0/0"
+ ],
+ "targetTags": [
+ "www-tag"
+ ]
}
],
"kind": "compute#firewallList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/firewalls"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/firewalls"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall.json b/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall.json
index fde8474..068721e 100644
--- a/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall.json
+++ b/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall.json
@@ -11,8 +11,8 @@
"id": "0565629596395414121",
"kind": "compute#firewall",
"name": "lcfirewall",
- "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/firewalls/lcfirewall",
+ "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/firewalls/lcfirewall",
"sourceTags": [
"libcloud"
]
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall_delete.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall_delete.json b/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall_delete.json
index 75c0ce7..b2ae795 100644
--- a/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall_delete.json
+++ b/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall_delete.json
@@ -5,10 +5,10 @@
"name": "operation-global_firewalls_lcfirewall_delete",
"operationType": "delete",
"progress": 0,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/operations/operation-global_firewalls_lcfirewall_delete",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/operations/operation-global_firewalls_lcfirewall_delete",
"startTime": "2013-06-26T10:04:53.508-07:00",
"status": "PENDING",
"targetId": "0565629596395414121",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/firewalls/lcfirewall",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/firewalls/lcfirewall",
"user": "897001307951@developer.gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall_put.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall_put.json b/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall_put.json
index c075282..b38aa5d 100644
--- a/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall_put.json
+++ b/libcloud/test/compute/fixtures/gce/global_firewalls_lcfirewall_put.json
@@ -5,10 +5,10 @@
"name": "operation-global_firewalls_lcfirewall_put",
"operationType": "update",
"progress": 0,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/operations/operation-global_firewalls_lcfirewall_put",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/operations/operation-global_firewalls_lcfirewall_put",
"startTime": "2013-06-26T20:52:00.410-07:00",
"status": "PENDING",
"targetId": "10942695305090163011",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/firewalls/lcfirewall",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/firewalls/lcfirewall",
"user": "897001307951@developer.gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_firewalls_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_firewalls_post.json b/libcloud/test/compute/fixtures/gce/global_firewalls_post.json
index 84124f3..f7cac33 100644
--- a/libcloud/test/compute/fixtures/gce/global_firewalls_post.json
+++ b/libcloud/test/compute/fixtures/gce/global_firewalls_post.json
@@ -5,9 +5,9 @@
"name": "operation-global_firewalls_post",
"operationType": "insert",
"progress": 0,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/operations/operation-global_firewalls_post",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/operations/operation-global_firewalls_post",
"startTime": "2013-06-26T20:51:06.128-07:00",
"status": "PENDING",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/firewalls/lcfirewall",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/firewalls/lcfirewall",
"user": "897001307951@developer.gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_httpHealthChecks.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_httpHealthChecks.json b/libcloud/test/compute/fixtures/gce/global_httpHealthChecks.json
index 051fded..35d0f6f 100644
--- a/libcloud/test/compute/fixtures/gce/global_httpHealthChecks.json
+++ b/libcloud/test/compute/fixtures/gce/global_httpHealthChecks.json
@@ -12,7 +12,7 @@
"name": "basic-check",
"port": 80,
"requestPath": "/",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/httpHealthChecks/basic-check",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/httpHealthChecks/basic-check",
"timeoutSec": 5,
"unhealthyThreshold": 2
},
@@ -25,11 +25,11 @@
"name": "libcloud-lb-demo-healthcheck",
"port": 80,
"requestPath": "/",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/httpHealthChecks/libcloud-lb-demo-healthcheck",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/httpHealthChecks/libcloud-lb-demo-healthcheck",
"timeoutSec": 5,
"unhealthyThreshold": 2
}
],
"kind": "compute#httpHealthCheckList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/httpHealthChecks"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/httpHealthChecks"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_basic-check.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_basic-check.json b/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_basic-check.json
index 0812ecd..bbfb868 100644
--- a/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_basic-check.json
+++ b/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_basic-check.json
@@ -9,7 +9,7 @@
"name": "basic-check",
"port": 80,
"requestPath": "/",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/httpHealthChecks/basic-check",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/httpHealthChecks/basic-check",
"timeoutSec": 5,
"unhealthyThreshold": 2
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_lchealthcheck.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_lchealthcheck.json b/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_lchealthcheck.json
index 76bb117..805d0e0 100644
--- a/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_lchealthcheck.json
+++ b/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_lchealthcheck.json
@@ -8,7 +8,7 @@
"name": "lchealthcheck",
"port": 8000,
"requestPath": "/lc",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/httpHealthChecks/lchealthcheck",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/httpHealthChecks/lchealthcheck",
"timeoutSec": 10,
"unhealthyThreshold": 4
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_lchealthcheck_delete.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_lchealthcheck_delete.json b/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_lchealthcheck_delete.json
index 03f97e4..df1c973 100644
--- a/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_lchealthcheck_delete.json
+++ b/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_lchealthcheck_delete.json
@@ -5,10 +5,10 @@
"name": "operation-global_httpHealthChecks_lchealthcheck_delete",
"operationType": "delete",
"progress": 0,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/operations/operation-global_httpHealthChecks_lchealthcheck_delete",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/operations/operation-global_httpHealthChecks_lchealthcheck_delete",
"startTime": "2013-09-02T22:18:02.558-07:00",
"status": "PENDING",
"targetId": "06860603312991823381",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/healthChecks/lchealthcheck",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/healthChecks/lchealthcheck",
"user": "user@gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_lchealthcheck_put.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_lchealthcheck_put.json b/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_lchealthcheck_put.json
index 1daa897..6173d3b 100644
--- a/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_lchealthcheck_put.json
+++ b/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_lchealthcheck_put.json
@@ -5,10 +5,10 @@
"name": "operation-global_httpHealthChecks_lchealthcheck_put",
"operationType": "update",
"progress": 0,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/operations/operation-global_httpHealthChecks_lchealthcheck_put",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/operations/operation-global_httpHealthChecks_lchealthcheck_put",
"startTime": "2013-09-03T02:19:55.628-07:00",
"status": "PENDING",
"targetId": "0742691415598204878",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/healthChecks/lchealthcheck",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/healthChecks/lchealthcheck",
"user": "user@gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_libcloud-lb-demo-healthcheck.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_libcloud-lb-demo-healthcheck.json b/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_libcloud-lb-demo-healthcheck.json
index 6e772aa..72c0a6a 100644
--- a/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_libcloud-lb-demo-healthcheck.json
+++ b/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_libcloud-lb-demo-healthcheck.json
@@ -7,7 +7,7 @@
"name": "libcloud-lb-demo-healthcheck",
"port": 80,
"requestPath": "/",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/httpHealthChecks/libcloud-lb-demo-healthcheck",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/httpHealthChecks/libcloud-lb-demo-healthcheck",
"timeoutSec": 5,
"unhealthyThreshold": 2
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_post.json b/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_post.json
index f2f7873..f0d5ab8 100644
--- a/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_post.json
+++ b/libcloud/test/compute/fixtures/gce/global_httpHealthChecks_post.json
@@ -5,9 +5,9 @@
"name": "operation-global_httpHealthChecks_post",
"operationType": "insert",
"progress": 0,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/operations/operation-global_httpHealthChecks_post",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/operations/operation-global_httpHealthChecks_post",
"startTime": "2013-09-03T02:19:54.718-07:00",
"status": "PENDING",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/healthChecks/lchealthcheck",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/healthChecks/lchealthcheck",
"user": "user@gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_images.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_images.json b/libcloud/test/compute/fixtures/gce/global_images.json
index c472dfa..59b9d34 100644
--- a/libcloud/test/compute/fixtures/gce/global_images.json
+++ b/libcloud/test/compute/fixtures/gce/global_images.json
@@ -7,16 +7,16 @@
"id": "1549141992333368759",
"kind": "compute#image",
"name": "debian-7-wheezy-v20130617",
- "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130603",
+ "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130603",
"rawDisk": {
"containerType": "TAR",
"source": ""
},
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130617",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130617",
"sourceType": "RAW",
"status": "READY"
}
],
"kind": "compute#imageList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/images"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/images"
}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_images.json.save
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_images.json.save b/libcloud/test/compute/fixtures/gce/global_images.json.save
deleted file mode 100644
index c472dfa..0000000
--- a/libcloud/test/compute/fixtures/gce/global_images.json.save
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "id": "projects/project_name/global/images",
- "items": [
- {
- "creationTimestamp": "2013-06-19T13:47:20.563-07:00",
- "description": "Local Debian GNU/Linux 7.1 (wheezy) built on 2013-06-17",
- "id": "1549141992333368759",
- "kind": "compute#image",
- "name": "debian-7-wheezy-v20130617",
- "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130603",
- "rawDisk": {
- "containerType": "TAR",
- "source": ""
- },
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130617",
- "sourceType": "RAW",
- "status": "READY"
- }
- ],
- "kind": "compute#imageList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/images"
-}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_networks.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_networks.json b/libcloud/test/compute/fixtures/gce/global_networks.json
index 071d1dc..cc6f3e9 100644
--- a/libcloud/test/compute/fixtures/gce/global_networks.json
+++ b/libcloud/test/compute/fixtures/gce/global_networks.json
@@ -8,7 +8,7 @@
"id": "08257021638942464470",
"kind": "compute#network",
"name": "default",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default"
},
{
"IPv4Range": "10.10.0.0/16",
@@ -17,7 +17,7 @@
"id": "13254259054875092094",
"kind": "compute#network",
"name": "libcloud-demo-europe-network",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/libcloud-demo-europe-network"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/libcloud-demo-europe-network"
},
{
"IPv4Range": "10.10.0.0/16",
@@ -26,9 +26,9 @@
"id": "17172579178188075621",
"kind": "compute#network",
"name": "libcloud-demo-network",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/libcloud-demo-network"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/libcloud-demo-network"
}
],
"kind": "compute#networkList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_networks_default.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_networks_default.json b/libcloud/test/compute/fixtures/gce/global_networks_default.json
index a6353e8..85b9210 100644
--- a/libcloud/test/compute/fixtures/gce/global_networks_default.json
+++ b/libcloud/test/compute/fixtures/gce/global_networks_default.json
@@ -5,5 +5,5 @@
"id": "08257021638942464470",
"kind": "compute#network",
"name": "default",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_networks_lcnetwork.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_networks_lcnetwork.json b/libcloud/test/compute/fixtures/gce/global_networks_lcnetwork.json
index b615cad..77bd710 100644
--- a/libcloud/test/compute/fixtures/gce/global_networks_lcnetwork.json
+++ b/libcloud/test/compute/fixtures/gce/global_networks_lcnetwork.json
@@ -5,5 +5,5 @@
"id": "16211908079305042870",
"kind": "compute#network",
"name": "lcnetwork",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/lcnetwork"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/lcnetwork"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_networks_lcnetwork_delete.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_networks_lcnetwork_delete.json b/libcloud/test/compute/fixtures/gce/global_networks_lcnetwork_delete.json
index cc65f00..cf4f669 100644
--- a/libcloud/test/compute/fixtures/gce/global_networks_lcnetwork_delete.json
+++ b/libcloud/test/compute/fixtures/gce/global_networks_lcnetwork_delete.json
@@ -5,10 +5,10 @@
"name": "operation-global_networks_lcnetwork_delete",
"operationType": "delete",
"progress": 0,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/operations/operation-global_networks_lcnetwork_delete",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/operations/operation-global_networks_lcnetwork_delete",
"startTime": "2013-06-26T10:05:11.273-07:00",
"status": "PENDING",
"targetId": "16211908079305042870",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/lcnetwork",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/lcnetwork",
"user": "897001307951@developer.gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_networks_libcloud-demo-europe-network.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_networks_libcloud-demo-europe-network.json b/libcloud/test/compute/fixtures/gce/global_networks_libcloud-demo-europe-network.json
index 93915c0..25eaf57 100644
--- a/libcloud/test/compute/fixtures/gce/global_networks_libcloud-demo-europe-network.json
+++ b/libcloud/test/compute/fixtures/gce/global_networks_libcloud-demo-europe-network.json
@@ -5,5 +5,5 @@
"id": "13254259054875092094",
"kind": "compute#network",
"name": "libcloud-demo-europe-network",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/libcloud-demo-europe-network"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/libcloud-demo-europe-network"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_networks_libcloud-demo-network.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_networks_libcloud-demo-network.json b/libcloud/test/compute/fixtures/gce/global_networks_libcloud-demo-network.json
index 55b9be1..733fc54 100644
--- a/libcloud/test/compute/fixtures/gce/global_networks_libcloud-demo-network.json
+++ b/libcloud/test/compute/fixtures/gce/global_networks_libcloud-demo-network.json
@@ -5,5 +5,5 @@
"id": "17172579178188075621",
"kind": "compute#network",
"name": "libcloud-demo-network",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/libcloud-demo-network"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/libcloud-demo-network"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/global_networks_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/global_networks_post.json b/libcloud/test/compute/fixtures/gce/global_networks_post.json
index 72fca77..4141991 100644
--- a/libcloud/test/compute/fixtures/gce/global_networks_post.json
+++ b/libcloud/test/compute/fixtures/gce/global_networks_post.json
@@ -5,9 +5,9 @@
"name": "operation-global_networks_post",
"operationType": "insert",
"progress": 0,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/operations/operation-global_networks_post",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/operations/operation-global_networks_post",
"startTime": "2013-06-26T10:05:03.315-07:00",
"status": "PENDING",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/lcnetwork",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/lcnetwork",
"user": "897001307951@developer.gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_global_firewalls_lcfirewall_delete.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_global_firewalls_lcfirewall_delete.json b/libcloud/test/compute/fixtures/gce/operations_operation_global_firewalls_lcfirewall_delete.json
index 56c6db6..c6852a5 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_global_firewalls_lcfirewall_delete.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_global_firewalls_lcfirewall_delete.json
@@ -6,10 +6,10 @@
"name": "operation-global_firewalls_lcfirewall_delete",
"operationType": "delete",
"progress": 100,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/operations/operation-global_firewalls_lcfirewall_delete",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/operations/operation-global_firewalls_lcfirewall_delete",
"startTime": "2013-06-26T10:04:53.508-07:00",
"status": "DONE",
"targetId": "0565629596395414121",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/firewalls/lcfirewall",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/firewalls/lcfirewall",
"user": "897001307951@developer.gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_global_firewalls_lcfirewall_put.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_global_firewalls_lcfirewall_put.json b/libcloud/test/compute/fixtures/gce/operations_operation_global_firewalls_lcfirewall_put.json
index e50185c..1629dc3 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_global_firewalls_lcfirewall_put.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_global_firewalls_lcfirewall_put.json
@@ -6,10 +6,10 @@
"name": "operation-global_firewalls_lcfirewall_put",
"operationType": "update",
"progress": 100,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/operations/operation-global_firewalls_lcfirewall_put",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/operations/operation-global_firewalls_lcfirewall_put",
"startTime": "2013-06-26T20:52:00.410-07:00",
"status": "DONE",
"targetId": "10942695305090163011",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/firewalls/lcfirewall",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/firewalls/lcfirewall",
"user": "897001307951@developer.gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_global_firewalls_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_global_firewalls_post.json b/libcloud/test/compute/fixtures/gce/operations_operation_global_firewalls_post.json
index 57623d9..c74816b 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_global_firewalls_post.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_global_firewalls_post.json
@@ -6,10 +6,10 @@
"name": "operation-global_firewalls_post",
"operationType": "insert",
"progress": 100,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/operations/operation-global_firewalls_post",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/operations/operation-global_firewalls_post",
"startTime": "2013-06-26T20:51:06.128-07:00",
"status": "DONE",
"targetId": "10942695305090163011",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/firewalls/lcfirewall",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/firewalls/lcfirewall",
"user": "897001307951@developer.gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_global_httpHealthChecks_lchealthcheck_delete.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_global_httpHealthChecks_lchealthcheck_delete.json b/libcloud/test/compute/fixtures/gce/operations_operation_global_httpHealthChecks_lchealthcheck_delete.json
index 17cef7b..f8bf93c 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_global_httpHealthChecks_lchealthcheck_delete.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_global_httpHealthChecks_lchealthcheck_delete.json
@@ -5,10 +5,10 @@
"name": "operation-global_httpHealthChecks_lchealthcheck_delete",
"operationType": "delete",
"progress": 100,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/operations/operation-global_httpHealthChecks_lchealthcheck_delete",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/operations/operation-global_httpHealthChecks_lchealthcheck_delete",
"startTime": "2013-09-02T22:18:02.558-07:00",
"status": "DONE",
"targetId": "06860603312991823381",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/healthChecks/lchealthcheck",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/healthChecks/lchealthcheck",
"user": "user@gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_global_httpHealthChecks_lchealthcheck_put.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_global_httpHealthChecks_lchealthcheck_put.json b/libcloud/test/compute/fixtures/gce/operations_operation_global_httpHealthChecks_lchealthcheck_put.json
index b69e548..ef0ce96 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_global_httpHealthChecks_lchealthcheck_put.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_global_httpHealthChecks_lchealthcheck_put.json
@@ -6,10 +6,10 @@
"name": "operation-global_httpHealthChecks_lchealthcheck_put",
"operationType": "update",
"progress": 100,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/operations/operation-global_httpHealthChecks_lchealthcheck_put",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/operations/operation-global_httpHealthChecks_lchealthcheck_put",
"startTime": "2013-09-03T02:19:55.628-07:00",
"status": "DONE",
"targetId": "0742691415598204878",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/healthChecks/lchealthcheck",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/healthChecks/lchealthcheck",
"user": "user@gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_global_httpHealthChecks_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_global_httpHealthChecks_post.json b/libcloud/test/compute/fixtures/gce/operations_operation_global_httpHealthChecks_post.json
index 534688e..3013faa 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_global_httpHealthChecks_post.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_global_httpHealthChecks_post.json
@@ -5,10 +5,10 @@
"name": "operation-global_httpHealthChecks_post",
"operationType": "insert",
"progress": 100,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/operations/operation-global_httpHealthChecks_post",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/operations/operation-global_httpHealthChecks_post",
"startTime": "2013-09-03T02:19:54.718-07:00",
"status": "DONE",
"targetId": "0742691415598204878",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/healthChecks/lchealthcheck",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/healthChecks/lchealthcheck",
"user": "user@gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_global_networks_lcnetwork_delete.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_global_networks_lcnetwork_delete.json b/libcloud/test/compute/fixtures/gce/operations_operation_global_networks_lcnetwork_delete.json
index a5e75cf..dbdd02a 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_global_networks_lcnetwork_delete.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_global_networks_lcnetwork_delete.json
@@ -6,10 +6,10 @@
"name": "operation-global_networks_lcnetwork_delete",
"operationType": "delete",
"progress": 100,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/operations/operation-global_networks_lcnetwork_delete",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/operations/operation-global_networks_lcnetwork_delete",
"startTime": "2013-06-26T10:05:11.273-07:00",
"status": "DONE",
"targetId": "16211908079305042870",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/lcnetwork",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/lcnetwork",
"user": "897001307951@developer.gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_global_networks_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_global_networks_post.json b/libcloud/test/compute/fixtures/gce/operations_operation_global_networks_post.json
index d0a989e..b4e7d9a 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_global_networks_post.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_global_networks_post.json
@@ -6,10 +6,10 @@
"name": "operation-global_networks_post",
"operationType": "insert",
"progress": 100,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/operations/operation-global_networks_post",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/operations/operation-global_networks_post",
"startTime": "2013-06-26T10:05:03.315-07:00",
"status": "DONE",
"targetId": "16211908079305042870",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/lcnetwork",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/lcnetwork",
"user": "897001307951@developer.gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_addresses_lcaddress_delete.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_addresses_lcaddress_delete.json b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_addresses_lcaddress_delete.json
index a138e5c..9176604 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_addresses_lcaddress_delete.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_addresses_lcaddress_delete.json
@@ -5,11 +5,11 @@
"name": "operation-regions_us-central1_addresses_lcaddress_delete",
"operationType": "delete",
"progress": 100,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_addresses_lcaddress_delete",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_addresses_lcaddress_delete",
"startTime": "2013-06-26T12:21:44.110-07:00",
"status": "DONE",
"targetId": "01531551729918243104",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/addresses/lcaddress",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/addresses/lcaddress",
"user": "897001307951@developer.gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_addresses_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_addresses_post.json b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_addresses_post.json
index baf5d57..3f85b87 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_addresses_post.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_addresses_post.json
@@ -5,11 +5,11 @@
"name": "operation-regions_us-central1_addresses_post",
"operationType": "insert",
"progress": 100,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_addresses_post",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_addresses_post",
"startTime": "2013-06-26T12:21:40.358-07:00",
"status": "DONE",
"targetId": "01531551729918243104",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/addresses/lcaddress",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/addresses/lcaddress",
"user": "897001307951@developer.gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_forwardingRules_lcforwardingrule_delete.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_forwardingRules_lcforwardingrule_delete.json b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_forwardingRules_lcforwardingrule_delete.json
index 974c636..0138b45 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_forwardingRules_lcforwardingrule_delete.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_forwardingRules_lcforwardingrule_delete.json
@@ -6,11 +6,11 @@
"name": "operation-regions_us-central1_forwardingRules_lcforwardingrule_delete",
"operationType": "delete",
"progress": 100,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_forwardingRules_lcforwardingrule_delete",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_forwardingRules_lcforwardingrule_delete",
"startTime": "2013-09-03T00:17:36.168-07:00",
"status": "DONE",
"targetId": "10901665092293158938",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/forwardingRules/lcforwardingrule",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/forwardingRules/lcforwardingrule",
"user": "user@gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_forwardingRules_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_forwardingRules_post.json b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_forwardingRules_post.json
index 4c83db1..fb6e5aa 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_forwardingRules_post.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_forwardingRules_post.json
@@ -6,11 +6,11 @@
"name": "operation-regions_us-central1_forwardingRules_post",
"operationType": "insert",
"progress": 100,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_forwardingRules_post",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_forwardingRules_post",
"startTime": "2013-09-03T00:17:25.434-07:00",
"status": "DONE",
"targetId": "10901665092293158938",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/forwardingRules/lcforwardingrule",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/forwardingRules/lcforwardingrule",
"user": "user@gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_addHealthCheck_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_addHealthCheck_post.json b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_addHealthCheck_post.json
index 8f4a405..b9adfea 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_addHealthCheck_post.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_addHealthCheck_post.json
@@ -6,11 +6,11 @@
"name": "operation-regions_us-central1_targetPools_lctargetpool_addHealthCheck_post",
"operationType": "addHealthCheck",
"progress": 100,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_addHealthCheck_post",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_addHealthCheck_post",
"startTime": "2013-09-03T01:28:40.838-07:00",
"status": "DONE",
"targetId": "16862638289615591831",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/lctargetpool",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/lctargetpool",
"user": "user@gserviceaccount.com"
}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_addInstance_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_addInstance_post.json b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_addInstance_post.json
index ecac372..6c16ec6 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_addInstance_post.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_addInstance_post.json
@@ -6,11 +6,11 @@
"name": "operation-regions_us-central1_targetPools_lctargetpool_addInstance_post",
"operationType": "addInstance",
"progress": 100,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_addInstance_post",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_addInstance_post",
"startTime": "2013-09-03T01:29:03.145-07:00",
"status": "DONE",
"targetId": "16862638289615591831",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/lctargetpool",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/lctargetpool",
"user": "user@gserviceaccount.com"
}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_delete.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_delete.json b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_delete.json
index a790311..d6cb9a8 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_delete.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_delete.json
@@ -5,11 +5,11 @@
"name": "operation-regions_us-central1_targetPools_lctargetpool_delete",
"operationType": "delete",
"progress": 100,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_delete",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_delete",
"startTime": "2013-09-03T00:51:06.840-07:00",
"status": "DONE",
"targetId": "13598380121688918358",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/lctargetpool",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/lctargetpool",
"user": "user@gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_removeHealthCheck_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_removeHealthCheck_post.json b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_removeHealthCheck_post.json
index 6c4eeb5..3a08f52 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_removeHealthCheck_post.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_removeHealthCheck_post.json
@@ -6,11 +6,11 @@
"name": "operation-regions_us-central1_targetPools_lctargetpool_removeHealthCheck_post",
"operationType": "removeHealthCheck",
"progress": 100,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_removeHealthCheck_post",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_removeHealthCheck_post",
"startTime": "2013-09-03T01:28:32.942-07:00",
"status": "DONE",
"targetId": "16862638289615591831",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/lctargetpool",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/lctargetpool",
"user": "user@gserviceaccount.com"
}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_removeInstance_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_removeInstance_post.json b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_removeInstance_post.json
index cb24504..58a1e51 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_removeInstance_post.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_lctargetpool_removeInstance_post.json
@@ -6,11 +6,11 @@
"name": "operation-regions_us-central1_targetPools_lctargetpool_removeInstance_post",
"operationType": "removeInstance",
"progress": 100,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_removeInstance_post",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_removeInstance_post",
"startTime": "2013-09-03T01:28:53.109-07:00",
"status": "DONE",
"targetId": "16862638289615591831",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/lctargetpool",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/lctargetpool",
"user": "user@gserviceaccount.com"
}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_post.json b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_post.json
index 0e4b666..e95babf 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_post.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_regions_us-central1_targetPools_post.json
@@ -5,11 +5,11 @@
"name": "operation-regions_us-central1_targetPools_post",
"operationType": "insert",
"progress": 100,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_post",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_post",
"startTime": "2013-09-03T00:51:05.115-07:00",
"status": "DONE",
"targetId": "13598380121688918358",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/lctargetpool",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/lctargetpool",
"user": "user@gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_zones_europe-west1-a_instances_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_zones_europe-west1-a_instances_post.json b/libcloud/test/compute/fixtures/gce/operations_operation_zones_europe-west1-a_instances_post.json
index 96ffebc..449789b 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_zones_europe-west1-a_instances_post.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_zones_europe-west1-a_instances_post.json
@@ -15,11 +15,11 @@
"name": "operation-zones_europe-west1-a_instances_post",
"operationType": "insert",
"progress": 100,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/operations/operation-zones_europe-west1-a_instances_post",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/operations/operation-zones_europe-west1-a_instances_post",
"startTime": "2013-06-26T20:57:34.453-07:00",
"status": "DONE",
"targetId": "14308265828754333159",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/instances/libcloud-demo-europe-np-node",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/instances/libcloud-demo-europe-np-node",
"user": "897001307951@developer.gserviceaccount.com",
- "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a"
+ "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_disks_lcdisk_delete.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_disks_lcdisk_delete.json b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_disks_lcdisk_delete.json
index e71f2a3..181efac 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_disks_lcdisk_delete.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_disks_lcdisk_delete.json
@@ -5,11 +5,11 @@
"name": "operation-zones_us-central1-a_disks_lcdisk_delete",
"operationType": "delete",
"progress": 100,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_disks_lcdisk_delete",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_disks_lcdisk_delete",
"startTime": "2013-06-26T10:06:12.006-07:00",
"status": "DONE",
"targetId": "16109451798967042451",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/disks/lcdisk",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/disks/lcdisk",
"user": "897001307951@developer.gserviceaccount.com",
- "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/operations_operation_zones_us-central1-a_disks_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_disks_post.json b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_disks_post.json
index 122a7a8..680697e 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_disks_post.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_disks_post.json
@@ -6,11 +6,11 @@
"name": "operation-zones_us-central1-a_disks_post",
"operationType": "insert",
"progress": 100,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_disks_post",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_disks_post",
"startTime": "2013-06-26T16:48:17.479-07:00",
"status": "DONE",
"targetId": "03196637868764498730",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/disks/lcdisk",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/disks/lcdisk",
"user": "897001307951@developer.gserviceaccount.com",
- "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/operations_operation_zones_us-central1-a_instances_lcnode-000_delete.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_lcnode-000_delete.json b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_lcnode-000_delete.json
index 524fe81..fdf102f 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_lcnode-000_delete.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_lcnode-000_delete.json
@@ -6,11 +6,11 @@
"name": "operation-zones_us-central1-a_instances_lcnode-000_delete",
"operationType": "delete",
"progress": 100,
- "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": "DONE",
"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": "897001307951@developer.gserviceaccount.com",
- "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/operations_operation_zones_us-central1-a_instances_lcnode-001_delete.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_lcnode-001_delete.json b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_lcnode-001_delete.json
index 369e9d2..7c02137 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_lcnode-001_delete.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_lcnode-001_delete.json
@@ -6,11 +6,11 @@
"name": "operation-zones_us-central1-a_instances_lcnode-001_delete",
"operationType": "delete",
"progress": 100,
- "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": "DONE",
"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": "897001307951@developer.gserviceaccount.com",
- "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/operations_operation_zones_us-central1-a_instances_node-name_attachDisk_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_attachDisk_post.json b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_attachDisk_post.json
index 1563c39..ec89003 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_attachDisk_post.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_attachDisk_post.json
@@ -6,11 +6,11 @@
"name": "operation-zones_us-central1-a_instances_node-name_attachDisk_post",
"operationType": "attachDisk",
"progress": 100,
- "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": "DONE",
"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": "897001307951@developer.gserviceaccount.com",
- "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/operations_operation_zones_us-central1-a_instances_node-name_delete.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_delete.json b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_delete.json
index 8e728e7..3eacbba 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_delete.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_delete.json
@@ -6,11 +6,11 @@
"name": "operation-zones_us-central1-a_instances_node-name_delete",
"operationType": "delete",
"progress": 100,
- "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": "DONE",
"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": "897001307951@developer.gserviceaccount.com",
- "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/operations_operation_zones_us-central1-a_instances_node-name_detachDisk_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_detachDisk_post.json b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_detachDisk_post.json
index fdf2a75..6b98bea 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_detachDisk_post.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_detachDisk_post.json
@@ -6,11 +6,11 @@
"name": "operation-zones_us-central1-a_instances_node-name_detachDisk_post",
"operationType": "detachDisk",
"progress": 100,
- "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": "DONE",
"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": "897001307951@developer.gserviceaccount.com",
- "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/operations_operation_zones_us-central1-a_instances_node-name_reset_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_reset_post.json b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_reset_post.json
index 28d87ef..651ef6d 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_reset_post.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_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": 100,
- "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": "DONE",
"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": "897001307951@developer.gserviceaccount.com",
- "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/operations_operation_zones_us-central1-a_instances_node-name_setTags_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_setTags_post.json b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_setTags_post.json
index 14c26f1..5ddaf68 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_setTags_post.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_node-name_setTags_post.json
@@ -6,11 +6,11 @@
"name": "operation-zones_us-central1-a_instances_node-name_setTags_post",
"operationType": "setTags",
"progress": 100,
- "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": "DONE",
"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": "897001307951@developer.gserviceaccount.com",
- "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/operations_operation_zones_us-central1-a_instances_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_post.json b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_post.json
index ab62f88..8b37d33 100644
--- a/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_post.json
+++ b/libcloud/test/compute/fixtures/gce/operations_operation_zones_us-central1-a_instances_post.json
@@ -6,11 +6,11 @@
"name": "operation-zones_us-central1-a_instances_post",
"operationType": "insert",
"progress": 100,
- "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": "DONE",
"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": "897001307951@developer.gserviceaccount.com",
- "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/project.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/project.json b/libcloud/test/compute/fixtures/gce/project.json
index b8b746c..d96f916 100644
--- a/libcloud/test/compute/fixtures/gce/project.json
+++ b/libcloud/test/compute/fixtures/gce/project.json
@@ -15,31 +15,6 @@
"name": "project_name",
"quotas": [
{
- "limit": 8.0,
- "metric": "INSTANCES",
- "usage": 7.0
- },
- {
- "limit": 8.0,
- "metric": "CPUS",
- "usage": 7.0
- },
- {
- "limit": 8.0,
- "metric": "EPHEMERAL_ADDRESSES",
- "usage": 7.0
- },
- {
- "limit": 8.0,
- "metric": "DISKS",
- "usage": 3.0
- },
- {
- "limit": 1024.0,
- "metric": "DISKS_TOTAL_GB",
- "usage": 30.0
- },
- {
"limit": 1000.0,
"metric": "SNAPSHOTS",
"usage": 0.0
@@ -52,7 +27,7 @@
{
"limit": 100.0,
"metric": "FIREWALLS",
- "usage": 4.0
+ "usage": 5.0
},
{
"limit": 100.0,
@@ -60,15 +35,25 @@
"usage": 0.0
},
{
- "limit": 7.0,
- "metric": "STATIC_ADDRESSES",
- "usage": 3.0
- },
- {
"limit": 100.0,
"metric": "ROUTES",
"usage": 6.0
+ },
+ {
+ "limit": 50.0,
+ "metric": "FORWARDING_RULES",
+ "usage": 0.0
+ },
+ {
+ "limit": 50.0,
+ "metric": "TARGET_POOLS",
+ "usage": 1.0
+ },
+ {
+ "limit": 50.0,
+ "metric": "HEALTH_CHECKS",
+ "usage": 1.0
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name"
}
\ No newline at end of file
[4/9] Update GCE driver to API version v1beta16 Most of the changes
are in the test fixtures, some were regenerated,
some were just had URLs updated as necessary. In addition,
there were some changes made to the tests to use the regenerated test fixtures
Posted by to...@apache.org.
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/projects_debian-cloud_global_images.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/projects_debian-cloud_global_images.json b/libcloud/test/compute/fixtures/gce/projects_debian-cloud_global_images.json
index 461b0c9..e8c832a 100644
--- a/libcloud/test/compute/fixtures/gce/projects_debian-cloud_global_images.json
+++ b/libcloud/test/compute/fixtures/gce/projects_debian-cloud_global_images.json
@@ -2,156 +2,278 @@
"id": "projects/debian-cloud/global/images",
"items": [
{
+ "archiveSizeBytes": "214107225",
"creationTimestamp": "2013-05-07T17:09:22.111-07:00",
"description": "Debian GNU/Linux 6.0.7 (squeeze) built on 2013-05-07",
"id": "647943287916432906",
"kind": "compute#image",
"name": "debian-6-squeeze-v20130507",
- "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130225",
+ "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130225",
"rawDisk": {
"containerType": "TAR",
"source": ""
},
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-6-squeeze-v20130507",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-6-squeeze-v20130507",
"sourceType": "RAW",
"status": "READY"
},
{
+ "archiveSizeBytes": "255972840",
"creationTimestamp": "2013-05-09T12:56:21.720-07:00",
"description": "Debian GNU/Linux 6.0.7 (squeeze) built on 2013-05-09",
"id": "15745758816845911589",
"kind": "compute#image",
"name": "debian-6-squeeze-v20130509",
- "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130225",
+ "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130225",
"rawDisk": {
"containerType": "TAR",
"source": ""
},
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-6-squeeze-v20130509",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-6-squeeze-v20130509",
"sourceType": "RAW",
"status": "READY"
},
{
+ "archiveSizeBytes": "219458106",
"creationTimestamp": "2013-05-14T21:01:12.124-07:00",
"description": "Debian GNU/Linux 6.0.7 (squeeze) built on 2013-05-15",
"id": "006866479348046290",
"kind": "compute#image",
"name": "debian-6-squeeze-v20130515",
- "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130515",
+ "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130515",
"rawDisk": {
"containerType": "TAR",
"source": ""
},
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-6-squeeze-v20130515",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-6-squeeze-v20130515",
"sourceType": "RAW",
"status": "READY"
},
{
+ "archiveSizeBytes": "265118282",
"creationTimestamp": "2013-05-30T09:48:37.837-07:00",
"description": "Debian GNU/Linux 6.0.7 (squeeze) built on 2013-05-22",
"id": "1266148899538866390",
"kind": "compute#image",
"name": "debian-6-squeeze-v20130522",
- "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130522",
+ "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130522",
"rawDisk": {
"containerType": "TAR",
"source": ""
},
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-6-squeeze-v20130522",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-6-squeeze-v20130522",
"sourceType": "RAW",
"status": "READY"
},
{
+ "archiveSizeBytes": "233984980",
"creationTimestamp": "2013-06-19T13:45:44.111-07:00",
"description": "Debian GNU/Linux 6.0.7 (squeeze) built on 2013-06-17",
"id": "04009358257173422091",
"kind": "compute#image",
"name": "debian-6-squeeze-v20130617",
- "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130603",
+ "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130603",
"rawDisk": {
"containerType": "TAR",
"source": ""
},
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-6-squeeze-v20130617",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-6-squeeze-v20130617",
"sourceType": "RAW",
"status": "READY"
},
{
+ "archiveSizeBytes": "258168500",
+ "creationTimestamp": "2013-07-24T12:31:06.054-07:00",
+ "description": "Debian GNU/Linux 6.0.7 (squeeze) built on 2013-07-23",
+ "id": "3115342424904648000",
+ "kind": "compute#image",
+ "name": "debian-6-squeeze-v20130723",
+ "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130603",
+ "rawDisk": {
+ "containerType": "TAR",
+ "source": ""
+ },
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-6-squeeze-v20130723",
+ "sourceType": "RAW",
+ "status": "READY"
+ },
+ {
+ "archiveSizeBytes": "300710522",
+ "creationTimestamp": "2013-09-04T13:21:53.292-07:00",
+ "description": "Debian GNU/Linux 6.0.7 (squeeze) built on 2013-08-16",
+ "id": "06130699342353523133",
+ "kind": "compute#image",
+ "name": "debian-6-squeeze-v20130816",
+ "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130813",
+ "rawDisk": {
+ "containerType": "TAR",
+ "source": ""
+ },
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-6-squeeze-v20130816",
+ "sourceType": "RAW",
+ "status": "READY"
+ },
+ {
+ "archiveSizeBytes": "300710522",
+ "creationTimestamp": "2013-10-11T09:26:47.736-07:00",
+ "description": "Debian GNU/Linux 6.0.7 (squeeze) built on 2013-09-26",
+ "id": "0225119674082940764",
+ "kind": "compute#image",
+ "name": "debian-6-squeeze-v20130926",
+ "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-no-conn-track-v20130813",
+ "rawDisk": {
+ "containerType": "TAR",
+ "source": ""
+ },
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-6-squeeze-v20130926",
+ "sourceType": "RAW",
+ "status": "READY"
+ },
+ {
+ "archiveSizeBytes": "237290472",
"creationTimestamp": "2013-05-07T17:01:30.071-07:00",
"description": "Debian GNU/Linux 7.0 (wheezy) built on 2013-05-07",
"id": "15638477823580670459",
"kind": "compute#image",
"name": "debian-7-wheezy-v20130507",
- "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130225",
+ "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130225",
"rawDisk": {
"containerType": "TAR",
"source": ""
},
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130507",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130507",
"sourceType": "RAW",
"status": "READY"
},
{
+ "archiveSizeBytes": "270107366",
"creationTimestamp": "2013-05-09T12:56:47.910-07:00",
"description": "Debian GNU/Linux 7.0 (wheezy) built on 2013-05-09",
"id": "020034532765408091",
"kind": "compute#image",
"name": "debian-7-wheezy-v20130509",
- "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130225",
+ "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130225",
"rawDisk": {
"containerType": "TAR",
"source": ""
},
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130509",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130509",
"sourceType": "RAW",
"status": "READY"
},
{
+ "archiveSizeBytes": "265604335",
"creationTimestamp": "2013-05-14T21:02:55.044-07:00",
"description": "Debian GNU/Linux 7.0 (wheezy) built on 2013-05-15",
"id": "0587071888358410836",
"kind": "compute#image",
"name": "debian-7-wheezy-v20130515",
- "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130515",
+ "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130515",
"rawDisk": {
"containerType": "TAR",
"source": ""
},
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130515",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130515",
"sourceType": "RAW",
"status": "READY"
},
{
+ "archiveSizeBytes": "284301993",
"creationTimestamp": "2013-05-30T09:47:30.980-07:00",
"description": "Debian GNU/Linux 7.0 (wheezy) built on 2013-05-22",
"id": "622079684385221180",
"kind": "compute#image",
"name": "debian-7-wheezy-v20130522",
- "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130522",
+ "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130522",
"rawDisk": {
"containerType": "TAR",
"source": ""
},
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130522",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130522",
"sourceType": "RAW",
"status": "READY"
},
{
+ "archiveSizeBytes": "310882322",
"creationTimestamp": "2013-06-19T13:47:20.563-07:00",
"description": "Debian GNU/Linux 7.1 (wheezy) built on 2013-06-17",
"id": "1549141992333368759",
"kind": "compute#image",
"name": "debian-7-wheezy-v20130617",
- "preferredKernel": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130603",
+ "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130603",
+ "rawDisk": {
+ "containerType": "TAR",
+ "source": ""
+ },
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130617",
+ "sourceType": "RAW",
+ "status": "READY"
+ },
+ {
+ "archiveSizeBytes": "258869806",
+ "creationTimestamp": "2013-07-24T12:31:36.790-07:00",
+ "description": "Debian GNU/Linux 7.1 (wheezy) built on 2013-07-23",
+ "id": "3119304810142650253",
+ "kind": "compute#image",
+ "name": "debian-7-wheezy-v20130723",
+ "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130603",
+ "rawDisk": {
+ "containerType": "TAR",
+ "source": ""
+ },
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130723",
+ "sourceType": "RAW",
+ "status": "READY"
+ },
+ {
+ "archiveSizeBytes": "279162251",
+ "creationTimestamp": "2013-09-04T13:24:30.479-07:00",
+ "description": "Debian GNU/Linux 7.1 (wheezy) built on 2013-08-16",
+ "id": "2595370902107306327",
+ "kind": "compute#image",
+ "name": "debian-7-wheezy-v20130816",
+ "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-v20130813",
+ "rawDisk": {
+ "containerType": "TAR",
+ "source": ""
+ },
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130816",
+ "sourceType": "RAW",
+ "status": "READY"
+ },
+ {
+ "archiveSizeBytes": "279162251",
+ "creationTimestamp": "2013-10-11T09:26:56.993-07:00",
+ "description": "Debian GNU/Linux 7.1 (wheezy) built on 2013-09-26",
+ "id": "06737951524754934395",
+ "kind": "compute#image",
+ "name": "debian-7-wheezy-v20130926",
+ "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-no-conn-track-v20130813",
+ "rawDisk": {
+ "containerType": "TAR",
+ "source": ""
+ },
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20130926",
+ "sourceType": "RAW",
+ "status": "READY"
+ },
+ {
+ "archiveSizeBytes": "405683884",
+ "creationTimestamp": "2013-10-28T13:52:08.233-07:00",
+ "description": "Debian GNU/Linux 7.2 (wheezy) built on 2013-10-14",
+ "id": "1405559880052641502",
+ "kind": "compute#image",
+ "name": "debian-7-wheezy-v20131014",
+ "preferredKernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-no-conn-track-v20130813",
"rawDisk": {
"containerType": "TAR",
"source": ""
},
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130617",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20131014",
"sourceType": "RAW",
"status": "READY"
}
],
"kind": "compute#imageList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions.json b/libcloud/test/compute/fixtures/gce/regions.json
index edf3a37..d5e98c5 100644
--- a/libcloud/test/compute/fixtures/gce/regions.json
+++ b/libcloud/test/compute/fixtures/gce/regions.json
@@ -7,11 +7,33 @@
"id": "0827308347805275727",
"kind": "compute#region",
"name": "europe-west1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/europe-west1",
+ "quotas": [
+ {
+ "limit": 24.0,
+ "metric": "CPUS",
+ "usage": 0.0
+ },
+ {
+ "limit": 5120.0,
+ "metric": "DISKS_TOTAL_GB",
+ "usage": 0.0
+ },
+ {
+ "limit": 7.0,
+ "metric": "STATIC_ADDRESSES",
+ "usage": 0.0
+ },
+ {
+ "limit": 23.0,
+ "metric": "IN_USE_ADDRESSES",
+ "usage": 0.0
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/europe-west1",
"status": "UP",
"zones": [
- "https://www.googleapis.com/compute/v1beta15/zones/europe-west1-a",
- "https://www.googleapis.com/compute/v1beta15/zones/europe-west1-b"
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a",
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b"
]
},
{
@@ -20,11 +42,33 @@
"id": "06713580496607310378",
"kind": "compute#region",
"name": "us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
+ "quotas": [
+ {
+ "limit": 24.0,
+ "metric": "CPUS",
+ "usage": 3.0
+ },
+ {
+ "limit": 5120.0,
+ "metric": "DISKS_TOTAL_GB",
+ "usage": 10.0
+ },
+ {
+ "limit": 7.0,
+ "metric": "STATIC_ADDRESSES",
+ "usage": 0.0
+ },
+ {
+ "limit": 23.0,
+ "metric": "IN_USE_ADDRESSES",
+ "usage": 4.0
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
"status": "UP",
"zones": [
- "https://www.googleapis.com/compute/v1beta15/zones/us-central1-a",
- "https://www.googleapis.com/compute/v1beta15/zones/us-central1-b"
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a",
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b"
]
},
{
@@ -33,13 +77,35 @@
"id": "04157375529195793136",
"kind": "compute#region",
"name": "us-central2",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central2",
+ "quotas": [
+ {
+ "limit": 24.0,
+ "metric": "CPUS",
+ "usage": 0.0
+ },
+ {
+ "limit": 5120.0,
+ "metric": "DISKS_TOTAL_GB",
+ "usage": 0.0
+ },
+ {
+ "limit": 7.0,
+ "metric": "STATIC_ADDRESSES",
+ "usage": 0.0
+ },
+ {
+ "limit": 23.0,
+ "metric": "IN_USE_ADDRESSES",
+ "usage": 0.0
+ }
+ ],
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central2",
"status": "UP",
"zones": [
- "https://www.googleapis.com/compute/v1beta15/zones/us-central2-a"
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a"
]
}
],
"kind": "compute#regionList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses.json
index a75d633..11539c4 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses.json
@@ -8,8 +8,8 @@
"id": "17634862894218443422",
"kind": "compute#address",
"name": "libcloud-demo-address",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/addresses/libcloud-demo-address",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/addresses/libcloud-demo-address",
"status": "RESERVED"
},
{
@@ -19,11 +19,11 @@
"id": "11879548153827627972",
"kind": "compute#address",
"name": "testaddress",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/addresses/testaddress",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/addresses/testaddress",
"status": "RESERVED"
}
],
"kind": "compute#addressList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/addresses"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/addresses"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_lcaddress.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_lcaddress.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_lcaddress.json
index 5d2838e..fe72fdc 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_lcaddress.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_lcaddress.json
@@ -5,7 +5,7 @@
"id": "01531551729918243104",
"kind": "compute#address",
"name": "lcaddress",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/addresses/lcaddress",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/addresses/lcaddress",
"status": "RESERVED"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_lcaddress_delete.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_lcaddress_delete.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_lcaddress_delete.json
index afa4508..7aef2a9 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_lcaddress_delete.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_lcaddress_delete.json
@@ -5,11 +5,11 @@
"name": "operation-regions_us-central1_addresses_lcaddress_delete",
"operationType": "delete",
"progress": 0,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_addresses_lcaddress_delete",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_addresses_lcaddress_delete",
"startTime": "2013-06-26T12:21:44.110-07:00",
"status": "PENDING",
"targetId": "01531551729918243104",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/addresses/lcaddress",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/addresses/lcaddress",
"user": "897001307951@developer.gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_post.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_post.json
index 1242c94..bc00fb5 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_post.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_addresses_post.json
@@ -5,10 +5,10 @@
"name": "operation-regions_us-central1_addresses_post",
"operationType": "insert",
"progress": 0,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_addresses_post",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_addresses_post",
"startTime": "2013-06-26T12:21:40.358-07:00",
"status": "PENDING",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/addresses/lcaddress",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/addresses/lcaddress",
"user": "897001307951@developer.gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules.json
index fbc1b0e..0fe7a08 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules.json
@@ -9,9 +9,9 @@
"kind": "compute#forwardingRule",
"name": "lcforwardingrule",
"portRange": "8000-8500",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/forwardingRules/lcforwardingrule",
- "target": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/libcloud-lb-demo-lb-tp"
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/forwardingRules/lcforwardingrule",
+ "target": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/libcloud-lb-demo-lb-tp"
},
{
"IPAddress": "173.255.119.185",
@@ -21,11 +21,11 @@
"kind": "compute#forwardingRule",
"name": "libcloud-lb-demo-lb",
"portRange": "80-80",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/forwardingRules/libcloud-lb-demo-lb",
- "target": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/libcloud-lb-demo-lb-tp"
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/forwardingRules/libcloud-lb-demo-lb",
+ "target": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/libcloud-lb-demo-lb-tp"
}
],
"kind": "compute#forwardingRuleList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/forwardingRules"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/forwardingRules"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_lcforwardingrule.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_lcforwardingrule.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_lcforwardingrule.json
index d4c9051..d29a715 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_lcforwardingrule.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_lcforwardingrule.json
@@ -6,7 +6,7 @@
"kind": "compute#forwardingRule",
"name": "lcforwardingrule",
"portRange": "8000-8500",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/forwardingRules/lcforwardingrule",
- "target": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/lctargetpool"
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/forwardingRules/lcforwardingrule",
+ "target": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/lctargetpool"
}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_lcforwardingrule_delete.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_lcforwardingrule_delete.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_lcforwardingrule_delete.json
index 1c15638..807c24a 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_lcforwardingrule_delete.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_lcforwardingrule_delete.json
@@ -5,11 +5,11 @@
"name": "operation-regions_us-central1_forwardingRules_lcforwardingrule_delete",
"operationType": "delete",
"progress": 0,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_forwardingRules_lcforwardingrule_delete",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_forwardingRules_lcforwardingrule_delete",
"startTime": "2013-09-03T00:17:36.168-07:00",
"status": "PENDING",
"targetId": "10901665092293158938",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/forwardingRules/lcforwardingrule",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/forwardingRules/lcforwardingrule",
"user": "user@gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_libcloud-lb-demo-lb.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_libcloud-lb-demo-lb.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_libcloud-lb-demo-lb.json
index 99a310e..970328d 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_libcloud-lb-demo-lb.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_libcloud-lb-demo-lb.json
@@ -6,7 +6,7 @@
"kind": "compute#forwardingRule",
"name": "libcloud-lb-demo-lb",
"portRange": "80-80",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/forwardingRules/libcloud-lb-demo-lb",
- "target": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/libcloud-lb-demo-lb-tp"
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/forwardingRules/libcloud-lb-demo-lb",
+ "target": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/libcloud-lb-demo-lb-tp"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_post.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_post.json
index 1b08b75..6194247 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_post.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_forwardingRules_post.json
@@ -5,10 +5,10 @@
"name": "operation-regions_us-central1_forwardingRules_post",
"operationType": "insert",
"progress": 0,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_forwardingRules_post",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_forwardingRules_post",
"startTime": "2013-09-03T00:17:25.434-07:00",
"status": "PENDING",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/forwardingRules/lcforwardingrule",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/forwardingRules/lcforwardingrule",
"user": "user@gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools.json
index 331065b..0f25323 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools.json
@@ -4,35 +4,35 @@
{
"creationTimestamp": "2013-09-03T00:51:05.300-07:00",
"healthChecks": [
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/httpHealthChecks/libcloud-lb-demo-healthcheck"
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/httpHealthChecks/libcloud-lb-demo-healthcheck"
],
"id": "13598380121688918358",
"instances": [
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-000",
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-001"
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-000",
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-001"
],
"kind": "compute#targetPool",
"name": "lctargetpool",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/lctargetpool"
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/lctargetpool"
},
{
"creationTimestamp": "2013-09-02T22:25:45.817-07:00",
"healthChecks": [
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/httpHealthChecks/libcloud-lb-demo-healthcheck"
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/httpHealthChecks/libcloud-lb-demo-healthcheck"
],
"id": "16862638289615591831",
"instances": [
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-002",
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-001",
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-000"
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-002",
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-001",
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-000"
],
"kind": "compute#targetPool",
"name": "libcloud-lb-demo-lb-tp",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/libcloud-lb-demo-lb-tp"
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/libcloud-lb-demo-lb-tp"
}
],
"kind": "compute#targetPoolList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool.json
index 81828f8..6349186 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool.json
@@ -1,15 +1,15 @@
{
"creationTimestamp": "2013-09-03T00:51:05.300-07:00",
"healthChecks": [
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/httpHealthChecks/libcloud-lb-demo-healthcheck"
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/httpHealthChecks/libcloud-lb-demo-healthcheck"
],
"id": "13598380121688918358",
"instances": [
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-000",
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-001"
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-000",
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-001"
],
"kind": "compute#targetPool",
"name": "lctargetpool",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/lctargetpool"
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/lctargetpool"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_addHealthCheck_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_addHealthCheck_post.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_addHealthCheck_post.json
index 7743b89..5c783ea 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_addHealthCheck_post.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_addHealthCheck_post.json
@@ -5,11 +5,11 @@
"name": "operation-regions_us-central1_targetPools_lctargetpool_addHealthCheck_post",
"operationType": "addHealthCheck",
"progress": 0,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_addHealthCheck_post",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_addHealthCheck_post",
"startTime": "2013-09-03T01:28:40.838-07:00",
"status": "PENDING",
"targetId": "16862638289615591831",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/lctargetpool",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/lctargetpool",
"user": "user@gserviceaccount.com"
}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_addInstance_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_addInstance_post.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_addInstance_post.json
index 1af9354..a2fa532 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_addInstance_post.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_addInstance_post.json
@@ -5,11 +5,11 @@
"name": "operation-regions_us-central1_targetPools_lctargetpool_addInstance_post",
"operationType": "addInstance",
"progress": 0,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_addInstance_post",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_addInstance_post",
"startTime": "2013-09-03T01:29:03.145-07:00",
"status": "PENDING",
"targetId": "16862638289615591831",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/lctargetpool",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/lctargetpool",
"user": "user@gserviceaccount.com"
}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_delete.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_delete.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_delete.json
index 196a1e0..039ad00 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_delete.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_delete.json
@@ -5,11 +5,11 @@
"name": "operation-regions_us-central1_targetPools_lctargetpool_delete",
"operationType": "delete",
"progress": 0,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_delete",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_delete",
"startTime": "2013-09-03T00:51:06.840-07:00",
"status": "PENDING",
"targetId": "13598380121688918358",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/lctargetpool",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/lctargetpool",
"user": "user@gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_removeHealthCheck_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_removeHealthCheck_post.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_removeHealthCheck_post.json
index be21bbe..98e772e 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_removeHealthCheck_post.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_removeHealthCheck_post.json
@@ -5,11 +5,11 @@
"name": "operation-regions_us-central1_targetPools_lctargetpool_removeHealthCheck_post",
"operationType": "removeHealthCheck",
"progress": 0,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_removeHealthCheck_post",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_removeHealthCheck_post",
"startTime": "2013-09-03T01:28:32.942-07:00",
"status": "PENDING",
"targetId": "16862638289615591831",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/lctargetpool",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/lctargetpool",
"user": "user@gserviceaccount.com"
}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_removeInstance_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_removeInstance_post.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_removeInstance_post.json
index 435e2d2..698018d 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_removeInstance_post.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_lctargetpool_removeInstance_post.json
@@ -5,11 +5,11 @@
"name": "operation-regions_us-central1_targetPools_lctargetpool_removeInstance_post",
"operationType": "removeInstance",
"progress": 0,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_removeInstance_post",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_lctargetpool_removeInstance_post",
"startTime": "2013-09-03T01:28:53.109-07:00",
"status": "PENDING",
"targetId": "16862638289615591831",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/lctargetpool",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/lctargetpool",
"user": "user@gserviceaccount.com"
}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_libcloud-lb-demo-lb-tp.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_libcloud-lb-demo-lb-tp.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_libcloud-lb-demo-lb-tp.json
index 47179b7..ddcab9b 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_libcloud-lb-demo-lb-tp.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_libcloud-lb-demo-lb-tp.json
@@ -1,16 +1,16 @@
{
"creationTimestamp": "2013-09-02T22:25:45.817-07:00",
"healthChecks": [
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/httpHealthChecks/libcloud-lb-demo-healthcheck"
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/httpHealthChecks/libcloud-lb-demo-healthcheck"
],
"id": "16862638289615591831",
"instances": [
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-002",
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-001",
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-000"
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-002",
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-001",
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/libcloud-lb-demo-www-000"
],
"kind": "compute#targetPool",
"name": "libcloud-lb-demo-lb-tp",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/libcloud-lb-demo-lb-tp"
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/libcloud-lb-demo-lb-tp"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_post.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_post.json
index 32f57cc..5d1185c 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_post.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_post.json
@@ -5,10 +5,10 @@
"name": "operation-regions_us-central1_targetPools_post",
"operationType": "insert",
"progress": 0,
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_post",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/operations/operation-regions_us-central1_targetPools_post",
"startTime": "2013-09-03T00:51:05.115-07:00",
"status": "PENDING",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/lctargetpool",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/lctargetpool",
"user": "user@gserviceaccount.com"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_www-pool.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_www-pool.json b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_www-pool.json
index 797bf39..69e17d4 100644
--- a/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_www-pool.json
+++ b/libcloud/test/compute/fixtures/gce/regions_us-central1_targetPools_www-pool.json
@@ -2,16 +2,16 @@
"creationTimestamp": "2013-08-19T14:43:25.289-07:00",
"description": "",
"healthChecks": [
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/httpHealthChecks/basic-check"
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/httpHealthChecks/basic-check"
],
"id": "09965129111508633746",
"instances": [
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/www1",
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/www2",
- "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b/instances/www3"
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/www1",
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/www2",
+ "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b/instances/www3"
],
"kind": "compute#targetPool",
"name": "www-pool",
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1/targetPools/www-pool"
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1/targetPools/www-pool"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/zones.json b/libcloud/test/compute/fixtures/gce/zones.json
index 2c45d56..05b0b25 100644
--- a/libcloud/test/compute/fixtures/gce/zones.json
+++ b/libcloud/test/compute/fixtures/gce/zones.json
@@ -8,37 +8,15 @@
"kind": "compute#zone",
"maintenanceWindows": [
{
- "beginTime": "2013-08-03T12:00:00.000-07:00",
+ "beginTime": "2014-01-18T12:00:00.000-08:00",
"description": "maintenance zone",
- "endTime": "2013-08-18T12:00:00.000-07:00",
- "name": "2013-08-03-planned-outage"
+ "endTime": "2014-02-02T12:00:00.000-08:00",
+ "name": "2014-01-18-planned-outage"
}
],
"name": "europe-west1-a",
- "quotas": [
- {
- "limit": 8.0,
- "metric": "INSTANCES",
- "usage": 3.0
- },
- {
- "limit": 8.0,
- "metric": "CPUS",
- "usage": 3.0
- },
- {
- "limit": 8.0,
- "metric": "DISKS",
- "usage": 1.0
- },
- {
- "limit": 1024.0,
- "metric": "DISKS_TOTAL_GB",
- "usage": 10.0
- }
- ],
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/europe-west1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/europe-west1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a",
"status": "UP"
},
{
@@ -48,37 +26,15 @@
"kind": "compute#zone",
"maintenanceWindows": [
{
- "beginTime": "2013-09-28T12:00:00.000-07:00",
+ "beginTime": "2014-03-15T12:00:00.000-07:00",
"description": "maintenance zone",
- "endTime": "2013-10-13T12:00:00.000-07:00",
- "name": "2013-09-28-planned-outage"
+ "endTime": "2014-03-30T12:00:00.000-07:00",
+ "name": "2014-03-15-planned-outage"
}
],
"name": "europe-west1-b",
- "quotas": [
- {
- "limit": 8.0,
- "metric": "INSTANCES",
- "usage": 0.0
- },
- {
- "limit": 8.0,
- "metric": "CPUS",
- "usage": 0.0
- },
- {
- "limit": 8.0,
- "metric": "DISKS",
- "usage": 0.0
- },
- {
- "limit": 1024.0,
- "metric": "DISKS_TOTAL_GB",
- "usage": 0.0
- }
- ],
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/europe-west1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-b",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/europe-west1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-b",
"status": "UP"
},
{
@@ -86,39 +42,9 @@
"description": "us-central1-a",
"id": "13462829244527433283",
"kind": "compute#zone",
- "maintenanceWindows": [
- {
- "beginTime": "2013-08-17T12:00:00.000-07:00",
- "description": "maintenance zone",
- "endTime": "2013-09-01T12:00:00.000-07:00",
- "name": "2013-08-17-planned-outage"
- }
- ],
"name": "us-central1-a",
- "quotas": [
- {
- "limit": 8.0,
- "metric": "INSTANCES",
- "usage": 4.0
- },
- {
- "limit": 8.0,
- "metric": "CPUS",
- "usage": 4.0
- },
- {
- "limit": 8.0,
- "metric": "DISKS",
- "usage": 2.0
- },
- {
- "limit": 1024.0,
- "metric": "DISKS_TOTAL_GB",
- "usage": 20.0
- }
- ],
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a",
"status": "UP"
},
{
@@ -128,80 +54,41 @@
"kind": "compute#zone",
"maintenanceWindows": [
{
- "beginTime": "2013-10-26T12:00:00.000-07:00",
+ "beginTime": "2013-11-02T12:00:00.000-07:00",
"description": "maintenance zone",
"endTime": "2013-11-10T12:00:00.000-08:00",
- "name": "2013-10-26-planned-outage"
+ "name": "2013-11-02-planned-outage"
}
],
"name": "us-central1-b",
- "quotas": [
- {
- "limit": 8.0,
- "metric": "INSTANCES",
- "usage": 0.0
- },
- {
- "limit": 8.0,
- "metric": "CPUS",
- "usage": 0.0
- },
- {
- "limit": 8.0,
- "metric": "DISKS",
- "usage": 0.0
- },
- {
- "limit": 1024.0,
- "metric": "DISKS_TOTAL_GB",
- "usage": 0.0
- }
- ],
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-b",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-b",
"status": "UP"
},
{
"creationTimestamp": "2013-02-05T16:19:23.257-08:00",
+ "deprecated": {
+ "deprecated": "2013-10-24T10:46:00-00:00",
+ "replacement": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a",
+ "state": "DEPRECATED"
+ },
"description": "us-central2-a",
"id": "1001467574647549152",
"kind": "compute#zone",
"maintenanceWindows": [
{
- "beginTime": "2013-10-12T12:00:00.000-07:00",
+ "beginTime": "2013-12-31T12:00:00.000-08:00",
"description": "maintenance zone",
- "endTime": "2013-10-27T12:00:00.000-07:00",
- "name": "2013-10-12-planned-outage"
+ "endTime": "2014-07-01T12:00:00.000-07:00",
+ "name": "2013-12-31-planned-outage"
}
],
"name": "us-central2-a",
- "quotas": [
- {
- "limit": 8.0,
- "metric": "INSTANCES",
- "usage": 0.0
- },
- {
- "limit": 8.0,
- "metric": "CPUS",
- "usage": 0.0
- },
- {
- "limit": 8.0,
- "metric": "DISKS",
- "usage": 0.0
- },
- {
- "limit": 1024.0,
- "metric": "DISKS_TOTAL_GB",
- "usage": 0.0
- }
- ],
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central2",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central2-a",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central2",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central2-a",
"status": "UP"
}
],
"kind": "compute#zoneList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones"
-}
\ No newline at end of file
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones"
+}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_europe-west1-a_instances.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/zones_europe-west1-a_instances.json b/libcloud/test/compute/fixtures/gce/zones_europe-west1-a_instances.json
index 5965c46..d6174cf 100644
--- a/libcloud/test/compute/fixtures/gce/zones_europe-west1-a_instances.json
+++ b/libcloud/test/compute/fixtures/gce/zones_europe-west1-a_instances.json
@@ -3,7 +3,7 @@
"items": [
{
"canIpForward": false,
- "creationTimestamp": "2013-06-26T15:13:38.295-07:00",
+ "creationTimestamp": "2013-11-01T14:46:02.933-07:00",
"disks": [
{
"index": 0,
@@ -12,10 +12,11 @@
"type": "SCRATCH"
}
],
- "id": "4658881585544531189",
- "image": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130617",
+ "id": "04184465693678804555",
+ "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20131014",
+ "kernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-no-conn-track-v20130813",
"kind": "compute#instance",
- "machineType": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-1",
+ "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-1",
"metadata": {
"fingerprint": "42WmSpB8rSM=",
"kind": "compute#metadata"
@@ -27,16 +28,16 @@
{
"kind": "compute#accessConfig",
"name": "External NAT",
- "natIP": "192.158.29.167",
+ "natIP": "8.34.211.48",
"type": "ONE_TO_ONE_NAT"
}
],
"name": "nic0",
- "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default",
- "networkIP": "10.240.144.78"
+ "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
+ "networkIP": "10.240.141.92"
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/instances/libcloud-demo-europe-multiple-nodes-000",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/instances/libcloud-demo-europe-multiple-nodes-000",
"status": "RUNNING",
"tags": {
"fingerprint": "W7t6ZyTyIrc=",
@@ -44,23 +45,32 @@
"libcloud"
]
},
- "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a"
+ "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a"
},
{
"canIpForward": false,
- "creationTimestamp": "2013-06-26T15:12:29.726-07:00",
+ "creationTimestamp": "2013-11-01T14:44:57.127-07:00",
"disks": [
{
"index": 0,
"kind": "compute#attachedDisk",
"mode": "READ_WRITE",
"type": "SCRATCH"
+ },
+ {
+ "deviceName": "libcloud-demo-europe-attach-disk",
+ "index": 1,
+ "kind": "compute#attachedDisk",
+ "mode": "READ_WRITE",
+ "source": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/disks/libcloud-demo-europe-attach-disk",
+ "type": "PERSISTENT"
}
],
- "id": "14308265828754333159",
- "image": "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130617",
+ "id": "4450078356274958103",
+ "image": "https://www.googleapis.com/compute/v1beta16/projects/debian-cloud/global/images/debian-7-wheezy-v20131014",
+ "kernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-no-conn-track-v20130813",
"kind": "compute#instance",
- "machineType": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-1",
+ "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-1",
"metadata": {
"fingerprint": "42WmSpB8rSM=",
"kind": "compute#metadata"
@@ -72,16 +82,16 @@
{
"kind": "compute#accessConfig",
"name": "External NAT",
- "natIP": "192.158.29.88",
+ "natIP": "8.34.208.52",
"type": "ONE_TO_ONE_NAT"
}
],
"name": "nic0",
- "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default",
- "networkIP": "10.240.66.77"
+ "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
+ "networkIP": "10.240.48.164"
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/instances/libcloud-demo-europe-np-node",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/instances/libcloud-demo-europe-np-node",
"status": "RUNNING",
"tags": {
"fingerprint": "W7t6ZyTyIrc=",
@@ -89,11 +99,11 @@
"libcloud"
]
},
- "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a"
+ "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a"
},
{
"canIpForward": false,
- "creationTimestamp": "2013-06-26T15:13:21.549-07:00",
+ "creationTimestamp": "2013-11-01T14:45:44.186-07:00",
"disks": [
{
"boot": true,
@@ -101,14 +111,14 @@
"index": 0,
"kind": "compute#attachedDisk",
"mode": "READ_WRITE",
- "source": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/disks/libcloud-demo-europe-boot-disk",
+ "source": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/disks/libcloud-demo-europe-boot-disk",
"type": "PERSISTENT"
}
],
- "id": "0681789716029574243",
- "kernel": "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130603",
+ "id": "8051468456709756069",
+ "kernel": "https://www.googleapis.com/compute/v1beta16/projects/google/global/kernels/gce-no-conn-track-v20130813",
"kind": "compute#instance",
- "machineType": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-1",
+ "machineType": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-1",
"metadata": {
"fingerprint": "42WmSpB8rSM=",
"kind": "compute#metadata"
@@ -120,26 +130,27 @@
{
"kind": "compute#accessConfig",
"name": "External NAT",
- "natIP": "192.158.29.121",
+ "natIP": "8.34.211.23",
"type": "ONE_TO_ONE_NAT"
}
],
"name": "nic0",
- "network": "https://www.googleapis.com/compute/v1beta15/projects/project_name/global/networks/default",
- "networkIP": "10.240.206.91"
+ "network": "https://www.googleapis.com/compute/v1beta16/projects/project_name/global/networks/default",
+ "networkIP": "10.240.188.108"
}
],
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/instances/libcloud-demo-europe-persist-node",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/instances/libcloud-demo-europe-persist-node",
"status": "RUNNING",
"tags": {
- "fingerprint": "W7t6ZyTyIrc=",
+ "fingerprint": "EbZdwVRtKyg=",
"items": [
- "libcloud"
+ "libcloud",
+ "newtag"
]
},
- "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a"
+ "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a"
}
],
"kind": "compute#instanceList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/instances"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/instances"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_europe-west1-a_instances_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/zones_europe-west1-a_instances_post.json b/libcloud/test/compute/fixtures/gce/zones_europe-west1-a_instances_post.json
index 8a5813d..f507829 100644
--- a/libcloud/test/compute/fixtures/gce/zones_europe-west1-a_instances_post.json
+++ b/libcloud/test/compute/fixtures/gce/zones_europe-west1-a_instances_post.json
@@ -5,11 +5,11 @@
"name": "operation-zones_europe-west1-a_instances_post",
"operationType": "insert",
"progress": 0,
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/operations/operation-zones_europe-west1-a_instances_post",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/operations/operation-zones_europe-west1-a_instances_post",
"startTime": "2013-06-26T20:57:34.453-07:00",
"status": "PENDING",
"targetId": "14308265828754333159",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a/instances/libcloud-demo-europe-np-node",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/instances/libcloud-demo-europe-np-node",
"user": "897001307951@developer.gserviceaccount.com",
- "zone": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/europe-west1-a"
+ "zone": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ac04f363/libcloud/test/compute/fixtures/gce/zones_europe-west1-a_machineTypes_n1-standard-1.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/zones_europe-west1-a_machineTypes_n1-standard-1.json b/libcloud/test/compute/fixtures/gce/zones_europe-west1-a_machineTypes_n1-standard-1.json
index f66e26c..b598068 100644
--- a/libcloud/test/compute/fixtures/gce/zones_europe-west1-a_machineTypes_n1-standard-1.json
+++ b/libcloud/test/compute/fixtures/gce/zones_europe-west1-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/europe-west1-a/machineTypes/n1-standard-1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/europe-west1-a/machineTypes/n1-standard-1",
"zone": "europe-west1-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.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a.json
index 5fae313..9812bd8 100644
--- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a.json
+++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a.json
@@ -3,38 +3,8 @@
"description": "us-central1-a",
"id": "13462829244527433283",
"kind": "compute#zone",
- "maintenanceWindows": [
- {
- "beginTime": "2013-08-17T12:00:00.000-07:00",
- "description": "maintenance zone",
- "endTime": "2013-09-01T12:00:00.000-07:00",
- "name": "2013-08-17-planned-outage"
- }
- ],
"name": "us-central1-a",
- "quotas": [
- {
- "limit": 8.0,
- "metric": "INSTANCES",
- "usage": 4.0
- },
- {
- "limit": 8.0,
- "metric": "CPUS",
- "usage": 4.0
- },
- {
- "limit": 8.0,
- "metric": "DISKS",
- "usage": 2.0
- },
- {
- "limit": 1024.0,
- "metric": "DISKS_TOTAL_GB",
- "usage": 20.0
- }
- ],
- "region": "https://www.googleapis.com/compute/v1beta15/projects/project_name/regions/us-central1",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a",
+ "region": "https://www.googleapis.com/compute/v1beta16/projects/project_name/regions/us-central1",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a",
"status": "UP"
}
\ 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_disks.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_disks.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_disks.json
index fad39f7..ef0e4af 100644
--- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_disks.json
+++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_disks.json
@@ -6,32 +6,32 @@
"id": "16109451798967042451",
"kind": "compute#disk",
"name": "lcdisk",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/disks/lcdisk",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/disks/lcdisk",
"sizeGb": "1",
"status": "READY",
- "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"
},
{
"creationTimestamp": "2013-06-26T09:47:09.178-07:00",
"id": "10880026303683859871",
"kind": "compute#disk",
"name": "libcloud-demo-boot-disk",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/disks/libcloud-demo-boot-disk",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/disks/libcloud-demo-boot-disk",
"sizeGb": "10",
"status": "READY",
- "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"
},
{
"creationTimestamp": "2013-06-25T10:57:34.305-07:00",
"id": "14383387450728762434",
"kind": "compute#disk",
"name": "test-disk",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/disks/test-disk",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/disks/test-disk",
"sizeGb": "10",
"status": "READY",
- "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#diskList",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/disks"
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/disks"
}
\ 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_disks_lcdisk.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_disks_lcdisk.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_disks_lcdisk.json
index 85d7e31..ae28c7f 100644
--- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_disks_lcdisk.json
+++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_disks_lcdisk.json
@@ -3,8 +3,8 @@
"id": "16109451798967042451",
"kind": "compute#disk",
"name": "lcdisk",
- "selfLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/disks/lcdisk",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/disks/lcdisk",
"sizeGb": "1",
"status": "READY",
- "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_disks_lcdisk_delete.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_disks_lcdisk_delete.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_disks_lcdisk_delete.json
index 024da2a..19efa6a 100644
--- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_disks_lcdisk_delete.json
+++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_disks_lcdisk_delete.json
@@ -5,11 +5,11 @@
"name": "operation-zones_us-central1-a_disks_lcdisk_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_disks_lcdisk_delete",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_disks_lcdisk_delete",
"startTime": "2013-06-26T10:06:12.006-07:00",
"status": "PENDING",
"targetId": "16109451798967042451",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/disks/lcdisk",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/disks/lcdisk",
"user": "897001307951@developer.gserviceaccount.com",
- "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_disks_post.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_disks_post.json b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_disks_post.json
index 51cf6c0..370a3fb 100644
--- a/libcloud/test/compute/fixtures/gce/zones_us-central1-a_disks_post.json
+++ b/libcloud/test/compute/fixtures/gce/zones_us-central1-a_disks_post.json
@@ -5,10 +5,10 @@
"name": "operation-zones_us-central1-a_disks_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_disks_post",
+ "selfLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/operations/operation-zones_us-central1-a_disks_post",
"startTime": "2013-06-26T16:48:17.479-07:00",
"status": "PENDING",
- "targetLink": "https://www.googleapis.com/compute/v1beta15/projects/project_name/zones/us-central1-a/disks/lcdisk",
+ "targetLink": "https://www.googleapis.com/compute/v1beta16/projects/project_name/zones/us-central1-a/disks/lcdisk",
"user": "897001307951@developer.gserviceaccount.com",
- "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
[3/9] Update GCE driver to API version v1beta16 Most of the changes
are in the test fixtures, some were regenerated,
some were just had URLs updated as necessary. In addition,
there were some changes made to the tests to use the regenerated test fixtures
Posted by to...@apache.org.
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": "897001307951@developer.gserviceaccount.com",
- "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": "897001307951@developer.gserviceaccount.com",
- "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": "897001307951@developer.gserviceaccount.com",
- "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": "897001307951@developer.gserviceaccount.com",
- "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": "897001307951@developer.gserviceaccount.com",
- "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": "897001307951@developer.gserviceaccount.com",
- "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": "897001307951@developer.gserviceaccount.com",
- "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": "897001307951@developer.gserviceaccount.com",
- "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)