Skip to content

improve GCE create_node, make sure ex_get_disktype function will not fail #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mgogoulos wants to merge 1 commit into from
Closed

improve GCE create_node, make sure ex_get_disktype function will not fail #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libcloud/compute/drivers/gce.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2160,7 +2160,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:
Expand Down Expand Up @@ -2346,7 +2346,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,
Expand Down
10 changes: 10 additions & 0 deletions libcloud/test/compute/fixtures/gce/zones_europe-west1-a_diskTypes_pd_standard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
4 changes: 4 additions & 0 deletions libcloud/test/compute/test_gce.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down