diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-10-25 17:15:49 -0500 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-10-25 17:17:40 -0500 |
| commit | e8b0ff71faef4268669deb035f711de394fb0e78 (patch) | |
| tree | 626318e56b27a8785dfb678816c3735d9c0020c5 /nova/compute | |
| parent | ace2628dfa6048a8e8b7757daefffc1987cfad3f (diff) | |
Removed callback concept on VM driver methods:
* pause
* unpause
* suspend
* resume
* rescue
* unrescue
Worked off blueprint remove-virt-driver-callbacks
Change-Id: Ie3ef4c8155320f72106d7a39e5817516e180ba52
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 2fc2972bf..f133ee133 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -901,8 +901,7 @@ class ComputeManager(manager.SchedulerDependentManager): utils.generate_password(FLAGS.password_length)) network_info = self._get_instance_nw_info(context, instance_ref) - # NOTE(blamar): None of the virt drivers use the 'callback' param - self.driver.rescue(context, instance_ref, None, network_info) + self.driver.rescue(context, instance_ref, network_info) current_power_state = self._get_power_state(context, instance_ref) self._instance_update(context, @@ -921,8 +920,7 @@ class ComputeManager(manager.SchedulerDependentManager): instance_ref = self.db.instance_get(context, instance_id) network_info = self._get_instance_nw_info(context, instance_ref) - # NOTE(blamar): None of the virt drivers use the 'callback' param - self.driver.unrescue(instance_ref, None, network_info) + self.driver.unrescue(instance_ref, network_info) current_power_state = self._get_power_state(context, instance_ref) self._instance_update(context, @@ -1174,7 +1172,7 @@ class ComputeManager(manager.SchedulerDependentManager): context = context.elevated() instance_ref = self.db.instance_get(context, instance_id) - self.driver.pause(instance_ref, lambda result: None) + self.driver.pause(instance_ref) current_power_state = self._get_power_state(context, instance_ref) self._instance_update(context, @@ -1191,7 +1189,7 @@ class ComputeManager(manager.SchedulerDependentManager): context = context.elevated() instance_ref = self.db.instance_get(context, instance_id) - self.driver.unpause(instance_ref, lambda result: None) + self.driver.unpause(instance_ref) current_power_state = self._get_power_state(context, instance_ref) self._instance_update(context, @@ -1227,7 +1225,7 @@ class ComputeManager(manager.SchedulerDependentManager): context = context.elevated() instance_ref = self.db.instance_get(context, instance_id) - self.driver.suspend(instance_ref, lambda result: None) + self.driver.suspend(instance_ref) current_power_state = self._get_power_state(context, instance_ref) self._instance_update(context, @@ -1244,7 +1242,7 @@ class ComputeManager(manager.SchedulerDependentManager): context = context.elevated() instance_ref = self.db.instance_get(context, instance_id) - self.driver.resume(instance_ref, lambda result: None) + self.driver.resume(instance_ref) current_power_state = self._get_power_state(context, instance_ref) self._instance_update(context, |