libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erjoh...@apache.org
Subject [1/2] libcloud git commit: [google compute] list_images() returns all non-deprecated images by default
Date Tue, 06 Jan 2015 13:15:43 GMT
Repository: libcloud
Updated Branches:
  refs/heads/trunk 7771e1803 -> 71e38407e


http://git-wip-us.apache.org/repos/asf/libcloud/blob/71e38407/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 19bdc29..9ded3d4 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
@@ -346,7 +346,9 @@
       "archiveSizeBytes": "405683884",
       "creationTimestamp": "2013-10-28T13:52:08.233-07:00",
       "deprecated": {
-        "deprecated": "2013-12-02T12:00:00Z",
+        "deprecated": "2064-03-11T20:18:36.194-07:00",
+        "obsolete":  "2074-03-11T20:18:36.194-07:00",
+        "deleted": "2084-03-11T20:18:36.194-07:00",
         "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20131120",
         "state": "DEPRECATED"
       },

http://git-wip-us.apache.org/repos/asf/libcloud/blob/71e38407/libcloud/test/compute/fixtures/gce/projects_gce-nvme_global_images.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/projects_gce-nvme_global_images.json b/libcloud/test/compute/fixtures/gce/projects_gce-nvme_global_images.json
new file mode 100644
index 0000000..e802878
--- /dev/null
+++ b/libcloud/test/compute/fixtures/gce/projects_gce-nvme_global_images.json
@@ -0,0 +1,55 @@
+{
+ "kind": "compute#imageList",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/gce-nvme/global/images",
+ "id": "projects/gce-nvme/global/images",
+ "items": [
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/gce-nvme/global/images/nvme-backports-debian-7-wheezy-v20140904",
+   "id": "11933993573261788709",
+   "creationTimestamp": "2014-11-05T20:09:29.302-08:00",
+   "name": "nvme-backports-debian-7-wheezy-v20140904",
+   "description": "NVMe optimized Debian GNU/Linux 7.6 (wheezy) amd64 with backports kernel
and SSH packages built on 2014-09-04",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "158683343",
+   "diskSizeGb": "10"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/gce-nvme/global/images/nvme-backports-debian-7-wheezy-v20140926",
+   "id": "16689990597272015714",
+   "creationTimestamp": "2014-10-20T22:01:24.039-07:00",
+   "name": "nvme-backports-debian-7-wheezy-v20140926",
+   "description": "NVMe optimized Debian GNU/Linux 7.6 (wheezy) amd64 with backports kernel
and SSH packages built on 2014-09-26",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "221456136",
+   "diskSizeGb": "10"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/gce-nvme/global/images/nvme-backports-debian-7-wheezy-v20141108",
+   "id": "9219956677399420856",
+   "creationTimestamp": "2014-11-14T10:55:03.809-08:00",
+   "name": "nvme-backports-debian-7-wheezy-v20141108",
+   "description": "NVMe optimized Debian GNU/Linux 7.6 (wheezy) amd64 with backports kernel
and SSH packages built on 2014-11-08",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "162245079",
+   "diskSizeGb": "10"
+  }
+ ]
+}

