summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-03-05 14:48:06 +0000
committerGerrit Code Review <review@openstack.org>2013-03-05 14:48:06 +0000
commitad57a303f1916d99f73eb8123f60c8a2fd1e6a78 (patch)
tree9c16fcfb7e0c154f7f42ae6919a08265a8273e05 /nova/api
parent84d8ba574b0b19876b98b435a0d47ac1b8dd035c (diff)
parent6b3bba9141c7fdc4b00025f7e6ee8d980e41ec9a (diff)
Merge "Fix 'to integer' conversion of max and min count values"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/servers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index 532c5b0fa..3464cfdbd 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -825,7 +825,7 @@ class Controller(wsgi.Controller):
max_count = server_dict.get('max_count', min_count)
try:
- min_count = int(min_count)
+ min_count = int(str(min_count))
except ValueError:
msg = _('min_count must be an integer value')
raise exc.HTTPBadRequest(explanation=msg)
@@ -834,7 +834,7 @@ class Controller(wsgi.Controller):
raise exc.HTTPBadRequest(explanation=msg)
try:
- max_count = int(max_count)
+ max_count = int(str(max_count))
except ValueError:
msg = _('max_count must be an integer value')
raise exc.HTTPBadRequest(explanation=msg)