From 8acb7275de43f126cc3fdb8f701dbeca22338d5b Mon Sep 17 00:00:00 2001
From: Pádraig Brady <pbrady@redhat.com>
Date: Sat, 4 Aug 2012 06:01:32 +0100
Subject: maint: remove an unused import in libvirt.driver

This import was recently reintroduced, due to
confusing pylint output. Therefore remove it again
and adjust things so pylint won't warn in future.

Change-Id: I25f293f171c651c25d27e8d55c9240fd808590ba
---
 nova/tests/test_libvirt.py    | 2 +-
 nova/virt/baremetal/driver.py | 3 +--
 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 99e81add2..c6e2b6580 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 5338a82f5..8cab7ec77 100644
--- a/nova/virt/baremetal/driver.py
+++ b/nova/virt/baremetal/driver.py
@@ -708,8 +708,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 c19896171..e3dfa508c 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
@@ -2415,7 +2414,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
@@ -2439,8 +2438,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.
@@ -2459,7 +2458,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):
-- 
cgit