Merge autotest upstream from @5318 ~ @5336

client/virt/tests/netperf.py

 import logging, os, signal
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.bin import utils
-import kvm_subprocess, kvm_utils
-
+from autotest_lib.client.virt import aexpect, virt_utils
 
 def run_netperf(test, params, env):
     """
     Network stress test with netperf.
 
     1) Boot up a VM with multiple nics.
     2) Launch netserver on guest.
     3) Execute multiple netperf clients on host in parallel
        with different protocols.
     4) Output the test result.
@@ skipping 17 matching lines @@
     try:
         utils.run("iptables -F")
     except:
         pass
 
     for i in params.get("netperf_files").split():
         vm.copy_files_to(os.path.join(netperf_dir, i), "/tmp")
 
     try:
         session_serial.cmd(firewall_flush)
-    except kvm_subprocess.ShellError:
+    except aexpect.ShellError:
         logging.warning("Could not flush firewall rules on guest")
 
     session_serial.cmd(setup_cmd % "/tmp", timeout=200)
     session_serial.cmd(params.get("netserver_cmd") % "/tmp")
 
     tcpdump = env.get("tcpdump")
     pid = None
     if tcpdump:
         # Stop the background tcpdump process
         try:
@@ skipping 31 matching lines @@
             raise error.TestFail("Some netperf tests failed: %s" %
                                  ", ".join(list_fail))
 
     try:
         logging.info("Setup and run netperf clients on host")
         utils.run(setup_cmd % netperf_dir)
 
         bg = []
         nic_num = len(params.get("nics").split())
         for i in range(nic_num):
-            bg.append(kvm_utils.Thread(netperf, (i,)))
+            bg.append(virt_utils.Thread(netperf, (i,)))
             bg[i].start()
 
         completed = False
         while not completed:
             completed = True
             for b in bg:
                 if b.is_alive():
                     completed = False
     finally:
         for b in bg:
             if b:
                 b.join()
         session_serial.cmd_output("killall netserver")
         if tcpdump and pid:
             logging.debug("Resuming the background tcpdump")
             logging.info("pid is %s" % pid)
             os.kill(pid, signal.SIGCONT)