summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-06-06 19:05:31 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-06-06 19:05:31 -0700
commit225c8cb8843de17abe192b5efc7c0bd9db0b4d75 (patch)
treeeb838aa0244a9d4ceeb84e44bb2270affde9b4c1
parent727317333978ac5cf0fb1cd3f86e49e9868f1e19 (diff)
downloadnova-225c8cb8843de17abe192b5efc7c0bd9db0b4d75.tar.gz
nova-225c8cb8843de17abe192b5efc7c0bd9db0b4d75.tar.xz
nova-225c8cb8843de17abe192b5efc7c0bd9db0b4d75.zip
sanity check
-rw-r--r--nova/api/openstack/zones.py1
-rw-r--r--nova/scheduler/zone_aware_scheduler.py1
-rw-r--r--nova/tests/api/openstack/test_zones.py2
3 files changed, 1 insertions, 3 deletions
diff --git a/nova/api/openstack/zones.py b/nova/api/openstack/zones.py
index 0f83afb34..b2f7898cb 100644
--- a/nova/api/openstack/zones.py
+++ b/nova/api/openstack/zones.py
@@ -113,7 +113,6 @@ class Controller(object):
"""Returns a weighted list of costs to create instances
of desired capabilities."""
ctx = req.environ['nova.context']
- print "**** ZONES ", body
specs = json.loads(body)
build_plan = api.select(ctx, specs=specs)
cooked = self._scrub_build_plan(build_plan)
diff --git a/nova/scheduler/zone_aware_scheduler.py b/nova/scheduler/zone_aware_scheduler.py
index c125c7436..faa969124 100644
--- a/nova/scheduler/zone_aware_scheduler.py
+++ b/nova/scheduler/zone_aware_scheduler.py
@@ -22,6 +22,7 @@ across zones. There are two expansion points to this class for:
import operator
import json
+
import M2Crypto
import novaclient
diff --git a/nova/tests/api/openstack/test_zones.py b/nova/tests/api/openstack/test_zones.py
index fc70a1679..098577e4c 100644
--- a/nova/tests/api/openstack/test_zones.py
+++ b/nova/tests/api/openstack/test_zones.py
@@ -215,9 +215,7 @@ class ZonesTest(test.TestCase):
# Once to a string and again as an HTTP POST Body
req.body = json.dumps(json.dumps({}))
- print "********** BODY", req.body
res = req.get_response(fakes.wsgi_app())
- print "********** RES", res
res_dict = json.loads(res.body)
self.assertEqual(res.status_int, 200)