diff options
| author | Ryu Ishimoto <ryu@midokura.jp> | 2011-07-11 04:38:27 +0900 |
|---|---|---|
| committer | Ryu Ishimoto <ryu@midokura.jp> | 2011-07-11 04:38:27 +0900 |
| commit | 1da51f7b07f0080c44063a355c84fafd1fdf02bc (patch) | |
| tree | b9c2b372da0b58b28ff7f6c48face9d7cfd64bd0 /nova/compute | |
| parent | e71cf10dcf88f4a2f695285b25af75d8a0df2b3e (diff) | |
Moved 'setup_compute_network' logic into the virt layer
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index bbbddde0a..753240614 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -293,8 +293,7 @@ class ComputeManager(manager.SchedulerDependentManager): network_info = self.network_api.allocate_for_instance(context, instance, vpn=is_vpn) LOG.debug(_("instance network_info: |%s|"), network_info) - self.network_manager.setup_compute_network(context, - instance_id) + self.driver.setup_vif_network(context, instance, network_info) else: # TODO(tr3buchet) not really sure how this should be handled. # virt requires network_info to be passed in but stub_network @@ -444,7 +443,6 @@ class ComputeManager(manager.SchedulerDependentManager): instance_id, power_state.NOSTATE, 'rebooting') - self.network_manager.setup_compute_network(context, instance_id) self.driver.reboot(instance_ref) self._update_state(context, instance_id) @@ -635,7 +633,7 @@ class ComputeManager(manager.SchedulerDependentManager): instance_id, power_state.NOSTATE, 'rescuing') - self.network_manager.setup_compute_network(context, instance_id) + self.driver.setup_vif_network(context, instance_id) _update_state = lambda result: self._update_state_callback( self, context, instance_id, result) self.driver.rescue(instance_ref, _update_state) @@ -1176,14 +1174,13 @@ class ComputeManager(manager.SchedulerDependentManager): max_retry = FLAGS.live_migration_retry_count for cnt in range(max_retry): try: - self.network_manager.setup_compute_network(context, - instance_id) + self.driver.setup_vif_network(context, instance_id) break except exception.ProcessExecutionError: if cnt == max_retry - 1: raise else: - LOG.warn(_("setup_compute_network() failed %(cnt)d." + LOG.warn(_("setup_vif_network() failed %(cnt)d." "Retry up to %(max_retry)d for %(hostname)s.") % locals()) time.sleep(1) |