Merge autotest upstream from @5318 ~ @5336

client/virt/tests/nic_promisc.py

Index: client/virt/tests/nic_promisc.py
diff --git a/client/tests/kvm/tests/nic_promisc.py b/client/virt/tests/nic_promisc.py
similarity index 85%
rename from client/tests/kvm/tests/nic_promisc.py
rename to client/virt/tests/nic_promisc.py
index ac6f983e1fe7559215aea445148f594fb4e7ab64..0ff07b8fb19fd9b012d24cc811ebdeb55d5ce9b5 100644
--- a/client/tests/kvm/tests/nic_promisc.py
+++ b/client/virt/tests/nic_promisc.py
@@ -2,7 +2,7 @@ import logging, threading
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.bin import utils
 from autotest_lib.client.tests.kvm.tests import file_transfer
-import kvm_utils, kvm_test_utils
+from autotest_lib.client.virt import virt_test_utils, virt_utils
 
 
 def run_nic_promisc(test, params, env):
@@ -22,11 +22,11 @@ def run_nic_promisc(test, params, env):
     timeout = int(params.get("login_timeout", 360))
     session_serial = vm.wait_for_serial_login(timeout=timeout)
 
-    ethname = kvm_test_utils.get_linux_ifname(session_serial,
+    ethname = virt_test_utils.get_linux_ifname(session_serial,
                                               vm.get_mac_address(0))
 
     try:
-        transfer_thread = kvm_utils.Thread(file_transfer.run_file_transfer,
+        transfer_thread = virt_utils.Thread(file_transfer.run_file_transfer,
                                            (test, params, env))
         transfer_thread.start()
         while transfer_thread.isAlive():