Merge autotest upstream from @5318 ~ @5336

client/virt/tests/multicast.py

 import logging, os, re
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.bin import utils
-import kvm_test_utils, kvm_subprocess
+from autotest_lib.client.virt import virt_test_utils, aexpect
 
 
 def run_multicast(test, params, env):
     """
     Test multicast function of nic (rtl8139/e1000/virtio)
 
     1) Create a VM.
     2) Join guest into multicast groups.
     3) Ping multicast addresses on host.
     4) Flood ping test with different size of packets.
     5) Final ping test and check if lose packet.
 
     @param test: KVM test object.
     @param params: Dictionary with the test parameters.
     @param env: Dictionary with test environment.
     """
     vm = env.get_vm(params["main_vm"])
     vm.verify_alive()
     session = vm.wait_for_login(timeout=int(params.get("login_timeout", 360)))
 
     def run_guest(cmd):
         try:
             session.cmd(cmd)
-        except kvm_subprocess.ShellError, e:
+        except aexpect.ShellError, e:
             logging.warn(e)
 
     def run_host_guest(cmd):
         run_guest(cmd)
         utils.system(cmd, ignore_status=True)
 
     # flush the firewall rules
     cmd_flush = "iptables -F"
     cmd_selinux = ("if [ -e /selinux/enforce ]; then setenforce 0; "
                    "else echo 'no /selinux/enforce file present'; fi")
@@ skipping 24 matching lines @@
         pid = re.findall("join_mcast_pid:(\d+)", output)[0]
     except IndexError:
         raise error.TestFail("Can't join multicast groups,output:%s" % output)
 
     try:
         for i in range(mgroup_count):
             new_suffix = suffix + i
             mcast = "%s.%d" % (prefix, new_suffix)
 
             logging.info("Initial ping test, mcast: %s", mcast)
-            s, o = kvm_test_utils.ping(mcast, 10, interface=ifname, timeout=20)
+            s, o = virt_test_utils.ping(mcast, 10, interface=ifname, timeout=20)
             if s != 0:
                 raise error.TestFail(" Ping return non-zero value %s" % o)
 
             logging.info("Flood ping test, mcast: %s", mcast)
-            kvm_test_utils.ping(mcast, None, interface=ifname, flood=True,
+            virt_test_utils.ping(mcast, None, interface=ifname, flood=True,
                                 output_func=None, timeout=flood_minutes*60)
 
             logging.info("Final ping test, mcast: %s", mcast)
-            s, o = kvm_test_utils.ping(mcast, 10, interface=ifname, timeout=20)
+            s, o = virt_test_utils.ping(mcast, 10, interface=ifname, timeout=20)
             if s != 0:
                 raise error.TestFail("Ping failed, status: %s, output: %s" %
                                      (s, o))
 
     finally:
         logging.debug(session.cmd_output("ipmaddr show"))
         session.cmd_output("kill -s SIGCONT %s" % pid)
         session.close()