This commit is contained in:
Sandy Walsh
2011-07-11 18:49:46 -07:00
parent 2ac53e21e9
commit 46c59d20fd
3 changed files with 3 additions and 3 deletions

View File

@@ -903,7 +903,7 @@ class API(base.Base):
self._cast_compute_message('add_fixed_ip_to_instance', context,
instance_id,
params=dict(network_id=network_id))
@scheduler_api.reroute_compute("remove_fixed_ip")
def remove_fixed_ip(self, context, instance_id, address):
"""Remove fixed_ip from specified network to given instance."""

View File

@@ -1361,7 +1361,7 @@ class ComputeManager(manager.SchedulerDependentManager):
error_list.append(ex)
try:
pass #self._poll_instance_states(context)
self._poll_instance_states(context)
except Exception as ex:
LOG.warning(_("Error during instance poll: %s"),
unicode(ex))

View File

@@ -244,7 +244,7 @@ class ComputeDriver(object):
def inject_network_info(self, instance, nw_info):
"""inject network info for specified instance"""
pass # raise NotImplementedError()
pass
def poll_rescued_instances(self, timeout):
"""Poll for rescued instances"""