[v2,4/5] vxlan_sample: remove perf test case

Message ID 1628088115-756-5-git-send-email-lijuan.tu@intel.com (mailing list archive)
State Rejected
Headers
Series remove some run-down cases |

Commit Message

Tu, Lijuan Aug. 4, 2021, 2:41 p.m. UTC
  the case is no longer maintained.

Signed-off-by: Lijuan Tu <lijuan.tu@intel.com>
---
 test_plans/vxlan_sample_test_plan.rst |  30 ---------
 tests/TestSuite_vxlan_sample.py       | 111 +---------------------------------
 2 files changed, 1 insertion(+), 140 deletions(-)
  

Patch

diff --git a/test_plans/vxlan_sample_test_plan.rst b/test_plans/vxlan_sample_test_plan.rst
index a092e85..9681d05 100644
--- a/test_plans/vxlan_sample_test_plan.rst
+++ b/test_plans/vxlan_sample_test_plan.rst
@@ -234,33 +234,3 @@  Verify that packet received by virtIO port0 and forwarded by virtIO port1::
 
 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
index 92253bb..109196f 100644
--- a/tests/TestSuite_vxlan_sample.py
+++ b/tests/TestSuite_vxlan_sample.py
@@ -176,10 +176,7 @@  class TestVxlanSample(TestCase):
         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
+        self.prepare_vxlan_sample_env(tep_cmd, vm_num=vm_num)
 
     def prepare_vxlan_sample_env(self, tep_cmd, vm_num=1):
         # remove unexpected socket
@@ -491,112 +488,6 @@  class TestVxlanSample(TestCase):
                 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: