summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Harris <rick.harris@rackspace.com>2011-06-16 17:52:34 +0000
committerRick Harris <rick.harris@rackspace.com>2011-06-16 17:52:34 +0000
commitbd6993f9e6bf3ef925b0c0f456ddf1622be2b432 (patch)
tree023f2fcc6175b2e16e5f79c8b6aafef7c697a2cd
parent9f0a2d8b870f65e0e76b1868a151facc6f2bfda4 (diff)
downloadnova-bd6993f9e6bf3ef925b0c0f456ddf1622be2b432.tar.gz
nova-bd6993f9e6bf3ef925b0c0f456ddf1622be2b432.tar.xz
nova-bd6993f9e6bf3ef925b0c0f456ddf1622be2b432.zip
PEP8 cleanup.
-rw-r--r--nova/scheduler/api.py11
-rw-r--r--nova/tests/api/openstack/test_servers.py1
2 files changed, 7 insertions, 5 deletions
diff --git a/nova/scheduler/api.py b/nova/scheduler/api.py
index a363a3119..6e5471d76 100644
--- a/nova/scheduler/api.py
+++ b/nova/scheduler/api.py
@@ -259,16 +259,17 @@ class reroute_compute(object):
LOG.debug(_("Instance %(item_uuid)s not found "
"locally: '%(e)s'" % locals()))
else:
- # NOTE(sirp): since we're not re-routing in this case, and we
- # we were passed a UUID, we need to replace that UUID with an
- # integer ID in the argument list so that the zone-local code
- # can continue to use integer IDs.
+ # NOTE(sirp): since we're not re-routing in this case, and
+ # we we were passed a UUID, we need to replace that UUID
+ # with an integer ID in the argument list so that the
+ # zone-local code can continue to use integer IDs.
item_id = instance['id']
args = list(args) # needs to be mutable to replace
self.replace_uuid_with_id(args, kwargs, item_id)
if attempt_reroute:
- return self._route_to_child_zones(context, collection, item_uuid)
+ return self._route_to_child_zones(context, collection,
+ item_uuid)
else:
return f(*args, **kwargs)
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 98611480f..c3e593a54 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -64,6 +64,7 @@ def return_server_by_uuid(context, uuid):
id = 1
return stub_instance(id, uuid=uuid)
+
def return_server_with_addresses(private, public):
def _return_server(context, id):
return stub_instance(id, private_address=private,