summaryrefslogtreecommitdiffstats
path: root/nova/validate.py
diff options
context:
space:
mode:
authorJoshua McKenty <jmckenty@gmail.com>2010-06-24 04:11:56 +0100
committerandy <github@anarkystic.com>2010-06-24 04:11:56 +0100
commit0912a1c2d55e031287ca5dd5c8df0597667ad12d (patch)
treeb73957727608ba61a98681def10b13f1e7ba38ca /nova/validate.py
parenta17abe20d34336d0642bbf2b49cb37f6b9d0a197 (diff)
downloadnova-0912a1c2d55e031287ca5dd5c8df0597667ad12d.tar.gz
nova-0912a1c2d55e031287ca5dd5c8df0597667ad12d.tar.xz
nova-0912a1c2d55e031287ca5dd5c8df0597667ad12d.zip
Adding basic validation of volume size on creation, plus tests for it.
Diffstat (limited to 'nova/validate.py')
-rw-r--r--nova/validate.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/validate.py b/nova/validate.py
index e96a47059..adf2d147c 100644
--- a/nova/validate.py
+++ b/nova/validate.py
@@ -35,7 +35,7 @@ def rangetest(**argchecks): # validate ranges for both+defaults
# for all args to be checked
if argname in kargs:
# was passed by name
- if kargs[argname] < low or kargs[argname] > high:
+ if float(kargs[argname]) < low or float(kargs[argname]) > high:
errmsg = '{0} argument "{1}" not in {2}..{3}'
errmsg = errmsg.format(funcname, argname, low, high)
raise TypeError(errmsg)
@@ -43,9 +43,9 @@ def rangetest(**argchecks): # validate ranges for both+defaults
elif argname in positionals:
# was passed by position
position = positionals.index(argname)
- if pargs[position] < low or pargs[position] > high:
- errmsg = '{0} argument "{1}" not in {2}..{3}'
- errmsg = errmsg.format(funcname, argname, low, high)
+ if float(pargs[position]) < low or float(pargs[position]) > high:
+ errmsg = '{0} argument "{1}" with value of {4} not in {2}..{3}'
+ errmsg = errmsg.format(funcname, argname, low, high, pargs[position])
raise TypeError(errmsg)
else:
pass