From patchwork Fri Sep 4 08:18:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76532 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3E28AA04DB; Fri, 4 Sep 2020 10:17:58 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2D2FF1C139; Fri, 4 Sep 2020 10:17:58 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 9848D1C132 for ; Fri, 4 Sep 2020 10:17:55 +0200 (CEST) IronPort-SDR: S4oaNTT4n/plPdjqnOTjY/S2O2mmt3CzPpCVTNZVfMw5F2yVTv4GxnZvlYKg9B4b05g+mW5E7w 5FQ0/X5XJbDg== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="155106757" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="155106757" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:54 -0700 IronPort-SDR: rlqut8pfPAnkBUAJhe33R/zhcOVWIeiHtqdqD/Jx+feiUCxcL6qry+6+xhL5HLD7AWDTpSDuzS P+QBammckL/g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782825" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.240.182.150]) by orsmga002.jf.intel.com with ESMTP; 04 Sep 2020 01:17:53 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:44 +0800 Message-Id: <1599207525-22123-37-git-send-email-xix.zhang@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1599207525-22123-1-git-send-email-xix.zhang@intel.com> References: <1599207525-22123-1-git-send-email-xix.zhang@intel.com> Subject: [dts] [dts 37/38] tests/TestSuite_vxlan.py:support meson build X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" Signed-off-by: xizhan4x --- tests/TestSuite_vxlan.py | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/tests/TestSuite_vxlan.py b/tests/TestSuite_vxlan.py index b7c3308..d6cd93c 100644 --- a/tests/TestSuite_vxlan.py +++ b/tests/TestSuite_vxlan.py @@ -302,6 +302,7 @@ class TestVxlan(TestCase, IxiaPacketGenerator): self.invalid_ip = "192.168.1.256" self.invalid_vlan = 4097 self.invalid_queue = 64 + self.path = self.dut.apps_name['test-pmd'] # vxlan payload length for performance test # inner packet not contain crc, should need add four @@ -535,10 +536,10 @@ class TestVxlan(TestCase, IxiaPacketGenerator): self.dut.skip_setup = False self.dut.build_install_dpdk(self.target) - pmd_temp = "./%(TARGET)s/app/testpmd -c %(COREMASK)s -n " + \ + pmd_temp = "./%(TARGET)s -c %(COREMASK)s -n " + \ "%(CHANNEL)d -- -i --disable-rss --rxq=4 --txq=4" + \ " --nb-cores=4 --portmask=%(PORT)s" - pmd_cmd = pmd_temp % {'TARGET': self.target, + pmd_cmd = pmd_temp % {'TARGET': self.path, 'COREMASK': self.coremask, 'CHANNEL': self.dut.get_memory_channels(), 'PORT': self.portMask} @@ -593,10 +594,10 @@ class TestVxlan(TestCase, IxiaPacketGenerator): self.dut.skip_setup = False self.dut.build_install_dpdk(self.target) - pmd_temp = "./%(TARGET)s/app/testpmd -c %(COREMASK)s -n " + \ + pmd_temp = "./%(TARGET)s -c %(COREMASK)s -n " + \ "%(CHANNEL)d -- -i --disable-rss --rxq=4 --txq=4" + \ " --nb-cores=4 --portmask=%(PORT)s" - pmd_cmd = pmd_temp % {'TARGET': self.target, + pmd_cmd = pmd_temp % {'TARGET': self.path, 'COREMASK': self.coremask, 'CHANNEL': self.dut.get_memory_channels(), 'PORT': self.portMask} @@ -644,10 +645,10 @@ class TestVxlan(TestCase, IxiaPacketGenerator): verify vxlan packet checksum offload """ # start testpmd with 2queue/1port - pmd_temp = "./%(TARGET)s/app/testpmd -c %(COREMASK)s -n " + \ + pmd_temp = "./%(TARGET)s -c %(COREMASK)s -n " + \ "%(CHANNEL)d -- -i --portmask=%(PORT)s " + \ "--enable-rx-cksum" - pmd_cmd = pmd_temp % {'TARGET': self.target, + pmd_cmd = pmd_temp % {'TARGET': self.path, 'COREMASK': self.coremask, 'CHANNEL': self.dut.get_memory_channels(), 'PORT': self.portMask} @@ -718,10 +719,10 @@ class TestVxlan(TestCase, IxiaPacketGenerator): not support ipv6 + sctp """ # start testpmd with 2queue/1port - pmd_temp = "./%(TARGET)s/app/testpmd -c %(COREMASK)s -n " + \ + pmd_temp = "./%(TARGET)s -c %(COREMASK)s -n " + \ "%(CHANNEL)d -- -i --portmask=%(PORT)s " + \ "--enable-rx-cksum" - pmd_cmd = pmd_temp % {'TARGET': self.target, + pmd_cmd = pmd_temp % {'TARGET': self.path, 'COREMASK': self.coremask, 'CHANNEL': self.dut.get_memory_channels(), 'PORT': self.portMask} @@ -792,10 +793,10 @@ class TestVxlan(TestCase, IxiaPacketGenerator): """ verify tunnel filter feature """ - pmd_temp = "./%(TARGET)s/app/testpmd -c %(COREMASK)s -n " + \ + pmd_temp = "./%(TARGET)s -c %(COREMASK)s -n " + \ "%(CHANNEL)d -- -i --disable-rss --rxq=4 --txq=4" + \ " --nb-cores=4 --portmask=%(PORT)s" - pmd_cmd = pmd_temp % {'TARGET': self.target, + pmd_cmd = pmd_temp % {'TARGET': self.path, 'COREMASK': self.coremask, 'CHANNEL': self.dut.get_memory_channels(), 'PORT': self.portMask} @@ -833,10 +834,10 @@ class TestVxlan(TestCase, IxiaPacketGenerator): config = VxlanTestConfig(self) config.outer_mac_dst = self.dut_port_mac - pmd_temp = "./%(TARGET)s/app/testpmd -c %(COREMASK)s -n " + \ + pmd_temp = "./%(TARGET)s -c %(COREMASK)s -n " + \ "%(CHANNEL)d -- -i --disable-rss --rxq=4 --txq=4" + \ " --nb-cores=4 --portmask=%(PORT)s" - pmd_cmd = pmd_temp % {'TARGET': self.target, + pmd_cmd = pmd_temp % {'TARGET': self.path, 'COREMASK': self.coremask, 'CHANNEL': self.dut.get_memory_channels(), 'PORT': self.portMask} @@ -962,7 +963,7 @@ class TestVxlan(TestCase, IxiaPacketGenerator): socket=self.ports_socket) core_mask = utils.create_mask(core_list) - pmd_temp = "./%(TARGET)s/app/testpmd -c %(COREMASK)s -n " + \ + pmd_temp = "./%(TARGET)s -c %(COREMASK)s -n " + \ "%(CHANNEL)d -- -i --disable-rss --rxq=2 --txq=2" + \ " --nb-cores=4 --portmask=%(PORT)s" @@ -973,11 +974,11 @@ class TestVxlan(TestCase, IxiaPacketGenerator): % (perf_config['Packet'], tun_filter, recv_queue)))) if tun_filter == "None" and recv_queue == "Multi": - pmd_temp = "./%(TARGET)s/app/testpmd -c %(COREMASK)s -n " + \ + pmd_temp = "./%(TARGET)s -c %(COREMASK)s -n " + \ "%(CHANNEL)d -- -i --rss-udp --rxq=2 --txq=2" + \ " --nb-cores=4 --portmask=%(PORT)s" - pmd_cmd = pmd_temp % {'TARGET': self.target, + pmd_cmd = pmd_temp % {'TARGET': self.path, 'COREMASK': core_mask, 'CHANNEL': self.dut.get_memory_channels(), 'PORT': self.portMask} @@ -1074,15 +1075,15 @@ class TestVxlan(TestCase, IxiaPacketGenerator): # multi queue and signle queue commands if recv_queue == 'Multi': - pmd_temp = "./%(TARGET)s/app/testpmd -c %(COREMASK)s -n " + \ + pmd_temp = "./%(TARGET)s -c %(COREMASK)s -n " + \ "%(CHANNEL)d -- -i --disable-rss --rxq=2 --txq=2" + \ " --nb-cores=4 --portmask=%(PORT)s" else: - pmd_temp = "./%(TARGET)s/app/testpmd -c %(COREMASK)s -n " + \ + pmd_temp = "./%(TARGET)s -c %(COREMASK)s -n " + \ "%(CHANNEL)d -- -i --nb-cores=2 --portmask=%(PORT)s" + \ "" - pmd_cmd = pmd_temp % {'TARGET': self.target, + pmd_cmd = pmd_temp % {'TARGET': self.path, 'COREMASK': core_mask, 'CHANNEL': self.dut.get_memory_channels(), 'PORT': self.portMask}