summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-05-24 05:45:22 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-05-24 05:45:22 -0700
commite49bb59db9e9e40eb9941b51403f87b95671752a (patch)
treedccd8b1f83e636701564503c645cb7b0bac82cc9 /nova/api
parent758d60ccede696c1ef52488c90da7b80b807dedf (diff)
parent9a2c944be8e7187a12bfd363a2a74325403e00d8 (diff)
accepting calls
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py2
-rw-r--r--nova/api/openstack/zones.py5
2 files changed, 4 insertions, 3 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 474695d98..f726a3709 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -190,7 +190,7 @@ class Controller(common.OpenstackController):
inst['image_id'] = requested_image_id
# TODO(sandy): REMOVE THIS
- LOG.debug(_("***** INST = %(inst)s") % locals())
+ LOG.debug(_("***** INST = %(inst)s") % locals()) #pep8
builder = self._get_view_builder(req)
server = builder.build(inst, is_detail=True)
diff --git a/nova/api/openstack/zones.py b/nova/api/openstack/zones.py
index f9d933a50..96a6552b3 100644
--- a/nova/api/openstack/zones.py
+++ b/nova/api/openstack/zones.py
@@ -117,8 +117,9 @@ class Controller(common.OpenstackController):
"""Returns a weighted list of costs to create instances
of desired capabilities."""
ctx = req.environ['nova.context']
- LOG.debug("INCOMING SELECT '%s'" % req.environ)
- specs = json.loads(req.body)
+ json_specs = json.loads(req.body)
+ specs = json.loads(json_specs)
+ LOG.debug("INCOMING SELECT '%s'" % specs)
build_plan = api.select(ctx, specs=specs)
cooked = self._scrub_build_plan(build_plan)
return {"weights": cooked}