diff --git a/conf/vxlan_sample.cfg b/conf/vxlan_sample.cfg
deleted file mode 100644
index fe74e6f7..00000000
--- a/conf/vxlan_sample.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-# vm configuration for vxlan sample case
-[vm0]
-cpu =
-    model=host,number=4,cpupin=24 25 26 27;
-mem =
-    size=4096,hugepage=yes;
-disk =
-    file=/storage/vm-image/vm0.img;
-login =
-    user=root,password=tester;
-vnc = 
-    displayNum=1;
-
-[vm1]
-cpu =
-    model=host,number=4,cpupin=28 29 30 31;
-mem =
-    size=4096,hugepage=yes;
-disk =
-    file=/storage/vm-image/vm1.img;
-login =
-    user=root,password=tester;
-vnc = 
-    displayNum=2;
-daemon =
-    enable=yes;
diff --git a/test_plans/vxlan_sample_test_plan.rst b/test_plans/vxlan_sample_test_plan.rst
deleted file mode 100644
index a092e851..00000000
--- a/test_plans/vxlan_sample_test_plan.rst
+++ /dev/null
@@ -1,266 +0,0 @@
-.. Copyright (c) <2015-2017>, Intel Corporation
-   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.
-
-=======================================
-Sample Application Tests: Vxlan Example
-=======================================
-
-Vxlan sample simulates a VXLAN Tunnel Endpoint (VTEP) termination in DPDK.
-It is used to demonstrate the offload and filtering capabilities of i40 NIC
-for VXLAN packet.
-
-Vxlan sample uses the basic virtio devices management function from vHOST
-example, and the US-vHost interface and tunnel filtering mechanism to direct
-the traffic to/from a specific VM.
-
-Vxlan sample is also designed to show how tunneling protocols can be handled.
-
-Prerequisites
-=============
-1x Intel® X710 (Fortville) NICs (2x 40GbE full duplex optical ports per NIC)
-plugged into the available PCIe Gen3 8-lane slot.
-
-2x Intel® XL710-DA4 (Eagle Fountain) (1x 10GbE full duplex optical ports per NIC)
-plugged into the available PCIe Gen3 8-lane slot.
-
-DUT board must be two sockets system and each cpu have more than 8 lcores.
-
-Update qemu-system-x86_64 to version 2.2.0 which support hugepage based memory.
-Prepare vhost-use requested modules::
-
-    modprobe fuse
-    modprobe cuse
-    insmod lib/librte_vhost/eventfd_link/eventfd_link.ko
-
-Allocate 4096*2M hugepages for vm and dpdk::
-
-    echo 4096 > /sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages
-
-Test Case: Vxlan Sample Encap packet
-====================================
-Start vxlan sample with only encapsulation enable::
-
-    tep_termination -c 0xf -n 3 --socket-mem 2048,2048 -- -p 0x1 \
-        --udp-port 4789 --nb-devices 2 --filter-type 3 --tx-checksum 0 \
-        --encap 1 --decap 0
-
-Wait for vhost-net socket device created and message dumped::
-
-    VHOST_CONFIG: bind to vhost-net
-
-Start virtual machine with hugepage based memory and two vhost-user devices::
-
-    qemu-system-x86_64 -name vm0 -enable-kvm -daemonize \
-      -cpu host -smp 4 -m 4096 \
-      -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,share=on \
-      -numa node,memdev=mem -mem-prealloc \
-      -chardev socket,id=char0,path=./dpdk/vhost-net \
-      -netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce \
-      -device virtio-net-pci,netdev=netdev0,mac=00:00:20:00:00:20 \
-      -chardev socket,id=char1,path=./dpdk/vhost-net \
-      -netdev type=vhost-user,id=netdev1,chardev=char1,vhostforce \
-      -device virtio-net-pci,netdev=netdev1,mac=00:00:20:00:00:21 \
-      -drive file=/storage/vm-image/vm0.img -vnc :1
-
-Login into virtual machine and start testpmd with additional arguments::
-
-    testpmd -c f -n 3 -- -i --tx-offloads=0x8000 --disable-hw-vlan
-
-Start packet forward of testpmd and transit several packets for mac learning::
-
-    testpmd> set fwd mac
-    testpmd> start tx_first
-
-Make sure virtIO port registered normally::
-
-    VHOST_CONFIG: virtio is now ready for processing.
-    VHOST_DATA: (1) Device has been added to data core 56
-    VHOST_DATA: (1) MAC_ADDRESS 00:00:20:00:00:21 and VNI 1000 registered
-    VHOST_DATA: (0) MAC_ADDRESS 00:00:20:00:00:20 and VNI 1000 registered
-
-Send normal udp packet to PF device and packet dmac match PF device
-Verify packet has been received in virtIO port0 and forwarded by port1::
-
-      testpmd> show port stats all
-
-Verify encapsulated packet received on PF device
-
-Test Case: Vxlan Sample Decap packet
-====================================
-
-Start vxlan sample with only decapsulation enable::
-
-  tep_termination -c 0xf -n 3 --socket-mem 2048,2048 -- -p 0x1 \
-    --udp-port 4789 --nb-devices 2 --filter-type 3 --tx-checksum 0 \
-    --encap 0 --decap 1
-
-Start vhost-user test environment like case vxlan_sample_encap.
-
-Send vxlan packet to PF the device::
-
-  Ether(dst=PF mac)/IP/UDP/vni(1000)/Ether(dst=virtIO port0)/IP/UDP
-
-Verify that packet received by virtIO port0 and forwarded by virtIO port1::
-
-  testpmd> show port stats all
-
-Verify that PF received packet just the same as inner packet
-
-Send vxlan packet to the PF device::
-
-    Ether(dst=PF mac)/IP/UDP/vni(1000)/Ether(dst=virtIO port1)/IP/UDP
-
-Verify that packet received by virtIO port1 and forwarded by virtIO port0::
-
-  testpmd> show port stats all
-
-Make sure PF received packet received inner packet with mac reversed.
-
-Test Case: Vxlan Sample Encap and Decap
-=======================================
-Start vxlan sample with only decapsulation enable::
-
-  tep_termination -c 0xf -n 3 --socket-mem 2048,2048 -- -p 0x1 \
-    --udp-port 4789 --nb-devices 2 --filter-type 3 --tx-checksum 0 \
-    --encap 1 --decap 1
-
-Start vhost-user test environment like case vxlan_sample_encap
-
-Send vxlan packet to the PF device::
-
-  Ether(dst=PF mac)/IP/UDP/vni(1000)/Ether(dst=virtIO port0)/IP/UDP
-
-
-Verify that packet received by virtIO port0 and forwarded by virtIO port1::
-
-  testpmd> show port stats all
-
-Verify encapsulated packet received on PF device.
-Verify that inner packet src and dst mac address have been conversed.
-
-Test Case: Vxlan Sample Checksum
-================================
-Start vxlan sample with only decapsulation enable::
-
-  tep_termination -c 0xf -n 3 --socket-mem 2048,2048 -- -p 0x1 \
-    --udp-port 4789 --nb-devices 2 --filter-type 3 --tx-checksum 1 \
-    --encap 1 --decap 1
-
-Start vhost-user test environment like case vxlan_sample_encap
-
-Send vxlan packet with wrong chksum::
-
-  Ether(dst = PF mac)/IP/UDP/vni(1000)/Ether(dst = virtIO port0)/IP wrong chksum/UDP
-
-Verify that packet received by virtIO port0 and forwarded by virtIO port1::
-
-  testpmd> show port stats all
-
-Verify encapsulated packet received on PF device.
-Verify that inner packet src and dst mac address have been conversed.
-Verify that inner packet ip checksum and udp checksum were corrected.
-
-Send vxlan packet with wrong chksum::
-
-    Ether(dst = PF mac)/IP/UDP/vni(1000)/Ether(dst = virtIO port0)/IP wrong chksum/TCP
-
-Verify that packet received by virtIO port0 and forwarded by virtIO port1::
-
-  testpmd> show port stats all
-
-Verify encapsulated packet received on PF device.
-Verify that inner packet src and dst mac address have been conversed.
-Verify that inner packet ip checksum and tcp checksum were corrected.
-
-Send vxlan packet with wrong chksum::
-
-  Ether(dst = PF mac)/IP/UDP/vni(1000)/Ether(dst = virtIO port0)/IP wrong chksum/SCTP
-
-Verify that packet received by virtIO port0 and forwarded by virtIO port1::
-
-  testpmd> show port stats all
-
-Verify encapsulated packet received on PF device.
-Verify that inner packet src and dst mac address have been conversed.
-Verify that inner packet ip checksum and sctp checksum were corrected.
-
-Test Case: Vxlan Sample TSO
-===========================
-Start vxlan sample with tso enable, tx checksum must enable too.
-For hardware limitation, tso segment size must be larger 256::
-
-  tep_termination -c 0xf -n 3 --socket-mem 2048,2048 -- -p 0x1 \
-    --udp-port 4789 --nb-devices 2 --filter-type 3 --tx-checksum 1 \
-    --encap 1 --decap 1 --tso-segsz 256
-
-Start vhost-user test environment like case vxlan_sample_encap
-
-Send vxlan packet with 892 Bytes data, total length will be 1000::
-
-  Ether(dst = PF mac)/IP/UDP/vni(1000)/Ether(dst = virtIO port0)/TCP
-
-Verify that packet received by virtIO port0 and forwarded by virtIO port1::
-
-  testpmd> show port stats all
-
-Verify that four separated vxlan packets received on PF devices.
-Make sure tcp packet payload is 256, 256, 256 and 124.
-
-Test Case: Vxlan Sample Performance Benchmarking
-================================================
-The throughput is measured for different operations taken by vxlan sample.
-Virtio single mean there's only one flow and forwarded by single port in vm.
-Virtio two mean there are two flows and forwarded by both two ports in vm.
-
-+----------------+-----------+-------+------------+
-| Function       | VirtIO    | Mpps  | % linerate |
-+================+===========+=======+============+
-| Decap          | Single    |       |            |
-+----------------+-----------+-------+------------+
-| Encap          | Single    |       |            |
-+----------------+-----------+-------+------------+
-| Decap&Encap    | Single    |       |            |
-+----------------+-----------+-------+------------+
-| Checksum       | Single    |       |            |
-+----------------+-----------+-------+------------+
-| Checksum&Decap | Single    |       |            |
-+----------------+-----------+-------+------------+
-| Decap          | Two Ports |       |            |
-+----------------+-----------+-------+------------+
-| Encap          | Two Ports |       |            |
-+----------------+-----------+-------+------------+
-| Decap&Encap    | Two Ports |       |            |
-+----------------+-----------+-------+------------+
-| Checksum       | Two Ports |       |            |
-+----------------+-----------+-------+------------+
-| Checksum&Decap | Two Ports |       |            |
-+----------------+-----------+-------+------------+
diff --git a/tests/TestSuite_vxlan_sample.py b/tests/TestSuite_vxlan_sample.py
deleted file mode 100644
index 92253bbd..00000000
--- a/tests/TestSuite_vxlan_sample.py
+++ /dev/null
@@ -1,636 +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.
-
-Vxlan sample test suite.
-"""
-
-import os
-import utils
-import string
-import re
-import time
-from plotting import Plotting
-from test_case import TestCase
-from exception import VerifyFailure
-from settings import HEADER_SIZE
-from etgen import IxiaPacketGenerator
-from qemu_kvm import QEMUKvm
-from TestSuite_vxlan import VxlanTestConfig
-from pmd_output import PmdOutput
-from packet import Packet
-
-from scapy.utils import wrpcap, rdpcap
-from scapy.layers.inet import Ether, IP, TCP, UDP
-from scapy.layers.inet6 import IPv6
-from scapy.layers.l2 import Dot1Q
-from scapy.layers.vxlan import VXLAN
-from scapy.layers.sctp import SCTP, SCTPChunkData
-from scapy.sendrecv import sniff
-from scapy.config import conf
-from scapy.route import *
-
-
-PACKET_LEN = 128
-
-
-class TestVxlanSample(TestCase):
-    FEAT_ENABLE = 1
-    FEAT_DISABLE = 0
-    INNER_VLAN_VNI = 1
-    INNER_VNI = 2
-    OUTER_INNER_VNI = 3
-
-    def set_up_all(self):
-        """
-        Run before each test suite.
-        """
-
-        # this feature only enable in FVL now
-        self.verify(self.nic in ["fortville_eagle", "fortville_spirit",
-                                 "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "fortville_25g", "carlsville"],
-                    "Vxlan Only supported by Fortville")
-        # Based on h/w type, choose how many ports to use
-        self.dut_ports = self.dut.get_ports()
-
-        # Verify that enough ports are available
-        self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing")
-
-        # get pf socket
-        self.pf = self.dut_ports[0]
-        netdev = self.dut.ports_info[self.pf]['port']
-        self.socket = netdev.get_nic_socket()
-        self.pf_mac = self.dut.get_mac_address(self.pf)
-
-        # build sample app
-        out = self.dut.build_dpdk_apps('examples/tep_termination')
-        # out = self.dut.send_expect("make -C examples/tep_termination", "# ")
-        self.verify("Error" not in out, "compilation error 1")
-        self.verify("No such file" not in out, "compilation error 2")
-
-        self.def_mac = "00:00:20:00:00:20"
-        self.vm_dut = None
-        # self.tep_app = "./examples/tep_termination/build/tep_termination"
-        self.app_tep_termination_path = self.dut.apps_name['tep_termination']
-        self.vxlan_port = 4789
-        self.app_testpmd_path = self.dut.apps_name['test-pmd']
-        self.vm_testpmd = "./%s -c f -n 3" % self.app_testpmd_path \
-                          + " -- -i --tx-offloads=0x8000"
-
-        # params for tep_termination
-        self.cores = self.dut.get_core_list("1S/4C/1T", socket=self.socket)
-        self.def_mss = 256
-
-        # performance measurement, checksum based on encap
-        self.perf_cfg = [{'Func': 'Decap', 'VirtIO': 'Single', 'Mpps': {},
-                         'pct': {}},
-                         {'Func': 'Encap', 'VirtIO': 'Single', 'Mpps': {},
-                          'pct': {}},
-                         {'Func': 'Decap&Encap', 'VirtIO': 'Single',
-                          'Mpps': {}, 'pct': {}},
-                         {'Func': 'Checksum', 'VirtIO': 'Single',
-                          'Mpps': {}, 'pct': {}},
-                         {'Func': 'Checksum&Decap', 'VirtIO': 'Single',
-                          'Mpps': {}, 'pct': {}},
-                         {'Func': 'Decap', 'VirtIO': 'Two Ports', 'Mpps': {},
-                          'pct': {}},
-                         {'Func': 'Encap', 'VirtIO': 'Two Ports', 'Mpps': {},
-                          'pct': {}},
-                         {'Func': 'Decap&Encap', 'VirtIO': 'Two Ports',
-                          'Mpps': {}, 'pct': {}},
-                         {'Func': 'Checksum', 'VirtIO': 'Two Ports',
-                          'Mpps': {}, 'pct': {}},
-                         {'Func': 'Checksum&Decap', 'VirtIO': 'Two Ports',
-                          'Mpps': {}, 'pct': {}}]
-
-    def set_up(self):
-        """
-        Run before each test case.
-        """
-        # create coremask
-        self.coremask = utils.create_mask(self.cores)
-
-        if "2VM" not in self.running_case:
-            vm_num = 1
-        else:
-            vm_num = 2
-
-        encap = self.FEAT_ENABLE
-        decap = self.FEAT_ENABLE
-        chksum = self.FEAT_ENABLE
-        if self.running_case == "test_vxlan_sample_encap":
-            encap = self.FEAT_ENABLE
-            decap = self.FEAT_DISABLE
-            chksum = self.FEAT_ENABLE
-        elif self.running_case == "test_vxlan_sample_decap":
-            encap = self.FEAT_DISABLE
-            decap = self.FEAT_ENABLE
-        elif self.running_case == "test_vxlan_sample_chksum":
-            chksum = self.FEAT_ENABLE
-        elif self.running_case == "test_vxlan_sample_tso":
-            chksum = self.FEAT_ENABLE
-
-        tep_cmd_temp = self.app_tep_termination_path + " -c %(COREMASK)s -n %(CHANNELS)d " \
-            + "--socket-mem 2048,2048 -- -p 0x1 " \
-            + "--udp-port %(VXLAN_PORT)d --nb-devices %(NB_DEVS)d " \
-            + "--filter-type %(FILTERS)d " \
-            + "--tx-checksum %(TX_CHKS)d --encap %(ENCAP)d --decap %(DECAP)d"
-
-        tep_cmd = tep_cmd_temp % {
-            'COREMASK': self.coremask,
-            'CHANNELS': self.dut.get_memory_channels(),
-            'VXLAN_PORT': self.vxlan_port, 'NB_DEVS': vm_num * 2,
-            'FILTERS': self.OUTER_INNER_VNI, 'TX_CHKS': chksum,
-            'ENCAP': encap, 'DECAP': decap}
-
-        if self.running_case == "test_vxlan_sample_tso":
-            tep_cmd += " --tso-segsz=%d" % self.def_mss
-
-        if self.running_case != "test_perf_vxlan_sample":
-            self.prepare_vxlan_sample_env(tep_cmd, vm_num=vm_num)
-
-        pass
-
-    def prepare_vxlan_sample_env(self, tep_cmd, vm_num=1):
-        # remove unexpected socket
-        self.dut.send_expect("rm -rf vhost-net", "# ")
-
-        # start tep_termination first
-        self.dut.send_expect(tep_cmd, "VHOST_CONFIG: bind to vhost-net")
-
-        # start one vm
-        self.vm = QEMUKvm(self.dut, 'vm0', 'vxlan_sample')
-
-        # add two virtio user netdevices
-        vm_params = {}
-        vm_params['driver'] = 'vhost-user'
-        vm_params['opt_path'] = './vhost-net'
-        vm_params['opt_mac'] = self.def_mac
-        self.vm.set_vm_device(**vm_params)
-        vm_params['opt_mac'] = self.mac_address_add(1)
-        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:
-            self.logger.error("Failure for %s" % str(e))
-
-        # create another vm
-        if vm_num == 2:
-            self.logger.warning("not implemented now")
-
-        return True
-
-    def clear_vxlan_sample_env(self):
-        if self.vm_dut:
-            self.vm_dut.kill_all()
-            time.sleep(1)
-
-        if self.vm:
-            self.vm.stop()
-            self.vm = None
-
-        self.dut.virt_exit()
-
-    def mac_address_add(self, number):
-        if number > 15:
-            return ''
-        mac = int(self.def_mac[-1]) + number
-        return self.def_mac[:-1] + '%x' % mac
-
-    def vm_testpmd_start(self, vm_id=0):
-        """
-        Start testpmd in virtual machine
-        """
-        if vm_id == 0 and self.vm_dut is not None:
-            # start testpmd
-            self.vm_dut.send_expect(self.vm_testpmd, "testpmd>", 20)
-            # set fwd mac
-            self.vm_dut.send_expect("set fwd io", "testpmd>")
-            # start tx_first
-            self.vm_dut.send_expect("start tx_first", "testpmd>")
-
-    def test_vxlan_sample_encap(self):
-        self.vm_testpmd_start(vm_id=0)
-        self.send_and_verify(vm_id=0, vf_id=0, pkt_type="normal_udp")
-        self.send_and_verify(vm_id=0, vf_id=1, pkt_type="normal_udp")
-
-    def test_vxlan_sample_decap(self):
-        self.vm_testpmd_start(vm_id=0)
-        self.send_and_verify(vm_id=0, vf_id=0, pkt_type="vxlan_udp_decap")
-        self.send_and_verify(vm_id=0, vf_id=1, pkt_type="vxlan_udp_decap")
-
-    def test_vxlan_sample_encap_decap(self):
-        self.vm_testpmd_start(vm_id=0)
-        self.send_and_verify(vm_id=0, vf_id=0, pkt_type="vxlan_udp")
-        self.send_and_verify(vm_id=0, vf_id=1, pkt_type="vxlan_udp")
-
-    def test_vxlan_sample_chksum(self):
-        self.vm_testpmd_start(vm_id=0)
-        self.send_and_verify(vm_id=0, vf_id=0, pkt_type="vxlan_udp_chksum")
-        self.send_and_verify(vm_id=0, vf_id=0, pkt_type="vxlan_tcp_chksum")
-        self.send_and_verify(vm_id=0, vf_id=0, pkt_type="vxlan_sctp_chksum")
-
-    def test_vxlan_sample_tso(self):
-        self.vm_testpmd_start(vm_id=0)
-        self.send_and_verify(vm_id=0, vf_id=0, pkt_type="vxlan_tcp_tso")
-
-    def start_capture(self, itf, pkt_smac="", pkt_dmac="", count=1):
-        self.inst = None
-        filter_param = []
-        if pkt_smac != "":
-            filter_param = [{'layer': 'ether', 'config': {'src': '%s' % pkt_smac}}]
-        if pkt_dmac != "":
-            filter_param = [{'layer': 'ether', 'config': {'dst': '%s' % pkt_dmac}}]
-        self.inst = self.tester.tcpdump_sniff_packets(itf, count, filters=filter_param)
-
-    def transfer_capture_file(self):
-        # copy capture file from tester
-        pkts = self.tester.load_tcpdump_sniff_packets(self.inst)
-        return pkts.pktgen.pkts
-
-    def send_and_verify(self, vm_id, vf_id, pkt_type):
-        params = {}
-        case_pass = True
-        tester_recv_port = self.tester.get_local_port(self.pf)
-        tester_iface = self.tester.get_interface(tester_recv_port)
-        tester_smac = self.tester.get_mac(tester_recv_port)
-
-        if pkt_type == "normal_udp":
-            self.start_capture(tester_iface, pkt_smac=self.pf_mac)
-            self.tester.scapy_append(
-                'sendp([Ether(dst="%s",src="%s")/IP()/UDP()/Raw("X"*18)], iface="%s")'
-                % (self.pf_mac, tester_smac, tester_iface))
-            self.tester.scapy_execute()
-            time.sleep(5)
-
-            pkts = self.transfer_capture_file()
-            self.verify(len(pkts) >= 1, "Failed to capture packets")
-            self.verify(pkts[0].haslayer('VXLAN') == 1,
-                        "Packet not encapsulated")
-            try:
-                payload = pkts[0][UDP]['VXLAN'][UDP].payload
-                for i in range(18):
-                    self.verify(ord(payload[i]) == 88, "Check udp data failed")
-            except:
-                case_pass = False
-                self.logger.error("Failure in checking packet payload")
-
-            if case_pass:
-                self.logger.info("Check normal udp packet forward pass on "
-                                "virtIO port %d" % vf_id)
-
-        if pkt_type == "vxlan_udp_decap":
-            # create vxlan packet pf mac + vni=1000 + inner virtIO port0 mac
-            params['outer_mac_dst'] = self.pf_mac
-            params['vni'] = 1000 + vm_id
-            mac_incr = 2 * vm_id + vf_id
-            params['inner_mac_dst'] = self.mac_address_add(mac_incr)
-
-            # create vxlan pcap file and transfer it to tester
-            vxlan_pkt = VxlanTestConfig(self, **params)
-            vxlan_pkt.create_pcap()
-
-            # start capture
-            self.start_capture(tester_iface, pkt_dmac=params['inner_mac_dst'])
-            vxlan_pkt.send_pcap(tester_iface)
-            time.sleep(5)
-
-            # transfer capture pcap to server
-            pkts = self.transfer_capture_file()
-            # check packet number and payload
-            self.verify(len(pkts) >= 1, "Failed to capture packets")
-            self.verify(pkts[0].haslayer('VXLAN') == 0,
-                        "Packet not de-encapsulated")
-
-            try:
-                payload = pkts[0][UDP].payload
-                for i in range(18):
-                    self.verify(ord(payload[i]) == 88, "Check udp data failed")
-            except:
-                case_pass = False
-                self.logger.error("Failure in checking packet payload")
-
-            if case_pass:
-                self.logger.info("Check vxlan packet decap pass on virtIO port"
-                                " %d" % vf_id)
-
-        if pkt_type == "vxlan_udp":
-            # create vxlan packet pf mac + vni=1000 + inner virtIO port0 mac
-            params['outer_mac_dst'] = self.pf_mac
-            params['vni'] = 1000 + vm_id
-            mac_incr = 2 * vm_id + vf_id
-            params['inner_mac_dst'] = self.mac_address_add(mac_incr)
-
-            # create vxlan pcap file and transfer it to tester
-            vxlan_pkt = VxlanTestConfig(self, **params)
-            vxlan_pkt.create_pcap()
-
-            # start capture
-            self.start_capture(tester_iface, pkt_smac=self.pf_mac)
-            vxlan_pkt.send_pcap(tester_iface)
-            time.sleep(5)
-
-            # transfer capture pcap to server
-            pkts = self.transfer_capture_file()
-
-            # check packet number and payload
-            self.verify(len(pkts) >= 1, "Failed to capture packets")
-            self.verify(pkts[0].haslayer('VXLAN') == 1,
-                        "Packet not encapsulated")
-            try:
-                payload = pkts[0][UDP]['VXLAN'][UDP].payload
-                for i in range(18):
-                    self.verify(ord(payload[i]) == 88, "Check udp data failed")
-            except:
-                case_pass = False
-                self.logger.error("Failure in checking packet payload")
-
-            if case_pass:
-                self.logger.info("Check vxlan packet decap and encap pass on "
-                                "virtIO port %d" % vf_id)
-
-        if pkt_type == "vxlan_udp_chksum":
-            params['inner_l4_type'] = 'UDP'
-        if pkt_type == "vxlan_tcp_chksum":
-            params['inner_l4_type'] = 'TCP'
-        if pkt_type == "vxlan_sctp_chksum":
-            params['inner_l4_type'] = 'SCTP'
-
-        if 'chksum' in pkt_type:
-            # create vxlan packet pf mac + vni=1000 + inner virtIO port0 mac
-            params['outer_mac_dst'] = self.pf_mac
-            params['vni'] = 1000 + vm_id
-            mac_incr = 2 * vm_id + vf_id
-            params['inner_mac_dst'] = self.mac_address_add(mac_incr)
-            # extract reference chksum value
-            vxlan_pkt = VxlanTestConfig(self, **params)
-            vxlan_pkt.create_pcap()
-            chksums_ref = vxlan_pkt.get_chksums()
-            self.logger.info("Checksum reference: %s" % chksums_ref)
-
-            params['inner_ip_invalid'] = 1
-            params['inner_l4_invalid'] = 1
-
-            # create vxlan pcap file and transfer it to tester
-            vxlan_pkt = VxlanTestConfig(self, **params)
-            vxlan_pkt.create_pcap()
-
-            # start capture
-            self.start_capture(tester_iface, pkt_smac=self.pf_mac)
-            vxlan_pkt.send_pcap(tester_iface)
-            time.sleep(5)
-            # transfer capture pcap to server
-            pkts = self.transfer_capture_file()
-            # check packet number and payload
-            self.verify(len(pkts) >= 1, "Failed to capture packets")
-            self.verify(pkts[0].haslayer('VXLAN') == 1,
-                        "Packet not encapsulated")
-            pk_new = Packet()
-            pk_new.pktgen.assign_pkt(pkts)
-            pk_new.pktgen.update_pkts()
-            chksums = vxlan_pkt.get_chksums(pk_new)
-            self.logger.info("Checksum : %s" % chksums)
-            for key in chksums_ref:
-                if 'inner' in key:  # only check inner packet chksum
-                    self.verify(chksums[key] == chksums_ref[key],
-                                "%s not matched to %s"
-                                % (key, chksums_ref[key]))
-
-            self.logger.info("%s checksum pass" % params['inner_l4_type'])
-
-        if pkt_type == "vxlan_tcp_tso":
-            # create vxlan packet pf mac + vni=1000 + inner virtIO port0 mac +
-            # tcp
-            params['inner_l4_type'] = 'TCP'
-            params['outer_mac_dst'] = self.pf_mac
-            params['vni'] = 1000 + vm_id
-            mac_incr = 2 * vm_id + vf_id
-            params['inner_mac_dst'] = self.mac_address_add(mac_incr)
-            params['payload_size'] = 892  # 256 + 256 + 256 + 124
-
-            # extract reference chksum value
-            vxlan_pkt = VxlanTestConfig(self, **params)
-            vxlan_pkt.create_pcap()
-
-            # start capture
-            self.start_capture(tester_iface, pkt_smac=self.pf_mac, count=4)
-            vxlan_pkt.send_pcap(tester_iface)
-            time.sleep(5)
-
-            # transfer capture pcap to server
-            pkts = self.transfer_capture_file()
-            # check packet number and payload
-            self.verify(len(pkts) == 4, "Failed to capture tso packets")
-
-            # calculation  checksum, and check it
-            for pkt in pkts:
-                inner = pkt['VXLAN']
-                inner_ip_chksum = inner[IP].chksum
-                del inner.chksum
-                inner[IP] = inner[IP].__class__(inner[IP])
-                inner_ip_chksum_ref = inner[IP].chksum
-                self.logger.info("inner ip checksum reference: %x" % inner_ip_chksum_ref)
-                self.logger.info("inner ip checksum: %x" % inner_ip_chksum)
-                self.verify(inner_ip_chksum == inner_ip_chksum_ref, "inner ip checksum error")
-                inner_l4_chksum = inner[params['inner_l4_type']].chksum
-                del inner[params['inner_l4_type']].chksum
-                inner[params['inner_l4_type']] = inner[params['inner_l4_type']].__class__(inner[params['inner_l4_type']])
-                inner_l4_chksum_ref =  inner[params['inner_l4_type']].chksum
-                self.logger.info("inner l4 checksum reference: %x" % inner_l4_chksum_ref)
-                self.logger.info("inner l4 checksum: %x" % inner_l4_chksum)
-                self.verify(inner_l4_chksum == inner_l4_chksum_ref, "inner %s checksum error" % params['inner_l4_type'])
-
-            length = 0
-            for pkt in pkts:
-                self.verify(pkt.haslayer('VXLAN') == 1,
-                            "Packet not encapsulated")
-                try:
-                    payload = pkt[UDP]['VXLAN'][TCP].payload
-                    self.verify(len(payload) <= self.def_mss,
-                                "TCP payload oversized")
-                    length += len(payload)
-                except:
-                    case_pass = False
-                    self.logger.error("Failure in checking tso payload")
-
-            self.verify(length == 892, "Total tcp payload size not match")
-            if case_pass:
-                self.logger.info("Vxlan packet tso pass on virtIO port %d"
-                                % vf_id)
-
-    def test_perf_vxlan_sample(self):
-        # vxlan payload length for performance test
-        # inner packet not contain crc, should need add four
-        vxlan_payload = PACKET_LEN - HEADER_SIZE['eth'] - \
-            HEADER_SIZE['ip'] - HEADER_SIZE['udp'] - \
-            HEADER_SIZE['vxlan'] - HEADER_SIZE['eth'] - \
-            HEADER_SIZE['ip'] - HEADER_SIZE['udp'] + 4
-
-        vxlansample_header = ['Type', 'Queue', 'Mpps', '% linerate']
-        self.result_table_create(vxlansample_header)
-        for perf_cfg in self.perf_cfg:
-            func = perf_cfg['Func']
-            if func is 'Decap':
-                encap = self.FEAT_DISABLE
-                decap = self.FEAT_ENABLE
-                chksum = self.FEAT_DISABLE
-            elif func is 'Encap':
-                encap = self.FEAT_ENABLE
-                decap = self.FEAT_DISABLE
-                chksum = self.FEAT_DISABLE
-            elif func is 'Decap&Encap':
-                encap = self.FEAT_ENABLE
-                decap = self.FEAT_ENABLE
-                chksum = self.FEAT_DISABLE
-            elif func is 'Checksum':
-                encap = self.FEAT_ENABLE
-                decap = self.FEAT_DISABLE
-                chksum = self.FEAT_ENABLE
-            elif func is 'Checksum&Decap':
-                encap = self.FEAT_ENABLE
-                decap = self.FEAT_ENABLE
-                chksum = self.FEAT_ENABLE
-
-            tep_cmd_temp = self.app_tep_termination_path + " -c %(COREMASK)s -n %(CHANNELS)d " \
-                + "--socket-mem 2048,2048 -- -p 0x1 --udp-port " \
-                + "%(VXLAN_PORT)d  --nb-devices %(NB_DEVS)d --filter-type " \
-                + "%(FILTERS)d --tx-checksum %(TX_CHKS)d --encap %(ENCAP)d " \
-                + "--decap %(DECAP)d --rx-retry 1 --rx-retry-num 4 " \
-                + "--rx-retry-delay 15"
-
-            tep_cmd = tep_cmd_temp % {
-                'COREMASK': self.coremask,
-                'CHANNELS': self.dut.get_memory_channels(),
-                'VXLAN_PORT': self.vxlan_port, 'NB_DEVS': 2,
-                'FILTERS': self.OUTER_INNER_VNI, 'TX_CHKS': chksum,
-                'ENCAP': encap, 'DECAP': decap}
-
-            self.prepare_vxlan_sample_env(tep_cmd, vm_num=1)
-            self.vm_testpmd_start(vm_id=0)
-
-            # create vxlan packet pf mac + vni=1000 + inner virtIO port0 mac
-            params = {}
-            params['outer_mac_dst'] = self.pf_mac
-            params['vni'] = 1000
-            mac_incr = 0
-            params['inner_mac_dst'] = self.mac_address_add(mac_incr)
-            params['payload_size'] = vxlan_payload
-            params['pcap_file'] = 'vxlan_sample.pcap'
-
-            # create vxlan pcap file and transfer it to tester
-            vxlan_pkt = VxlanTestConfig(self, **params)
-            vxlan_pkt.create_pcap()
-
-            if perf_cfg['VirtIO'] == "Two Ports":
-                # create vxlan packet pf mac + vni=1000 + inner virtIO port0
-                # mac
-                params['outer_mac_dst'] = self.pf_mac
-                params['vni'] = 1000
-                mac_incr = 1
-                params['inner_mac_dst'] = self.mac_address_add(mac_incr)
-                params['pcap_file'] = 'vxlan_sample_1.pcap'
-
-                # create vxlan pcap file and transfer it to tester
-                vxlan_pkt = VxlanTestConfig(self, **params)
-                vxlan_pkt.create_pcap(scp=False)
-
-                self.combine_pcap("vxlan_sample.pcap", "vxlan_sample_1.pcap")
-
-            self.tester.session.copy_file_to("vxlan_sample.pcap")
-
-            # config the flows
-            tgen_input = []
-            tgen_input.append((self.tester.get_local_port(self.pf),
-                               self.tester.get_local_port(self.pf),
-                               "vxlan_sample.pcap"))
-
-            # run traffic generator
-            _, pps = self.tester.traffic_generator_throughput(tgen_input)
-
-            self.vm_dut.send_expect("stop", "testpmd>")
-            self.vm_dut.send_expect("quit", "# ")
-
-            pps /= 1000000.0
-            perf_cfg['Mpps'] = pps
-            wirespeed = self.wirespeed(self.nic, PACKET_LEN, 1)
-            perf_cfg['pct'] = pps * 100 / wirespeed
-
-            table_row = [perf_cfg['Func'], perf_cfg['VirtIO'],
-                         perf_cfg['Mpps'], perf_cfg['pct']]
-
-            self.result_table_add(table_row)
-
-            self.tear_down()
-
-        self.result_table_print()
-
-    def combine_pcap(self, dest_pcap, src_pcap):
-        pkts = rdpcap(dest_pcap)
-        if len(pkts) != 1:
-            return
-
-        pkts_src = rdpcap(src_pcap)
-        pkts += pkts_src
-
-        wrpcap(dest_pcap, pkts)
-
-    def tear_down(self):
-        """
-        Run after each test suite.
-        """
-        # send packet to pf, verify capture packet sent from virtIO port1
-        self.clear_vxlan_sample_env()
-
-        self.dut.kill_all()
-        time.sleep(2)
-        pass
-
-    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/RTE_LIBRTE_VHOST=y$/"
-                             + "RTE_LIBRTE_VHOST=n/' config/common_base",
-                             "# ", 30)
-        # temporary disable skip_setup
-        skip_setup = self.dut.skip_setup
-        self.dut.skip_setup = False
-        self.dut.build_install_dpdk(self.target)
-        self.dut.skip_setup = skip_setup
-        # wait for build done
-        time.sleep(20)
-        pass
