x/python-ganttclient
Code Issues Proposed changes

Small tweaks

Browse Source
This commit is contained in:
Rick Harris
2011-06-16 15:02:18 +00:00
parent 0267e05f1f
commit 38249457db
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nova/scheduler/api.py
View File

@@ -225,10 +225,6 @@ class reroute_compute(object):
def __init__(self, method_name): def __init__(self, method_name):
self.method_name = method_name self.method_name = method_name
def _route_local():
pass
def _route_to_child_zones(context, collection, item_uuid): def _route_to_child_zones(context, collection, item_uuid):
if not FLAGS.enable_zone_routing: if not FLAGS.enable_zone_routing:
raise InstanceNotFound(instance_id=item_uuid) raise InstanceNotFound(instance_id=item_uuid)
@@ -255,8 +251,7 @@ class reroute_compute(object):
if utils.is_uuid_like(item_id_or_uuid): if utils.is_uuid_like(item_id_or_uuid):
item_uuid = item_id_or_uuid item_uuid = item_id_or_uuid
try: try:
instance = self.db.instance_get_by_uuid( instance = db.instance_get_by_uuid(context, item_uuid)
context, item_uuid)
except exception.InstanceNotFound, e: except exception.InstanceNotFound, e:
# NOTE(sirp): since a UUID was passed in, we can attempt # NOTE(sirp): since a UUID was passed in, we can attempt
# to reroute to a child zone # to reroute to a child zone
@@ -269,10 +264,11 @@ class reroute_compute(object):
# integer ID in the argument list so that the zone-local code # integer ID in the argument list so that the zone-local code
# can continue to use integer IDs. # can continue to use integer IDs.
item_id = instance['id'] item_id = instance['id']
self.replace_uuid_with_id(args, kwargs, replacement_id) args = list(args) # needs to be mutable to replace
self.replace_uuid_with_id(args, kwargs, item_id)
if attempt_reroute: if attempt_reroute:
self._route_to_child_zones(context, collection, item_uuid) return self._route_to_child_zones(context, collection, item_uuid)
else: else:
return f(*args, **kwargs) return f(*args, **kwargs)
@@ -303,6 +299,8 @@ class reroute_compute(object):
if 'instance_id' in kwargs: if 'instance_id' in kwargs:
kwargs['instance_id'] = replacement_id kwargs['instance_id'] = replacement_id
elif len(args) > 1: elif len(args) > 1:
# NOTE(sirp): args comes in as a tuple, so we need to convert it
# to a list to mutate it, and then convert it back to a tuple
args.pop(2) args.pop(2)
args.insert(2, replacement_id) args.insert(2, replacement_id)