http://git-wip-us.apache.org/repos/asf/libcloud/blob/71e38407/libcloud/test/compute/fixtures/gce/projects_google-containers_global_images.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/projects_google-containers_global_images.json
b/libcloud/test/compute/fixtures/gce/projects_google-containers_global_images.json
new file mode 100644
index 0000000..08c6cf5
--- /dev/null
+++ b/libcloud/test/compute/fixtures/gce/projects_google-containers_global_images.json
@@ -0,0 +1,179 @@
+{
+ "kind": "compute#imageList",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/google-containers/global/images",
+ "id": "projects/google-containers/global/images",
+ "items": [
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20140522",
+   "id": "12928746743513706688",
+   "creationTimestamp": "2014-05-21T15:30:01.045-07:00",
+   "name": "container-vm-v20140522",
+   "description": "Google container VM image, GlueCon 2014 release",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "deprecated": {
+    "state": "DEPRECATED",
+    "replacement": "https://content.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20140522"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "396961200",
+   "diskSizeGb": "10"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20140624",
+   "id": "17637324906060386740",
+   "creationTimestamp": "2014-06-24T17:59:38.240-07:00",
+   "name": "container-vm-v20140624",
+   "description": "Google container VM image, Google I/O 2014 release",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "deprecated": {
+    "state": "DEPRECATED",
+    "replacement": "https://content.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20140624"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "391233093",
+   "diskSizeGb": "10"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20140710",
+   "id": "17658123443453052547",
+   "creationTimestamp": "2014-07-15T17:29:02.737-07:00",
+   "name": "container-vm-v20140710",
+   "description": "Google container VM image",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "deprecated": {
+    "state": "DEPRECATED",
+    "replacement": "https://content.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20140710"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "428253862",
+   "diskSizeGb": "10"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20140731",
+   "id": "7675862044791361451",
+   "creationTimestamp": "2014-08-01T09:41:06.107-07:00",
+   "name": "container-vm-v20140731",
+   "description": "Google container VM image",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "deprecated": {
+    "state": "DEPRECATED",
+    "replacement": "https://content.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20140731"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "403951165",
+   "diskSizeGb": "10"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20140826",
+   "id": "5337588031210316441",
+   "creationTimestamp": "2014-08-26T16:19:17.533-07:00",
+   "name": "container-vm-v20140826",
+   "description": "Google container VM image",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "deprecated": {
+    "state": "DEPRECATED",
+    "replacement": "https://content.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20140826"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "420545090",
+   "diskSizeGb": "10"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20140925",
+   "id": "7326458020538492469",
+   "creationTimestamp": "2014-09-25T14:23:38.865-07:00",
+   "name": "container-vm-v20140925",
+   "description": "Google container VM image",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "deprecated": {
+    "state": "DEPRECATED",
+    "replacement": "https://content.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20140925"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "432272421",
+   "diskSizeGb": "10"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20140929",
+   "id": "17245742661521590081",
+   "creationTimestamp": "2014-09-29T13:49:23.330-07:00",
+   "name": "container-vm-v20140929",
+   "description": "Google container VM image",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "deprecated": {
+    "state": "DEPRECATED",
+    "replacement": "https://content.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20140929"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "422162733",
+   "diskSizeGb": "10"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20141016",
+   "id": "857872787891330870",
+   "creationTimestamp": "2014-10-22T13:40:01.068-07:00",
+   "name": "container-vm-v20141016",
+   "description": "Google container VM image",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "432768815",
+   "diskSizeGb": "10"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20141208",
+   "id": "8037634834499556312",
+   "creationTimestamp": "2014-12-09T15:57:34.413-08:00",
+   "name": "container-vm-v20141208",
+   "description": "Google container VM image",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "413371239",
+   "diskSizeGb": "10"
+  }
+ ]
+}

http://git-wip-us.apache.org/repos/asf/libcloud/blob/71e38407/libcloud/test/compute/fixtures/gce/projects_opensuse-cloud_global_images.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/projects_opensuse-cloud_global_images.json
b/libcloud/test/compute/fixtures/gce/projects_opensuse-cloud_global_images.json
new file mode 100644
index 0000000..1fdda28
--- /dev/null
+++ b/libcloud/test/compute/fixtures/gce/projects_opensuse-cloud_global_images.json
@@ -0,0 +1,102 @@
+{
+ "kind": "compute#imageList",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/opensuse-cloud/global/images",
+ "id": "projects/opensuse-cloud/global/images",
+ "items": [
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/opensuse-cloud/global/images/opensuse-13-1-v20140609",
+   "id": "5330388859130445578",
+   "creationTimestamp": "2014-06-09T11:45:56.997-07:00",
+   "name": "opensuse-13-1-v20140609",
+   "description": "",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "deprecated": {
+    "state": "DEPRECATED",
+    "replacement": "https://content.googleapis.com/compute/v1/projects/opensuse-cloud/global/images/opensuse-13-1-v20140627",
+    "deprecated": "2014-06-27T00:00:00Z"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "872777232",
+   "diskSizeGb": "8"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/opensuse-cloud/global/images/opensuse-13-1-v20140627",
+   "id": "635369188275126205",
+   "creationTimestamp": "2014-06-27T08:44:37.896-07:00",
+   "name": "opensuse-13-1-v20140627",
+   "description": "",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "deprecated": {
+    "state": "DEPRECATED",
+    "replacement": "https://content.googleapis.com/compute/v1/projects/opensuse-cloud/global/images/opensuse-13-1-v20140711",
+    "deprecated": "2014-07-11T00:00:00Z"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "878545758",
+   "diskSizeGb": "8"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/opensuse-cloud/global/images/opensuse-13-1-v20140711",
+   "id": "414150705420767734",
+   "creationTimestamp": "2014-07-11T14:04:35.210-07:00",
+   "name": "opensuse-13-1-v20140711",
+   "description": "",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "deprecated": {
+    "state": "DEPRECATED",
+    "replacement": "https://content.googleapis.com/compute/v1/projects/opensuse-cloud/global/images/opensuse-13-1-v20141102",
+    "deprecated": "2014-11-02T00:00:00Z"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "878437869",
+   "diskSizeGb": "8"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/opensuse-cloud/global/images/opensuse-13-1-v20141102",
+   "id": "4629398803823711760",
+   "creationTimestamp": "2014-11-02T04:34:26.263-08:00",
+   "name": "opensuse-13-1-v20141102",
+   "description": "openSUSE 13.1 (built on 2014-11-02)",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "881210631",
+   "diskSizeGb": "8"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/opensuse-cloud/global/images/opensuse-13-2-v20141205",
+   "id": "7015477126275748573",
+   "creationTimestamp": "2014-12-09T05:36:16.085-08:00",
+   "name": "opensuse-13-2-v20141205",
+   "description": "openSUSE 13.2 (built on 2014-12-05)",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "1091494581",
+   "diskSizeGb": "8"
+  }
+ ]
+}

http://git-wip-us.apache.org/repos/asf/libcloud/blob/71e38407/libcloud/test/compute/fixtures/gce/projects_rhel-cloud_global_images.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/projects_rhel-cloud_global_images.json b/libcloud/test/compute/fixtures/gce/projects_rhel-cloud_global_images.json
new file mode 100644
index 0000000..c646fd9
--- /dev/null
+++ b/libcloud/test/compute/fixtures/gce/projects_rhel-cloud_global_images.json
@@ -0,0 +1,49 @@
+{
+ "kind": "compute#imageList",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/rhel-cloud/global/images",
+ "id": "projects/rhel-cloud/global/images",
+ "items": [
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/rhel-cloud/global/images/rhel-7-v20141108",
+   "id": "9656001643961289198",
+   "creationTimestamp": "2014-11-10T14:15:28.054-08:00",
+   "name": "rhel-7-v20141108",
+   "description": "Red Hat Enterprise Linux 7.0 x86_64 built on 2014-11-08",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "deprecated": {
+    "state": "DEPRECATED",
+    "replacement": "https://content.googleapis.com/compute/v1/projects/rhel-cloud/global/images/rhel-7-v20141205"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "1201321944",
+   "diskSizeGb": "10",
+   "licenses": [
+    "https://content.googleapis.com/compute/v1/projects/rhel-cloud/global/licenses/rhel-7-server"
+   ]
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/rhel-cloud/global/images/rhel-7-v20141205",
+   "id": "9718957591079040023",
+   "creationTimestamp": "2014-12-08T17:07:02.804-08:00",
+   "name": "rhel-7-v20141205",
+   "description": "Red Hat Enterprise Linux 7.0 x86_64 built on 2014-12-05",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "1204146084",
+   "diskSizeGb": "10",
+   "licenses": [
+    "https://content.googleapis.com/compute/v1/projects/rhel-cloud/global/licenses/rhel-7-server"
+   ]
+  }
+ ]
+}

http://git-wip-us.apache.org/repos/asf/libcloud/blob/71e38407/libcloud/test/compute/fixtures/gce/projects_rhel-cloud_global_licenses_rhel_server.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/projects_rhel-cloud_global_licenses_rhel_server.json
b/libcloud/test/compute/fixtures/gce/projects_rhel-cloud_global_licenses_rhel_server.json
new file mode 100644
index 0000000..a509a68
--- /dev/null
+++ b/libcloud/test/compute/fixtures/gce/projects_rhel-cloud_global_licenses_rhel_server.json
@@ -0,0 +1,6 @@
+{
+ "kind": "compute#license",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/windows-cloud/global/licenses/rhel-7-server",
+ "name": "rhel-7-server",
+ "chargesUseFee": true
+}

http://git-wip-us.apache.org/repos/asf/libcloud/blob/71e38407/libcloud/test/compute/fixtures/gce/projects_ubuntu-os-cloud_global_images.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/projects_ubuntu-os-cloud_global_images.json
b/libcloud/test/compute/fixtures/gce/projects_ubuntu-os-cloud_global_images.json
new file mode 100644
index 0000000..f7e7e20
--- /dev/null
+++ b/libcloud/test/compute/fixtures/gce/projects_ubuntu-os-cloud_global_images.json
@@ -0,0 +1,169 @@
+{
+ "kind": "compute#imageList",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images",
+ "id": "projects/ubuntu-os-cloud/global/images",
+ "items": [
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-1204-precise-v20141028",
+   "id": "15508054221909398824",
+   "creationTimestamp": "2014-10-29T09:51:42.018-07:00",
+   "name": "ubuntu-1204-precise-v20141028",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "deprecated": {
+    "state": "DEPRECATED",
+    "replacement": "https://content.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-1204-precise-v20141212"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "378614228",
+   "diskSizeGb": "10"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-1204-precise-v20141031",
+   "id": "3216640293232429175",
+   "creationTimestamp": "2014-11-07T00:48:18.673-08:00",
+   "name": "ubuntu-1204-precise-v20141031",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "deprecated": {
+    "state": "DEPRECATED",
+    "replacement": "https://content.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-1204-precise-v20141212"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "1137275331",
+   "diskSizeGb": "10"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-1204-precise-v20141212",
+   "id": "12756823774499736482",
+   "creationTimestamp": "2014-12-17T11:31:59.126-08:00",
+   "name": "ubuntu-1204-precise-v20141212",
+   "description": "Canonical, Ubuntu, 12.04 LTS, amd64 precise image built on 2014-12-12",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "1140352383",
+   "diskSizeGb": "10"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-1404-trusty-v20141028",
+   "id": "17781692821175088041",
+   "creationTimestamp": "2014-10-29T09:51:42.072-07:00",
+   "name": "ubuntu-1404-trusty-v20141028",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "deprecated": {
+    "state": "DEPRECATED",
+    "replacement": "https://content.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-1404-trusty-v20141212"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "375105326",
+   "diskSizeGb": "10"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-1404-trusty-v20141031a",
+   "id": "6500942514398264968",
+   "creationTimestamp": "2014-11-07T00:48:04.471-08:00",
+   "name": "ubuntu-1404-trusty-v20141031a",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "deprecated": {
+    "state": "DEPRECATED",
+    "replacement": "https://content.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-1404-trusty-v20141212"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "1015791618",
+   "diskSizeGb": "10"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-1404-trusty-v20141212",
+   "id": "14921913565797044708",
+   "creationTimestamp": "2014-12-17T11:31:37.868-08:00",
+   "name": "ubuntu-1404-trusty-v20141212",
+   "description": "Canonical, Ubuntu, 14.04 LTS, amd64 trusty image built on 2014-12-12",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "981936603",
+   "diskSizeGb": "10"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-1410-utopic-v20141029",
+   "id": "13898107879086076373",
+   "creationTimestamp": "2014-10-29T09:51:39.609-07:00",
+   "name": "ubuntu-1410-utopic-v20141029",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "deprecated": {
+    "state": "DEPRECATED",
+    "replacement": "https://content.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-1410-utopic-v20141217"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "348037877",
+   "diskSizeGb": "10"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-1410-utopic-v20141030a",
+   "id": "2412636152371793564",
+   "creationTimestamp": "2014-11-07T00:47:53.082-08:00",
+   "name": "ubuntu-1410-utopic-v20141030a",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "deprecated": {
+    "state": "DEPRECATED",
+    "replacement": "https://content.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-1410-utopic-v20141217"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "1044175299",
+   "diskSizeGb": "10"
+  },
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-1410-utopic-v20141217",
+   "id": "6363233028234584116",
+   "creationTimestamp": "2014-12-17T11:31:26.695-08:00",
+   "name": "ubuntu-1410-utopic-v20141217",
+   "description": "Canonical, Ubuntu, 14.10, amd64 utopic image built on 2014-12-17",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "1048366941",
+   "diskSizeGb": "10"
+  }
+ ]
+}

http://git-wip-us.apache.org/repos/asf/libcloud/blob/71e38407/libcloud/test/compute/fixtures/gce/projects_windows-cloud_global_images.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/projects_windows-cloud_global_images.json
b/libcloud/test/compute/fixtures/gce/projects_windows-cloud_global_images.json
new file mode 100644
index 0000000..53b0ea4
--- /dev/null
+++ b/libcloud/test/compute/fixtures/gce/projects_windows-cloud_global_images.json
@@ -0,0 +1,26 @@
+{
+ "kind": "compute#imageList",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/windows-cloud/global/images",
+ "id": "projects/windows-cloud/global/images",
+ "items": [
+  {
+   "kind": "compute#image",
+   "selfLink": "https://www.googleapis.com/compute/v1/projects/windows-cloud/global/images/windows-server-2008-r2-dc-v20141120",
+   "id": "10752443450426453317",
+   "creationTimestamp": "2014-12-02T10:31:56.162-08:00",
+   "name": "windows-server-2008-r2-dc-v20141120",
+   "description": "Microsoft Windows Server 2008 R2 Datacenter Edition built on 2014-11-20",
+   "sourceType": "RAW",
+   "rawDisk": {
+    "source": "",
+    "containerType": "TAR"
+   },
+   "status": "READY",
+   "archiveSizeBytes": "6974709077",
+   "diskSizeGb": "100",
+   "licenses": [
+    "https://content.googleapis.com/compute/v1/projects/windows-cloud/global/licenses/windows-server-2008-r2-dc"
+   ]
+  }
+ ]
+}

http://git-wip-us.apache.org/repos/asf/libcloud/blob/71e38407/libcloud/test/compute/fixtures/gce/projects_windows-cloud_global_licenses_windows_server_2008_r2_dc.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/gce/projects_windows-cloud_global_licenses_windows_server_2008_r2_dc.json
b/libcloud/test/compute/fixtures/gce/projects_windows-cloud_global_licenses_windows_server_2008_r2_dc.json
new file mode 100644
index 0000000..a7e2652
--- /dev/null
+++ b/libcloud/test/compute/fixtures/gce/projects_windows-cloud_global_licenses_windows_server_2008_r2_dc.json
@@ -0,0 +1,6 @@
+{
+ "kind": "compute#license",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/windows-cloud/global/licenses/windows-2008-r2-dc",
+ "name": "windows-2008-r2-dc",
+ "chargesUseFee": true
+}

http://git-wip-us.apache.org/repos/asf/libcloud/blob/71e38407/libcloud/test/compute/test_gce.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_gce.py b/libcloud/test/compute/test_gce.py
index 52c7125..c2fe333 100644
--- a/libcloud/test/compute/test_gce.py
+++ b/libcloud/test/compute/test_gce.py
@@ -149,13 +149,15 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin):
 
     def test_list_images(self):
         local_images = self.driver.list_images()
+        all_deprecated_images = self.driver.list_images(ex_include_deprecated=True)
         debian_images = self.driver.list_images(ex_project='debian-cloud')
         local_plus_deb = self.driver.list_images(['debian-cloud', 'project_name'])
-        self.assertEqual(len(local_images), 3)
-        self.assertEqual(len(debian_images), 19)
-        self.assertEqual(len(local_plus_deb), 22)
-        self.assertEqual(local_images[0].name, 'debian-7-wheezy-v20130617')
-        self.assertEqual(local_images[1].name, 'centos-6-v20131118')
+        self.assertEqual(len(local_images), 23)
+        self.assertEqual(len(all_deprecated_images), 156)
+        self.assertEqual(len(debian_images), 2)
+        self.assertEqual(len(local_plus_deb), 3)
+        self.assertEqual(local_images[0].name, 'aws-ubuntu')
+        self.assertEqual(debian_images[1].name, 'debian-7-wheezy-v20131120')
 
     def test_list_locations(self):
         locations = self.driver.list_locations()
@@ -299,8 +301,8 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin):
         volume = self.driver.ex_get_volume('lcdisk')
         image = self.driver.ex_create_image('coreos', volume)
         self.assertTrue(isinstance(image, GCENodeImage))
-        self.assertEqual(image.name, 'coreos')
-        self.assertEqual(image.extra['description'], 'CoreOS test image')
+        self.assertTrue(image.name.startswith('coreos'))
+        self.assertEqual(image.extra['description'], 'CoreOS beta 522.3.0')
 
     def test_ex_create_firewall(self):
         firewall_name = 'lcfirewall'
@@ -708,7 +710,7 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin):
         dep_ts = '2064-03-11T20:18:36.194-07:00'
         obs_ts = '2074-03-11T20:18:36.194-07:00'
         del_ts = '2084-03-11T20:18:36.194-07:00'
-        image = self.driver.ex_get_image('debian-6-squeeze-v20130926')
+        image = self.driver.ex_get_image('debian-7-wheezy-v20131014')
         deprecated = image.deprecate('debian-7', 'DEPRECATED',
                                      deprecated=dep_ts,
                                      obsolete=obs_ts,
@@ -826,9 +828,9 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin):
     def test_ex_get_image(self):
         partial_name = 'debian-7'
         image = self.driver.ex_get_image(partial_name)
-        self.assertEqual(image.name, 'debian-7-wheezy-v20130617')
+        self.assertEqual(image.name, 'debian-7-wheezy-v20131120')
         # A 'debian-7' image exists in the local project
-        self.assertTrue(image.extra['description'].startswith('Local'))
+        self.assertTrue(image.extra['description'].startswith('Debian'))
 
         partial_name = 'debian-6'
         image = self.driver.ex_get_image(partial_name)
@@ -842,9 +844,9 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin):
     def test_ex_copy_image(self):
         name = 'coreos'
         url = 'gs://storage.core-os.net/coreos/amd64-generic/247.0.0/coreos_production_gce.tar.gz'
-        description = 'CoreOS test image'
+        description = 'CoreOS beta 522.3.0'
         image = self.driver.ex_copy_image(name, url, description)
-        self.assertEqual(image.name, name)
+        self.assertTrue(image.name.startswith(name))
         self.assertEqual(image.extra['description'], description)
 
     def test_ex_get_route(self):
@@ -1192,14 +1194,14 @@ class GCEMockHttp(MockHttpTestCase):
             body = self.fixtures.load('global_images.json')
         return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
 
-    def _global_images_debian_7_wheezy_v20130617(
+    def _global_images_debian_7_wheezy_v20131120(
             self, method, url, body, headers):
-        body = self.fixtures.load('global_images_debian_7_wheezy_v20130617_delete.json')
+        body = self.fixtures.load('global_images_debian_7_wheezy_v20131120_delete.json')
         return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
 
-    def _global_images_debian_6_squeeze_v20130926_deprecate(
+    def _global_images_debian_7_wheezy_v20131014_deprecate(
             self, method, url, body, headers):
-        body = self.fixtures.load('global_images_debian_6_squeeze_v20130926_deprecate.json')
+        body = self.fixtures.load('global_images_debian_7_wheezy_v20131014_deprecate.json')
         return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
 
     def _global_routes(self, method, url, body, headers):
@@ -1557,14 +1559,54 @@ class GCEMockHttp(MockHttpTestCase):
         body = self.fixtures.load('project.json')
         return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
 
+    def _projects_windows_cloud_global_licenses_windows_server_2008_r2_dc(self, method, url,
body, headers):
+        body = self.fixtures.load('projects_windows-cloud_global_licenses_windows_server_2008_r2_dc.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
     def _projects_suse_cloud_global_licenses_sles_11(self, method, url, body, headers):
         body = self.fixtures.load('projects_suse-cloud_global_licenses_sles_11.json')
         return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
 
+    def _projects_rhel_cloud_global_licenses_rhel_7_server(self, method, url, body, headers):
+        body = self.fixtures.load('projects_rhel-cloud_global_licenses_rhel_server.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
     def _projects_suse_cloud_global_licenses_sles_12(self, method, url, body, headers):
         body = self.fixtures.load('projects_suse-cloud_global_licenses_sles_12.json')
         return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
 
+    def _projects_windows_cloud_global_images(self, method, url, body, header):
+        body = self.fixtures.load('projects_windows-cloud_global_images.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _projects_rhel_cloud_global_images(self, method, url, boyd, header):
+        body = self.fixtures.load('projects_rhel-cloud_global_images.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _projects_gce_nvme_global_images(self, method, url, boyd, header):
+        body = self.fixtures.load('projects_gce-nvme_global_images.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _projects_coreos_cloud_global_images(self, method, url, boyd, header):
+        body = self.fixtures.load('projects_coreos-cloud_global_images.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _projects_opensuse_cloud_global_images(self, method, url, boyd, header):
+        body = self.fixtures.load('projects_opensuse-cloud_global_images.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _projects_google_containers_global_images(self, method, url, boyd, header):
+        body = self.fixtures.load('projects_google-containers_global_images.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _projects_ubuntu_os_cloud_global_images(self, method, url, body, header):
+        body = self.fixtures.load('projects_ubuntu-os-cloud_global_images.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
+    def _projects_centos_cloud_global_images(self, method, url, body, header):
+        body = self.fixtures.load('projects_centos-cloud_global_images.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
     def _projects_suse_cloud_global_images(self, method, url, body, headers):
         body = self.fixtures.load('projects_suse-cloud_global_images.json')
         return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])


Mime
View raw message