diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-07-11 18:49:46 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-07-11 18:49:46 -0700 |
| commit | 46c59d20fd86f8ce6a57e7c663d893f6f5411d88 (patch) | |
| tree | ad9f1a9ef9417ce22a183542e4bb2d36f836cbb1 | |
| parent | 2ac53e21e99c45c801d4ff8f1db500dc98477585 (diff) | |
| download | nova-46c59d20fd86f8ce6a57e7c663d893f6f5411d88.tar.gz nova-46c59d20fd86f8ce6a57e7c663d893f6f5411d88.tar.xz nova-46c59d20fd86f8ce6a57e7c663d893f6f5411d88.zip | |
pep8
| -rw-r--r-- | nova/compute/api.py | 2 | ||||
| -rw-r--r-- | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/virt/driver.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index edc96d5ea..432658bbb 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -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.""" diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 3f8fc809e..c627d2985 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -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)) diff --git a/nova/virt/driver.py b/nova/virt/driver.py index b5476fcb0..178279d31 100644 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -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""" |