libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject [3/3] git commit: Updating Compute Engine image project list
Date Mon, 07 Jul 2014 18:46:52 GMT
Updating Compute Engine image project list

Signed-off-by: Tomaz Muraus <tomaz@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/3d2a38db
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/3d2a38db
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/3d2a38db

Branch: refs/heads/trunk
Commit: 3d2a38db9e15e67e8ea8639782446960bf968ee4
Parents: 810bbe2
Author: Eric Johnson <erjohnso@google.com>
Authored: Tue Jul 1 09:03:17 2014 -0700
Committer: Tomaz Muraus <tomaz@apache.org>
Committed: Mon Jul 7 20:37:31 2014 +0200

----------------------------------------------------------------------
 libcloud/compute/drivers/gce.py   | 9 ++++++++-
 libcloud/test/compute/test_gce.py | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/3d2a38db/libcloud/compute/drivers/gce.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/gce.py b/libcloud/compute/drivers/gce.py
index a1cf75e..c216c64 100644
--- a/libcloud/compute/drivers/gce.py
+++ b/libcloud/compute/drivers/gce.py
@@ -2305,10 +2305,17 @@ class GCENodeDriver(NodeDriver):
             return self._to_node_image(response.object)
         image = self._match_images(None, partial_name)
         if not image:
-            if partial_name.startswith('debian'):
+            if (partial_name.startswith('debian') or
+                    partial_name.startswith('backports')):
                 image = self._match_images('debian-cloud', partial_name)
             elif partial_name.startswith('centos'):
                 image = self._match_images('centos-cloud', partial_name)
+            elif partial_name.startswith('sles'):
+                image = self._match_images('suse-cloud', partial_name)
+            elif partial_name.startswith('rhel'):
+                image = self._match_images('rhel-cloud', partial_name)
+            elif partial_name.startswith('windows'):
+                image = self._match_images('windows-cloud', partial_name)
             elif partial_name.startswith('container-vm'):
                 image = self._match_images('google-containers', partial_name)
 

http://git-wip-us.apache.org/repos/asf/libcloud/blob/3d2a38db/libcloud/test/compute/test_gce.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_gce.py b/libcloud/test/compute/test_gce.py
index 80110d0..faf6303 100644
--- a/libcloud/test/compute/test_gce.py
+++ b/libcloud/test/compute/test_gce.py
@@ -100,8 +100,8 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin):
         project = 'debian-cloud'
         image = self.driver._match_images(project, 'debian-7')
         self.assertEqual(image.name, 'debian-7-wheezy-v20131120')
-        image = self.driver._match_images(project, 'debian-6')
-        self.assertEqual(image.name, 'debian-6-squeeze-v20130926')
+        image = self.driver._match_images(project, 'backports')
+        self.assertEqual(image.name, 'backports-debian-7-wheezy-v20131127')
 
     def test_ex_list_addresses(self):
         address_list = self.driver.ex_list_addresses()


Mime
View raw message