[google compute] improve GCE create_node, make sure ex_get_disktype f…

…unction will not fail Closes #448 Signed-off-by: Eric Johnson <erjohnso@google.com>
apache · Feb 13, 2015 · f40c311 · f40c311
1 parent e33132d
commit f40c311
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -16,6 +16,10 @@ General
 Compute
 ~~~~~~~
 
+- Improve GCE create_node, make sure ex_get_disktype function
+  (GITHUB-448)
+  [Markos Gogoulos]
+
 - GCE driver fix to handle unknown image projects
   (GITHUB-447)
   [Markos Gogoulos]

diff --git a/libcloud/compute/drivers/gce.py b/libcloud/compute/drivers/gce.py
@@ -2178,7 +2178,7 @@ def create_node(self, name, size, image, location=None,
         if image and not hasattr(image, 'name'):
             image = self.ex_get_image(image)
         if not hasattr(ex_disk_type, 'name'):
-            ex_disk_type = self.ex_get_disktype(ex_disk_type)
+            ex_disk_type = self.ex_get_disktype(ex_disk_type, zone=location)
 
         # Use disks[].initializeParams to auto-create the boot disk
         if not ex_disks_gce_struct and not ex_boot_disk:
@@ -2364,7 +2364,7 @@ def ex_create_multiple_nodes(self, base_name, size, image, number,
         if image and not hasattr(image, 'name'):
             image = self.ex_get_image(image)
         if not hasattr(ex_disk_type, 'name'):
-            ex_disk_type = self.ex_get_disktype(ex_disk_type)
+            ex_disk_type = self.ex_get_disktype(ex_disk_type, zone=location)
 
         node_attrs = {'size': size,
                       'image': image,

diff --git a/libcloud/test/compute/fixtures/gce/zones_europe-west1-a_diskTypes_pd_standard.json b/libcloud/test/compute/fixtures/gce/zones_europe-west1-a_diskTypes_pd_standard.json
@@ -0,0 +1,10 @@
+{
+"creationTimestamp": "2014-06-02T11:07:28.530-07:00",
+ "defaultDiskSizeGb": "500",
+ "description": "Standard Persistent Disk",
+ "kind": "compute#diskType",
+ "name": "pd-standard",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/gifted-electron-225/zones/europe-west1-a/diskTypes/pd-standard",
+ "validDiskSize": "10GB-10240GB",
+ "zone": "https://www.googleapis.com/compute/v1/projects/gifted-electron-225/zones/europe-west1-a"
+}
diff --git a/libcloud/test/compute/test_gce.py b/libcloud/test/compute/test_gce.py
@@ -2259,6 +2259,10 @@ def _zones_europe_west1_a_instances(self, method, url, body, headers):
             body = self.fixtures.load('zones_europe-west1-a_instances.json')
         return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
 
+    def _zones_europe_west1_a_diskTypes_pd_standard(self, method, url, body, headers):
+        body = self.fixtures.load('zones_europe-west1-a_diskTypes_pd_standard.json')
+        return (httplib.OK, body, self.json_hdr, httplib.responses[httplib.OK])
+
     def _zones_us_central1_a_instances(self, method, url, body, headers):
         if method == 'POST':
             body = self.fixtures.load(