diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-10 23:05:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-10 23:05:33 +0000 |
| commit | 7e944c0e8dfd31c9adb05c1a1887898669e27ab6 (patch) | |
| tree | fcd689ff64079742d4c21955b107d6445178cfdb | |
| parent | 95dbc97a2ce7a9be585c7e7fe44ff0b9e8594b30 (diff) | |
| parent | 8acb7275de43f126cc3fdb8f701dbeca22338d5b (diff) | |
Merge "maint: remove an unused import in libvirt.driver"
| -rw-r--r-- | nova/tests/test_libvirt.py | 2 | ||||
| -rw-r--r-- | nova/virt/baremetal/driver.py | 3 | ||||
| -rw-r--r-- | nova/virt/libvirt/driver.py | 9 |
3 files changed, 6 insertions, 8 deletions
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index 14e66871a..2fda6eb45 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -1565,7 +1565,7 @@ class LibvirtConnTestCase(test.TestCase): fake_none) conn.ensure_filtering_rules_for_instance(instance_ref, network_info, - time=fake_timer) + time_module=fake_timer) except exception.NovaException, e: c1 = (0 <= str(e).find('Timeout migrating for')) self.assertTrue(c1) diff --git a/nova/virt/baremetal/driver.py b/nova/virt/baremetal/driver.py index 3da59e929..c729db9d5 100644 --- a/nova/virt/baremetal/driver.py +++ b/nova/virt/baremetal/driver.py @@ -698,8 +698,7 @@ class BareMetalDriver(driver.ComputeDriver): LOG.info(_('Compute_service record updated for %s ') % host) db.compute_node_update(ctxt, compute_node_ref[0]['id'], dic) - def ensure_filtering_rules_for_instance(self, instance_ref, - time=None): + def ensure_filtering_rules_for_instance(self, instance_ref, network_info): raise NotImplementedError() def live_migration(self, ctxt, instance_ref, dest, diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index ba04dd70d..41f87f2e8 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -48,7 +48,6 @@ import os import shutil import sys import tempfile -import time import uuid from eventlet import greenthread @@ -2392,7 +2391,7 @@ class LibvirtDriver(driver.ComputeDriver): os.remove(tmp_file) def ensure_filtering_rules_for_instance(self, instance_ref, network_info, - time=None): + time_module=None): """Setting up filtering rules and waiting for its completion. To migrate an instance, filtering rules to hypervisors @@ -2416,8 +2415,8 @@ class LibvirtDriver(driver.ComputeDriver): """ - if not time: - time = greenthread + if not time_module: + time_module = greenthread # If any instances never launch at destination host, # basic-filtering must be set here. @@ -2436,7 +2435,7 @@ class LibvirtDriver(driver.ComputeDriver): if len(timeout_count) == 0: msg = _('Timeout migrating for %s. nwfilter not found.') raise exception.NovaException(msg % instance_ref["name"]) - time.sleep(1) + time_module.sleep(1) def live_migration(self, ctxt, instance_ref, dest, post_method, recover_method, block_migration=False): |