From 3b6207976a51d33ee2ec701d21fa2a0cc6eca2e8 Mon Sep 17 00:00:00 2001 From: Eoghan Glynn Date: Mon, 30 Jul 2012 16:23:11 +0100 Subject: Allow XML payload for volume creation. Fixes nova-volume aspect of LP 1030330 Tolerate volume size attribute of type string as opposed to int. Change-Id: I7cccb760a246d562792dec1669d634803bb9bc57 --- nova/api/openstack/volume/volumes.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'nova/api') diff --git a/nova/api/openstack/volume/volumes.py b/nova/api/openstack/volume/volumes.py index 4c12638b4..ec9a47a74 100644 --- a/nova/api/openstack/volume/volumes.py +++ b/nova/api/openstack/volume/volumes.py @@ -218,7 +218,17 @@ class VolumeController(object): raise exc.HTTPUnprocessableEntity() volume = body['volume'] - size = volume['size'] + + def as_int(s): + try: + return int(s) + except ValueError: + return s + + # NOTE(eglynn): we're tolerant of non-int sizes here, as type + # integrity is enforced later in the creation codepath + size = as_int(volume['size']) + LOG.audit(_("Create volume of %s GB"), size, context=context) kwargs = {} -- cgit