diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-09-26 18:47:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-09-26 18:47:56 +0000 |
| commit | eed6ee7cfff8c7586c825fd93fa65f5f1f5e2053 (patch) | |
| tree | 7e1cecfa90c9111eb9158eb43e1e6a8dea8f12b3 /nova/api | |
| parent | 89de26a42360ee06b7a4d143d8d04c9dc21e2791 (diff) | |
| parent | 3981a218da0c201a89158cf9a95400e44f9c6eb2 (diff) | |
Merge "Ensure minRam and minDisk are always integers"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/views/images.py | 17 |
1 files changed, 13 insertions, 4 deletions
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 |