openstack/trove
Code Issues Proposed changes

Fixing validation to not force public RDL users to have a volume.

Browse Source
This commit is contained in:
Tim Simpson 2012-06-07 09:10:29 -05:00
parent 651e792f11
commit 27f00b1ba0
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
reddwarf/instance/service.py
View File

@ -317,9 +317,18 @@ class InstanceController(BaseController):
vol_enabled = utils.bool_from_string(
config.Config.get('reddwarf_volume_support',
'True'))
must_have_vol = utils.bool_from_string(
config.Config.get('reddwarf_must_use_volume',
'False'))
if vol_enabled:
volume_size = body['instance']['volume']['size']
InstanceController._validate_volume_size(volume_size)
if body['instance'].get('volume', None):
if body['instance']['volume'].get('size', None):
volume_size = body['instance']['volume']['size']
InstanceController._validate_volume_size(volume_size)
elif must_have_vol:
raise exception.MissingKey(key="size")
elif must_have_vol:
raise exception.MissingKey(key="volume")
except KeyError as e:
LOG.error(_("Create Instance Required field(s) - %s") % e)
raise exception.ReddwarfError("Required element/key - %s "