summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-06-09 16:19:24 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-06-09 16:19:24 -0700
commit810b580cb41b076b083ace1c4670c13b2f16c5a5 (patch)
tree4c9b3f5b3131070d3558d05ec06af4c0b475a5ef /nova/api
parentc6ba1bb5035cb1ea4cb2b86ee56797c4dac63983 (diff)
forgot some debugging statements
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/create_instance_controller.py8
-rw-r--r--nova/api/openstack/servers.py3
2 files changed, 0 insertions, 11 deletions
diff --git a/nova/api/openstack/create_instance_controller.py b/nova/api/openstack/create_instance_controller.py
index 613a33b25..cffd944f7 100644
--- a/nova/api/openstack/create_instance_controller.py
+++ b/nova/api/openstack/create_instance_controller.py
@@ -76,7 +76,6 @@ class OpenstackCreateInstanceController(object):
[instance dicts] vs. reservation_id). So the handling of the
return type from this method is left to the caller.
"""
- print "************************ A"
if not body:
return (None, faults.Fault(exc.HTTPUnprocessableEntity()))
@@ -84,7 +83,6 @@ class OpenstackCreateInstanceController(object):
password = self._get_server_admin_password(body['server'])
- print "************************ B"
key_name = None
key_data = None
key_pairs = auth_manager.AuthManager.get_key_pairs(context)
@@ -93,15 +91,11 @@ class OpenstackCreateInstanceController(object):
key_name = key_pair['name']
key_data = key_pair['public_key']
- print "************************ C"
image_href = self._image_ref_from_req_data(body)
try:
- print "************************ Ca"
image_service, image_id = nova.image.get_image_service(image_href)
- print "************************ Cb"
kernel_id, ramdisk_id = self._get_kernel_ramdisk_from_image(
req, image_id)
- print "************************ Ce"
images = set([str(x['id']) for x in image_service.index(context)])
assert str(image_id) in images
except Exception, e:
@@ -109,7 +103,6 @@ class OpenstackCreateInstanceController(object):
locals())
return (None, faults.Fault(exc.HTTPBadRequest(msg)))
- print "************************ D"
personality = body['server'].get('personality')
injected_files = []
@@ -118,7 +111,6 @@ class OpenstackCreateInstanceController(object):
flavor_id = self._flavor_id_from_req_data(body)
- print "************************ E"
if not 'name' in body['server']:
msg = _("Server name is not defined")
return (None, exc.HTTPBadRequest(msg))
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 23bb1c869..387b0343a 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -110,14 +110,11 @@ class Controller(base_controller.OpenstackCreateInstanceController):
def create(self, req, body):
""" Creates a new server for a given user """
- print "************************ 1"
extra_values, result = \
self.create_instance(req, body, self.compute_api.create)
- print "************************ 2"
if extra_values is None:
return result # a Fault.
- print "************************ 3"
instances = result
(inst, ) = instances