summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-13 08:16:29 +0000
committerGerrit Code Review <review@openstack.org>2013-02-13 08:16:29 +0000
commitb0b5132f375ecee8e85fa9945dc69e5feaee396d (patch)
treefb2fa2d067c0028d7d085a196517fd99bc92a62f
parente1f76a154214bae795b48aa3008ff8f4a62d6856 (diff)
parentf59a0373834655346b50eac2a033c7cb31061c3a (diff)
downloadnova-b0b5132f375ecee8e85fa9945dc69e5feaee396d.tar.gz
nova-b0b5132f375ecee8e85fa9945dc69e5feaee396d.tar.xz
nova-b0b5132f375ecee8e85fa9945dc69e5feaee396d.zip
Merge "Forces flavorRef to be string in servers resize api"
-rw-r--r--nova/api/openstack/compute/servers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index 723997eba..5858ad640 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -1202,7 +1202,7 @@ class Controller(wsgi.Controller):
def _action_resize(self, req, id, body):
"""Resizes a given instance to the flavor size requested."""
try:
- flavor_ref = body["resize"]["flavorRef"]
+ flavor_ref = str(body["resize"]["flavorRef"])
if not flavor_ref:
msg = _("Resize request has invalid 'flavorRef' attribute.")
raise exc.HTTPBadRequest(explanation=msg)