From 3981a218da0c201a89158cf9a95400e44f9c6eb2 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Mon, 26 Sep 2011 13:13:33 -0400 Subject: Ensure minRam and minDisk are always integers Fixing bug 859149 Change-Id: I52bcb442225e8e3cb4aecc6d993e1c3a774cdf84 --- nova/api/openstack/views/images.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'nova/api') diff --git a/nova/api/openstack/views/images.py b/nova/api/openstack/views/images.py index 4e8584bad..67364b115 100644 --- a/nova/api/openstack/views/images.py +++ b/nova/api/openstack/views/images.py @@ -197,11 +197,20 @@ class ViewBuilderV11(ViewBuilder): if detail: image["metadata"] = image_obj.get("properties", {}) - if 'min_ram' in image_obj: - image["minRam"] = image_obj.get("min_ram") or 0 - if 'min_disk' in image_obj: - image["minDisk"] = image_obj.get("min_disk") or 0 + min_ram = image_obj.get('min_ram') or 0 + try: + min_ram = int(min_ram) + except ValueError: + min_ram = 0 + image['minRam'] = min_ram + + min_disk = image_obj.get('min_disk') or 0 + try: + min_disk = int(min_disk) + except ValueError: + min_disk = 0 + image['minDisk'] = min_disk return image -- cgit