test suite reviews and discussions
 help / color / mirror / Atom feed
From: lihong <lihongx.ma@intel.com>
To: dts@dpdk.org
Cc: yinan.wang@intel.com, lihong <lihongx.ma@intel.com>
Subject: [dts] [PATCH V1] tests: delete useless testsuite of virtio
Date: Wed,  5 Jun 2019 08:41:53 +0800	[thread overview]
Message-ID: <1559695313-16891-1-git-send-email-lihongx.ma@intel.com> (raw)

Signed-off-by: lihong <lihongx.ma@intel.com>
---
 tests/TestSuite_vhost_cuse_one_copy_one_vm.py | 446 --------------------------
 tests/TestSuite_vhost_user_one_copy_one_vm.py | 421 ------------------------
 tests/TestSuite_virtio_iperf.py               | 305 ------------------
 3 files changed, 1172 deletions(-)
 delete mode 100644 tests/TestSuite_vhost_cuse_one_copy_one_vm.py
 delete mode 100644 tests/TestSuite_vhost_user_one_copy_one_vm.py
 delete mode 100644 tests/TestSuite_virtio_iperf.py

diff --git a/tests/TestSuite_vhost_cuse_one_copy_one_vm.py b/tests/TestSuite_vhost_cuse_one_copy_one_vm.py
deleted file mode 100644
index 573419a..0000000
--- a/tests/TestSuite_vhost_cuse_one_copy_one_vm.py
+++ /dev/null
@@ -1,446 +0,0 @@
-# BSD LICENSE
-#
-# Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   * Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#   * Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in
-#     the documentation and/or other materials provided with the
-#     distribution.
-#   * Neither the name of Intel Corporation nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""
-DPDK Test suite.
-
-Vhost Cuse one-copy sample test suite.
-"""
-import os
-import utils
-import string
-import re
-import time
-from scapy.utils import wrpcap, rdpcap
-from test_case import TestCase
-from exception import VerifyFailure
-from settings import HEADER_SIZE
-from etgen import IxiaPacketGenerator
-from qemu_kvm import QEMUKvm
-
-
-class TestVhostCuseOneCopyOneVm(TestCase, IxiaPacketGenerator):
-
-    def set_up_all(self):
-        # To Extend IXIA packet generator method, call the tester's method.
-        self.tester.extend_external_packet_generator(TestVhostCuseOneCopyOneVm, self)
-
-        # Change config file to enable vhost-cuse compiled.
-        self.dut.send_expect(
-            "sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.*$/CONFIG_RTE_LIBRTE"
-            "_VHOST_USER=n/' ./config/common_base",
-            "# ",
-            30)
-        self.dut.build_install_dpdk(self.target)
-        self.dut.send_expect("cd ./lib/librte_vhost", "#", 30)
-        print self.dut.send_expect("make", "#", 30)
-        self.dut.send_expect("cd ./eventfd_link", "#", 30)
-        print self.dut.send_expect("make", "#", 30)
-        self.dut.send_expect("cd ~/dpdk", "#", 30)
-
-        # build the vhost sample in vhost-cuse mode.
-        if self.nic in ['niantic']:
-            self.dut.send_expect(
-                "sed -i -e 's/#define MAX_QUEUES.*$/#define MAX_QUEUES 128/' "
-                "./examples/vhost/main.c",
-                "#")
-        else:
-            self.dut.send_expect(
-                "sed -i -e 's/#define MAX_QUEUES.*$/#define MAX_QUEUES 512/' "
-                "./examples/vhost/main.c",
-                "#")
-        out = self.dut.send_expect("make -C examples/vhost", "#")
-        self.verify("Error" not in out, "compilation error")
-        self.verify("No such file" not in out, "Not found file error")
-
-        # Build target with modified config file
-        self.dut.build_install_dpdk(self.target)
-
-        # Get and verify the ports
-        self.dut_ports = self.dut.get_ports()
-        self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing")
-
-        # Get the port's socket
-        self.pf = self.dut_ports[0]
-        netdev = self.dut.ports_info[self.pf]['port']
-        self.socket = netdev.get_nic_socket()
-        self.cores = self.dut.get_core_list("1S/3C/1T", socket=self.socket)
-
-        # Set the params of vhost-cuse sample
-        self.vhost_app = "./examples/vhost/build/vhost-switch"
-        self.zero_copy = 0
-        self.vm2vm = 0
-        self.jumbo = 0
-        self.vhost_test = self.vhost_app + \
-            " -c %s -n %d --socket-mem 1024,1024 -- -p 0x1 --mergeable %d" + \
-            " --zero-copy %d --vm2vm %d 2 > ./vhost.out &"
-
-        # Define the virtio/VM variables
-        self.virtio1 = "eth1"
-        self.virtio2 = "eth2"
-        self.virtio1_mac = "52:54:00:00:00:01"
-        self.virtio2_mac = "52:54:00:00:00:02"
-        self.src1 = "192.168.4.1"
-        self.src2 = "192.168.3.1"
-        self.dst1 = "192.168.3.1"
-        self.dst2 = "192.168.4.1"
-        self.vm_dut = None
-        self.virtio_cmd_params = \
-        'csum=off,gso=off,guest_csum=off,guest_tso4=off,guest_tso6=off,guest_ecn=off'
-        # Define the table columns
-        self.header_row = ["FrameSize(B)", "Injection(Mpps)", "Throughput(Mpps)", "LineRate(%)"]
-        self.memory_channel = 4
-
-    def set_up(self):
-        #
-        # Run before each test case.
-        #
-        # Launch vhost sample using default params
-
-        if "jumbo" in self.running_case:
-            self.jumbo = 1
-            self.frame_sizes = [64, 128, 256, 512, 1024, 1280, 1518, 2048, 5000, 9000]
-            self.vm_testpmd = "./x86_64-native-linuxapp-gcc/app/testpmd -c 0x3 -n 3" \
-                + " -- -i --tx-offloads=0x8000 " \
-                + "--disable-hw-vlan-filter --max-pkt-len 9600"
-        else:
-            self.jumbo = 0
-            self.frame_sizes = [64, 128, 256, 512, 1024, 1280, 1518]
-            self.vm_testpmd = "./x86_64-native-linuxapp-gcc/app/testpmd -c 0x3 -n 3" \
-                + " -- -i --tx-offloads=0x8000 --disable-hw-vlan-filter"
-        self.dut.send_expect("rm -rf ./vhost.out", "#")
-
-        self.launch_vhost_sample()
-
-        # start VM with 2virtio
-        self.start_onevm()
-
-    def launch_vhost_sample(self):
-        #
-        # Launch the vhost sample with different parameters
-        #
-        self.coremask = utils.create_mask(self.cores)
-        self.vhostapp_testcmd = self.vhost_test % (
-            self.coremask, self.memory_channel, self.jumbo, self.zero_copy, self.vm2vm)
-        # Clean and prepare the vhost cuse modules
-        self.dut.send_expect("rm -rf /dev/vhost-net", "#", 20)
-        self.dut.send_expect("modprobe fuse", "#", 20)
-        self.dut.send_expect("modprobe cuse", "#", 20)
-        self.dut.send_expect("rmmod eventfd_link", "#", 20)
-        self.dut.send_expect(
-            "insmod lib/librte_vhost/eventfd_link/eventfd_link.ko",
-            "#",
-            20)
-        self.dut.send_expect(self.vhostapp_testcmd, "# ", 40)
-        time.sleep(30)
-        try:
-            print "Launch vhost sample:"
-            self.dut.session.copy_file_from("/root/dpdk/vhost.out")
-            fp = open('./vhost.out', 'r')
-            out = fp.read()
-            fp.close()
-            if "Error" in out:
-                raise Exception("Launch vhost sample failed")
-            else:
-                print "Launch vhost sample finished"
-        except Exception as e:
-            print utils.RED("Failed to launch vhost sample: %s" % str(e))
-
-    def start_onevm(self):
-        #
-        # Start One VM with 2 virtio devices
-        #
-
-        self.vm = QEMUKvm(self.dut, 'vm0', 'vhost_cuse_sample')
-        if "cuse" in self.running_case:
-            vm_params = {}
-            vm_params['driver'] = 'vhost-cuse'
-            vm_params['opt_mac'] = self.virtio1_mac
-            vm_params['opt_settings'] = self.virtio_cmd_params
-            self.vm.set_vm_device(**vm_params)
-
-            vm_params['opt_mac'] = self.virtio2_mac
-            vm_params['opt_settings'] = self.virtio_cmd_params
-            self.vm.set_vm_device(**vm_params)
-        try:
-            self.vm_dut = self.vm.start()
-            if self.vm_dut is None:
-                raise Exception("Set up VM ENV failed")
-        except Exception as e:
-            print utils.RED("Failure for %s" % str(e))
-
-        return True
-
-    def vm_testpmd_start(self):
-        #
-        # Start testpmd in vm
-        #
-        if self.vm_dut is not None:
-            # Start testpmd with user
-            self.vm_dut.send_expect(self.vm_testpmd, "testpmd>", 20)
-            # Start tx_first
-            self.vm_dut.send_expect("start tx_first", "testpmd>")
-
-    def clear_vhost_env(self):
-        #
-        # Kill all vhost sample, shutdown VM
-        #
-        if self.vm_dut:
-            self.vm_dut.kill_all()
-            time.sleep(1)
-        if self.vm:
-            self.vm.stop()
-            self.vm = None
-
-    def set_legacy_disablefw(self):
-        #
-        # Disable firewall and ip tables in legacy case
-        #
-        if self.vm_dut is not None:
-            self.vm_dut.send_expect("systemctl stop firewalld.service", "#")
-            self.vm_dut.send_expect("systemctl disable firewalld.service", "#")
-            self.vm_dut.send_expect("systemctl stop ip6tables.service", "#")
-            self.vm_dut.send_expect("systemctl disable ip6tables.service", "#")
-            self.vm_dut.send_expect("systemctl stop iptables.service", "#")
-            self.vm_dut.send_expect("systemctl disable iptables.service", "#")
-            self.vm_dut.send_expect(
-                "systemctl stop NetworkManager.service",
-                "#")
-            self.vm_dut.send_expect(
-                "systemctl disable NetworkManager.service",
-                "#")
-            self.vm_dut.send_expect(
-                "echo 1 >/proc/sys/net/ipv4/ip_forward",
-                "#")
-
-    def set_onevm_legacy_fwd(self):
-        if self.vm_dut is not None:
-            ifcfg = self.vm_dut.send_expect("ifconfig -a", "#", 10)
-            intfs = re.compile('eth\d').findall(ifcfg)
-            # Get the virito1/virtio2's interface names
-            for intf in intfs:
-                out_mac = self.vm_dut.send_expect(
-                    "ifconfig %s" %
-                    intf, "#", 10)
-                if self.virtio1_mac in out_mac:
-                    self.virtio1 = intf
-                if self.virtio2_mac in out_mac:
-                    self.virtio2 = intf
-            print "Virtio1's intf is %s" % self.virtio1
-            print "Virtio2's intf is %s" % self.virtio2
-            # Set the MTU for jumboframe enabled case
-            if self.jumbo == 1:
-                self.vm_dut.send_expect(
-                    "ifconfig %s mtu 9000" %
-                    self.virtio1, "#")
-                self.vm_dut.send_expect(
-                    "ifconfig %s mtu 9000" %
-                    self.virtio2, "#")
-            # Set the ipv4 fwd rules
-            self.vm_dut.send_expect(
-                "ip addr add 192.168.4.2/24 dev %s" %
-                self.virtio1, "#")
-            self.vm_dut.send_expect(
-                "ip addr add 192.168.3.2/24 dev %s" %
-                self.virtio2, "#")
-            self.vm_dut.send_expect(
-                "ip link set dev %s up" %
-                self.virtio1, "#")
-            self.vm_dut.send_expect(
-                "ip link set dev %s up" %
-                self.virtio2, "#")
-            self.vm_dut.send_expect(
-                "ip neigh add 192.168.4.1 lladdr 52:00:00:00:00:01 dev %s" %
-                self.virtio1, "#")
-            self.vm_dut.send_expect(
-                "ip neigh add 192.168.3.1 lladdr 52:00:00:00:00:02 dev %s" %
-                self.virtio2, "#")
-            self.vm_dut.send_expect("ip route show", "#")
-            print self.vm_dut.send_expect("arp -a", "#")
-
-    def get_transmission_results(self, rx_port_list, tx_port_list, delay=5):
-        time.sleep(delay)
-        recvbpsRate = 0
-        recvRate = 0
-        txbpsRate = 0
-        txRate = 0
-        for port in tx_port_list:
-            self.stat_get_rate_stat_all_stats(port)
-            out = self.send_expect('stat cget -framesSent', '%', 10)
-            txRate += int(out.strip())
-            self.logger.info("Port %s: TX %f Mpps" % (port, (txRate * 1.0 / 1000000)))
-            out = self.send_expect('stat cget -bitsSent', '%', 10)
-            txbpsRate += int(out.strip())
-            self.logger.info("Port %s: TX %f Mbps" % (port, (txbpsRate * 1.0 / 1000000)))
-        for port in rx_port_list:
-            self.stat_get_rate_stat_all_stats(port)
-            out = self.send_expect('stat cget -framesReceived', '%', 10)
-            recvRate += int(out.strip())
-            out = self.send_expect('stat cget -oversize', '%', 10)
-            recvRate += int(out.strip())
-            self.logger.info("Port %s: RX %f Mpps" % (port, (recvRate * 1.0 / 1000000)))
-            out = self.send_expect('stat cget -bitsReceived', '%', 10)
-            recvbpsRate += int(out.strip())
-            self.logger.info("Port %s: RX %f Mbps" % (port, (recvbpsRate * 1.0 / 1000000)))
-
-        self.hook_transmissoin_func()
-        self.send_expect("ixStopTransmit portList", "%", 30)
-
-        return (txRate,recvRate)
-
-    def send_verify(self, case, frame_sizes, vlan_id1=0, vlan_id2=0):
-        self.result_table_create(self.header_row)
-        for frame_size in frame_sizes:
-            info = "Running test %s, and %d frame size." % (case, frame_size)
-            self.logger.info(info)
-            payload = frame_size - HEADER_SIZE['eth'] - HEADER_SIZE['ip']
-            flow1 = '[Ether(dst="%s")/Dot1Q(vlan=%s)/IP(src="%s",dst="%s")/("X"*%d)]' % (
-                self.virtio1_mac, vlan_id1, self.src1, self.dst1, payload)
-            flow2 = '[Ether(dst="%s")/Dot1Q(vlan=%s)/IP(src="%s",dst="%s")/("X"*%d)]' % (
-                self.virtio2_mac, vlan_id2, self.src2, self.dst2, payload)
-            self.tester.scapy_append('wrpcap("flow1.pcap", %s)' % flow1)
-            self.tester.scapy_append('wrpcap("flow2.pcap", %s)' % flow2)
-            self.tester.scapy_execute()
-
-            tgenInput = []
-            port = self.tester.get_local_port(self.pf)
-            tgenInput.append((port, port, "flow1.pcap"))
-            tgenInput.append((port, port, "flow2.pcap"))
-
-            recvpkt, sendpkt = self.tester.traffic_generator_throughput(
-                tgenInput, delay=15)
-            recvpkt /= 1000000.0
-            sendpkt /= 1000000.0
-            pct = sendpkt * 100 / recvpkt
-            data_row = [frame_size, str(recvpkt), str(sendpkt), str(pct)]
-            self.result_table_add(data_row)
-        self.result_table_print()
-
-    def test_perf_cuse_one_vm_legacy_fwd(self):
-        #
-        # Test the performance of one vm with 2virtio devices in legacy fwd
-        #
-
-        self.vm_dut.restore_interfaces()
-        # Setup legacy env
-        self.set_legacy_disablefw()
-        self.set_onevm_legacy_fwd()
-        time.sleep(5)
-
-        self.dut.get_session_output(timeout=2)
-        # print "\nclean out1:", out1
-        self.dut.session.copy_file_from("/root/dpdk/vhost.out")
-        fp = open('./vhost.out', 'r')
-        out = fp.read()
-        fp.close()
-        # Get the VLAN ID for virtio
-        print "Check the vlan info: "
-        l1 = re.findall(
-            'MAC_ADDRESS.*?%s.*?and.*?VLAN_TAG.*?(\d+).*?registered' %
-            (str(self.virtio1_mac)), out)
-        if len(l1) > 0:
-            vlan_id1 = l1[0]
-            print "vlan_id1 is ", vlan_id1
-        l2 = re.findall(
-            'MAC_ADDRESS.*?%s.*?and.*?VLAN_TAG.*?(\d+).*?registered' %
-            (str(self.virtio2_mac)), out)
-        if len(l2) > 0:
-            vlan_id2 = l2[0]
-            print "vlan_id2 is ", vlan_id2
-
-        self.send_verify(self.running_case, self.frame_sizes, vlan_id1, vlan_id2)
-        # Stop the Vhost sample
-        self.dut.send_expect("killall -s INT vhost-switch", "#", 20)
-
-    def test_perf_cuse_one_vm_dpdk_fwd(self):
-        #
-        # Test the performance of one vm with 2virtio devices in legacy fwd
-        #
-
-        # start testpmd on VM
-        self.vm_testpmd_start()
-        time.sleep(5)
-        # Clean the output to make the next command can get correct answers
-        self.dut.get_session_output(timeout=2)
-        self.dut.session.copy_file_from("/root/dpdk/vhost.out")
-        fp = open('./vhost.out', 'r')
-        out = fp.read()
-        fp.close()
-        # Get the VLAN ID for virtio
-        print "Check the vlan info: "
-        l1 = re.findall(
-            'MAC_ADDRESS.*?%s.*?and.*?VLAN_TAG.*?(\d+).*?registered' %
-            (str(self.virtio1_mac)), out)
-        if len(l1) > 0:
-            vlan_id1 = l1[0]
-            print vlan_id1
-        l2 = re.findall(
-            'MAC_ADDRESS.*?%s.*?and.*?VLAN_TAG.*?(\d+).*?registered' %
-            (str(self.virtio2_mac)), out)
-        if len(l2) > 0:
-            vlan_id2 = l2[0]
-            print vlan_id2
-
-        self.send_verify(self.running_case, self.frame_sizes, vlan_id1, vlan_id2)
-        # Stop testpmd
-        self.vm_dut.send_expect("stop", "testpmd>")
-        time.sleep(1)
-        self.vm_dut.send_expect("quit", "# ")
-
-        # Stop the Vhost sample
-        self.dut.send_expect("killall -s INT vhost-switch", "#")
-
-    def test_perf_cuse_one_vm_legacy_fwd_jumboframe(self):
-        self.test_perf_cuse_one_vm_legacy_fwd()
-
-    def test_perf_cuse_one_vm_dpdk_fwd_jumboframe(self):
-        self.test_perf_cuse_one_vm_dpdk_fwd()
-
-    def tear_down(self):
-        #
-        # Run after each test case.
-        #
-        self.clear_vhost_env()
-        self.dut.kill_all()
-        time.sleep(2)
-
-    def tear_down_all(self):
-        """
-        Run after each test suite.
-        """
-        # Restore the config file and recompile the package
-        self.dut.send_expect(
-            "sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.*$/CONFIG_RTE_LIBRTE_VHOST_USER=y/' "
-            "./config/common_base",
-            "# ",
-            30)
-        self.dut.build_install_dpdk(self.target)
-        time.sleep(20)
diff --git a/tests/TestSuite_vhost_user_one_copy_one_vm.py b/tests/TestSuite_vhost_user_one_copy_one_vm.py
deleted file mode 100644
index ae7b5e9..0000000
--- a/tests/TestSuite_vhost_user_one_copy_one_vm.py
+++ /dev/null
@@ -1,421 +0,0 @@
-# BSD LICENSE
-#
-# Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   * Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#   * Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in
-#     the documentation and/or other materials provided with the
-#     distribution.
-#   * Neither the name of Intel Corporation nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""
-DPDK Test suite.
-
-Vhost user one-copy sample test suite.
-"""
-import os
-import utils
-import string
-import re
-import time
-from scapy.utils import wrpcap, rdpcap
-from test_case import TestCase
-from exception import VerifyFailure
-from settings import HEADER_SIZE
-from etgen import IxiaPacketGenerator
-from qemu_kvm import QEMUKvm
-
-
-class TestVhostUserOneCopyOneVm(TestCase, IxiaPacketGenerator):
-
-    def set_up_all(self):
-        # To Extend IXIA packet generator method, call the tester's method.
-        self.tester.extend_external_packet_generator(TestVhostUserOneCopyOneVm, self)
-
-        # Build target with modified config file
-        self.dut.send_expect(
-            "sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.*$/CONFIG_RTE_LIBRTE"
-            "_VHOST_USER=y/' ./config/common_base",
-            "# ",
-            30)
-        self.dut.build_install_dpdk(self.target)
-
-        # Get and verify the ports
-        self.dut_ports = self.dut.get_ports()
-        self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing")
-
-        # Get the port's socket
-        self.pf = self.dut_ports[0]
-        netdev = self.dut.ports_info[self.pf]['port']
-        self.socket = netdev.get_nic_socket()
-        self.cores = self.dut.get_core_list("1S/3C/1T", socket=self.socket)
-
-        # Set the params of vhost sample
-        self.vhost_app = "./examples/vhost/build/vhost-switch"
-        self.zero_copy = 0
-        self.vm2vm = 0
-        self.jumbo = 0
-
-        # Using file to save the vhost sample output since in jumboframe case,
-        # there will be lots of output
-        self.vhost_test = self.vhost_app + \
-            " -c %s -n %d --socket-mem 1024,1024 -- -p 0x1 --mergeable %d" + \
-            " --zero-copy %d --vm2vm %d 2 > ./vhost.out &"
-        # build the vhost sample in vhost-user mode.
-        if self.nic in ['niantic']:
-            self.dut.send_expect(
-                "sed -i -e 's/#define MAX_QUEUES.*$/#define MAX_QUEUES 128/' "
-                "./examples/vhost/main.c",
-                "#", 10)
-        else:
-            self.dut.send_expect(
-                "sed -i -e 's/#define MAX_QUEUES.*$/#define MAX_QUEUES 512/' "
-                "./examples/vhost/main.c",
-                "#", 10)
-        out = self.dut.send_expect("make -C examples/vhost", "#")
-        self.verify("Error" not in out, "compilation error")
-        self.verify("No such file" not in out, "Not found file error")
-
-        # Define the virtio/VM variables
-        self.virtio1 = "eth1"
-        self.virtio2 = "eth2"
-        self.virtio1_mac = "52:54:00:00:00:01"
-        self.virtio2_mac = "52:54:00:00:00:02"
-        self.src1 = "192.168.4.1"
-        self.src2 = "192.168.3.1"
-        self.dst1 = "192.168.3.1"
-        self.dst2 = "192.168.4.1"
-        self.vm_dut = None
-
-        self.header_row = ["FrameSize(B)", "Injection(Mpps)", "Throughput(Mpps)", "LineRate(%)"]
-        self.memory_channel = 4
-
-    def set_up(self):
-        #
-        # Run before each test case.
-        #
-        # Launch vhost sample using default params
-
-        if "jumbo" in self.running_case:
-            self.jumbo = 1
-            self.frame_sizes = [64, 128, 256, 512, 1024, 1280, 1518, 2048, 5000, 9000]
-            self.vm_testpmd = "./x86_64-native-linuxapp-gcc/app/testpmd -c 0x3 -n 3" \
-                + " -- -i --tx-offloads=0x8000 " \
-                + "--disable-hw-vlan-filter --max-pkt-len 9600"
-        else:
-            self.jumbo = 0
-            self.frame_sizes = [64, 128, 256, 512, 1024, 1280, 1518]
-            self.vm_testpmd = "./x86_64-native-linuxapp-gcc/app/testpmd -c 0x3 -n 3" \
-                + " -- -i --tx-offloads=0x8000 --disable-hw-vlan-filter"
-        self.dut.send_expect("rm -rf ./vhost.out", "#")
-
-        self.launch_vhost_sample()
-
-        # start VM with 2virtio
-        self.start_onevm()
-
-    def launch_vhost_sample(self):
-        #
-        # Launch the vhost sample with different parameters
-        #
-        self.coremask = utils.create_mask(self.cores)
-        self.vhostapp_testcmd = self.vhost_test % (
-            self.coremask, self.memory_channel, self.jumbo, self.zero_copy, self.vm2vm)
-        self.dut.send_expect(self.vhostapp_testcmd, "# ", 40)
-        time.sleep(30)
-        try:
-            print "Launch vhost sample:"
-            self.dut.session.copy_file_from("/root/dpdk/vhost.out")
-            fp = open('./vhost.out', 'r')
-            out = fp.read()
-            fp.close()
-            if "Error" in out:
-                raise Exception("Launch vhost sample failed")
-            else:
-                print "Launch vhost sample finished"
-        except Exception as e:
-            print utils.RED("Failed to launch vhost sample: %s" % str(e))
-
-    def start_onevm(self):
-        #
-        # Start One VM with 2 virtio devices
-        #
-
-        self.vm = QEMUKvm(self.dut, 'vm0', 'vhost_sample')
-        if "user" in self.running_case:
-            vm_params = {}
-            vm_params['driver'] = 'vhost-user'
-            vm_params['opt_path'] = './vhost-net'
-            vm_params['opt_mac'] = self.virtio1_mac
-            self.vm.set_vm_device(**vm_params)
-            vm_params['opt_mac'] = self.virtio2_mac
-            self.vm.set_vm_device(**vm_params)
-
-        try:
-            self.vm_dut = self.vm.start()
-            if self.vm_dut is None:
-                raise Exception("Set up VM ENV failed")
-        except Exception as e:
-            print utils.RED("Failure for %s" % str(e))
-
-        return True
-
-    def vm_testpmd_start(self):
-        #
-        # Start testpmd in vm
-        #
-        if self.vm_dut is not None:
-            # Start testpmd with user
-            self.vm_dut.send_expect(self.vm_testpmd, "testpmd>", 20)
-            # Start tx_first
-            self.vm_dut.send_expect("start tx_first", "testpmd>")
-
-    def clear_vhost_env(self):
-        #
-        # Kill all vhost sample, shutdown VM
-        #
-        if self.vm_dut:
-            self.vm_dut.kill_all()
-            time.sleep(1)
-        if self.vm:
-            self.vm.stop()
-            self.vm = None
-
-    def set_legacy_disablefw(self):
-        #
-        # Disable firewall and iptables in legacy case
-        #
-        if self.vm_dut is not None:
-            self.vm_dut.send_expect("systemctl stop firewalld.service", "#")
-            self.vm_dut.send_expect("systemctl disable firewalld.service", "#")
-            self.vm_dut.send_expect("systemctl stop ip6tables.service", "#")
-            self.vm_dut.send_expect("systemctl disable ip6tables.service", "#")
-            self.vm_dut.send_expect("systemctl stop iptables.service", "#")
-            self.vm_dut.send_expect("systemctl disable iptables.service", "#")
-            self.vm_dut.send_expect(
-                "systemctl stop NetworkManager.service",
-                "#")
-            self.vm_dut.send_expect(
-                "systemctl disable NetworkManager.service",
-                "#")
-            self.vm_dut.send_expect(
-                "echo 1 >/proc/sys/net/ipv4/ip_forward",
-                "#")
-
-    def set_onevm_legacy_fwd(self):
-        if self.vm_dut is not None:
-            ifcfg = self.vm_dut.send_expect("ifconfig -a", "#", 10)
-            intfs = re.compile('eth\d').findall(ifcfg)
-            # Find the virtio1 and virtio2's interface names
-            for intf in intfs:
-                out_mac = self.vm_dut.send_expect(
-                    "ifconfig %s" %
-                    intf, "#", 10)
-                if self.virtio1_mac in out_mac:
-                    self.virtio1 = intf
-                if self.virtio2_mac in out_mac:
-                    self.virtio2 = intf
-            print "Virtio1's intf is %s" % self.virtio1
-            print "Virtio2's intf is %s" % self.virtio2
-            # Set the mtu 9000 if jumboframe is enabled.
-            if self.jumbo == 1:
-                self.vm_dut.send_expect(
-                    "ifconfig %s mtu 9000" %
-                    self.virtio1, "#")
-                self.vm_dut.send_expect(
-                    "ifconfig %s mtu 9000" %
-                    self.virtio2, "#")
-            # Set up the ip address/ipv4 fwd tables
-            self.vm_dut.send_expect(
-                "ip addr add 192.168.4.2/24 dev %s" %
-                self.virtio1, "#")
-            self.vm_dut.send_expect(
-                "ip addr add 192.168.3.2/24 dev %s" %
-                self.virtio2, "#")
-            self.vm_dut.send_expect(
-                "ip link set dev %s up" %
-                self.virtio1, "#")
-            self.vm_dut.send_expect(
-                "ip link set dev %s up" %
-                self.virtio2, "#")
-            self.vm_dut.send_expect(
-                "ip neigh add 192.168.4.1 lladdr 52:00:00:00:00:01 dev %s" %
-                self.virtio1, "#")
-            self.vm_dut.send_expect(
-                "ip neigh add 192.168.3.1 lladdr 52:00:00:00:00:02 dev %s" %
-                self.virtio2, "#")
-            self.vm_dut.send_expect("ip route show", "#")
-            print self.vm_dut.send_expect("arp -a", "#")
-
-    def get_transmission_results(self, rx_port_list, tx_port_list, delay=5):
-        time.sleep(delay)
-        recvbpsRate = 0
-        recvRate = 0
-        txbpsRate = 0
-        txRate = 0
-        for port in tx_port_list:
-            self.stat_get_rate_stat_all_stats(port)
-            out = self.send_expect('stat cget -framesSent', '%', 10)
-            txRate += int(out.strip())
-            self.logger.info("Port %s: TX %f Mpps" % (port, (txRate * 1.0 / 1000000)))
-            out = self.send_expect('stat cget -bitsSent', '%', 10)
-            txbpsRate += int(out.strip())
-            self.logger.info("Port %s: TX %f Mbps" % (port, (txbpsRate * 1.0 / 1000000)))
-        for port in rx_port_list:
-            self.stat_get_rate_stat_all_stats(port)
-            out = self.send_expect('stat cget -framesReceived', '%', 10)
-            recvRate += int(out.strip())
-            out = self.send_expect('stat cget -oversize', '%', 10)
-            recvRate += int(out.strip())
-            self.logger.info("Port %s: RX %f Mpps" % (port, (recvRate * 1.0 / 1000000)))
-            out = self.send_expect('stat cget -bitsReceived', '%', 10)
-            recvbpsRate += int(out.strip())
-            self.logger.info("Port %s: RX %f Mbps" % (port, (recvbpsRate * 1.0 / 1000000)))
-
-        self.hook_transmissoin_func()
-        self.send_expect("ixStopTransmit portList", "%", 30)
-
-        return (txRate,recvRate)
-
-    def send_verify(self, case, frame_sizes, vlan_id1=0, vlan_id2=0):
-        self.result_table_create(self.header_row)
-        for frame_size in frame_sizes:
-            info = "Running test %s, and %d frame size." % (case, frame_size)
-            self.logger.info(info)
-            payload = frame_size - HEADER_SIZE['eth'] - HEADER_SIZE['ip']
-            flow1 = '[Ether(dst="%s")/Dot1Q(vlan=%s)/IP(src="%s",dst="%s")/("X"*%d)]' % (
-                self.virtio1_mac, vlan_id1, self.src1, self.dst1, payload)
-            flow2 = '[Ether(dst="%s")/Dot1Q(vlan=%s)/IP(src="%s",dst="%s")/("X"*%d)]' % (
-                self.virtio2_mac, vlan_id2, self.src2, self.dst2, payload)
-            self.tester.scapy_append('wrpcap("flow1.pcap", %s)' % flow1)
-            self.tester.scapy_append('wrpcap("flow2.pcap", %s)' % flow2)
-            self.tester.scapy_execute()
-
-            tgenInput = []
-            port = self.tester.get_local_port(self.pf)
-            tgenInput.append((port, port, "flow1.pcap"))
-            tgenInput.append((port, port, "flow2.pcap"))
-
-            recvpkt, sendpkt = self.tester.traffic_generator_throughput(
-                tgenInput, delay=15)
-            recvpkt /= 1000000.0
-            sendpkt /= 1000000.0
-            pct = sendpkt * 100 / recvpkt
-            data_row = [frame_size, str(recvpkt), str(sendpkt), str(pct)]
-            self.result_table_add(data_row)
-        self.result_table_print()
-
-    def test_perf_user_one_vm_legacy_fwd(self):
-        #
-        # Test the performance of one vm with 2virtio devices in legacy fwd
-        #
-        # Restore the virtio interfaces to use legacy driver
-        self.vm_dut.restore_interfaces()
-        self.set_legacy_disablefw()
-        # Set the legacy fwd rules then get the VLAN id from vhost sample
-        # output
-        self.set_onevm_legacy_fwd()
-        time.sleep(5)
-
-        self.dut.get_session_output(timeout=2)
-        self.dut.session.copy_file_from("/root/dpdk/vhost.out")
-        fp = open('./vhost.out', 'r')
-        out = fp.read()
-        fp.close()
-        # Get the VLAN ID for virtio
-        print "Check the vlan info: "
-        l1 = re.findall(
-            'MAC_ADDRESS.*?%s.*?and.*?VLAN_TAG.*?(\d+).*?registered' %
-            (str(self.virtio1_mac)), out)
-        if len(l1) > 0:
-            vlan_id1 = l1[0]
-            print "vlan_id1 is ", vlan_id1
-        l2 = re.findall(
-            'MAC_ADDRESS.*?%s.*?and.*?VLAN_TAG.*?(\d+).*?registered' %
-            (str(self.virtio2_mac)), out)
-        if len(l2) > 0:
-            vlan_id2 = l2[0]
-            print "vlan_id2 is ", vlan_id2
-
-        self.send_verify(self.running_case, self.frame_sizes, vlan_id1, vlan_id2)
-        # Stop the Vhost sample
-        self.dut.send_expect("killall -s INT vhost-switch", "#", 20)
-
-    def test_perf_user_one_vm_dpdk_fwd(self):
-        #
-        # Test the performance of one vm with 2virtio devices in legacy fwd
-        #
-        # start testpmd on VM
-        self.vm_testpmd_start()
-        time.sleep(5)
-        # Clean the output to ensure the commands cat ./vhost.out can be sent
-        # and got answered correctly.
-        self.dut.get_session_output(timeout=2)
-        self.dut.session.copy_file_from("/root/dpdk/vhost.out")
-        fp = open('./vhost.out', 'r')
-        out = fp.read()
-        fp.close()
-        # Get the VLAN ID for virtio
-        print "Check the vlan info: "
-        l1 = re.findall(
-            'MAC_ADDRESS.*?%s.*?and.*?VLAN_TAG.*?(\d+).*?registered' %
-            (str(self.virtio1_mac)), out)
-        if len(l1) > 0:
-            vlan_id1 = l1[0]
-            print vlan_id1
-        l2 = re.findall(
-            'MAC_ADDRESS.*?%s.*?and.*?VLAN_TAG.*?(\d+).*?registered' %
-            (str(self.virtio2_mac)), out)
-        if len(l2) > 0:
-            vlan_id2 = l2[0]
-            print vlan_id2
-
-        self.send_verify(self.running_case, self.frame_sizes, vlan_id1, vlan_id2)
-        # Stop testpmd
-        self.vm_dut.send_expect("stop", "testpmd>")
-        time.sleep(1)
-        self.vm_dut.send_expect("quit", "# ")
-
-        # Stop the Vhost sample
-        self.dut.send_expect("killall -s INT vhost-switch", "#")
-
-    def test_perf_user_one_vm_legacy_fwd_jumboframe(self):
-        self.test_perf_user_one_vm_legacy_fwd()
-
-    def test_perf_user_one_vm_dpdk_fwd_jumboframe(self):
-        self.test_perf_user_one_vm_dpdk_fwd()
-
-    def tear_down(self):
-        #
-        # Run after each test case.
-        #
-        self.clear_vhost_env()
-        self.dut.kill_all()
-        time.sleep(2)
-
-    def tear_down_all(self):
-        """
-        Run after each test suite.
-        """
-        pass
diff --git a/tests/TestSuite_virtio_iperf.py b/tests/TestSuite_virtio_iperf.py
deleted file mode 100644
index a0bd6e9..0000000
--- a/tests/TestSuite_virtio_iperf.py
+++ /dev/null
@@ -1,305 +0,0 @@
-# BSD LICENSE
-#
-# Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   * Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#   * Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in
-#     the documentation and/or other materials provided with the
-#     distribution.
-#   * Neither the name of Intel Corporation nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-"""
-DPDK Test suite
-Test DPDK vhost + virtio scenarios
-"""
-import re
-import utils
-import time
-import os
-
-from test_case import TestCase
-from qemu_kvm import QEMUKvm
-
-class TestVirtioIperf(TestCase):
-    def set_up_all(self):
-        self.vhost_legacy_virtio_cmdline="csum=off,gso=off,guest_csum=off,guest_tso4=off,guest_tso6=off,guest_ecn=off"
-        self.vhost_cuse_virtio_cmdline="csum=off,gso=off,guest_csum=off,guest_tso4=off,guest_tso6=off,guest_ecn=off"
-        self.vhost_user_virtio_cmdline=""
-        self.virtio_mac = ["52:54:00:00:00:01", "52:54:00:00:00:02"]
-        self.virtio_ip = ["1.1.1.2", "1.1.1.3"]
-        self.vm = []
-        self.vm_dut = []
-
-        self.dut_ports = self.dut.get_ports(self.nic)
-        self.verify(len(self.dut_ports) >= 1, 'Insufficient ports for test')
-        
-        self.phy_function = self.dut_ports[0]
-        netdev = self.dut.ports_info[self.phy_function]['port']
-        self.socket = netdev.get_nic_socket()
-        self.cores = self.dut.get_core_list("1S/3C/1T", socket=self.socket)
-        self.coremask = utils.create_mask(self.cores)
-        
-    def set_up(self):
-        pass
-    
-    def dut_execut_cmd(self, cmdline, ex='#', timout=30):
-        return self.dut.send_expect(cmdline, ex, timout)
-    
-    def build_vhost_lib(self, vhost='user'):
-        self.dut_execut_cmd('git clean -x -d -f')
-        self.dut_execut_cmd('git checkout *')
-        if vhost == 'cuse':
-            self.dut_execut_cmd(
-                "sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.*$/CONFIG_RTE_LIBRTE" +
-                "_VHOST_USER=n/' ./config/common_base")
-        else:
-            self.dut_execut_cmd(
-                "sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.*$/CONFIG_RTE_LIBRTE" +
-                "_VHOST_USER=y/' ./config/common_base")
-        self.dut.build_install_dpdk(self.target)
-        self.dut_execut_cmd("cd ./lib/librte_vhost")
-        out = self.dut_execut_cmd("make")
-        self.verify('Error' not in out, 'bulid err: build lib vhost failed')
-        self.dut_execut_cmd("cd ./eventfd_link")
-        out = self.dut_execut_cmd("make")
-        self.verify('Error' not in out, 'bulid err: build eventfd_link failed')
-        self.dut_execut_cmd("cd ~/dpdk")
-        
-    def build_vhost_app(self):
-        if self.nic in "niantic":
-            self.dut_execut_cmd(
-                "sed -i -e 's/define MAX_QUEUES.*/define MAX_QUEUES 128/' " +
-                "./examples/vhost/main.c")
-        else:
-            self.dut_execut_cmd(
-                "sed -i -e 's/define MAX_QUEUES.*/define MAX_QUEUES 512/' " +
-                "./examples/vhost/main.c")
-        out = self.dut_execut_cmd("make -C ./examples/vhost")
-        self.verify("Error" not in out, "compilation error")
-        self.verify("No such file" not in out, "Not found file error")
-        
-    def launch_vhost_switch(self, coremask, channel, jumbo, scenario):
-        self.vhost_switch = "./examples/vhost/build/vhost-switch"
-        self.vhost_switch_cmd = self.vhost_switch + \
-        " -c %s -n %d --socket-mem 2048,2048 -- -p 0x1" + \
-        " --mergeable %d --zero-copy 0 --vm2vm %d  > ./vhost.out &"
-        self.dut_execut_cmd(self.vhost_switch_cmd % (coremask, channel, jumbo, scenario))
-        time.sleep(20)
-        self.dut.session.copy_file_from('/root/dpdk/vhost.out')
-        time.sleep(5)
-        fp = open('./vhost.out')
-        fmsg = fp.read()
-        fp.close()
-        if 'Error' or 'error' in fmsg:
-            print 'launch vhost sample failed'
-            return False
-        else:
-            return True 
-
-    def iperf_result_verify(self, vm_client):
-        '''
-        vm_client.session.copy_file_from("/root/dpdk/iperf_client.log")
-        self.tester.send_expect('scp -P')
-        '''
-        vm_client.session.copy_file_from("/root/dpdk/iperf_client.log")
-        fp = open("./iperf_client.log")
-        fmsg = fp.read()
-        iperfdata = re.compile('[\d+]*.[\d+] [M|G]bits/sec').findall(fmsg)
-        self.result_table_create(['Data', 'Unit'])
-        for data in iperfdata:
-            self.results_table_add([data.split()[0], data.split()[1]])
-        self.result_table_print()
-        os.popen("rm -rf ./iperf_client.log")
-        
-    def test_perf_vhost_legacy_virtio_iperf(self):
-        pass
-
-    def test_perf_vhost_cuse_virtio_iperf(self):
-        """
-        vhost cuse as back end, legacy virtio dirver as front end
-        """
-        self.build_vhost_lib(vhost='cuse')
-        self.build_vhost_app()
-        self.dut_execut_cmd('rm -rf /dev/vhost-net')
-        self.dut_execut_cmd('rmmod igb_uio -f')
-        self.dut_execut_cmd('rmmod eventfd_link')
-        self.dut_execut_cmd('modprobe uio')
-        self.dut_execut_cmd('modprobe fuse')
-        self.dut_execut_cmd('modprobe cuse')
-        self.dut_execut_cmd('insmod ./x86_64-native-linuxapp-gcc/kmod/igb_uio.ko')
-        self.dut_execut_cmd('insmod ./lib/librte_vhost/eventfd_link/eventfd_link.ko')
-        self.dut.bind_interfaces_linux(self.drivername)
-        self.launch_vhost_switch(self.coremask, 4, 0, 1)
-
-        self.vm1 = QEMUKvm(self.dut, 'vm0', 'virtio_iperf')
-        vm1_params = {}
-        vm1_params['driver'] = 'vhost-cuse'
-        vm1_params['opt_tap'] = 'vhost0'
-        vm1_params['opt_mac'] = self.virtio_mac[0]
-        vm1_params['opt_settings'] = self.vhost_cuse_virtio_cmdline
-        self.vm1.set_vm_device(**vm1_params)
-        try:
-            self.vm1_dut = self.vm1.start(auto_portmap=False)
-            time.sleep(10)
-            if self.vm1_dut is None:
-                raise Exception('VM1 start failed')
-        except Exception as e0:
-            print utils.RED('VM1 already exist, powerdown it first')
-        self.vm1_dut.restore_interfaces()
-        
-        self.vm2 = QEMUKvm(self.dut, 'vm1', 'virtio_iperf')
-        vm2_params = {}
-        vm2_params['driver'] = 'vhost-cuse'
-        vm2_params['opt_tap'] = 'vhost1'
-        vm2_params['opt_mac'] = self.virtio_mac[1]
-        vm2_params['opt_settings'] = self.vhost_cuse_virtio_cmdline
-        self.vm2.set_vm_device(**vm2_params)
-        try:
-            self.vm2_dut = self.vm2.start(auto_portmap=False)
-            time.sleep(10)
-            if self.vm2_dut is None:
-                raise Exception('VM2 start failed')
-        except Exception as e1:
-            print utils.RED('VM2 already exist, powerdown it first')
-        self.vm2_dut.restore_interfaces()
-        
-        #self.start_iperf_server()
-        vm1_vport = self.vm1_dut.send_expect('ifconfig -a', '#', 30)
-        print 'vm net port:'
-        print vm1_vport
-        intfs = re.compile('eth\d').findall(vm1_vport)
-        for intf in intfs:
-            outmac = self.vm1_dut.send_expect('ifconfig %s' % intf, '#', 30)
-            if self.virtio_mac[0] in outmac:
-                self.vm1_intf = intf
-        self.vm1_dut.send_expect('ifconfig %s %s' % (self.vm1_intf, self.virtio_ip[0]), '#', 10)
-        self.vm1_dut.send_expect('ifconfig %s up' % self.vm1_intf, '#', 10)
-        self.vm1_dut.send_expect('arp -s %s %s' % (self.virtio_ip[1], self.virtio_mac[1]), '#', 10)
-        self.vm1_dut.send_expect('iperf -s -p 12345 -i 1 > iperf_server.log &', '', 10)
-        
-        #self.start_iperf_client()
-        vm2_vport = self.vm2_dut.send_expect('ifconfig -a', '#', 30)
-        print 'vm net port:'
-        print vm2_vport
-        intfs = re.compile('eth\d').findall(vm2_vport)
-        for intf in intfs:
-            outmac = self.vm2_dut.send_expect('ifconfig %s' % intf, '#', 30)
-            if self.virtio_mac[1] in outmac:
-                self.vm2_intf = intf
-        self.vm2_dut.send_expect('ifconfig %s %s' % (self.vm2_intf, self.virtio_ip[1]), '#', 10)
-        self.vm2_dut.send_expect('ifconfig %s up' % self.vm2_intf, '#', 10)
-        self.vm2_dut.send_expect('arp -s %s %s' % (self.virtio_ip[0], self.virtio_mac[0]), '#', 10)
-        self.vm2_dut.send_expect('iperf -c %s -p 12345 -i 1 -t 60 > iperf_client.log &' % self.virtio_ip[0], '', 60)
-        time.sleep(70)
-        self.vm1_dut.send_expect("killall -s INT iperf", '', 10)
-        self.iperf_result_verify(self.vm2_dut)
-        
-    def test_perf_vhost_user_virtio_iperf(self):
-        """
-        vhost user as back end, legacy virtio dirver as front end
-        """
-        self.build_vhost_lib(vhost='user')
-        self.build_vhost_app()
-        #self.dut_execut_cmd('rm -rf /dev/vhost-net')
-        self.dut_execut_cmd('rmmod igb_uio -f')
-        self.dut_execut_cmd('rmmod eventfd_link')
-        self.dut_execut_cmd('modprobe uio')
-        #self.dut_execut_cmd('modprobe fuse')
-        #self.dut_execut_cmd('modprobe cuse')
-        self.dut_execut_cmd('insmod ./x86_64-native-linuxapp-gcc/kmod/igb_uio.ko')
-        self.dut_execut_cmd('insmod ./lib/librte_vhost/eventfd_link/eventfd_link.ko')
-        self.dut.bind_interfaces_linux(self.drivername)
-        self.launch_vhost_switch(self.coremask, 4, 0, 1)
-        
-        self.vm1 = QEMUKvm(self.dut, 'vm0', 'virtio_iperf')
-        vm1_params = {}
-        vm1_params['driver'] = 'vhost-user'
-        vm1_params['opt_path'] = './vhost-net'
-        vm1_params['opt_mac'] = self.virtio_mac[0]
-        self.vm1.set_vm_device(**vm1_params)
-        try:
-            self.vm1_dut = self.vm1.start(auto_portmap=False)
-            if self.vm1_dut is None:
-                raise Exception('VM1 start failed')
-        except Exception as e0:
-            print utils.RED('VM1 already exist, powerdown it first')
-        self.vm1_dut.restore_interfaces()
-
-        self.vm2 = QEMUKvm(self.dut, 'vm1', 'virtio_iperf')
-        vm2_params = {}
-        vm2_params['driver'] = 'vhost-user'
-        vm2_params['opt_path'] = './vhost-net'
-        vm2_params['opt_mac'] = self.virtio_mac[1]
-        self.vm2.set_vm_device(**vm2_params)
-        try:
-            self.vm2_dut = self.vm2.start(auto_portmap=False)
-            if self.vm2_dut is None:
-                raise Exception('VM2 start failed')
-        except Exception as e1:
-            print utils.RED('VM2 already exist, powerdown it first')
-        
-        self.vm2_dut.restore_interfaces()
-        
-        #self.start_iperf_server()
-        vm1_vport = self.vm1_dut.send_expect('ifconfig -a', '#', 30)
-        print 'vm net port:'
-        print vm1_vport
-        intfs = re.compile('eth\d').findall(vm1_vport)
-        for intf in intfs:
-            outmac = self.vm1_dut.send_expect('ifconfig %s' % intf, '#', 30)
-            if self.virtio_mac[0] in outmac:
-                self.vm1_intf = intf
-        self.vm1_dut.send_expect('ifconfig %s %s' % (self.vm1_intf, self.virtio_ip[0]), '#', 10)
-        self.vm1_dut.send_expect('ifconfig %s up' % self.vm1_intf, '#', 10)
-        self.vm1_dut.send_expect('arp -s %s %s' % (self.virtio_ip[1], self.virtio_mac[1]), '#', 10)
-        self.vm1_dut.send_expect('iperf -s -p 12345 -i 1 > iperf_server.log &', '', 10)
-        
-        #self.start_iperf_client()
-        vm2_vport = self.vm2_dut.send_expect('ifconfig -a', '#', 30)
-        print 'vm net port:'
-        print vm2_vport
-        intfs = re.compile('eth\d').findall(vm2_vport)
-        for intf in intfs:
-            outmac = self.vm2_dut.send_expect('ifconfig %s' % intf, '#', 30)
-            if self.virtio_mac[1] in outmac:
-                self.vm2_intf = intf
-        self.vm2_dut.send_expect('ifconfig %s %s' % (self.vm2_intf, self.virtio_ip[1]), '#', 10)
-        self.vm2_dut.send_expect('ifconfig %s up' % self.vm2_intf, '#', 10)
-        self.vm2_dut.send_expect('arp -s %s %s' % (self.virtio_ip[0], self.virtio_mac[0]), '#', 10)
-        self.vm2_dut.send_expect('iperf -c %s -p 12345 -i 1 -t 60 > iperf_client.log &' % self.virtio_ip[0], '', 60)
-        time.sleep(70)
-        
-        self.vm1_dut.session.send_expect('killall -s INT iperf', '#', 10)
-        self.iperf_result_verify(self.vm2_dut)
-    
-    def tear_down(self):
-        if self.vm2:
-            self.vm2.stop()
-            self.vm2 = None
-        if self.vm1:
-            self.vm1.stop()
-            self.vm1 = None
-        self.dut.send_expect("killall -s INT vhost-switch", "#")
-
-    def tear_down_all(self):
-        pass
-- 
2.7.4


             reply	other threads:[~2019-06-05  8:03 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-05  0:41 lihong [this message]
2019-06-06  6:28 ` Wang, Yinan
2019-06-12  2:38 ` Tu, Lijuan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1559695313-16891-1-git-send-email-lihongx.ma@intel.com \
    --to=lihongx.ma@intel.com \
    --cc=dts@dpdk.org \
    --cc=yinan.wang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).