From patchwork Fri Sep 4 08:18:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76497 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 A0BA4A04C5; Fri, 4 Sep 2020 10:17:04 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7F8D41C0AF; Fri, 4 Sep 2020 10:17:04 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id CD308255 for ; Fri, 4 Sep 2020 10:17:02 +0200 (CEST) IronPort-SDR: 7A8gwbRKPY9WRov8CQ+JgzZvutbrflco5wo4dltZDOG2ALuh3ePFjveLVbowbbwDyC7Wctn6Eh u9ZkvXCRdxXw== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763240" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763240" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:01 -0700 IronPort-SDR: COcT3Cwf95dW2/WBGX3vt1vfRmlgaqi9rVAuO/eQohnIVGKPtIi9ExgdmD/sjb4bU/CdTAnZRV AHNxVXlbybvA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782523" 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:00 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:08 +0800 Message-Id: <1599207525-22123-1-git-send-email-xix.zhang@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dts] [dts 01/38] tests-TestSuite_dpdk_gro_lib.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_dpdk_gro_lib.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/TestSuite_dpdk_gro_lib.py b/tests/TestSuite_dpdk_gro_lib.py index 49a7407..f2b5b0d 100644 --- a/tests/TestSuite_dpdk_gro_lib.py +++ b/tests/TestSuite_dpdk_gro_lib.py @@ -69,6 +69,8 @@ class TestDPDKGROLib(TestCase): 'Pls config the direct connection info in vhost_peer_conf.cfg') bind_script_path = self.dut.get_dpdk_bind_script() self.dut.send_expect('%s --bind=%s %s' % (bind_script_path, self.def_driver, self.pci), '# ') + self.path=self.dut.apps_name['test-pmd'] + self.testpmd_name=self.path.split("/")[-1] # get the numa info about the pci info which config in peer cfg bus = int(self.pci[5:7], base=16) @@ -101,7 +103,7 @@ class TestDPDKGROLib(TestCase): # # Clean the execution ENV self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#") - self.dut.send_expect("killall -s INT testpmd", "#") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") def launch_testpmd_gro_on(self, mode=1): @@ -112,7 +114,7 @@ class TestDPDKGROLib(TestCase): # mode 3 : vxlan traffic light mode # mode 4 : tcp traffic flush 4 eal_param = self.dut.create_eal_parameters(cores=self.vhost_list, vdevs=['net_vhost0,iface=%s/vhost-net,queues=1' % self.base_dir]) - self.testcmd_start = self.target + "/app/testpmd " + eal_param + " -- -i --enable-hw-vlan-strip --tx-offloads=0x00 --txd=1024 --rxd=1024" + self.testcmd_start = self.path + eal_param + " -- -i --enable-hw-vlan-strip --tx-offloads=0x00 --txd=1024 --rxd=1024" self.vhost_user = self.dut.new_session(suite="user") self.vhost_user.send_expect(self.testcmd_start, "testpmd> ", 120) self.vhost_user.send_expect("set fwd csum", "testpmd> ", 120) @@ -378,7 +380,7 @@ class TestDPDKGROLib(TestCase): """ Run after each test case. """ - self.dut.send_expect("killall -s INT testpmd", "#") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") self.dut.send_expect("rm -rf %s/vhost-net" % self.base_dir, "#") time.sleep(2) From patchwork Fri Sep 4 08:18:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76498 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 31FF6A04DB; Fri, 4 Sep 2020 10:17:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A555A1C0C0; Fri, 4 Sep 2020 10:17:04 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 70F25255 for ; Fri, 4 Sep 2020 10:17:03 +0200 (CEST) IronPort-SDR: Hfbpdq/xX4+dWlQ8a/WD0kn/0dVu6nuyV8uTb7HclxT4YrBU+d8jXCZFF8WlDfGtDAGH9sYu1E J0mGSdHd5oRA== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763241" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763241" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:02 -0700 IronPort-SDR: iDpOfUO3V/g2eiwP/HuxYUVOBo12Okavu0SFNlL2iQAwy7m9AbTK1+4Yfa2dwYQROkX1N1TLMf C0+b0G9bP41A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782538" 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:01 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:09 +0800 Message-Id: <1599207525-22123-2-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 02/38] tests-TestSuite_dpdk_gso_lib.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_dpdk_gso_lib.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/TestSuite_dpdk_gso_lib.py b/tests/TestSuite_dpdk_gso_lib.py index 433869a..722a7c9 100644 --- a/tests/TestSuite_dpdk_gso_lib.py +++ b/tests/TestSuite_dpdk_gso_lib.py @@ -70,6 +70,8 @@ class TestDPDKGsoLib(TestCase): 'Pls config the direct connection info in vhost_peer_conf.cfg') bind_script_path = self.dut.get_dpdk_bind_script() self.dut.send_expect('%s --bind=%s %s' % (bind_script_path, self.def_driver, self.pci), '# ') + self.path=self.dut.apps_name['test-pmd'] + self.testpmd_name=self.path.split("/")[-1] # get the numa info about the pci info which config in peer cfg bus = int(self.pci[5:7], base=16) @@ -103,7 +105,7 @@ class TestDPDKGsoLib(TestCase): # Run before each test case. # Clean the execution ENV self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#") - self.dut.send_expect("killall -s INT testpmd", "#") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") def launch_testpmd_gso_on(self, mode=0): @@ -113,7 +115,7 @@ class TestDPDKGsoLib(TestCase): # mode = 3: TSO # mode = others: NO DPDK GSO/TSO eal_param = self.dut.create_eal_parameters(cores=self.vhost_list, vdevs=['net_vhost0,iface=%s/vhost-net,queues=1' % self.base_dir]) - self.testcmd_start = self.target + "/app/testpmd " + eal_param + " -- -i --tx-offloads=0x00 --txd=1024 --rxd=1024" + self.testcmd_start = self.path + eal_param + " -- -i --tx-offloads=0x00 --txd=1024 --rxd=1024" self.vhost_user = self.dut.new_session(suite="user") self.vhost_user.send_expect(self.testcmd_start, "testpmd> ", 120) self.vhost_user.send_expect("set fwd csum", "testpmd> ", 120) @@ -521,7 +523,7 @@ class TestDPDKGsoLib(TestCase): """ Run after each test case. """ - self.dut.send_expect("killall -s INT testpmd", "#") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") self.dut.send_expect( "./usertools/dpdk-devbind.py -u %s" % (self.peer_pci), '# ', 30) From patchwork Fri Sep 4 08:18:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76499 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 E9F93A04C5; Fri, 4 Sep 2020 10:17:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DAB4D1C0BF; Fri, 4 Sep 2020 10:17:05 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 63178255 for ; Fri, 4 Sep 2020 10:17:04 +0200 (CEST) IronPort-SDR: dGi5/zcsQuA4WIplEA1jdHc59sPyXvVg8lXAJERYizMWJvpdqe0bq0brfXBmdk6K8fliz022wf 6UNmtX1qrCWg== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763246" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763246" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:03 -0700 IronPort-SDR: sUFhEIDOg6ku/6EGsebCNil0Zd11g2DgzgxIssUJBMzYy8+ZCMoZXnfadBW0wVWrwDbysMt7M8 yFMsdR613epw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782550" 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:02 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:10 +0800 Message-Id: <1599207525-22123-3-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 03/38] tests-TestSuite_dynamic_config.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_dynamic_config.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/TestSuite_dynamic_config.py b/tests/TestSuite_dynamic_config.py index dd5e4b2..1b77ea1 100644 --- a/tests/TestSuite_dynamic_config.py +++ b/tests/TestSuite_dynamic_config.py @@ -75,10 +75,10 @@ class TestDynamicConfig(TestCase): cores = self.dut.get_core_list('1S/2C/2T') self.coreMask = utils.create_mask(cores) self.portMask = utils.create_mask(self.dut_ports[:2]) - + self.path=self.dut.apps_name['test-pmd'] # launch app - cmd = "./%s/app/testpmd -c %s -n 3 -- -i --rxpt=0 \ - --rxht=0 --rxwt=0 --txpt=39 --txht=0 --txwt=0 --portmask=%s" % (self.target, self.coreMask, self.portMask) + cmd = "%s -c %s -n 3 -- -i --rxpt=0 \ + --rxht=0 --rxwt=0 --txpt=39 --txht=0 --txwt=0 --portmask=%s" % (self.path, self.coreMask, self.portMask) self.dut.send_expect("%s" % cmd, "testpmd> ", 120) @@ -118,8 +118,8 @@ class TestDynamicConfig(TestCase): """ Run before each test case. """ - cmd = "./%s/app/testpmd -c %s -n 3 -- -i --rxpt=0 \ - --rxht=0 --rxwt=0 --txpt=39 --txht=0 --txwt=0 --portmask=%s" % (self.target, self.coreMask, self.portMask) + cmd = "%s -n 3 -- -i --rxpt=0 \ + --rxht=0 --rxwt=0 --txpt=39 --txht=0 --txwt=0 --portmask=%s" % (self.path, self.coreMask, self.portMask) self.dut.send_expect("%s" % cmd, "testpmd> ", 120) time.sleep(5) From patchwork Fri Sep 4 08:18:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76500 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 24571A04C5; Fri, 4 Sep 2020 10:17:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1A4AB1C0CD; Fri, 4 Sep 2020 10:17:08 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id BE010255 for ; Fri, 4 Sep 2020 10:17:05 +0200 (CEST) IronPort-SDR: hbG5PSvIu2ot/zkor1LkubSUZdklSvzXFp+y8GbLYExuIZ130eu3+WuwybGqxSBjCCHjIB+gaw PjxNVvYz7hGA== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763249" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763249" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:05 -0700 IronPort-SDR: sem4f8roZoalYFQ3jvQGhDGluFajgLkYhdIHgZ7PBTTBIrhi+FdLTJrCFnSpqBUwHTBE9+gTmd mROTjefg+YuQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782561" 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:04 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:11 +0800 Message-Id: <1599207525-22123-4-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 04/38] tests-TestSuite_dynamic_config.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_eventdev_pipeline.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/TestSuite_eventdev_pipeline.py b/tests/TestSuite_eventdev_pipeline.py index b0b3b8b..33091b6 100644 --- a/tests/TestSuite_eventdev_pipeline.py +++ b/tests/TestSuite_eventdev_pipeline.py @@ -85,9 +85,9 @@ class TestEventdevPipeline(TestCase): pass def build_eventdev_app(self): - self.app_command = "examples/eventdev_pipeline" - out = self.dut.build_dpdk_apps(self.app_command) - self.verify('make: Leaving directory' in out, "Compilation failed") + self.app_command = self.dut.apps_name["eventdev_pipeline"] + out = self.dut.build_dpdk_apps("examples/eventdev_pipeline") + # self.verify('make: Leaving directory' in out, "Compilation failed") self.verify("Error" not in out, "compilation error 1") self.verify("No such file" not in out, "compilation error 2") From patchwork Fri Sep 4 08:18:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76501 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 54076A04C5; Fri, 4 Sep 2020 10:17:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 488CEE07; Fri, 4 Sep 2020 10:17:09 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 71D7D255 for ; Fri, 4 Sep 2020 10:17:07 +0200 (CEST) IronPort-SDR: JeLD3e92X9PAzvV+ADIgRumX05ErFG46cuZ7u9m1x1W9a2/Wh/A5jU8F+IDiy7m7fvL4eLaLr7 NH0oJGwAbJWg== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763253" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763253" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:06 -0700 IronPort-SDR: HT1eMeyelvdVBA57y1L4c0lDwPdLNAklxMpDBBV8ibb/JeRwtpPH1aMdpFzCpjkl78FaO7RlBx eTzR1LOkOrSw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782573" 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:05 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:12 +0800 Message-Id: <1599207525-22123-5-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 05/38] tests-TestSuite_fdir.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_fdir.py | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/tests/TestSuite_fdir.py b/tests/TestSuite_fdir.py index 2b34776..1b7ad0a 100644 --- a/tests/TestSuite_fdir.py +++ b/tests/TestSuite_fdir.py @@ -141,7 +141,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): PMD prerequisites. """ self.tester.extend_external_packet_generator(TestFdir, self) - #self.verify('bsdapp' not in self.target, "FDIR not support freebsd") + #self.verify('bsdapp' not in self.path, "FDIR not support freebsd") # this feature support Fortville, Niantic #self.verify(self.nic in ["kawela_2", "niantic", "bartonhills", "82545EM", # "82540EM", "springfountain", "fortville_eagle", @@ -164,6 +164,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): self.dut_rx_interface = self.tester.get_interface(self.dut_rx_port) self.dut_tx_port = self.tester.get_local_port(self.dut_ports[1]) self.dut_tx_interface = self.tester.get_interface(self.dut_rx_port) + self.path=self.dut.apps_name['test-pmd'] self.blacklist = "" @@ -255,7 +256,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): """ self.dut.kill_all() - self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.target, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) + self.dut.send_expect("%s -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.path, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) self.dut.send_expect("set verbose 1", "testpmd>") self.dut.send_expect("set fwd rxonly", "testpmd>") @@ -331,10 +332,10 @@ class TestFdir(TestCase, IxiaPacketGenerator): self.dut.kill_all() if self.nic in ["niantic", "sagepond", "sageville"]: # Niantic ipv6 only support signature mode - self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=signature" % (self.target, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) + self.dut.send_expect("%s -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=signature" % (self.path, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) elif self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortpark_BASE-T","fortville_25g", "carlsville"]: # Fortville ipv6 support perfect mode - self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.target, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) + self.dut.send_expect("%s -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.path, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) self.dut.send_expect("set verbose 1", "testpmd>") self.dut.send_expect("set fwd rxonly", "testpmd>") @@ -402,7 +403,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): def test_fdir_noflexword_drop_ipv4(self): # drop command testing self.dut.kill_all() - self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.target, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) + self.dut.send_expect("%s -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.path, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) self.dut.send_expect("set verbose 1", "testpmd>") self.dut.send_expect("set fwd rxonly", "testpmd>") @@ -480,7 +481,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): # drop command testing self.dut.kill_all() - self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.target, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) + self.dut.send_expect("%s -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.path, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) self.dut.send_expect("set verbose 1", "testpmd>") self.dut.send_expect("set fwd rxonly", "testpmd>") @@ -537,7 +538,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): self.dut.kill_all() # fwd testing with flexword - self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.target, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) + self.dut.send_expect("%s -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.path, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) self.dut.send_expect("set verbose 1", "testpmd>") self.dut.send_expect("set fwd rxonly", "testpmd>") @@ -616,10 +617,10 @@ class TestFdir(TestCase, IxiaPacketGenerator): # fwd testing with flexword if self.nic in ["niantic", "sagepond", "sageville"]: # Niantic ipv6 only support signature mode - self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=signature" % (self.target, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) + self.dut.send_expect("%s -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=signature" % (self.path, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) elif self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "fortville_25g", "carlsville"]: # fortville ipv6 support perfect mode - self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.target, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) + self.dut.send_expect("%s -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.path, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) self.dut.send_expect("set verbose 1", "testpmd>") self.dut.send_expect("set fwd rxonly", "testpmd>") @@ -686,7 +687,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): def test_fdir_flexword_drop_ipv4(self): # drop testing with flexword - self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.target, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) + self.dut.send_expect("%s -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.path, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) self.dut.send_expect("set verbose 1", "testpmd>") self.dut.send_expect("set fwd rxonly", "testpmd>") @@ -744,7 +745,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): # Niantic is not support in drop ipv6 if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortpark_BASE-T","fortville_25g", "carlsville"]): # drop testing with flexword - self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.target, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) + self.dut.send_expect("%s -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.path, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) self.dut.send_expect("set verbose 1", "testpmd>") self.dut.send_expect("set fwd rxonly", "testpmd>") @@ -787,7 +788,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): if not self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "carlsville", "foxville"]: self.verify(False, "This case only support fortville nic") self.dut.kill_all() - self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.target, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) + self.dut.send_expect("%s -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.path, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) self.dut.send_expect("set verbose 1", "testpmd>") self.dut.send_expect("set fwd rxonly", "testpmd>") @@ -908,7 +909,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): if not self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "carlsville", "foxville"]: self.verify(False, "This case only support fortville nic") self.dut.kill_all() - self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.target, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) + self.dut.send_expect("%s -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.path, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) self.dut.send_expect("set verbose 1", "testpmd>") self.dut.send_expect("set fwd rxonly", "testpmd>") @@ -1029,7 +1030,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): if not self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "carlsville", "foxville"]: self.verify(False, "This case only support fortville nic") self.dut.kill_all() - self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.target, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) + self.dut.send_expect("%s -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.path, self.coreMask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) self.dut.send_expect("set verbose 1", "testpmd>") self.dut.send_expect("set fwd rxonly", "testpmd>") @@ -1124,7 +1125,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): self.dut.kill_all() - self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=8 --txq=8 --nb-cores=16 --nb-ports=2 --pkt-filter-mode=perfect" % (self.target, self.all_cores_mask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) + self.dut.send_expect("%s -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=8 --txq=8 --nb-cores=16 --nb-ports=2 --pkt-filter-mode=perfect" % (self.path, self.all_cores_mask, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) self.dut.send_expect("set verbose 1", "testpmd>") self.dut.send_expect("set fwd rxonly", "testpmd>") @@ -1212,13 +1213,13 @@ class TestFdir(TestCase, IxiaPacketGenerator): port_mask = utils.create_mask([self.dut_ports[0], self.dut_ports[1]]) if test_type == "fdir_disable": - command_line = "./%s/app/testpmd -c 0xff00ff -n %d -- -i --rxq=2 --txq=2 --rxd=512 --txd=512 --burst=32 --rxfreet=64 --txfreet=64 --mbcache=256 \ + command_line = "%s -c 0xff00ff -n %d -- -i --rxq=2 --txq=2 --rxd=512 --txd=512 --burst=32 --rxfreet=64 --txfreet=64 --mbcache=256 \ --portmask=%s --nb-cores=4 --nb-ports=2 --rss-ip\ - " % (self.target, self.dut.get_memory_channels(), port_mask) + " % (self.path, self.dut.get_memory_channels(), port_mask) else: - command_line = "./%s/app/testpmd -c 0xff00ff -n %d -- -i --rxq=2 --txq=2 --rxd=512 --txd=512 --burst=32 --rxfreet=64 --txfreet=64 --mbcache=256 \ + command_line = "%s -c 0xff00ff -n %d -- -i --rxq=2 --txq=2 --rxd=512 --txd=512 --burst=32 --rxfreet=64 --txfreet=64 --mbcache=256 \ --portmask=%s --nb-cores=4 --nb-ports=2 --rss-ip\ - --pkt-filter-mode=perfect" % (self.target, self.dut.get_memory_channels(), port_mask) + --pkt-filter-mode=perfect" % (self.path, self.dut.get_memory_channels(), port_mask) info = "Executing PMD using %s\n" % test_cycle['cores'] self.logger.info(info) From patchwork Fri Sep 4 08:18:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76502 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 78F99A04DB; Fri, 4 Sep 2020 10:17:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6D4CA1C0D5; Fri, 4 Sep 2020 10:17:09 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id AFD1C255 for ; Fri, 4 Sep 2020 10:17:08 +0200 (CEST) IronPort-SDR: YsBauND4D4XceBrbhBDV4oGgsKTEXWDs+4+EBW/qiTd5CyMt8N7ztDKa6U404/AiaYAOwIh+fT oxdz40llflrw== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763257" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763257" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:08 -0700 IronPort-SDR: Tt4BxrnM+hbYHdw7HMQ48z9Q+9nwoS/0CYZ9TDBBZFXd8l5ppjkBCBeWlCE31ZjmWO0R7aGN8s m0U7gOQSNx/g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782580" 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:07 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:13 +0800 Message-Id: <1599207525-22123-6-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 06/38] tests-TestSuite_flow_classify.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_flow_classify.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/TestSuite_flow_classify.py b/tests/TestSuite_flow_classify.py index 213ae49..75410b3 100644 --- a/tests/TestSuite_flow_classify.py +++ b/tests/TestSuite_flow_classify.py @@ -319,7 +319,8 @@ class TestFlowClassify(TestCase): self.output_path, 'flow_classify', timestamp) with open(self.test_data, 'w') as fp: fp.write(output) - cmds = ['killall flow_classify', '# ', 10] + app_name=self.flow_classify.split("/")[-1] + cmds = ['killall %s'%app_name, '# ', 10] self.d_a_console(cmds) def get_stream_rule_priority(self, stream_type): @@ -470,7 +471,8 @@ class TestFlowClassify(TestCase): self.dut_ports = self.dut.get_ports() self.verify(len(self.dut_ports) >= 2, "Insufficient ports") # set binary process setting - self.flow_classify = self.prepare_binary('flow_classify') + self.prepare_binary('flow_classify') + self.flow_classify =self.dut.apps_name["flow_classify"] self.verify_supported_nic() def set_up(self): From patchwork Fri Sep 4 08:18:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76503 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 92D92A04C5; Fri, 4 Sep 2020 10:17:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8BAAB1C0C6; Fri, 4 Sep 2020 10:17:11 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 329A6255 for ; Fri, 4 Sep 2020 10:17:10 +0200 (CEST) IronPort-SDR: TQ651UR64lRvuCE0uPXX2IRjDVo8qun41OxOfuonFwsyL2QBsn4hfmbOTxt1buTuYilCfeO2Tf BU5P0UUARzXA== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763259" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763259" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:09 -0700 IronPort-SDR: jMX6bhIWF7mQpm0cZfLnJ6MD1g2EEvh5cbC30iCmLVczPuI4QoGU0aLdDFHhuknt0OUQAe04Pg MzxwT4wDouvg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782585" 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:08 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:14 +0800 Message-Id: <1599207525-22123-7-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 07/38] tests-TestSuite_fortville_rss_granularity_config.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 --- .../TestSuite_fortville_rss_granularity_config.py | 32 +++++++++------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/tests/TestSuite_fortville_rss_granularity_config.py b/tests/TestSuite_fortville_rss_granularity_config.py index 1f2e6d2..3ebd513 100644 --- a/tests/TestSuite_fortville_rss_granularity_config.py +++ b/tests/TestSuite_fortville_rss_granularity_config.py @@ -198,10 +198,8 @@ class TestFortvilleRssGranularityConfig(TestCase): # test with different rss queues for queue in testQueues: - self.dut.send_expect( - "./%s/app/testpmd -c fffff -n %d -- -i --coremask=0xffffe --portmask=0x1 --rxq=%d --txq=%d" % - (self.target, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120) - + self.pmdout.start_testpmd( + "Default", " --portmask=0x1 --rxq=%d --txq=%d" % (queue, queue)) self.dut.send_expect("set verbose 8", "testpmd> ") self.dut.send_expect("set fwd rxonly", "testpmd> ") @@ -272,9 +270,8 @@ class TestFortvilleRssGranularityConfig(TestCase): # test with different rss queues for queue in testQueues: - self.dut.send_expect( - "./%s/app/testpmd -c fffff -n %d -- -i --coremask=0xffffe --portmask=0x1 --rxq=%d --txq=%d" % - (self.target, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120) + self.pmdout.start_testpmd( + "Default", " --portmask=0x1 --rxq=%d --txq=%d" % (queue, queue)) self.dut.send_expect("set verbose 8", "testpmd> ") self.dut.send_expect("set fwd rxonly", "testpmd> ") @@ -347,9 +344,8 @@ class TestFortvilleRssGranularityConfig(TestCase): # test with different rss queues for queue in testQueues: - self.dut.send_expect( - "./%s/app/testpmd -c fffff -n %d -- -i --coremask=0xffffe --portmask=0x1 --rxq=%d --txq=%d" % - (self.target, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120) + self.pmdout.start_testpmd( + "Default", " --portmask=0x1 --rxq=%d --txq=%d" % (queue, queue)) self.dut.send_expect("set verbose 8", "testpmd> ") self.dut.send_expect("set fwd rxonly", "testpmd> ") @@ -422,9 +418,8 @@ class TestFortvilleRssGranularityConfig(TestCase): # test with different rss queues for queue in testQueues: - self.dut.send_expect( - "./%s/app/testpmd -c fffff -n %d -- -i --coremask=0xffffe --portmask=0x1 --rxq=%d --txq=%d" % - (self.target, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120) + self.pmdout.start_testpmd( + "Default", " --portmask=0x1 --rxq=%d --txq=%d" % (queue, queue)) self.dut.send_expect("set verbose 8", "testpmd> ") self.dut.send_expect("set fwd rxonly", "testpmd> ") @@ -497,9 +492,8 @@ class TestFortvilleRssGranularityConfig(TestCase): # test with different rss queues for queue in testQueues: - self.dut.send_expect( - "./%s/app/testpmd -c fffff -n %d -- -i --coremask=0xffffe --portmask=0x1 --rxq=%d --txq=%d" % - (self.target, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120) + self.pmdout.start_testpmd( + "Default", " --portmask=0x1 --rxq=%d --txq=%d" % (queue, queue)) self.dut.send_expect("set verbose 8", "testpmd> ") self.dut.send_expect("set fwd rxonly", "testpmd> ") @@ -556,9 +550,8 @@ class TestFortvilleRssGranularityConfig(TestCase): # test with different rss queues for queue in testQueues: - self.dut.send_expect( - "./%s/app/testpmd -c fffff -n %d -- -i --coremask=0xffffe --portmask=0x1 --rxq=%d --txq=%d" % - (self.target, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120) + self.pmdout.start_testpmd( + "Default", " --portmask=0x1 --rxq=%d --txq=%d" % (queue, queue)) self.dut.send_expect("set verbose 8", "testpmd> ") self.dut.send_expect("set fwd rxonly", "testpmd> ") @@ -623,3 +616,4 @@ class TestFortvilleRssGranularityConfig(TestCase): Run after each test suite. """ pass + From patchwork Fri Sep 4 08:18:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76504 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 C1951A04C5; Fri, 4 Sep 2020 10:17:12 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B60CF1C0BD; Fri, 4 Sep 2020 10:17:12 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 751D6255 for ; Fri, 4 Sep 2020 10:17:11 +0200 (CEST) IronPort-SDR: nENTX5JNF/yOYhE1NWAQq4R1onnEyPQiPMAKN0VPaKIkLIiyNMjkPiWiPhWf/0rnvAEcKdhXZC su8iQLU9Tvhg== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763262" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763262" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:10 -0700 IronPort-SDR: WN9SEN3BvBEsdfHMPgUnV9ovuQKppRsktFG8Iau9eZRkLRH7R+VT9ciFqYfLyoKjYzrTzTYY7A y2t8q7PHhaRg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782589" 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:09 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:15 +0800 Message-Id: <1599207525-22123-8-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 08/38] tests-TestSuite_generic_flow_api.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_generic_flow_api.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/tests/TestSuite_generic_flow_api.py b/tests/TestSuite_generic_flow_api.py index 7e95d4b..bed6796 100644 --- a/tests/TestSuite_generic_flow_api.py +++ b/tests/TestSuite_generic_flow_api.py @@ -101,6 +101,7 @@ class TestGeneric_flow_api(TestCase): self.wrong_mac = "00:11:22:33:44:77" self.vf_flag = 0 self.pkt_obj = packet.Packet() + self.app_path=self.dut.apps_name["test-pmd"] def set_up(self): """ @@ -835,13 +836,13 @@ class TestGeneric_flow_api(TestCase): self.dut.send_expect("start", "testpmd> ", 120) time.sleep(2) # start testpmd on vf0 - self.session_secondary.send_expect("./%s/app/testpmd -c 0x1e0 -n 4 -m 1024 -w %s --file-prefix=vf1 -- -i --rxq=4 --txq=4" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120) + self.session_secondary.send_expect("%s -c 0x1e0 -n 4 -m 1024 -w %s --file-prefix=vf1 -- -i --rxq=4 --txq=4" % (self.app_path, self.sriov_vfs_port[0].pci), "testpmd>", 120) self.session_secondary.send_expect("set fwd rxonly", "testpmd> ") self.session_secondary.send_expect("set verbose 1", "testpmd> ") self.session_secondary.send_expect("start", "testpmd> ") time.sleep(2) # start testpmd on vf1 - self.session_third.send_expect("./%s/app/testpmd -c 0x1e00 -n 4 -m 1024 -w %s --file-prefix=vf2 -- -i --rxq=4 --txq=4" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120) + self.session_third.send_expect("%s -c 0x1e00 -n 4 -m 1024 -w %s --file-prefix=vf2 -- -i --rxq=4 --txq=4" % (self.app_path, self.sriov_vfs_port[1].pci), "testpmd>", 120) self.session_third.send_expect("set fwd rxonly", "testpmd> ") self.session_third.send_expect("set verbose 1", "testpmd> ") self.session_third.send_expect("start", "testpmd> ") @@ -1332,13 +1333,13 @@ class TestGeneric_flow_api(TestCase): self.dut.send_expect("start", "testpmd> ", 120) time.sleep(2) # start testpmd on vf0 - self.session_secondary.send_expect("./%s/app/testpmd -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120) + self.session_secondary.send_expect("%s -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect" % (self.app_path, self.sriov_vfs_port[0].pci), "testpmd>", 120) self.session_secondary.send_expect("set fwd rxonly", "testpmd>") self.session_secondary.send_expect("set verbose 1", "testpmd>") self.session_secondary.send_expect("start", "testpmd>") time.sleep(2) # start testpmd on vf1 - self.session_third.send_expect("./%s/app/testpmd -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120) + self.session_third.send_expect("%s -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect" % (self.app_path, self.sriov_vfs_port[1].pci), "testpmd>", 120) self.session_third.send_expect("set fwd rxonly", "testpmd>") self.session_third.send_expect("set verbose 1", "testpmd>") self.session_third.send_expect("start", "testpmd>") @@ -1428,13 +1429,13 @@ class TestGeneric_flow_api(TestCase): self.dut.send_expect("start", "testpmd> ", 120) time.sleep(2) # start testpmd on vf0 - self.session_secondary.send_expect("./%s/app/testpmd -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120) + self.session_secondary.send_expect("%s -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect" % (self.app_path, self.sriov_vfs_port[0].pci), "testpmd>", 120) self.session_secondary.send_expect("set fwd rxonly", "testpmd>") self.session_secondary.send_expect("set verbose 1", "testpmd>") self.session_secondary.send_expect("start", "testpmd>") time.sleep(2) # start testpmd on vf1 - self.session_third.send_expect("./%s/app/testpmd -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120) + self.session_third.send_expect("%s -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect" % (self.app_path, self.sriov_vfs_port[1].pci), "testpmd>", 120) self.session_third.send_expect("set fwd rxonly", "testpmd>") self.session_third.send_expect("set verbose 1", "testpmd>") self.session_third.send_expect("start", "testpmd>") @@ -1535,12 +1536,12 @@ class TestGeneric_flow_api(TestCase): self.dut.send_expect("set verbose 1", "testpmd> ", 120) self.dut.send_expect("start", "testpmd> ", 120) time.sleep(2) - self.session_secondary.send_expect("./%s/app/testpmd -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120) + self.session_secondary.send_expect("%s -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect" % (self.app_path, self.sriov_vfs_port[0].pci), "testpmd>", 120) self.session_secondary.send_expect("set fwd rxonly", "testpmd>") self.session_secondary.send_expect("set verbose 1", "testpmd>") self.session_secondary.send_expect("start", "testpmd>") time.sleep(2) - self.session_third.send_expect("./%s/app/testpmd -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120) + self.session_third.send_expect("%s -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect" % (self.app_path, self.sriov_vfs_port[1].pci), "testpmd>", 120) self.session_third.send_expect("set fwd rxonly", "testpmd>") self.session_third.send_expect("set verbose 1", "testpmd>") self.session_third.send_expect("start", "testpmd>") @@ -1982,12 +1983,12 @@ class TestGeneric_flow_api(TestCase): self.dut.send_expect("set verbose 1", "testpmd> ", 120) self.dut.send_expect("start", "testpmd> ", 120) time.sleep(2) - self.session_secondary.send_expect("./%s/app/testpmd -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120) + self.session_secondary.send_expect("%s -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[0].pci), "testpmd>", 120) self.session_secondary.send_expect("set fwd rxonly", "testpmd>") self.session_secondary.send_expect("set verbose 1", "testpmd>") self.session_secondary.send_expect("start", "testpmd>") time.sleep(2) - self.session_third.send_expect("./%s/app/testpmd -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120) + self.session_third.send_expect("%s -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[1].pci), "testpmd>", 120) self.session_third.send_expect("set fwd rxonly", "testpmd>") self.session_third.send_expect("set verbose 1", "testpmd>") self.session_third.send_expect("start", "testpmd>") @@ -2045,12 +2046,12 @@ class TestGeneric_flow_api(TestCase): self.dut.send_expect("set verbose 1", "testpmd> ", 120) self.dut.send_expect("start", "testpmd> ", 120) time.sleep(2) - self.session_secondary.send_expect("./%s/app/testpmd -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120) + self.session_secondary.send_expect("%s -c 0x1e0000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf1 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[0].pci), "testpmd>", 120) self.session_secondary.send_expect("set fwd rxonly", "testpmd>") self.session_secondary.send_expect("set verbose 1", "testpmd>") self.session_secondary.send_expect("start", "testpmd>") time.sleep(2) - self.session_third.send_expect("./%s/app/testpmd -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120) + self.session_third.send_expect("%s -c 0x1e000000 -n 4 --socket-mem 1024,1024 --legacy-mem -w %s --file-prefix=vf2 -- -i --rxq=4 --txq=4 --disable-rss" % (self.app_path, self.sriov_vfs_port[1].pci), "testpmd>", 120) self.session_third.send_expect("set fwd rxonly", "testpmd>") self.session_third.send_expect("set verbose 1", "testpmd>") self.session_third.send_expect("start", "testpmd>") @@ -2105,3 +2106,4 @@ class TestGeneric_flow_api(TestCase): self.dut.kill_all() self.dut.close_session(self.session_secondary) self.dut.close_session(self.session_third) + From patchwork Fri Sep 4 08:18:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76505 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 EA9C6A04C5; Fri, 4 Sep 2020 10:17:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E2AE81C0BC; Fri, 4 Sep 2020 10:17:20 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 055FA255 for ; Fri, 4 Sep 2020 10:17:18 +0200 (CEST) IronPort-SDR: asEp3hTd7+Du7+nQ9QWI04S7l2lNyXbzK4B1zX58FZq0N4tSPAW8HlX+N1CirZSnXtRlXUYe2X Q1Kge0loJZKQ== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763271" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763271" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:17 -0700 IronPort-SDR: Uga7m1aZFewJKLd7kmNf553/V/TG0wCtJj0awiRcsC09jfwyGfd8oxwn4DdGflaqoE6nXa3ffk cOxoqJR5dsew== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782602" 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:11 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:16 +0800 Message-Id: <1599207525-22123-9-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 09/38] tests-TestSuite_hotplug.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_hotplug.py | 92 +++++++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 41 deletions(-) diff --git a/tests/TestSuite_hotplug.py b/tests/TestSuite_hotplug.py index 4af9957..1882c84 100644 --- a/tests/TestSuite_hotplug.py +++ b/tests/TestSuite_hotplug.py @@ -1,4 +1,4 @@ -#BSD LICENSE +# BSD LICENSE # # Copyright(c) 2010-2016 Intel Corporation. All rights reserved. # All rights reserved. @@ -42,10 +42,12 @@ from test_case import TestCase from packet import Packet import os + class TestPortHotPlug(TestCase): """ This feature supports igb_uio, vfio-pci and vfio-pci:noiommu now and not support freebsd """ + def set_up_all(self): """ Run at the start of each test suite. @@ -59,59 +61,62 @@ class TestPortHotPlug(TestCase): self.driver_name = "vfio-pci" else: self.driver_name = self.drivername + self.path=self.dut.apps_name['test-pmd'] def set_up(self): """ Run before each test case. """ - self.dut.send_expect("./usertools/dpdk-devbind.py -u %s" % self.dut.ports_info[self.port]['pci'],"#",60) + self.dut.send_expect("./usertools/dpdk-devbind.py -u %s" % self.dut.ports_info[self.port]['pci'], "#", 60) def attach(self, port): """ attach port """ # dpdk hotplug discern NIC by pci bus and include domid - self.dut.send_expect("port attach %s" % self.dut.ports_info[port]['pci'],"is attached",60) - self.dut.send_expect("port start %s" % port,"Configuring Port",120) + self.dut.send_expect("port attach %s" % self.dut.ports_info[port]['pci'], "is attached", 60) + self.dut.send_expect("port start %s" % port, "Configuring Port", 120) # sleep 10 seconds for fortville update link stats time.sleep(10) - self.dut.send_expect("show port info %s" % port,"testpmd>",60) + self.dut.send_expect("show port info %s" % port, "testpmd>", 60) def detach(self, port): """ - detach port + detach port """ - self.dut.send_expect("port stop %s" % port,"Stopping ports",60) + self.dut.send_expect("port stop %s" % port, "Stopping ports", 60) # sleep 10 seconds for fortville update link stats time.sleep(10) - self.dut.send_expect("port detach %s" % port,"is detached",60) + self.dut.send_expect("port detach %s" % port, "is detached", 60) def test_after_attach(self): """ first run testpmd after attach port """ - cmd = "./%s/app/testpmd -c %s -n %s -- -i" % (self.target,self.coremask,self.dut.get_memory_channels()) - self.dut.send_expect(cmd,"testpmd>",60) + cmd = "%s -c %s -n %s -- -i" % (self.path, self.coremask, self.dut.get_memory_channels()) + self.dut.send_expect(cmd, "testpmd>", 60) session_secondary = self.dut.new_session() - session_secondary.send_expect("./usertools/dpdk-devbind.py --bind=%s %s" % (self.driver_name, self.dut.ports_info[self.port]['pci']), "#", 60) + session_secondary.send_expect( + "./usertools/dpdk-devbind.py --bind=%s %s" % (self.driver_name, self.dut.ports_info[self.port]['pci']), "#", + 60) self.dut.close_session(session_secondary) self.attach(self.port) - self.dut.send_expect("start","testpmd>",60) - self.dut.send_expect("port detach %s" % self.port,"Port not stopped",60) - self.dut.send_expect("stop","testpmd>",60) + self.dut.send_expect("start", "testpmd>", 60) + self.dut.send_expect("port detach %s" % self.port, "Port not stopped", 60) + self.dut.send_expect("stop", "testpmd>", 60) self.detach(self.port) self.attach(self.port) - - self.dut.send_expect("start","testpmd>",60) - self.dut.send_expect("port detach %s" % self.port,"Port not stopped",60) - self.dut.send_expect("clear port stats %s" % self.port ,"testpmd>",60) + + self.dut.send_expect("start", "testpmd>", 60) + self.dut.send_expect("port detach %s" % self.port, "Port not stopped", 60) + self.dut.send_expect("clear port stats %s" % self.port, "testpmd>", 60) self.send_packet(self.port) - out = self.dut.send_expect("show port stats %s" % self.port ,"testpmd>",60) - packet = re.search("RX-packets:\s*(\d*)",out) + out = self.dut.send_expect("show port stats %s" % self.port, "testpmd>", 60) + packet = re.search("RX-packets:\s*(\d*)", out) sum_packet = packet.group(1) self.verify(int(sum_packet) == 1, "Insufficient the received package") - self.dut.send_expect("quit","#",60) - + self.dut.send_expect("quit", "#", 60) + def send_packet(self, port): """ Send a packet to port @@ -120,30 +125,32 @@ class TestPortHotPlug(TestCase): txport = self.tester.get_local_port(port) self.txItf = self.tester.get_interface(txport) pkt = Packet(pkt_type='UDP') - pkt.config_layer('ether', {'dst': self.dmac,}) + pkt.config_layer('ether', {'dst': self.dmac, }) pkt.send_pkt(self.tester, tx_port=self.txItf) - + def test_before_attach(self): """ first attach port after run testpmd """ session_secondary = self.dut.new_session() - session_secondary.send_expect("./usertools/dpdk-devbind.py --bind=%s %s" % (self.driver_name, self.dut.ports_info[self.port]['pci']), "#", 60) + session_secondary.send_expect( + "./usertools/dpdk-devbind.py --bind=%s %s" % (self.driver_name, self.dut.ports_info[self.port]['pci']), "#", + 60) self.dut.close_session(session_secondary) - cmd = "./%s/app/testpmd -c %s -n %s -- -i" % (self.target,self.coremask,self.dut.get_memory_channels()) - self.dut.send_expect(cmd,"testpmd>",60) + cmd = "%s -c %s -n %s -- -i" % (self.path, self.coremask, self.dut.get_memory_channels()) + self.dut.send_expect(cmd, "testpmd>", 60) self.detach(self.port) self.attach(self.port) - self.dut.send_expect("start","testpmd>",60) - self.dut.send_expect("port detach %s" % self.port, "Port not stopped",60) - self.dut.send_expect("clear port stats %s" % self.port ,"testpmd>",60) + self.dut.send_expect("start", "testpmd>", 60) + self.dut.send_expect("port detach %s" % self.port, "Port not stopped", 60) + self.dut.send_expect("clear port stats %s" % self.port, "testpmd>", 60) self.send_packet(self.port) - out = self.dut.send_expect("show port stats %s" % self.port ,"testpmd>",60) - packet = re.search("RX-packets:\s*(\d*)",out) + out = self.dut.send_expect("show port stats %s" % self.port, "testpmd>", 60) + packet = re.search("RX-packets:\s*(\d*)", out) sum_packet = packet.group(1) self.verify(int(sum_packet) == 1, "Insufficient the received package") - self.dut.send_expect("quit","#",60) + self.dut.send_expect("quit", "#", 60) def test_port_detach_attach_for_vhost_user_virtio_user(self): vdev = "eth_vhost0,iface=vhost-net,queues=1" @@ -154,25 +161,27 @@ class TestPortHotPlug(TestCase): cores = self.dut.get_core_list("all") self.verify(len(cores) > 8, "insufficient cores for this case") eal_param = self.dut.create_eal_parameters(no_pci=True, cores=cores[1:5], vdevs=[vdev], prefix="vhost") - testpmd_cmd = "./%s/app/testpmd " % self.target + eal_param + ' -- -i' + testpmd_cmd = "%s " % self.path + eal_param + ' -- -i' self.dut.send_expect(testpmd_cmd, "testpmd>", timeout=60) self.dut.send_expect("port stop 0", "testpmd>") self.dut.send_expect("port detach 0", "Device is detached") stats = self.dut.send_expect("ls %s" % path, "#", timeout=3, - alt_session=True, verify=True) - self.verify(stats==2, 'port detach failed') + alt_session=True, verify=True) + self.verify(stats == 2, 'port detach failed') time.sleep(1) self.dut.send_expect("port attach eth_vhost1,iface=%s,queues=1" % iface, "Port 0 is attached.") self.dut.send_expect("port start 0", "testpmd>") out = self.dut.send_expect("ls %s" % path, "#", timeout=3, alt_session=True, verify=True) - self.verify(iface in out , 'port attach failed') + self.verify(iface in out, 'port attach failed') self.session2 = self.dut.create_session(name="virtio_user") eal_param = self.dut.create_eal_parameters(no_pci=True, fixed_prefix="virtio1", cores=cores[5:9]) - testpmd_cmd2 = "%s/%s/app/testpmd " % (self.dut.base_dir,self.target) + eal_param + ' -- -i' + testpmd_cmd2 = "%s " % (self.path) + eal_param + ' -- -i' self.session2.send_expect(testpmd_cmd2, "testpmd>", timeout=60) - self.session2.send_expect("port attach net_virtio_user1,mac=00:01:02:03:04:05,path=%s,queues=1,packed_vq=1,mrg_rxbuf=1,in_order=0" % path, "testpmd") + self.session2.send_expect( + "port attach net_virtio_user1,mac=00:01:02:03:04:05,path=%s,queues=1,packed_vq=1,mrg_rxbuf=1,in_order=0" % path, + "testpmd") self.session2.send_expect("port start 0", "testpmd>", timeout=60) out = self.dut.send_expect("ls %s" % path, "#", timeout=3, alt_session=True, verify=True) @@ -197,9 +206,10 @@ class TestPortHotPlug(TestCase): Run after each test case. """ self.dut.kill_all() - self.dut.send_expect("./usertools/dpdk-devbind.py --bind=%s %s" % (self.driver_name, self.dut.ports_info[self.port]['pci']), "#", 60) + self.dut.send_expect( + "./usertools/dpdk-devbind.py --bind=%s %s" % (self.driver_name, self.dut.ports_info[self.port]['pci']), "#", + 60) time.sleep(2) - def tear_down_all(self): """ From patchwork Fri Sep 4 08:18:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76506 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 1B053A04C5; Fri, 4 Sep 2020 10:17:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 125881C0CE; Fri, 4 Sep 2020 10:17:22 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id BA9BD1C0BC for ; Fri, 4 Sep 2020 10:17:19 +0200 (CEST) IronPort-SDR: +peILORpJ4ggxZjp2DhSPUV3z9wAMbTbAD/Db1GxqMsaxswnDoeGXSVjhO/3POlEt3yC6kC0g2 6ZCM4JpQ5HLw== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763273" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763273" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:17 -0700 IronPort-SDR: Gf6/wJW6LmnanBm+GWDMgzixUYuCaM30n1nkK1/b41KfZ+G8x2H5AhVGyjrYGSQ1jQ3z3R46oJ 3dGnv52Q7ssw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782622" 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:16 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:17 +0800 Message-Id: <1599207525-22123-10-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 10/38] tests-TestSuite_hotplug_mp.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_hotplug_mp.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/TestSuite_hotplug_mp.py b/tests/TestSuite_hotplug_mp.py index 4cb5ce5..e9abe4f 100644 --- a/tests/TestSuite_hotplug_mp.py +++ b/tests/TestSuite_hotplug_mp.py @@ -23,7 +23,8 @@ class TestHotplugMp(TestCase): self.verify(len(self.dut_ports) >= 1, "Insufficient ports") self.intf0 = self.dut.ports_info[0]['intf'] self.pci0 = self.dut.ports_info[0]['pci'] - out = self.dut.build_dpdk_apps("./examples/multi_process/") + out = self.dut.build_dpdk_apps("./examples/multi_process/hotplug_mp") + self.app_path=self.dut.apps_name['hotplug_mp'] self.verify('Error' not in out, "Compilation failed") # Start one new session to run primary process self.session_pri = self.dut.new_session() @@ -48,16 +49,16 @@ class TestHotplugMp(TestCase): if self.drivername in ["igb_uio"]: self.iova_param = "--iova-mode=pa" out = self.session_pri.send_expect( - "./examples/multi_process/hotplug_mp/%s/hotplug_mp %s --proc-type=auto" - % (self.target, self.iova_param), "example>") + "%s %s --proc-type=auto" + % (self.app_path, self.iova_param), "example>") self.verify("Auto-detected process type: PRIMARY" in out, "Failed to setup primary process!") for out in [self.session_sec_1.send_expect( - "./examples/multi_process/hotplug_mp/%s/hotplug_mp %s --proc-type=auto" - % (self.target, self.iova_param), "example>"), + "%s %s --proc-type=auto" + % (self.app_path, self.iova_param), "example>"), self.session_sec_2.send_expect( - "./examples/multi_process/hotplug_mp/%s/hotplug_mp %s --proc-type=auto" - % (self.target, self.iova_param), "example>")]: + "%s %s --proc-type=auto" + % (self.app_path, self.iova_param), "example>")]: self.verify("Auto-detected process type: SECONDARY" in out, "Failed to setup secondary process!") @@ -328,10 +329,11 @@ class TestHotplugMp(TestCase): """ vdev = "net_virtio_user0" self.path = "/home/vhost-net" + pmd_path=self.dut.apps_name['test-pmd'] self.session_vhost.send_expect("rm -rf %s" % self.path, "#") eal_param = self.dut.create_eal_parameters(no_pci=True, prefix='vhost',vdevs=["eth_vhost0,iface=%s" % self.path]) param = ' -- -i' - testpmd_cmd = "./%s/app/testpmd " % self.target + eal_param + param + testpmd_cmd = "%s " % pmd_path + eal_param + param self.session_vhost.send_expect(testpmd_cmd, 'testpmd> ', timeout=60) try: self.attach_detach_vdev("pri", "hotplug", 1, vdev, iface="mac=00:01:02:03:04:05,path=%s,packed_vq=1,mrg_rxbuf=1,in_order=0" % self.path) From patchwork Fri Sep 4 08:18:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76507 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 533BEA04DB; Fri, 4 Sep 2020 10:17:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3C11B1C0D2; Fri, 4 Sep 2020 10:17:22 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id E82F8255 for ; Fri, 4 Sep 2020 10:17:19 +0200 (CEST) IronPort-SDR: hSh21ypx0hiyvjs6XfbTYSgO9x8CO0ZmRlMT65KXskMn7j7xDoTYTQD2ZfPqpzMAlYg64YIYrQ tX9ma+ASVnjg== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763275" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763275" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:18 -0700 IronPort-SDR: S/7AkgTHMNFua7RWbWe8fO3tl3KzIow9lDgoPTrSBITW/ui9Dsk0IEfI5UpphnobtpuGBqO7B5 6mD4VzzF2l1A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782629" 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:17 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:18 +0800 Message-Id: <1599207525-22123-11-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 11/38] tests-TestSuite_interrupt_pmd.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_interrupt_pmd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestSuite_interrupt_pmd.py b/tests/TestSuite_interrupt_pmd.py index 17a58af..752c673 100644 --- a/tests/TestSuite_interrupt_pmd.py +++ b/tests/TestSuite_interrupt_pmd.py @@ -52,7 +52,7 @@ class TestInterruptPmd(TestCase): cores = self.dut.get_core_list("1S/4C/1T") self.coremask = utils.create_mask(cores) - self.path = "./examples/l3fwd-power/build/l3fwd-power" + self.path = self.dut.apps_name["l3fwd-power"] self.trafficFlow = { "Flow1": [[0, 0, 1], [1, 0, 2]], From patchwork Fri Sep 4 08:18:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76508 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 9048CA04DC; Fri, 4 Sep 2020 10:17:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6A8EE1C0DB; Fri, 4 Sep 2020 10:17:22 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 1C3A31C0CE for ; Fri, 4 Sep 2020 10:17:20 +0200 (CEST) IronPort-SDR: bjyyNvemcT9Qi2ESmmDM+Jxren3TDZIbIq8n0sd0GB3LgU5+1322AYNDCUQNfPUoQm30oj+YX1 uc6PSnN5vH8Q== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763277" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763277" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:20 -0700 IronPort-SDR: C9lsLEf+V8QlUJ/aTn8vpAoCHJAhodtdBJeINJk/7LQqO9j/bqFPcRzrXXmmJgucsvxYhIMPct xEQ2IuUoAjCA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782638" 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:19 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:19 +0800 Message-Id: <1599207525-22123-12-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 12/38] tests-TestSuite_ipgre.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_ipgre.py | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/tests/TestSuite_ipgre.py b/tests/TestSuite_ipgre.py index 1e4edae..743c7ab 100644 --- a/tests/TestSuite_ipgre.py +++ b/tests/TestSuite_ipgre.py @@ -54,6 +54,7 @@ from scapy.layers.l2 import GRE from test_case import TestCase from exception import VerifyFailure +from pmd_output import PmdOutput class TestIpgre(TestCase): @@ -71,6 +72,10 @@ class TestIpgre(TestCase): valports = [_ for _ in ports if self.tester.get_local_port(_) != -1] # start testpmd self.dut_port = valports[0] + self.dut_ports = self.dut.get_ports(self.nic) + self.portMask = utils.create_mask([self.dut_ports[0]]) + self.ports_socket = self.dut.get_numa_id(self.dut_ports[0]) + self.pmdout = PmdOutput(self.dut) tester_port = self.tester.get_local_port(self.dut_port) self.tester_iface = self.tester.get_interface(tester_port) self.tester_iface_mac = self.tester.get_mac(tester_port) @@ -210,10 +215,10 @@ class TestIpgre(TestCase): config_layers = {'ether': {'src': self.outer_mac_src}, 'ipv4': {'proto': 'gre'}} # Start testpmd and enable rxonly forwarding mode - testpmd_cmd = "./%s/app/testpmd -c ffff -n 4 -- -i --enable-rx-cksum" % self.target - self.dut.send_expect( testpmd_cmd, - "testpmd>", - 20) + self.pmdout.start_testpmd("Default", "--portmask=%s " % + (self.portMask) + " --enable-rx-cksum " + , socket=self.ports_socket) + self.dut.send_expect("set fwd rxonly", "testpmd>") self.dut.send_expect("set verbose 1", "testpmd>") self.dut.send_expect("start", "testpmd>") @@ -266,10 +271,14 @@ class TestIpgre(TestCase): # Start testpmd and enable rxonly forwarding mode if (self.nic in ["cavium_a063", "cavium_a064"]): - testpmd_cmd = "./%s/app/testpmd -c ffff -n 4 -- -i --enable-rx-cksum" % self.target + self.pmdout.start_testpmd("Default", "--portmask=%s " % + (self.portMask) + " --enable-rx-cksum " + , socket=self.ports_socket) else: - testpmd_cmd = "./%s/app/testpmd -c ffff -n 4 -- -i --enable-rx-cksum --enable-hw-vlan" % self.target - self.dut.send_expect(testpmd_cmd, "testpmd>", 20) + self.pmdout.start_testpmd("Default", "--portmask=%s " % + (self.portMask) + " --enable-rx-cksum --enable-hw-vlan" + , socket=self.ports_socket) + self.dut.send_expect("set fwd rxonly", "testpmd>") self.dut.send_expect("set verbose 1", "testpmd>") self.dut.send_expect("start", "testpmd>") @@ -298,8 +307,8 @@ class TestIpgre(TestCase): def test_GRE_packet_filter(self): """ - Start testpmd with multi queues, add GRE filter that forward - inner/outer ip address 0.0.0.0 to queue 3, Send packet inner + Start testpmd with multi queues, add GRE filter that forward + inner/outer ip address 0.0.0.0 to queue 3, Send packet inner ip address matched and check packet received by queue 3 """ outer_mac = self.tester_iface_mac @@ -307,8 +316,9 @@ class TestIpgre(TestCase): # Start testpmd with multi queues #testpmd_cmd = "./%s/app/testpmd -c ff -n 3 -- -i --rxq=4 --txq=4" % self.target - testpmd_cmd = "./%s/app/testpmd -c ff -n 3 -- -i --enable-rx-cksum --rxq=4 --txq=4" % self.target - self.dut.send_expect(testpmd_cmd, "testpmd>", 20) + self.pmdout.start_testpmd("Default", "--portmask=%s " % + (self.portMask) + " --enable-rx-cksum --rxq=4 --txq=4 " + , socket=self.ports_socket) self.dut.send_expect("set fwd rxonly", "testpmd>") self.dut.send_expect("set nbcore 4", "testpmd>") self.dut.send_expect("set verbose 1", "testpmd>") @@ -353,11 +363,12 @@ class TestIpgre(TestCase): def test_GRE_packet_chksum_offload(self): """ Start testpmd with hardware checksum offload enabled, - Send packet with wrong IP/TCP/UDP/SCTP checksum and check forwarded packet checksum + Send packet with wrong IP/TCP/UDP/SCTP checksum and check forwarded packet checksum """ # Start testpmd and enable rxonly forwarding mode - testpmd_cmd = "./%s/app/testpmd -c ff -n 3 -- -i --enable-rx-cksum --port-topology=loop" % self.target - self.dut.send_expect(testpmd_cmd, "testpmd>", 20) + self.pmdout.start_testpmd("Default", "--portmask=%s " % + (self.portMask) + " --enable-rx-cksum --port-topology=loop" + , socket=self.ports_socket) self.dut.send_expect("set verbose 1", "testpmd>") self.dut.send_expect("set fwd csum", "testpmd>") self.dut.send_expect("stop", "testpmd>") From patchwork Fri Sep 4 08:18:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76509 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 A16E2A04C5; Fri, 4 Sep 2020 10:17:24 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 982C11C0DA; Fri, 4 Sep 2020 10:17:24 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 7CB901C0DC for ; Fri, 4 Sep 2020 10:17:22 +0200 (CEST) IronPort-SDR: +Baupt2vIyMIVipidJNkr5G4INZRNwWtYNAittbB29QUr6mIOy+ij7Zp0YU4atdj4lR48VVbcm JaSlX+C+IK/w== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763280" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763280" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:21 -0700 IronPort-SDR: lZrN7+6FXiypBomBKDprwCYQQgp6CW6e62+X8uc7eBnUnDx7Tt9dBKL6luDe3jIFl/ETEZMKWt HpIV8WfK+EOA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782644" 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:20 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:20 +0800 Message-Id: <1599207525-22123-13-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 13/38] tests-TestSuite_l2fwd_jobstats.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_l2fwd_jobstats.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestSuite_l2fwd_jobstats.py b/tests/TestSuite_l2fwd_jobstats.py index 855c399..c00e39c 100644 --- a/tests/TestSuite_l2fwd_jobstats.py +++ b/tests/TestSuite_l2fwd_jobstats.py @@ -75,7 +75,7 @@ class TestL2fwdJobstats(TestCase): """ Verify l2fwd jobstats is correct """ - path = "./examples/l2fwd-jobstats/build/l2fwd-jobstats" + path = self.dut.apps_name["l2fwd-jobstats"] cmd = path + " -c %s -n 4 -- -q 2 -p 0x03 -l" % (self.coremask) self.dut.send_expect(cmd, "Port statistics", 60) From patchwork Fri Sep 4 08:18:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76510 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 CE655A04C5; Fri, 4 Sep 2020 10:17:26 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C76BE1C10D; Fri, 4 Sep 2020 10:17:26 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id ED8631C10D for ; Fri, 4 Sep 2020 10:17:24 +0200 (CEST) IronPort-SDR: pPCn/plYC51+A4uBozlj3dbqlvTZo9W4KnlPd/GM4mddGAENou6QqiJRX64HI6j1alxUQciCH7 +RLwkf1r9k6w== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763282" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763282" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:22 -0700 IronPort-SDR: PggKoNrUosofcDwDI+PCCWTUTz1BZfllS+YI88dWLA8t9L9JpPaB1HIeV5jBm7i9i7NfSFzBVb LfgrBH5uTgMA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782649" 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:21 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:21 +0800 Message-Id: <1599207525-22123-14-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 14/38] tests/TestSuite_loopback_multi_paths_port_restart.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_loopback_multi_paths_port_restart.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/TestSuite_loopback_multi_paths_port_restart.py b/tests/TestSuite_loopback_multi_paths_port_restart.py index 1e91af4..7a1448d 100644 --- a/tests/TestSuite_loopback_multi_paths_port_restart.py +++ b/tests/TestSuite_loopback_multi_paths_port_restart.py @@ -57,6 +57,7 @@ class TestLoopbackPortRestart(TestCase): self.core_config, socket=self.ports_socket) self.core_list_user = self.core_list[0:2] self.core_list_host = self.core_list[2:5] + self.path=self.dut.apps_name['test-pmd'] def set_up(self): """ @@ -80,7 +81,7 @@ class TestLoopbackPortRestart(TestCase): self.dut.send_expect("killall -s INT testpmd", "#") self.dut.send_expect("rm -rf ./vhost-net*", "#") eal_param = self.dut.create_eal_parameters(cores=self.core_list_host, prefix='vhost', no_pci=True, vdevs=['net_vhost0,iface=vhost-net,queues=1,client=0']) - command_line_client = self.dut.target + "/app/testpmd " + eal_param + " -- -i --nb-cores=1 --txd=1024 --rxd=1024" + command_line_client = self.path + eal_param + " -- -i --nb-cores=1 --txd=1024 --rxd=1024" self.vhost.send_expect(command_line_client, "testpmd> ", 120) self.vhost.send_expect("set fwd mac", "testpmd> ", 120) @@ -96,7 +97,7 @@ class TestLoopbackPortRestart(TestCase): eal_param = self.dut.create_eal_parameters(cores=self.core_list_user, prefix='virtio', no_pci=True, vdevs=['net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net,%s' % pmd_arg["version"]]) if self.check_2M_env: eal_param += " --single-file-segments" - command_line_user = self.dut.target + "/app/testpmd " + eal_param + " -- -i %s --rss-ip --nb-cores=1 --txd=1024 --rxd=1024" % pmd_arg["path"] + command_line_user = self.path + eal_param + " -- -i %s --rss-ip --nb-cores=1 --txd=1024 --rxd=1024" % pmd_arg["path"] self.virtio_user.send_expect(command_line_user, "testpmd> ", 120) self.virtio_user.send_expect("set fwd mac", "testpmd> ", 120) self.virtio_user.send_expect("start", "testpmd> ", 120) From patchwork Fri Sep 4 08:18:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76511 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 06569A04DB; Fri, 4 Sep 2020 10:17:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EC38B1C112; Fri, 4 Sep 2020 10:17:26 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 9AFE71C0D1 for ; Fri, 4 Sep 2020 10:17:25 +0200 (CEST) IronPort-SDR: mxX43Q5Zo82BoTjEZBVQnNmtxUWy41evGQz7AVyHNLJp6f3Vo9fo5bp+lhoUSLzK+MOmbSVVzP MG1v2abDpbCA== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763286" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763286" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:24 -0700 IronPort-SDR: XGIF0onzli4j+1cgpSzjLXOZT9CVi15WhMz/EFpwKyyX9oHm3zDVjZ6aX3IhfTTQIgFB3WM+Rq 6+0ANMOP5RfQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782656" 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:23 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:22 +0800 Message-Id: <1599207525-22123-15-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 15/38] tests/TestSuite_loopback_multi_queues.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_loopback_multi_queues.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/TestSuite_loopback_multi_queues.py b/tests/TestSuite_loopback_multi_queues.py index 8300dfc..0fdadeb 100644 --- a/tests/TestSuite_loopback_multi_queues.py +++ b/tests/TestSuite_loopback_multi_queues.py @@ -59,6 +59,7 @@ class TestLoopbackMultiQueues(TestCase): # get the frame_sizes from cfg file if 'packet_sizes' in self.get_suite_cfg(): self.frame_sizes = self.get_suite_cfg()['packet_sizes'] + self.path=self.dut.apps_name['test-pmd'] def set_up(self): """ @@ -89,7 +90,7 @@ class TestLoopbackMultiQueues(TestCase): start testpmd on vhost """ eal_param = self.dut.create_eal_parameters(cores=self.core_list_host, prefix='vhost', no_pci=True, vdevs=['net_vhost0,iface=vhost-net,queues=%d' % self.queue_number]) - command_line_client = self.dut.target + "/app/testpmd " + eal_param + " -- -i --nb-cores=%d --rxq=%d --txq=%d --txd=1024 --rxd=1024" % (self.nb_cores, self.queue_number, self.queue_number) + command_line_client = self.path + eal_param + " -- -i --nb-cores=%d --rxq=%d --txq=%d --txd=1024 --rxd=1024" % (self.nb_cores, self.queue_number, self.queue_number) self.vhost.send_expect(command_line_client, "testpmd> ", 120) self.vhost.send_expect("set fwd mac", "testpmd> ", 120) @@ -105,7 +106,7 @@ class TestLoopbackMultiQueues(TestCase): eal_param = self.dut.create_eal_parameters(cores=self.core_list_user, prefix='virtio', no_pci=True, vdevs=['net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net,queues=%d,%s' % (self.queue_number, args["version"])]) if self.check_2M_env: eal_param += " --single-file-segments" - command_line_user = self.dut.target + "/app/testpmd " + eal_param + " -- -i %s --nb-cores=%d --rxq=%d --txq=%d --txd=1024 --rxd=1024" % (args["path"], self.nb_cores, self.queue_number, self.queue_number) + command_line_user = self.path + eal_param + " -- -i %s --nb-cores=%d --rxq=%d --txq=%d --txd=1024 --rxd=1024" % (args["path"], self.nb_cores, self.queue_number, self.queue_number) self.virtio_user.send_expect(command_line_user, "testpmd> ", 120) self.virtio_user.send_expect("set fwd mac", "testpmd> ", 120) self.virtio_user.send_expect("start", "testpmd> ", 120) From patchwork Fri Sep 4 08:18:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76512 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 24FDDA04C5; Fri, 4 Sep 2020 10:17:28 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1EA701C0D8; Fri, 4 Sep 2020 10:17:28 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 4EA511C0D1 for ; Fri, 4 Sep 2020 10:17:26 +0200 (CEST) IronPort-SDR: 9HE4KUYNBjU6YfAOlFRsRT9Uz7yZDocc9NPdKfW/k1KtDeZJU9hAYWO1a8L1q4tRA9IEyW90Xw p3HXHOHCkVyQ== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763288" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763288" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:25 -0700 IronPort-SDR: 9hluqMGNYuG0H7RSRf8atIz96AzVaJiL1oIt4XM3hpKGrnfOsMWtfZPj60fc+yaIRMoPkxJ6q8 set9anLfmUJQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782664" 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:24 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:23 +0800 Message-Id: <1599207525-22123-16-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 16/38] tests/TestSuite_loopback_virtio_user_server_mode.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_loopback_virtio_user_server_mode.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/TestSuite_loopback_virtio_user_server_mode.py b/tests/TestSuite_loopback_virtio_user_server_mode.py index d329d46..9503208 100644 --- a/tests/TestSuite_loopback_virtio_user_server_mode.py +++ b/tests/TestSuite_loopback_virtio_user_server_mode.py @@ -57,6 +57,7 @@ class TestLoopbackVirtioUserServerMode(TestCase): self.core_list = self.dut.get_core_list(self.core_config) self.core_list_user = self.core_list[0:3] self.core_list_host = self.core_list[3:6] + self.path=self.dut.apps_name['test-pmd'] def set_up(self): """ @@ -78,7 +79,7 @@ class TestLoopbackVirtioUserServerMode(TestCase): start testpmd on vhost """ eal_param = self.dut.create_eal_parameters(cores=self.core_list_host, prefix='vhost', no_pci=True, vdevs=['net_vhost0,iface=vhost-net,client=1,queues=%d' % queue_number]) - command_line_client = self.dut.target + "/app/testpmd " + eal_param + " -- -i --rxq=%d --txq=%d --nb-cores=%d %s" % (queue_number, queue_number, nb_cores, extern_params) + command_line_client = self.path + eal_param + " -- -i --rxq=%d --txq=%d --nb-cores=%d %s" % (queue_number, queue_number, nb_cores, extern_params) self.vhost.send_expect(command_line_client, "testpmd> ", 120) self.vhost.send_expect("set fwd mac", "testpmd> ", 120) @@ -94,7 +95,7 @@ class TestLoopbackVirtioUserServerMode(TestCase): eal_param = self.dut.create_eal_parameters(cores=self.core_list_user, prefix='virtio', no_pci=True, vdevs=['net_virtio_user0,mac=00:01:02:03:04:05,path=vhost-net,server=1,queues=1,%s' % args["version"]]) if self.check_2M_env: eal_param += " --single-file-segments" - command_line_user = self.dut.target + "/app/testpmd " + eal_param + " -- -i --rxq=1 --txq=1 --no-numa" + command_line_user = self.path + eal_param + " -- -i --rxq=1 --txq=1 --no-numa" self.virtio_user.send_expect(command_line_user, "testpmd> ", 120) self.virtio_user.send_expect("set fwd mac", "testpmd> ", 120) @@ -111,7 +112,7 @@ class TestLoopbackVirtioUserServerMode(TestCase): eal_param = self.dut.create_eal_parameters(cores=self.core_list_user, prefix='virtio', no_pci=True, vdevs=['net_virtio_user0,mac=00:01:02:03:04:05,path=vhost-net,server=1,queues=%d,%s' % (self.queue_number, mode)]) if self.check_2M_env: eal_param += " --single-file-segments" - command_line_user = self.dut.target + "/app/testpmd " + eal_param + " -- -i %s --nb-cores=%d --rxq=%d --txq=%d" % (extern_params, self.nb_cores, self.queue_number, self.queue_number) + command_line_user = self.path + eal_param + " -- -i %s --nb-cores=%d --rxq=%d --txq=%d" % (extern_params, self.nb_cores, self.queue_number, self.queue_number) self.virtio_user.send_expect(command_line_user, "testpmd> ", 120) self.virtio_user.send_expect("set fwd mac", "testpmd> ", 120) From patchwork Fri Sep 4 08:18:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76513 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 470C8A04C5; Fri, 4 Sep 2020 10:17:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 40AE51C0CA; Fri, 4 Sep 2020 10:17:30 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id E1FBADE0 for ; Fri, 4 Sep 2020 10:17:27 +0200 (CEST) IronPort-SDR: hjVUw8Uo5RjchHnCwGDO+sC/PKn5wT3vUIYHnB52YSj0kNpcHetOCDeqEUj+ARH+zhv/j/GY0u af+1ROn5+Dtw== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763290" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763290" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:26 -0700 IronPort-SDR: rNACanqpS3AaxpGfRUYO5MsO81ZyZSOKDGIM4qM0bE3az/MtORuBisLv6FYUygHHgYT0l4H3YG 2cavdqgy5TdQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782669" 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:25 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:24 +0800 Message-Id: <1599207525-22123-17-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 17/38] tests/TestSuite_multiple_pthread.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_multiple_pthread.py | 42 +++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/tests/TestSuite_multiple_pthread.py b/tests/TestSuite_multiple_pthread.py index 83ab7bd..d46ac70 100644 --- a/tests/TestSuite_multiple_pthread.py +++ b/tests/TestSuite_multiple_pthread.py @@ -56,6 +56,7 @@ class TestMultiplePthread(TestCase): self.cores = self.dut.get_core_list("1S/8C/1T", socket=self.socket) self.verify(self.cores is not None, "Requested 8 cores failed") self.out_view = {'header': [], 'data': []} + self.path=self.dut.apps_name["test-pmd"].rstrip() def set_up(self): """ @@ -80,7 +81,8 @@ class TestMultiplePthread(TestCase): Get cpu and thread statistics. """ mutiple_pthread_session = self.dut.new_session() - out = mutiple_pthread_session.send_expect("ps -C testpmd -L -opid,tid,%cpu,psr,args", "#", 20) + testpmd_name = self.path.split("/")[-1] + out = mutiple_pthread_session.send_expect(f"ps -C {testpmd_name} -L -opid,tid,%cpu,psr,args", "#", 20) m = cmdline.replace('"', '', 2) out_list = out.split(m) mutiple_pthread_session.send_expect("^C", "#") @@ -127,9 +129,9 @@ class TestMultiplePthread(TestCase): # Allocate enough streams based on the number of CPUs if len(cpu_list) > 2: queue_num = len(cpu_list) - cmdline = './%s/app/testpmd --lcores="%s" -n 4 -- -i --txq=%d --rxq=%d' % (self.target, lcores, queue_num, queue_num) + cmdline = './%s --lcores="%s" -n 4 -- -i --txq=%d --rxq=%d' % (self.path, lcores, queue_num, queue_num) else: - cmdline = './%s/app/testpmd --lcores="%s" -n 4 -- -i' % (self.target, lcores) + cmdline = './%s --lcores="%s" -n 4 -- -i' % (self.path, lcores) # start application self.dut.send_expect(cmdline, "testpmd", 60) @@ -203,25 +205,25 @@ class TestMultiplePthread(TestCase): """ Test an random parameter from an defined table which has a couple of invalid lcore parameters. """ - cmdline_list = ["./%s/app/testpmd --lcores='(0-,4-7)@(4,5)' -n 4 -- -i", - "./%s/app/testpmd --lcores='(-1,4-7)@(4,5)' -n 4 -- -i", - "./%s/app/testpmd --lcores='(0,4-7-9)@(4,5)' -n 4 -- -i", - "./%s/app/testpmd --lcores='(0,abcd)@(4,5)' -n 4 -- -i", - "./%s/app/testpmd --lcores='(0,4-7)@(1-,5)' -n 4 -- -i", - "./%s/app/testpmd --lcores='(0,4-7)@(-1,5)' -n 4 -- -i", - "./%s/app/testpmd --lcores='(0,4-7)@(4,5-8-9)' -n 4 -- -i", - "./%s/app/testpmd --lcores='(0,4-7)@(abc,5)' -n 4 -- -i", - "./%s/app/testpmd --lcores='(0,4-7)@(4,xyz)' -n 4 -- -i", - "./%s/app/testpmd --lcores='(0,4-7)=(8,9)' -n 4 -- -i", - "./%s/app/testpmd --lcores='2,3 at 4,(0-1,,4))' -n 4 -- -i", - "./%s/app/testpmd --lcores='[0-,4-7]@(4,5)' -n 4 -- -i", - "./%s/app/testpmd --lcores='(0-,4-7)@[4,5]' -n 4 -- -i", - "./%s/app/testpmd --lcores='3-4 at 3,2 at 5-6' -n 4 -- -i", - "./%s/app/testpmd --lcores='2,,3''2--3' -n 4 -- -i", - "./%s/app/testpmd --lcores='2,,,3''2--3' -n 4 -- -i"] + cmdline_list = ["./%s --lcores='(0-,4-7)@(4,5)' -n 4 -- -i", + "./%s --lcores='(-1,4-7)@(4,5)' -n 4 -- -i", + "./%s --lcores='(0,4-7-9)@(4,5)' -n 4 -- -i", + "./%s --lcores='(0,abcd)@(4,5)' -n 4 -- -i", + "./%s --lcores='(0,4-7)@(1-,5)' -n 4 -- -i", + "./%s --lcores='(0,4-7)@(-1,5)' -n 4 -- -i", + "./%s --lcores='(0,4-7)@(4,5-8-9)' -n 4 -- -i", + "./%s --lcores='(0,4-7)@(abc,5)' -n 4 -- -i", + "./%s --lcores='(0,4-7)@(4,xyz)' -n 4 -- -i", + "./%s --lcores='(0,4-7)=(8,9)' -n 4 -- -i", + "./%s --lcores='2,3 at 4,(0-1,,4))' -n 4 -- -i", + "./%s --lcores='[0-,4-7]@(4,5)' -n 4 -- -i", + "./%s --lcores='(0-,4-7)@[4,5]' -n 4 -- -i", + "./%s --lcores='3-4 at 3,2 at 5-6' -n 4 -- -i", + "./%s --lcores='2,,3''2--3' -n 4 -- -i", + "./%s --lcores='2,,,3''2--3' -n 4 -- -i",] cmdline = random.sample(cmdline_list, 1) - out = self.dut.send_expect(cmdline[0] % self.target, "#", 60) + out = self.dut.send_expect(cmdline[0]%self.path, "#", 60) self.verify("invalid parameter" in out, "it's a valid parameter") def tear_down(self): From patchwork Fri Sep 4 08:18:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76514 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 7468BA04DB; Fri, 4 Sep 2020 10:17:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 655AF1C117; Fri, 4 Sep 2020 10:17:30 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id C1A6EDE0 for ; Fri, 4 Sep 2020 10:17:28 +0200 (CEST) IronPort-SDR: aYysX0CgSlqgrvS+avLuhb2EYc90/yQRcy8CEUzGXTfAoVCaHrzS5f+KcIhxh3/+tR5xeisy7/ 6XynTSivTEbg== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763291" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763291" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:28 -0700 IronPort-SDR: VkNHr8w9inOR+GoOB/VrR/urBnQ0+jEiV7ts8T+P+9yYQAQV/NqvESMnCalq4UeA9IG5saHF09 46uNPzxL2kkw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782677" 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:27 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:25 +0800 Message-Id: <1599207525-22123-18-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 18/38] tests/TestSuite_ntb.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_ntb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestSuite_ntb.py b/tests/TestSuite_ntb.py index e01bd4b..34dda6a 100644 --- a/tests/TestSuite_ntb.py +++ b/tests/TestSuite_ntb.py @@ -136,7 +136,7 @@ class TestNtb(TestCase): cmd_opt = " ".join(["{}={}".format(key, param[key]) for key in param.keys()]) self.get_core_list() - app = "./examples/ntb/build/ntb_fwd" + app = self.dut.apps_name['ntb_fwd'] eal_host = self.ntb_host.create_eal_parameters(cores=self.host_core_list) eal_client = self.ntb_client.create_eal_parameters(cores=self.client_core_list) host_cmd_line = ' '.join([app, eal_host, cmd_opt]) From patchwork Fri Sep 4 08:18:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76515 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 8C852A04C5; Fri, 4 Sep 2020 10:17:32 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 84DA51C10C; Fri, 4 Sep 2020 10:17:32 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 5A47C1C10C for ; Fri, 4 Sep 2020 10:17:30 +0200 (CEST) IronPort-SDR: 68Gn6fcKySUODoGaksodqt3BB83fnUAV79sOCDoDKNV5jFF6CJyYI6yqRMtfyuwN3KaRzqzBeS 00PbJwcEH0+g== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763292" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763292" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:29 -0700 IronPort-SDR: J9STGvkDNCnaYAyi8utyJ57COeK6v0kCdDF8vatQCfhbKwdPhp8qKFvpszSOIGWWo7R7Okdk9x dB3xuk8chPdg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782684" 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:28 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:26 +0800 Message-Id: <1599207525-22123-19-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 19/38] tests/TestSuite_nvgre.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_nvgre.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/tests/TestSuite_nvgre.py b/tests/TestSuite_nvgre.py index 663968b..e81b370 100644 --- a/tests/TestSuite_nvgre.py +++ b/tests/TestSuite_nvgre.py @@ -384,7 +384,7 @@ class TestNvgre(TestCase): # start testpmd self.pmdout = PmdOutput(self.dut) - + self.path=self.dut.apps_name['test-pmd'] # init port self.dut_rx_port = ports[0] self.dut_tx_port = ports[1] @@ -452,8 +452,8 @@ class TestNvgre(TestCase): """ send nvgre packet and check whether testpmd detect the correct packet type """ - out = self.dut.send_expect("./%s/app/testpmd -c %s -n %d -- -i --disable-rss --rxq=4 --txq=4 --nb-cores=4 --portmask=%s" - % (self.target, self.coremask, self.dut.get_memory_channels(), self.portmask), "testpmd>", 30) + out = self.dut.send_expect("%s -c %s -n %d -- -i --disable-rss --rxq=4 --txq=4 --nb-cores=4 --portmask=%s" + % (self.path, self.coremask, self.dut.get_memory_channels(), self.portmask), "testpmd>", 30) out = self.dut.send_expect("set fwd rxonly", "testpmd>", 10) self.dut.send_expect("set verbose 1", "testpmd>", 10) @@ -481,8 +481,8 @@ class TestNvgre(TestCase): """ send nvgre packet and check whether receive packet in assigned queue """ - self.dut.send_expect("./%s/app/testpmd -c %s -n %d -- -i --disable-rss --rxq=4 --txq=4 --nb-cores=4 --portmask=%s" - % (self.target, self.coremask, self.dut.get_memory_channels(), self.portmask), "testpmd>", 30) + self.dut.send_expect("%s -c %s -n %d -- -i --disable-rss --rxq=4 --txq=4 --nb-cores=4 --portmask=%s" + % (self.path, self.coremask, self.dut.get_memory_channels(), self.portmask), "testpmd>", 30) self.dut.send_expect("set fwd rxonly", "testpmd>", 10) self.dut.send_expect("set verbose 1", "testpmd>", 10) @@ -557,8 +557,8 @@ class TestNvgre(TestCase): self.logger.info("chksums_ref:" + str(chksums_default)) # start testpmd with 2queue/1port - out = self.dut.send_expect("./%s/app/testpmd -c %s -n %d -- -i --disable-rss --rxq=4 --txq=4 --nb-cores=4 --portmask=%s --enable-rx-cksum" - % (self.target, self.coremask, self.dut.get_memory_channels(), self.portmask), "testpmd>", 30) + out = self.dut.send_expect("%s -c %s -n %d -- -i --disable-rss --rxq=4 --txq=4 --nb-cores=4 --portmask=%s --enable-rx-cksum" + % (self.path, self.coremask, self.dut.get_memory_channels(), self.portmask), "testpmd>", 30) # disable vlan filter self.dut.send_expect('vlan set filter off %d' % self.dut_rx_port, "testpmd") @@ -762,8 +762,8 @@ class TestNvgre(TestCase): self.nvgre_filter(filter_type="imac", remove=True) config = NvgreTestConfig(self) # config.outer_mac_dst = self.dut_port_mac - self.dut.send_expect("./%s/app/testpmd -c %s -n %d -- -i --disable-rss --rxq=4 --txq=4 --nb-cores=4 --portmask=%s" - % (self.target, self.coremask, self.dut.get_memory_channels(), self.portmask), "testpmd>", 30) + self.dut.send_expect("%s -c %s -n %d -- -i --disable-rss --rxq=4 --txq=4 --nb-cores=4 --portmask=%s" + % (self.path, self.coremask, self.dut.get_memory_channels(), self.portmask), "testpmd>", 30) out = self.dut.send_expect("tunnel_filter add %d %s %s %s %d nvgre %s %d %d" % (self.dut_rx_port, config.outer_mac_dst, self.invalid_mac, config.inner_ip_dst, vlan_id, filter_type, config.tni, queue_id), "testpmd>", 10) @@ -825,7 +825,7 @@ class TestNvgre(TestCase): core_list = self.dut.get_core_list('1S/%dC/1T' % (self.tunnel_multiqueue * 2), socket=self.ports_socket) core_mask = utils.create_mask(core_list) - command_line = "./%s/app/testpmd -c %s -n %d -- -i --disable-rss --coremask=%s --rxq=4 --txq=4 --portmask=%s" % (self.target, + command_line = "%s -c %s -n %d -- -i --disable-rss --coremask=%s --rxq=4 --txq=4 --portmask=%s" % (self.path, self.all_cores_mask, self.dut.get_memory_channels(), core_mask, self.portmask) @@ -942,8 +942,8 @@ class TestNvgre(TestCase): core_mask = utils.create_mask(core_list) - command_line = "./%s/app/testpmd -c %s -n %d -- -i \ - --disable-rss --coremask=%s --portmask=%s" % (self.target, + command_line = "%s -c %s -n %d -- -i \ + --disable-rss --coremask=%s --portmask=%s" % (self.path, all_cores_mask, self.dut.get_memory_channels(), core_mask, self.portmask) @@ -1000,3 +1000,4 @@ class TestNvgre(TestCase): Run after each test suite. """ pass + From patchwork Fri Sep 4 08:18:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76516 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 B29AAA04DB; Fri, 4 Sep 2020 10:17:32 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ADA5C1C11C; Fri, 4 Sep 2020 10:17:32 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id E74FB1C0C2 for ; Fri, 4 Sep 2020 10:17:31 +0200 (CEST) IronPort-SDR: P1zSg64SLEhuvbL2iEhpmEk9AkAp41ICD4Kl2JXd+vmwnPcPQKkTGuF+Pyk2jYK4J9Ur+DotT7 aq16hqMN8zNg== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763294" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763294" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:31 -0700 IronPort-SDR: rzNsC5kcBU51B0t1ccHkFdZG1Z63+hV1w3sE6AqV1yuBTyoLUceAfZAq8o+aX/Qncz/6HPCC9B eg6fMVLEPpIQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782692" 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:30 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:27 +0800 Message-Id: <1599207525-22123-20-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 20/38] tests/TestSuite_perf_virtio_user_loopback.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_perf_virtio_user_loopback.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/TestSuite_perf_virtio_user_loopback.py b/tests/TestSuite_perf_virtio_user_loopback.py index 822e6d9..9f40d36 100644 --- a/tests/TestSuite_perf_virtio_user_loopback.py +++ b/tests/TestSuite_perf_virtio_user_loopback.py @@ -72,6 +72,7 @@ class TestPerfVirtioUserLoopback(TestCase): self.virtio_user = self.dut.new_session(suite="virtio-user") self.save_result_flag = True self.json_obj = dict() + self.path=self.dut.apps_name['test-pmd'] def set_up(self): """ @@ -107,7 +108,7 @@ class TestPerfVirtioUserLoopback(TestCase): """ eal_params = self.dut.create_eal_parameters(cores=self.core_list_host, no_pci=True, prefix='vhost') - command_line_client = self.dut.target + "/app/testpmd %s " + \ + command_line_client = self.path + " %s " + \ "--socket-mem %s --vdev " + \ "'net_vhost0,iface=vhost-net,queues=%d' -- -i --nb-cores=%d " + \ "--rxq=%d --txq=%d --txd=%d --rxd=%d" @@ -124,7 +125,7 @@ class TestPerfVirtioUserLoopback(TestCase): """ eal_params = self.dut.create_eal_parameters(cores=self.core_list_user, no_pci=True, prefix='virtio') - command_line_user = self.dut.target + "/app/testpmd %s " + \ + command_line_user = self.path+ " %s " + \ " --socket-mem %s " + \ "--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net,queues=%d,%s " + \ "-- -i %s --rss-ip --nb-cores=%d --rxq=%d --txq=%d --txd=%d --rxd=%d" From patchwork Fri Sep 4 08:18:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76517 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 DB8B7A04C5; Fri, 4 Sep 2020 10:17:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D40CB1C113; Fri, 4 Sep 2020 10:17:34 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 514C81C0C2 for ; Fri, 4 Sep 2020 10:17:33 +0200 (CEST) IronPort-SDR: Yh7GTJwDh8HWnzeVx76gjNOZsKymAIFgccuGgPw4B35jYZFFcNuu7yHdh+VOz/rUGTP/6Nl+Wg j8aZD5/fsVKw== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763297" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763297" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:32 -0700 IronPort-SDR: +7gY3H9w2Wy9ZBxZSxErtCuLXcwvyQeFeuJAinW90JMSyjXRDi42aX6i1SbXjEMZZkrFRUZAjQ lVlIr+rttQ2g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782699" 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:31 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:28 +0800 Message-Id: <1599207525-22123-21-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 21/38] tests/TestSuite_perf_vm2vm_virtio_net_perf.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_perf_vm2vm_virtio_net_perf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/TestSuite_perf_vm2vm_virtio_net_perf.py b/tests/TestSuite_perf_vm2vm_virtio_net_perf.py index ae8c975..4bf86c5 100644 --- a/tests/TestSuite_perf_vm2vm_virtio_net_perf.py +++ b/tests/TestSuite_perf_vm2vm_virtio_net_perf.py @@ -75,6 +75,7 @@ class TestPerfVM2VMVirtioNetPerf(TestCase): self.pmd_vhost = PmdOutput(self.dut, self.vhost) self.json_obj = dict() self.save_result_flag = True + self.path=self.dut.apps_name['test-pmd'] def set_up(self): """ @@ -162,12 +163,11 @@ class TestPerfVM2VMVirtioNetPerf(TestCase): zerocopy_arg = ",dequeue-zero-copy=1" else: zerocopy_arg = "" - testcmd = self.dut.target + "/app/testpmd " vdev1 = "--vdev 'net_vhost0,iface=%s/vhost-net0,queues=1%s' " % (self.base_dir, zerocopy_arg) vdev2 = "--vdev 'net_vhost1,iface=%s/vhost-net1,queues=1%s' " % (self.base_dir, zerocopy_arg) eal_params = self.dut.create_eal_parameters(cores=self.cores_list, prefix='vhost', no_pci=True) para = " -- -i --nb-cores=2 --txd=1024 --rxd=1024" - self.command_line = testcmd + eal_params + vdev1 + vdev2 + para + self.command_line = self.path + eal_params + vdev1 + vdev2 + para self.pmd_vhost.execute_cmd(self.command_line, timeout=30) self.pmd_vhost.execute_cmd('start', timeout=30) From patchwork Fri Sep 4 08:18:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76518 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 0BA75A04C5; Fri, 4 Sep 2020 10:17:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 02E081C0D9; Fri, 4 Sep 2020 10:17:36 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 8367E1C0CC for ; Fri, 4 Sep 2020 10:17:34 +0200 (CEST) IronPort-SDR: l9fqHkbHviPGDSV69/XjsQiDJqFZY8j6/zgupxZcf1f56qvOhgtMQxZUddjsh6wkCUK7KATHGH 6pTFbW6kcEgg== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763300" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763300" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:34 -0700 IronPort-SDR: PSVabO9DKiPmXTXBb3zmr8YFbqSxKiDA6+DsmyUhZMW4E/YGrqAAp7AIz8nQ4nXYjDENDk2Z7x gyfC7xdbFbjQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782708" 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:33 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:29 +0800 Message-Id: <1599207525-22123-22-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 22/38] tests/TestSuite_pmdpcap.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_pmdpcap.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/TestSuite_pmdpcap.py b/tests/TestSuite_pmdpcap.py index 509af0b..cec987a 100644 --- a/tests/TestSuite_pmdpcap.py +++ b/tests/TestSuite_pmdpcap.py @@ -66,6 +66,7 @@ class TestPmdPcap(TestCase): os_type = self.dut.get_os_type() if os_type == "freebsd": self.dut.send_expect("kldload contigmem", "#",20) + self.path=self.dut.apps_name['test-pmd'] def get_pcap_compile_config(self): config_head = "common_" @@ -128,11 +129,11 @@ class TestPmdPcap(TestCase): self.create_pcap_file(in_pcap, TestPmdPcap.pcap_file_sizes[0]) self.dut.session.copy_file_to(in_pcap) - command = ("./{}/app/testpmd -c {} -n {} " + + command = ("{} -c {} -n {} " + "--vdev=eth_pcap0,rx_pcap={},tx_pcap={} " + "-- -i --port-topology=chained --no-flush-rx") - self.dut.send_expect(command.format(self.target, core_mask, + self.dut.send_expect(command.format(self.path, core_mask, self.memory_channel, TestPmdPcap.dut_pcap_files_path + in_pcap, out_pcap), 'testpmd> ', 15) @@ -161,12 +162,12 @@ class TestPmdPcap(TestCase): self.create_pcap_file(in_pcap2, TestPmdPcap.pcap_file_sizes[1]) self.dut.session.copy_file_to(in_pcap2) - command = ("./{}/app/testpmd -c {} -n {} " + + command = ("{} -c {} -n {} " + "--vdev=eth_pcap0,rx_pcap={},tx_pcap={} " + "--vdev=eth_pcap1,rx_pcap={},tx_pcap={} " + "-- -i --no-flush-rx") - self.dut.send_expect(command.format(self.target, core_mask, + self.dut.send_expect(command.format(self.path, core_mask, self.memory_channel, TestPmdPcap.dut_pcap_files_path + in_pcap1, From patchwork Fri Sep 4 08:18:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76519 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 25614A04C5; Fri, 4 Sep 2020 10:17:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1DB281C0CC; Fri, 4 Sep 2020 10:17:38 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id DF463255 for ; Fri, 4 Sep 2020 10:17:35 +0200 (CEST) IronPort-SDR: f9jgAH0Bmqb5Vn+NMJVkpbYbjubZM1J7mYJWqjUl26CVtyJOULmXMYKgMyptuhd7t6hJtliZZd ornmMadiGirQ== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763308" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763308" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:35 -0700 IronPort-SDR: RrKAEXzVFcb872wwJ51fWotu/D9Nc8Qw3dft1Ws2bM9T94W4Qc1X6R+WBvBRCRy//YigyqqkT+ 4GgBr9h8fDqA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782713" 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:34 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:30 +0800 Message-Id: <1599207525-22123-23-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 23/38] tests/TestSuite_pmdrss_hash.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_pmdrss_hash.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/TestSuite_pmdrss_hash.py b/tests/TestSuite_pmdrss_hash.py index b3c1d66..7e6d0bf 100644 --- a/tests/TestSuite_pmdrss_hash.py +++ b/tests/TestSuite_pmdrss_hash.py @@ -442,6 +442,7 @@ class TestPmdrssHash(TestCase): self.verify(False, "NIC Unsupported:%s" % str(self.nic)) ports = self.dut.get_ports(self.nic) self.verify(len(ports) >= 1, "Not enough ports available") + self.path=self.dut.apps_name['test-pmd'] def set_up(self): """ @@ -461,8 +462,8 @@ class TestPmdrssHash(TestCase): # test with different rss queues self.dut.send_expect( - "./%s/app/testpmd -c %s -n %d -- -i --rxq=%d --txq=%d" % - (self.target, self.coremask, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120) + "%s -c %s -n %d -- -i --rxq=%d --txq=%d" % + (self.path, self.coremask, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120) for iptype, rsstype in list(iptypes.items()): self.dut.send_expect("set verbose 8", "testpmd> ") @@ -499,8 +500,8 @@ class TestPmdrssHash(TestCase): # test with different rss queues self.dut.send_expect( - "./%s/app/testpmd -c %s -n %d -- -i --rxq=%d --txq=%d" % - (self.target, self.coremask, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120) + "%s -c %s -n %d -- -i --rxq=%d --txq=%d" % + (self.path, self.coremask, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120) for iptype, rsstype in list(iptypes.items()): self.dut.send_expect("set verbose 8", "testpmd> ") @@ -544,8 +545,8 @@ class TestPmdrssHash(TestCase): # test with different rss queues self.dut.send_expect( - "./%s/app/testpmd -c %s -n %d -- -i --rxq=%d --txq=%d" % - (self.target, self.coremask, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120) + "%s -c %s -n %d -- -i --rxq=%d --txq=%d" % + (self.path, self.coremask, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120) for iptype, rsstype in list(iptypes.items()): self.logger.info("***********************%s rss test********************************" % iptype) @@ -584,8 +585,8 @@ class TestPmdrssHash(TestCase): # test with different rss queues self.dut.send_expect( - "./%s/app/testpmd -c %s -n %d -- -i --rxq=%d --txq=%d" % - (self.target, self.coremask, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120) + "%s -c %s -n %d -- -i --rxq=%d --txq=%d" % + (self.path, self.coremask, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120) for iptype, rsstype in list(iptypes.items()): self.dut.send_expect("set verbose 8", "testpmd> ") @@ -620,7 +621,7 @@ class TestPmdrssHash(TestCase): "fortpark_TLV","fortpark_BASE-T", "fortville_25g", "carlsville", "foxville"], "NIC Unsupported: " + str(self.nic)) - self.dut.send_expect("./%s/app/testpmd -c %s -n %d -- -i" % (self.target, self.coremask, self.dut.get_memory_channels()), "testpmd> ", 120) + self.dut.send_expect("%s -c %s -n %d -- -i" % (self.path, self.coremask, self.dut.get_memory_channels()), "testpmd> ", 120) self.dut.send_expect("set promisc all off", "testpmd> ") out = self.dut.send_expect("create bonded device 3 0", "testpmd> ", 30) bond_device_id = int(re.search("port \d+", out).group().split(" ")[-1].strip()) From patchwork Fri Sep 4 08:18:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76520 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 44E6FA04C5; Fri, 4 Sep 2020 10:17:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3D4341C0D7; Fri, 4 Sep 2020 10:17:39 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 40CE2255 for ; Fri, 4 Sep 2020 10:17:37 +0200 (CEST) IronPort-SDR: fj5O26JhnNaWAIRM1Z2cl3US6aG9IdmQEvOjrmEMou/3aeoysEM99W1pRX5WUajPVKuRjV1pOx YgzgsV+iwxfA== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763309" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763309" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:36 -0700 IronPort-SDR: uwEwz/h9iS377QVEPIO9DIzM81I5sv4uXPrhI8gp8rRXiAtv8QfinCuOTnGBXDD7OzG4krYlWv ahSbrcaQ5+xQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782719" 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:35 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:31 +0800 Message-Id: <1599207525-22123-24-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 24/38] tests/TestSuite_pvp_diff_qemu_version.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_pvp_diff_qemu_version.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/TestSuite_pvp_diff_qemu_version.py b/tests/TestSuite_pvp_diff_qemu_version.py index 91b7bd3..54f148f 100644 --- a/tests/TestSuite_pvp_diff_qemu_version.py +++ b/tests/TestSuite_pvp_diff_qemu_version.py @@ -82,6 +82,8 @@ class TestVhostPVPDiffQemuVersion(TestCase): self.base_dir = self.dut.base_dir.replace('~', '/root') self.pci_info = self.dut.ports_info[0]['pci'] self.number_of_ports = 1 + self.path=self.dut.apps_name['test-pmd'] + self.testpmd_name = self.path.split("/")[-1] def set_up(self): """ @@ -89,7 +91,7 @@ class TestVhostPVPDiffQemuVersion(TestCase): """ self.vhost = self.dut.new_session(suite="vhost-user") self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#") - self.dut.send_expect("killall -s INT testpmd", "#") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name , "#") self.dut.send_expect("killall -I qemu-system-x86_64", '#', 20) def packet_params_set(self): @@ -201,11 +203,10 @@ class TestVhostPVPDiffQemuVersion(TestCase): """ Launch the vhost testpmd """ - testcmd = self.dut.target + "/app/testpmd " vdev = [r"'eth_vhost0,iface=%s/vhost-net,queues=1'" % self.base_dir] eal_params = self.dut.create_eal_parameters(cores=self.cores, prefix='vhost', ports=[self.pci_info], vdevs=vdev) para = " -- -i --nb-cores=1 --txd=1024 --rxd=1024" - command_line_client = testcmd + eal_params + para + command_line_client = self.path + eal_params + para self.vhost.send_expect(command_line_client, "testpmd> ", 30) self.vhost.send_expect("set fwd mac", "testpmd> ", 30) self.vhost.send_expect("start", "testpmd> ", 30) @@ -215,7 +216,7 @@ class TestVhostPVPDiffQemuVersion(TestCase): Start testpmd in vm """ if self.vm_dut is not None: - vm_testpmd = self.dut.target + "/app/testpmd -c 0x3 -n 3" \ + vm_testpmd = self.path + " -c 0x3 -n 3" \ + " -- -i --nb-cores=1 --txd=1024 --rxd=1024" self.vm_dut.send_expect(vm_testpmd, "testpmd> ", 20) self.vm_dut.send_expect("set fwd mac", "testpmd> ", 20) @@ -314,7 +315,7 @@ class TestVhostPVPDiffQemuVersion(TestCase): """ self.dut.close_session(self.vhost) self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") - self.dut.send_expect("killall -s INT testpmd", "#") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name , "#") time.sleep(2) def tear_down_all(self): From patchwork Fri Sep 4 08:18:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76521 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 BF33BA04C5; Fri, 4 Sep 2020 10:17:40 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 64D3D1C122; Fri, 4 Sep 2020 10:17:40 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 9D082255 for ; Fri, 4 Sep 2020 10:17:38 +0200 (CEST) IronPort-SDR: yOsHiQ6mmEFQ3mj8/2WjiBhPz9sIO4ddXtbVJOEFBweRw32cxO1ypO+PeLqEAO7c6RSiA5RD8s 2DXJh9UZ9LdQ== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763310" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763310" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:38 -0700 IronPort-SDR: noB7sBFBiA9+FdcVH8/v16kVKDQjxrwJCtLvCFpmZBYzGaYs/sZWP5+Z8SzdgwgNlj8wlttfCW NMLz9HGdcvxA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782727" 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:37 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:32 +0800 Message-Id: <1599207525-22123-25-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 25/38] tests/TestSuite_pvp_multi_paths_performance.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_pvp_multi_paths_performance.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/TestSuite_pvp_multi_paths_performance.py b/tests/TestSuite_pvp_multi_paths_performance.py index 3e6e593..21106be 100644 --- a/tests/TestSuite_pvp_multi_paths_performance.py +++ b/tests/TestSuite_pvp_multi_paths_performance.py @@ -98,6 +98,8 @@ class TestPVPMultiPathPerformance(TestCase): self.gap = self.get_suite_cfg()['accepted_tolerance'] self.test_result = {} self.nb_desc = self.test_parameters[64][0] + self.path=self.dut.apps_name['test-pmd'] + self.testpmd_name = self.path.split("/")[-1] @property def check_value(self): @@ -157,12 +159,12 @@ class TestPVPMultiPathPerformance(TestCase): """ self.dut.send_expect("rm -rf ./vhost.out", "#") self.dut.send_expect("rm -rf ./vhost-net*", "#") - self.dut.send_expect("killall -s INT testpmd", "#") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name , "#") self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") eal_param = self.dut.create_eal_parameters(cores=self.core_list_host, prefix='vhost', ports=[self.dut.ports_info[self.dut_ports[0]]['pci']], vdevs=['net_vhost0,iface=vhost-net,queues=1,client=0']) - command_line_client = "./%s/app/testpmd " % self.target + eal_param + \ + command_line_client = self.path + eal_param + \ " -- -i --nb-cores=1 --txd=%d --rxd=%d" % (self.nb_desc, self.nb_desc) self.vhost.send_expect(command_line_client, "testpmd> ", 120) self.vhost.send_expect("set fwd mac", "testpmd> ", 120) @@ -178,7 +180,7 @@ class TestPVPMultiPathPerformance(TestCase): args["version"]]) if self.check_2M_env: eal_param += " --single-file-segments" - command_line_user = "./%s/app/testpmd " % self.target + eal_param + \ + command_line_user = self.path + eal_param + \ " -- -i %s --rss-ip --nb-cores=1 --txd=%d --rxd=%d" % \ (args["path"], self.nb_desc, self.nb_desc) self.vhost_user = self.dut.new_session(suite="user") From patchwork Fri Sep 4 08:18:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76522 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 94D7DA04DB; Fri, 4 Sep 2020 10:17:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 868251C124; Fri, 4 Sep 2020 10:17:41 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 3532F1C11F for ; Fri, 4 Sep 2020 10:17:40 +0200 (CEST) IronPort-SDR: x9lbauHNE/oqumG+jm1Ni8xw+m/YvJTl7CpUZVXLTWUcz5wcPcsrTIeIVfk2kID8D1rFGmuFsR dKkP1D2RsdjQ== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763313" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763313" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:39 -0700 IronPort-SDR: 2HLIRv6sXE3MZiOFImgqQABSgIDzf3vKWFkj1IJ2iXR+HjsSaOxd/jYo/gz2CrV6Aq60ISEO4Y w84Si0DPWrQQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782738" 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:38 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:33 +0800 Message-Id: <1599207525-22123-26-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 26/38] tests/TestSuite_pvp_multi_paths_vhost_single_core_performance.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_pvp_multi_paths_vhost_single_core_performance.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/TestSuite_pvp_multi_paths_vhost_single_core_performance.py b/tests/TestSuite_pvp_multi_paths_vhost_single_core_performance.py index 6f0f139..e628a44 100644 --- a/tests/TestSuite_pvp_multi_paths_vhost_single_core_performance.py +++ b/tests/TestSuite_pvp_multi_paths_vhost_single_core_performance.py @@ -71,6 +71,8 @@ class TestPVPMultiPathVhostPerformance(TestCase): self.vhost = self.dut.new_session(suite="vhost") self.save_result_flag = True self.json_obj = {} + self.path=self.dut.apps_name['test-pmd'] + self.testpmd_name = self.path.split("/")[-1] def set_up(self): """ @@ -156,12 +158,12 @@ class TestPVPMultiPathVhostPerformance(TestCase): # Clean the execution ENV self.dut.send_expect("rm -rf ./vhost.out", "#") self.dut.send_expect("rm -rf ./vhost-net*", "#") - self.dut.send_expect("killall -s INT testpmd", "#") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name , "#") self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") eal_param = self.dut.create_eal_parameters(cores=self.core_list_host, prefix='vhost', no_pci=True, vdevs=['net_vhost0,iface=vhost-net,queues=1']) - command_line_client = "./%s/app/testpmd " % self.target + eal_param + \ + command_line_client =self.path + eal_param + \ " -- -i --nb-cores=1 --txd=%d --rxd=%d" % (self.nb_desc, self.nb_desc) self.vhost.send_expect(command_line_client, "testpmd> ", 120) self.vhost.send_expect("set fwd mac", "testpmd> ", 120) @@ -177,7 +179,7 @@ class TestPVPMultiPathVhostPerformance(TestCase): args["version"]]) if self.check_2M_env: eal_param += " --single-file-segments" - command_line_user = "./%s/app/testpmd " % self.target + eal_param + \ + command_line_user = self.path + eal_param + \ " -- -i %s --nb-cores=2 --txd=%d --rxd=%d" % \ (args["path"], self.nb_desc, self.nb_desc) self.vhost_user.send_expect(command_line_user, "testpmd> ", 120) From patchwork Fri Sep 4 08:18:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76523 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 CCDF7A04C5; Fri, 4 Sep 2020 10:17:43 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B71391C11F; Fri, 4 Sep 2020 10:17:43 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 62AF61C11F for ; Fri, 4 Sep 2020 10:17:41 +0200 (CEST) IronPort-SDR: kjwsI/kLxAE7q6Sk5g2nIp8uX9tRxEWB4pURSe9XRmjjKQbv7bH1LTbmfyocSlIV8XLQK6nIla m7s9O7gcna9w== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763317" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763317" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:40 -0700 IronPort-SDR: T3p4gs3iJ+orsjUgZ6PhYaYt72woH9gnuTBPijL4ZFvdE3pp1b+ISrllqwaOXI4kDYjXTwGB32 SMXrkF+Oojxw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782749" 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:39 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:34 +0800 Message-Id: <1599207525-22123-27-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 27/38] tests/TestSuite_pvp_multi_paths_virtio_single_core_performance.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_pvp_multi_paths_virtio_single_core_performance.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/TestSuite_pvp_multi_paths_virtio_single_core_performance.py b/tests/TestSuite_pvp_multi_paths_virtio_single_core_performance.py index 13ec493..00e7df7 100644 --- a/tests/TestSuite_pvp_multi_paths_virtio_single_core_performance.py +++ b/tests/TestSuite_pvp_multi_paths_virtio_single_core_performance.py @@ -72,6 +72,8 @@ class TestPVPMultiPathVirtioPerformance(TestCase): self.vhost = self.dut.new_session(suite="vhost") self.save_result_flag = True self.json_obj = {} + self.path=self.dut.apps_name['test-pmd'] + self.testpmd_name = self.path.split("/")[-1] def set_up(self): """ @@ -159,12 +161,12 @@ class TestPVPMultiPathVirtioPerformance(TestCase): """ self.dut.send_expect("rm -rf ./vhost.out", "#") self.dut.send_expect("rm -rf ./vhost-net*", "#") - self.dut.send_expect("killall -s INT testpmd", "#") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name , "#") self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") eal_param = self.dut.create_eal_parameters(socket=self.ports_socket, cores=self.core_list_host, prefix='vhost', ports=[self.dut.ports_info[self.dut_ports[0]]['pci']], vdevs=['net_vhost0,iface=vhost-net,queues=1,client=0']) - command_line_client = "./%s/app/testpmd " % self.target + eal_param + \ + command_line_client = self.path + eal_param + \ ' -- -i --nb-cores=2 --txd=%d --rxd=%d' % (self.nb_desc, self.nb_desc) self.vhost.send_expect(command_line_client, "testpmd> ", 120) self.vhost.send_expect("set fwd io", "testpmd> ", 120) @@ -177,7 +179,7 @@ class TestPVPMultiPathVirtioPerformance(TestCase): eal_param = self.dut.create_eal_parameters(socket=self.ports_socket, cores=self.core_list_user, prefix='virtio', no_pci=True, vdevs=['net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net,%s' % args["version"]]) if self.check_2M_env: eal_param += " --single-file-segments" - command_line_user = "./%s/app/testpmd " % self.target + eal_param + \ + command_line_user = self.path + eal_param + \ " -- -i %s --rss-ip --nb-cores=1 --txd=%d --rxd=%d" % ( args["path"], self.nb_desc, self.nb_desc) self.vhost_user.send_expect(command_line_user, "testpmd> ", 120) From patchwork Fri Sep 4 08:18:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76524 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 0F7AEA04C5; Fri, 4 Sep 2020 10:17:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E10B21C128; Fri, 4 Sep 2020 10:17:44 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id BE7821C11F for ; Fri, 4 Sep 2020 10:17:42 +0200 (CEST) IronPort-SDR: auk1bCvV0ZXPUe4QXKo2XvIX+CAwYhbwwhA9ZyUNDREdsT/HGily8y9ancKjOz9g+X5hOnKWKU SoIXY+atByzQ== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763318" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763318" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:42 -0700 IronPort-SDR: 2I2fQFLJFTg6nyMFP1n2VbBGE3S9feK23urQe3UYcWu0BYVkmR6MYJqOvVABqSQCMU0h4Ya8U3 +YzXER97Lwzg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782760" 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:41 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:35 +0800 Message-Id: <1599207525-22123-28-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 28/38] tests/TestSuite_pvp_qemu_multi_paths_port_restart.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_pvp_qemu_multi_paths_port_restart.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/TestSuite_pvp_qemu_multi_paths_port_restart.py b/tests/TestSuite_pvp_qemu_multi_paths_port_restart.py index 877d40b..1c31ce6 100644 --- a/tests/TestSuite_pvp_qemu_multi_paths_port_restart.py +++ b/tests/TestSuite_pvp_qemu_multi_paths_port_restart.py @@ -73,6 +73,8 @@ class TestPVPQemuMultiPathPortRestart(TestCase): self.pktgen_helper = PacketGeneratorHelper() self.pci_info = self.dut.ports_info[0]['pci'] self.number_of_ports = 1 + self.path=self.dut.apps_name['test-pmd'] + self.testpmd_name = self.path.split("/")[-1] def set_up(self): """ @@ -80,7 +82,7 @@ class TestPVPQemuMultiPathPortRestart(TestCase): """ # Clean the execution ENV self.dut.send_expect("rm -rf ./vhost.out", "#") - self.dut.send_expect("killall -s INT testpmd", "#") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name , "#") self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") # Prepare the result table self.table_header = ["FrameSize(B)", "Mode", @@ -93,13 +95,12 @@ class TestPVPQemuMultiPathPortRestart(TestCase): """ start testpmd on vhost """ - self.dut.send_expect("killall -s INT testpmd", "#") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name , "#") self.dut.send_expect("rm -rf ./vhost-net*", "#") - testcmd = self.dut.target + "/app/testpmd " vdev = [r"'net_vhost0,iface=vhost-net,queues=1'"] eal_params = self.dut.create_eal_parameters(cores=self.core_list, prefix='vhost', ports=[self.pci_info], vdevs=vdev) para = " -- -i --nb-cores=1 --txd=1024 --rxd=1024" - command_line_client = testcmd + eal_params + para + command_line_client = self.path + eal_params + para self.vhost.send_expect(command_line_client, "testpmd> ", 120) self.vhost.send_expect("set fwd mac", "testpmd> ", 120) self.vhost.send_expect("start", "testpmd> ", 120) @@ -109,16 +110,16 @@ class TestPVPQemuMultiPathPortRestart(TestCase): start testpmd in vm depend on different path """ if path == "mergeable": - command = self.dut.target + "/app/testpmd " + \ + command = self.path + \ "-c 0x3 -n 3 -- -i " + \ "--nb-cores=1 --txd=1024 --rxd=1024" elif path == "normal": - command = self.dut.target + "/app/testpmd " + \ + command = self.path + \ "-c 0x3 -n 3 -- -i " + \ "--tx-offloads=0x0 --enable-hw-vlan-strip " + \ "--nb-cores=1 --txd=1024 --rxd=1024" elif path == "vector_rx": - command = self.dut.target + "/app/testpmd " + \ + command = self.path + \ "-c 0x3 -n 3 -- -i " + \ "--nb-cores=1 --txd=1024 --rxd=1024" self.vm_dut.send_expect(command, "testpmd> ", 30) @@ -356,7 +357,7 @@ class TestPVPQemuMultiPathPortRestart(TestCase): """ Run after each test case. """ - self.dut.send_expect("killall -s INT testpmd", "#") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name , "#") self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") self.close_session() time.sleep(2) From patchwork Fri Sep 4 08:18:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76525 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 4909BA04C5; Fri, 4 Sep 2020 10:17:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1419A1C12C; Fri, 4 Sep 2020 10:17:45 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 228691C128 for ; Fri, 4 Sep 2020 10:17:43 +0200 (CEST) IronPort-SDR: RQnnXC/44PNUBbEY5v2DaAaR5ssKJPXa8jq2qtY+Tm7PB4baX5EGB/QAosSZZFpfzPVevzbEqX KE7EQj+CRJXw== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763319" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763319" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:43 -0700 IronPort-SDR: cj1TOh2v552wS7Muj0DzOVPpVe8/ae1d+/XZ6IZ6RchReIzIyARLALpBaPxkf0H9A0joYn7QWh wMu+AwarK0Ew== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782768" 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:42 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:36 +0800 Message-Id: <1599207525-22123-29-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 29/38] tests/TestSuite_pvp_share_lib.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_pvp_share_lib.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/TestSuite_pvp_share_lib.py b/tests/TestSuite_pvp_share_lib.py index 78e2243..56435db 100644 --- a/tests/TestSuite_pvp_share_lib.py +++ b/tests/TestSuite_pvp_share_lib.py @@ -68,13 +68,15 @@ class TestPVPShareLib(TestCase): self.tester.send_expect('mkdir -p %s' % self.out_path, '# ') # create an instance to set stream field setting self.pktgen_helper = PacketGeneratorHelper() + self.path=self.dut.apps_name['test-pmd'] + self.testpmd_name = self.path.split("/")[-1] def set_up(self): """ Run before each test case. """ self.dut.send_expect("rm -rf ./vhost-net*", "# ") - self.dut.send_expect("killall -s INT testpmd", "# ") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") self.vhost_user = self.dut.new_session(suite="vhost-user") self.virtio_user = self.dut.new_session(suite="virtio-user") self.vhost_user.send_expect("export LD_LIBRARY_PATH=%s/%s/lib:$LD_LIBRARY_PATH" % @@ -139,7 +141,7 @@ class TestPVPShareLib(TestCase): eal_param = self.dut.create_eal_parameters(socket=self.ports_socket, cores=self.core_list_vhost_user, prefix='vhost', vdevs=['net_vhost0,iface=vhost-net,queues=1']) eal_param += " -d librte_pmd_vhost.so -d librte_pmd_%s.so -d librte_mempool_ring.so --file-prefix=vhost" % driver - command_line_client = "./%s/app/testpmd " % self.target + eal_param + ' -- -i' + command_line_client = self.path + eal_param + ' -- -i' self.vhost_user.send_expect(command_line_client, "testpmd> ", 120) self.vhost_user.send_expect("set fwd mac", "testpmd> ", 120) @@ -155,7 +157,7 @@ class TestPVPShareLib(TestCase): if self.check_2M_env: eal_param += " --single-file-segments" eal_param += " -d librte_pmd_virtio.so -d librte_mempool_ring.so" - command_line_user = "./%s/app/testpmd " % self.target + eal_param + " -- -i" + command_line_user = self.path + eal_param + " -- -i" self.virtio_user.send_expect(command_line_user, "testpmd> ", 120) self.virtio_user.send_expect("start", "testpmd> ", 120) @@ -196,7 +198,7 @@ class TestPVPShareLib(TestCase): """ Run after each test case. """ - self.dut.send_expect("killall -s INT testpmd", "# ") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") def tear_down_all(self): """ From patchwork Fri Sep 4 08:18:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76526 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 85C7BA04B1; Fri, 4 Sep 2020 10:17:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 388AC1C10E; Fri, 4 Sep 2020 10:17:48 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 7F50B1C0C0 for ; Fri, 4 Sep 2020 10:17:45 +0200 (CEST) IronPort-SDR: cefRBVR1BaEStX0emcBiBriFVwW/Fxl4ZwywjHNRwxFHxdfd0CUM6/Ur2sDcCPHLJFlNchOubg YCDqzL/Dpvjw== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763322" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763322" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:45 -0700 IronPort-SDR: iIDuBEbXmNFGjopRnuCrOmp+LER/77hSh88prx5loe6XtdGsuOxlL26kCtF5mfJDFHaoNDQCoG ji5Y+Us9d51g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782776" 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:43 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:37 +0800 Message-Id: <1599207525-22123-30-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 30/38] tests/TestSuite_pvp_vhost_user_built_in_net_driver.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_pvp_vhost_user_built_in_net_driver.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py b/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py index 1b7d9c5..a0d1667 100644 --- a/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py +++ b/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py @@ -81,6 +81,8 @@ class TestPVPVhostUserBuiltInNetDriver(TestCase): # set memory size self.verify(self.sockets > 0, 'cpu socket should not be zero') self.mem_size = ','.join(['2048']*self.sockets) + self.path=self.dut.apps_name['test-pmd'] + self.testpmd_name = self.path.split("/")[-1] def set_up(self): """ @@ -89,7 +91,7 @@ class TestPVPVhostUserBuiltInNetDriver(TestCase): self.dut.send_expect("rm -rf ./vhost-net*", "# ") self.dut.send_expect("rm -rf ./vhost.out", "# ") self.dut.send_expect("killall -s INT vhost", "# ") - self.dut.send_expect("killall -s INT testpmd", "# ") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name , "#") self.vhost_switch = self.dut.new_session(suite="vhost-switch") self.virtio_user = self.dut.new_session(suite="virtio-user") self.pmd_out = PmdOutput(self.dut, self.virtio_user) @@ -210,7 +212,7 @@ class TestPVPVhostUserBuiltInNetDriver(TestCase): 'net_virtio_user0,mac=%s,path=./vhost-net,queues=1' % self.virtio_mac]) if self.check_2M_env: eal_param += " --single-file-segments" - command_line_user = "./%s/app/testpmd " % self.target + eal_param + " -- -i --rxq=1 --txq=1" + command_line_user = self.path + eal_param + " -- -i --rxq=1 --txq=1" self.virtio_user.send_expect(command_line_user, "testpmd> ", 120) self.virtio_user.send_expect("set fwd mac", "testpmd> ", 120) self.virtio_user.send_expect("start tx_first", "testpmd> ", 120) @@ -240,7 +242,7 @@ class TestPVPVhostUserBuiltInNetDriver(TestCase): """ Run after each test case. """ - self.dut.send_expect("killall -s INT testpmd", "# ") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name , "#") self.dut.send_expect("killall -s INT vhost", "# ") def tear_down_all(self): From patchwork Fri Sep 4 08:18:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76527 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 1ACD6A04DB; Fri, 4 Sep 2020 10:17:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 581A31C0C0; Fri, 4 Sep 2020 10:17:50 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id DB0641C0BF for ; Fri, 4 Sep 2020 10:17:46 +0200 (CEST) IronPort-SDR: ls6msap1cILC959uVlfeNoRwaSXfkYJ/IQY8z97Rt1TMHZ15rBhk7rc6OD4HMBdi5NOHZOjr8D Lt4TgEWCFFlQ== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763324" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763324" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:46 -0700 IronPort-SDR: jL9e3bFwtDD1GdM9HXONzBcRYY4UlIZWoNfLIowoaIQvOD/KvvYO4tObBeHoqNtfKYXZPMDaOl esdb9W5c4P4g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782781" 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:45 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:38 +0800 Message-Id: <1599207525-22123-31-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 31/38] tests/TestSuite_pvp_vhost_user_reconnect.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_pvp_vhost_user_reconnect.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/tests/TestSuite_pvp_vhost_user_reconnect.py b/tests/TestSuite_pvp_vhost_user_reconnect.py index b609115..026e03d 100644 --- a/tests/TestSuite_pvp_vhost_user_reconnect.py +++ b/tests/TestSuite_pvp_vhost_user_reconnect.py @@ -82,13 +82,15 @@ class TestPVPVhostUserReconnect(TestCase): self.tester.send_expect('mkdir -p %s' % self.out_path, '# ') # create an instance to set stream field setting self.pktgen_helper = PacketGeneratorHelper() + self.path=self.dut.apps_name['test-pmd'] + self.testpmd_name = self.path.split("/")[-1] def set_up(self): """ run before each test case. clear the execution ENV """ - self.dut.send_expect("killall -s INT testpmd", "# ") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") self.dut.send_expect("killall -s INT qemu-system-x86_64", "# ") self.dut.send_expect("rm -rf ./vhost-net*", "# ") self.vhost_user = self.dut.new_session(suite="vhost-user") @@ -100,7 +102,7 @@ class TestPVPVhostUserReconnect(TestCase): vdev_info = "" for i in range(self.vm_num): vdev_info += "--vdev 'net_vhost%d,iface=vhost-net%d,client=1,queues=1' " % (i, i) - testcmd = self.dut.base_dir + "/%s/app/testpmd " % self.target + testcmd = self.dut.base_dir + self.path eal_params = self.dut.create_eal_parameters(cores=self.cores, prefix='vhost', ports=[self.pci_info]) para = " -- -i --port-topology=chained --nb-cores=1 --txd=1024 --rxd=1024" self.vhostapp_testcmd = testcmd + eal_params + vdev_info + para @@ -115,7 +117,7 @@ class TestPVPVhostUserReconnect(TestCase): vdev_info = "" for i in range(self.vm_num): vdev_info += "--vdev 'net_vhost%d,iface=vhost-net%d,client=1,queues=1' " % (i, i) - testcmd = self.dut.base_dir + "/%s/app/testpmd " % self.target + testcmd = self.dut.base_dir + self.path eal_params = self.dut.create_eal_parameters(cores=self.cores, no_pci=True, prefix='vhost', ports=[self.pci_info]) para = " -- -i --nb-cores=1 --txd=1024 --rxd=1024" @@ -198,7 +200,7 @@ class TestPVPVhostUserReconnect(TestCase): """ start testpmd in vm """ - vm_testpmd = self.dut.target + "/app/testpmd -c 0x3 -n 4 " + \ + vm_testpmd = self.path+ " -c 0x3 -n 4 " + \ "-- -i --port-topology=chained --txd=1024 --rxd=1024 " for i in range(len(self.vm_dut)): self.vm_dut[i].send_expect(vm_testpmd, "testpmd> ", 20) @@ -329,7 +331,7 @@ class TestPVPVhostUserReconnect(TestCase): # reconnet from vhost self.logger.info('now reconnect from vhost') for i in range(self.reconnect_times): - self.dut.send_expect("killall -s INT testpmd", "# ") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") self.launch_testpmd_as_vhost_user() self.reconnect_data = self.send_and_verify(vm_cycle, "reconnet from vhost") self.check_reconnect_perf() @@ -362,7 +364,7 @@ class TestPVPVhostUserReconnect(TestCase): # reconnet from vhost self.logger.info('now reconnect from vhost') for i in range(self.reconnect_times): - self.dut.send_expect("killall -s INT testpmd", "# ") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") self.launch_testpmd_as_vhost_user() self.reconnect_data = self.send_and_verify(vm_cycle, "reconnet from vhost") self.check_reconnect_perf() @@ -395,7 +397,7 @@ class TestPVPVhostUserReconnect(TestCase): # reconnet from vhost self.logger.info('now reconnect from vhost') for i in range(self.reconnect_times): - self.dut.send_expect("killall -s INT testpmd", "# ") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") self.launch_testpmd_as_vhost_user_with_no_pci() self.start_iperf() self.reconnect_data = self.iperf_result_verify(vm_cycle, 'reconnet from vhost') @@ -433,7 +435,7 @@ class TestPVPVhostUserReconnect(TestCase): # reconnet from vhost self.logger.info('now reconnect from vhost') for i in range(self.reconnect_times): - self.dut.send_expect("killall -s INT testpmd", "# ") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") self.launch_testpmd_as_vhost_user() self.reconnect_data = self.send_and_verify(vm_cycle, "reconnet from vhost") self.check_reconnect_perf() @@ -466,7 +468,7 @@ class TestPVPVhostUserReconnect(TestCase): # reconnet from vhost self.logger.info('now reconnect from vhost') for i in range(self.reconnect_times): - self.dut.send_expect("killall -s INT testpmd", "# ") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") self.launch_testpmd_as_vhost_user() self.reconnect_data = self.send_and_verify(vm_cycle, "reconnet from vhost") self.check_reconnect_perf() @@ -498,7 +500,7 @@ class TestPVPVhostUserReconnect(TestCase): # reconnet from vhost self.logger.info('now reconnect from vhost') for i in range(self.reconnect_times): - self.dut.send_expect("killall -s INT testpmd", "# ") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") self.launch_testpmd_as_vhost_user_with_no_pci() self.start_iperf() self.reconnect_data = self.iperf_result_verify(vm_cycle, 'reconnet from vhost') From patchwork Fri Sep 4 08:18:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76529 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 12C0EA04B1; Fri, 4 Sep 2020 10:17:53 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A23D11C12A; Fri, 4 Sep 2020 10:17:52 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 423DAE07 for ; Fri, 4 Sep 2020 10:17:51 +0200 (CEST) IronPort-SDR: yLBI5C7qNSv2f2+i16Q1b6EAeej2n+tbozyrCpLvZbb7ZCncEqPf+yFehlTOXPenqvXE7c+ZCB 1gyUaxYpzx/Q== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763327" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763327" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:48 -0700 IronPort-SDR: ATBs/55o87KJiOlYKy53U3T0vjNErozK12tKh7u+1lK3Vr0GffMMnJc1HqLyeag9N4FInYNyCS 6DWDMpRpD7RA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782791" 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:46 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:39 +0800 Message-Id: <1599207525-22123-32-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 32/38] tests/TestSuite_pvp_virtio_user_2M_hugepages.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_pvp_virtio_user_2M_hugepages.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/TestSuite_pvp_virtio_user_2M_hugepages.py b/tests/TestSuite_pvp_virtio_user_2M_hugepages.py index 0e7af54..c168546 100644 --- a/tests/TestSuite_pvp_virtio_user_2M_hugepages.py +++ b/tests/TestSuite_pvp_virtio_user_2M_hugepages.py @@ -76,13 +76,15 @@ class TestPVPVirtioWith2Mhuge(TestCase): self.pktgen_helper = PacketGeneratorHelper() self.pci_info = self.dut.ports_info[0]['pci'] self.number_of_ports = 1 + self.path=self.dut.apps_name['test-pmd'] + self.testpmd_name = self.path.split("/")[-1] def set_up(self): """ Run before each test case. """ self.dut.send_expect("rm -rf ./vhost-net*", "# ") - self.dut.send_expect("killall -s INT testpmd", "# ") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") self.vhost_user = self.dut.new_session(suite="vhost-user") self.virtio_user = self.dut.new_session(suite="virtio-user") # Prepare the result table @@ -139,10 +141,9 @@ class TestPVPVirtioWith2Mhuge(TestCase): """ start testpmd on vhost """ - testcmd = self.dut.target + "/app/testpmd " vdev = ["net_vhost0,iface=vhost-net,queues=1"] eal_params = self.dut.create_eal_parameters(cores=self.core_list_vhost_user, prefix='vhost', ports=[self.pci_info], vdevs=vdev) - command_line_client = testcmd + eal_params + " -- -i" + command_line_client = self.path + eal_params + " -- -i" self.vhost_user.send_expect(command_line_client, "testpmd> ", 120) self.vhost_user.send_expect("start", "testpmd> ", 120) @@ -150,10 +151,9 @@ class TestPVPVirtioWith2Mhuge(TestCase): """ start testpmd on virtio """ - testcmd = self.dut.target + "/app/testpmd " vdev = 'net_virtio_user0,mac=00:11:22:33:44:10,path=./vhost-net,queues=1' if not packed else 'net_virtio_user0,mac=00:11:22:33:44:10,path=./vhost-net,queues=1,packed_vq=1' eal_params = self.dut.create_eal_parameters(cores=self.core_list_virtio_user, no_pci=True, prefix='virtio-user', vdevs=[vdev]) - command_line_user = testcmd + eal_params + ' --single-file-segments -- -i' + command_line_user = self.path + eal_params + ' --single-file-segments -- -i' self.virtio_user.send_expect(command_line_user, "testpmd> ", 120) self.virtio_user.send_expect("set fwd mac", "testpmd> ", 120) self.virtio_user.send_expect("start", "testpmd> ", 120) @@ -191,7 +191,7 @@ class TestPVPVirtioWith2Mhuge(TestCase): """ Run after each test case. """ - self.dut.send_expect("killall -s INT testpmd", "# ") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") def tear_down_all(self): """ From patchwork Fri Sep 4 08:18:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76528 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 93EF4A04DC; Fri, 4 Sep 2020 10:17:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7B4E11C10A; Fri, 4 Sep 2020 10:17:51 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 47436E07 for ; Fri, 4 Sep 2020 10:17:50 +0200 (CEST) IronPort-SDR: YI4vg0/l68MiNHaEqOnAkHgPo3hZbLD8dZsHM9Bja2N/5QTlh9XXyI4do6fDyStBot4k/AgnYe VHBfKqq9LSAw== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="242528905" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="242528905" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:49 -0700 IronPort-SDR: 5XtLj/gR3jlwg9TagTciAGr34KANciL2vMZ7OTnaCJ0bmICYFAi7SmKFCAwyld1zyyvlBXCApu QprEkqAGdFWg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782797" 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:48 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:40 +0800 Message-Id: <1599207525-22123-33-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 33/38] tests/TestSuite_qinq_filter.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_qinq_filter.py | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/tests/TestSuite_qinq_filter.py b/tests/TestSuite_qinq_filter.py index 560f08d..086abc1 100644 --- a/tests/TestSuite_qinq_filter.py +++ b/tests/TestSuite_qinq_filter.py @@ -75,7 +75,8 @@ class TestQinqFilter(TestCase): self.dut.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=.*$/" + "CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=n/' config/common_base", "# ", 30) - self.dut.build_install_dpdk(self.target) + self.dut.build_install_dpdk(self.target) + self.path=self.dut.apps_name['test-pmd'] def vlan_send_packet(self, vlans): """ @@ -144,9 +145,9 @@ class TestQinqFilter(TestCase): Enable receipt of dual VLAN packets """ - self.dut.send_expect(r'./%s/app/testpmd -c %s -n 4 -- -i \ + self.dut.send_expect(r'%s -c %s -n 4 -- -i \ --portmask=%s --port-topology=loop \ - --rxq=4 --txq=4 --disable-rss' % (self.target, self.coreMask, self.portMask), + --rxq=4 --txq=4 --disable-rss' % (self.path, self.coreMask, self.portMask), "testpmd> ", 30) self.dut.send_expect("vlan set extend on %s" % dutRxPortId, "testpmd> ") self.dut.send_expect("vlan set strip on %s" % dutRxPortId, "testpmd> ") @@ -166,9 +167,9 @@ class TestQinqFilter(TestCase): """ qinq filter packet received by assign PF queues """ - self.dut.send_expect(r'./%s/app/testpmd -c %s -n 4 -- -i \ + self.dut.send_expect(r'%s -c %s -n 4 -- -i \ --portmask=%s --port-topology=loop \ - --rxq=4 --txq=4 --disable-rss' % (self.target, self.coreMask, self.portMask), + --rxq=4 --txq=4 --disable-rss' % (self.path, self.coreMask, self.portMask), "testpmd> ", 30) self.dut.send_expect("vlan set extend on %s" % dutRxPortId, "testpmd> ") self.dut.send_expect("set fwd rxonly", "testpmd> ") @@ -202,10 +203,10 @@ class TestQinqFilter(TestCase): vf0_session = self.dut.new_session('qinq_filter') vf1_session = self.dut.new_session('qinq_filter') - self.dut.send_expect(r'./%s/app/testpmd -c %s -n 4 \ + self.dut.send_expect(r'%s -c %s -n 4 \ --socket-mem=1024,1024 --file-prefix=pf -w %s -- -i --port-topology=loop \ --rxq=4 --txq=4 --disable-rss' - % (self.target, self.coreMask, self.dut.ports_info[dutRxPortId]['pci']), + % (self.path, self.coreMask, self.dut.ports_info[dutRxPortId]['pci']), "testpmd> ", 30) self.dut.send_expect("vlan set extend on %s" % dutRxPortId, "testpmd> ") self.dut.send_expect("set fwd rxonly", "testpmd> ") @@ -219,16 +220,16 @@ class TestQinqFilter(TestCase): # out vlan 3, inner vlan 4094 packet will received by pf queue 1 self.dut.send_expect(r'flow create 0 ingress pattern eth / vlan tci is 3 / vlan tci is 4094 / end actions pf / queue index 1 / end', "testpmd> ") - vf0_session.send_expect(r'./%s/app/testpmd -c %s -n 4 \ + vf0_session.send_expect(r'%s -c %s -n 4 \ --socket-mem=1024,1024 --file-prefix=vf0 -w %s -- -i --port-topology=loop \ --rxq=4 --txq=4 --disable-rss' - % (self.target, self.coreMask, vf_list[0]), + % (self.path, self.coreMask, vf_list[0]), "testpmd> ", 30) - vf1_session.send_expect(r'./%s/app/testpmd -c %s -n 4 \ + vf1_session.send_expect(r'%s -c %s -n 4 \ --socket-mem=1024,1024 --file-prefix=vf1 -w %s -- -i --port-topology=loop \ --rxq=4 --txq=4 --disable-rss' - % (self.target, self.coreMask, vf_list[1]), + % (self.path, self.coreMask, vf_list[1]), "testpmd>", 30) for session_name in [vf0_session, vf1_session]: session_name.send_expect("set fwd rxonly", "testpmd> ") @@ -271,10 +272,10 @@ class TestQinqFilter(TestCase): vf0_session = self.dut.new_session('qinq_filter') vf1_session = self.dut.new_session('qinq_filter') - self.dut.send_expect(r'./%s/app/testpmd -c %s -n 4 \ + self.dut.send_expect(r'%s -c %s -n 4 \ --socket-mem=1024,1024 --file-prefix=pf -w %s -- -i --port-topology=loop \ --rxq=4 --txq=4 --disable-rss' - % (self.target, self.coreMask, self.dut.ports_info[dutRxPortId]['pci']), + % (self.path, self.coreMask, self.dut.ports_info[dutRxPortId]['pci']), "testpmd> ", 30) self.dut.send_expect("vlan set extend on %s" % dutRxPortId, "testpmd> ") self.dut.send_expect("set fwd rxonly", "testpmd> ") @@ -291,16 +292,16 @@ class TestQinqFilter(TestCase): self.dut.send_expect('vlan set outer tpid 0x88a8 0', "testpmd") - vf0_session.send_expect(r'./%s/app/testpmd -c %s -n 4 \ + vf0_session.send_expect(r'%s -c %s -n 4 \ --socket-mem=1024,1024 --file-prefix=vf0 -w %s -- -i --port-topology=loop \ --rxq=4 --txq=4 --disable-rss' - % (self.target, self.coreMask, vf_list[0]), + % (self.path, self.coreMask, vf_list[0]), "testpmd> ", 30) - vf1_session.send_expect(r'./%s/app/testpmd -c %s -n 4 \ + vf1_session.send_expect(r'%s -c %s -n 4 \ --socket-mem=1024,1024 --file-prefix=vf1 -w %s -- -i --port-topology=loop \ --rxq=4 --txq=4 --disable-rss' - % (self.target, self.coreMask, vf_list[1]), + % (self.path, self.coreMask, vf_list[1]), "testpmd>", 30) for session_name in [vf0_session, vf1_session]: session_name.send_expect("set fwd rxonly", "testpmd> ") From patchwork Fri Sep 4 08:18:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76534 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 22C82A04B1; Fri, 4 Sep 2020 10:17:59 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6BD821C194; Fri, 4 Sep 2020 10:17:58 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id C5EF41C136 for ; Fri, 4 Sep 2020 10:17:56 +0200 (CEST) IronPort-SDR: enpR1+KYA4CFewV2luMs329MHGxmXWDgMxfXUiadysu8zOTcw1ci55gjn+J2d74+dK/NYn3lcq VZY9UDOd3C2g== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="242528907" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="242528907" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:50 -0700 IronPort-SDR: DFLaGTIhRt1oKvKCNEuOx3vI9/c4WQQ7ZdxWO8dRj1GvBi1So57igS5wTNovAY4BrZS6Ibgcwm VpE5+2R+o0+w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782807" 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:49 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:41 +0800 Message-Id: <1599207525-22123-34-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 34/38] tests/TestSuite_queue_start_stop.py: 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" git add tests/TestSuite_softnic.py git git add tests/TestSuite_tso.py git commit -m tests/TestSuite_tso. Signed-off-by: xizhan4x --- tests/TestSuite_queue_start_stop.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/TestSuite_queue_start_stop.py b/tests/TestSuite_queue_start_stop.py index cb59c95..55264dc 100644 --- a/tests/TestSuite_queue_start_stop.py +++ b/tests/TestSuite_queue_start_stop.py @@ -65,6 +65,7 @@ class TestQueueStartStop(TestCase): """ self.ports = self.dut.get_ports(self.nic) self.verify(len(self.ports) >= 1, "Insufficient number of ports.") + self.path=self.dut.apps_name['test-pmd'] def set_up(self): """ @@ -82,7 +83,7 @@ class TestQueueStartStop(TestCase): try: self.dut.session.copy_file_to(patch_file, patch_dst) self.patch_hotfix_dpdk(patch_dst + "macfwd_log.patch", True) - self.dut.build_dpdk_apps('./app/test-pmd') + self.dut.build_install_dpdk(self.target) except Exception as e: raise IOError("dpdk setup failure: %s" % e) @@ -130,7 +131,7 @@ class TestQueueStartStop(TestCase): """ #dpdk start try: - self.dut.send_expect("./app/test-pmd/testpmd -c 0xf -n 4 -- -i --portmask=0x1 --port-topology=loop", "testpmd>", 120) + self.dut.send_expect("%s -c 0xf -n 4 -- -i --portmask=0x1 --port-topology=loop"%self.path, "testpmd>", 120) time.sleep(5) self.dut.send_expect("set fwd mac", "testpmd>") self.dut.send_expect("start", "testpmd>") From patchwork Fri Sep 4 08:18:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76530 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 DB05EA04B1; Fri, 4 Sep 2020 10:17:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D17FC1C133; Fri, 4 Sep 2020 10:17:55 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 86D891C127 for ; Fri, 4 Sep 2020 10:17:54 +0200 (CEST) IronPort-SDR: dp0WDB7s+YvFv2PW9BWousmGifDJI22QcaCIMyk0k1Pje9QSQ7H/RDsFZbUTDV4G+dTs2M7res l5LHPdY8lnFw== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="155106753" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="155106753" 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:53 -0700 IronPort-SDR: LgsL+AOUtiV+3tlbw8bDoN3KcqOOs4qqqQ+k2VYJzzMU+OG++L5xXeOhQyqR1A6tN9mbFMGwN3 f29TBBurcQdg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782811" 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:50 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:42 +0800 Message-Id: <1599207525-22123-35-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 35/38] tests/TestSuite_softnic.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_softnic.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/TestSuite_softnic.py b/tests/TestSuite_softnic.py index c6ba6b9..dee163e 100644 --- a/tests/TestSuite_softnic.py +++ b/tests/TestSuite_softnic.py @@ -75,7 +75,8 @@ class TestSoftnic(TestCase): self.dut.session.copy_file_to(self.firmware, self.root_path) self.dut.session.copy_file_to(self.tm_firmware, self.root_path) self.dut.session.copy_file_to(self.nat_firmware, self.root_path) - self.cmd = "./%s/app/testpmd -c 0x7 -s 0x4 -n 4 --vdev 'net_softnic0,firmware=/tmp/%s,cpu_id=1,conn_port=8086' -- -i --forward-mode=softnic --portmask=0x2" + self.path=self.dut.apps_name['test-pmd'] + self.cmd = "%s -c 0x7 -s 0x4 -n 4 --vdev 'net_softnic0,firmware=/tmp/%s,cpu_id=1,conn_port=8086' -- -i --forward-mode=softnic --portmask=0x2" # get dts output path if self.logger.log_path.startswith(os.sep): self.output_path = self.logger.log_path @@ -106,7 +107,7 @@ class TestSoftnic(TestCase): # 10G nic pps(M) expect_pps = [14, 8, 4, 2, 1, 0.9, 0.8] - self.dut.send_expect(self.cmd % (self.target, 'firmware.cli'), "testpmd>", timeout=300) + self.dut.send_expect(self.cmd % (self.path, 'firmware.cli'), "testpmd>", timeout=300) self.dut.send_expect("set fwd macswap", "testpmd>") self.dut.send_expect("start", "testpmd>") rx_port = self.tester.get_local_port(0) @@ -132,7 +133,7 @@ class TestSoftnic(TestCase): def test_perf_shaping_for_pipe(self): self.change_config_file('tm_firmware.cli') - self.dut.send_expect(self.cmd % (self.target, 'tm_firmware.cli'), "testpmd> ", timeout=800) + self.dut.send_expect(self.cmd % (self.path, 'tm_firmware.cli'), "testpmd> ", timeout=800) self.dut.send_expect("set fwd macswap", "testpmd>") self.dut.send_expect("start", "testpmd>") rx_port = self.tester.get_local_port(0) @@ -169,7 +170,7 @@ class TestSoftnic(TestCase): for t in pkt_type: for i in range(2): self.dut.send_expect("sed -i -e '12c table action profile AP0 ipv4 offset 270 fwd nat %s proto %s' %s" % (pkt_location[i], t, self.root_path + 'nat_firmware.cli'), "#") - self.dut.send_expect(self.cmd % (self.target, 'nat_firmware.cli'), "testpmd>", timeout=60) + self.dut.send_expect(self.cmd % (self.path, 'nat_firmware.cli'), "testpmd>", timeout=60) self.dut.send_expect("start", "testpmd>") # src ip tcp for j in range(2): From patchwork Fri Sep 4 08:18:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76531 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 1109AA04B1; 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 0A0141C123; 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 4CDFD1C127 for ; Fri, 4 Sep 2020 10:17:55 +0200 (CEST) IronPort-SDR: wtM/tBd5OrymxLCxGcivCk2I9kSevyX8rppWMfj9cQ86j4tiS9oYKypN113P/NS+2OXcnMen26 CLMfYiQaahfw== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="155106754" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="155106754" 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:53 -0700 IronPort-SDR: egfakK1VpwzYTh0/3h90hZw/pc9LNM5EZrM3V2zee3pn31uCRFkvNfi2rP3/EID19C5JRP1xaC igACydYmIaxA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782817" 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:52 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:43 +0800 Message-Id: <1599207525-22123-36-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 36/38] tests/TestSuite_tso.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_tso.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/TestSuite_tso.py b/tests/TestSuite_tso.py index db98110..d0bff6c 100644 --- a/tests/TestSuite_tso.py +++ b/tests/TestSuite_tso.py @@ -93,6 +93,7 @@ class TestTSO(TestCase): self.output_path = os.sep.join([cur_path, self.logger.log_path]) # create an instance to set stream field setting self.pktgen_helper = PacketGeneratorHelper() + self.path=self.dut.apps_name['test-pmd'] def set_up(self): """ @@ -210,9 +211,9 @@ class TestTSO(TestCase): self.tester.send_expect("ip l set %s up" % tx_interface, "# ") if (self.nic in ["cavium_a063","cavium_a064"]): - cmd = "./%s/app/testpmd -c %s -n %d %s -- -i --rxd=512 --txd=512 --burst=32 --rxfreet=64 --mbcache=128 --portmask=%s --max-pkt-len=%s --txpt=36 --txht=0 --txwt=0 --txfreet=32 --txrst=32 --tx-offloads=0x8000" % (self.target, self.coreMask, self.dut.get_memory_channels(), self.eal_param, self.portMask, TSO_MTU) + cmd = "%s -c %s -n %d %s -- -i --rxd=512 --txd=512 --burst=32 --rxfreet=64 --mbcache=128 --portmask=%s --max-pkt-len=%s --txpt=36 --txht=0 --txwt=0 --txfreet=32 --txrst=32 --tx-offloads=0x8000" % (self.path, self.coreMask, self.dut.get_memory_channels(), self.eal_param, self.portMask, TSO_MTU) else: - cmd = "./%s/app/testpmd -c %s -n %d %s -- -i --rxd=512 --txd=512 --burst=32 --rxfreet=64 --mbcache=128 --portmask=%s --max-pkt-len=%s --txpt=36 --txht=0 --txwt=0 --txfreet=32 --txrst=32 " % (self.target, self.coreMask, self.dut.get_memory_channels(), self.eal_param, self.portMask, TSO_MTU) + cmd = "%s -c %s -n %d %s -- -i --rxd=512 --txd=512 --burst=32 --rxfreet=64 --mbcache=128 --portmask=%s --max-pkt-len=%s --txpt=36 --txht=0 --txwt=0 --txfreet=32 --txrst=32 " % (self.path, self.coreMask, self.dut.get_memory_channels(), self.eal_param, self.portMask, TSO_MTU) self.dut.send_expect(cmd, "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) @@ -307,7 +308,7 @@ class TestTSO(TestCase): self.tester.send_expect("ethtool -K %s rx off tx off tso off gso off gro off lro off" % tx_interface, "# ") self.tester.send_expect("ip l set %s up" % tx_interface, "# ") - cmd = "./%s/app/testpmd -c %s -n %d %s -- -i --rxd=512 --txd=512 --burst=32 --rxfreet=64 --mbcache=128 --portmask=%s --max-pkt-len=%s --txpt=36 --txht=0 --txwt=0 --txfreet=32 --txrst=32 " % (self.target, self.coreMask, self.dut.get_memory_channels(), self.eal_param, self.portMask, TSO_MTU) + cmd = "%s -c %s -n %d %s -- -i --rxd=512 --txd=512 --burst=32 --rxfreet=64 --mbcache=128 --portmask=%s --max-pkt-len=%s --txpt=36 --txht=0 --txwt=0 --txfreet=32 --txrst=32 " % (self.path, self.coreMask, self.dut.get_memory_channels(), self.eal_param, self.portMask, TSO_MTU) self.dut.send_expect(cmd, "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) self.dut.send_expect("port stop all", "testpmd> ", 120) @@ -409,7 +410,7 @@ class TestTSO(TestCase): else: queues = 1 - command_line = "./%s/app/testpmd -c %s -n %d %s -- -i --rxd=512 --txd=512 --burst=32 --rxfreet=64 --mbcache=128 --portmask=%s --max-pkt-len=%s --txpt=36 --txht=0 --txwt=0 --txfreet=32 --txrst=32 " % (self.target, self.coreMask, self.dut.get_memory_channels(), self.eal_param, self.portMask, TSO_MTU) + command_line = "%s -c %s -n %d %s -- -i --rxd=512 --txd=512 --burst=32 --rxfreet=64 --mbcache=128 --portmask=%s --max-pkt-len=%s --txpt=36 --txht=0 --txwt=0 --txfreet=32 --txrst=32 " % (self.path, self.coreMask, self.dut.get_memory_channels(), self.eal_param, self.portMask, TSO_MTU) info = "Executing PMD using %s\n" % test_cycle['cores'] self.logger.info(info) self.rst_report(info, annex=True) 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} From patchwork Fri Sep 4 08:18:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76533 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 81ECEA04DC; 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 4C5761C190; 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 6BD2A1C0DC for ; Fri, 4 Sep 2020 10:17:56 +0200 (CEST) IronPort-SDR: KXjLZFx/fMmSWd+8gYqjZgjxb6fXSBiEv9vUricbrvJ58dTCYfG+BAtUeTZhwap9IIi1YEHxyC 7ANOmCBbq2dQ== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="155106760" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="155106760" 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:56 -0700 IronPort-SDR: HYVj96TutgLW1/iApKUMg81/cZ5W42VF/wSnqtqzn/62UL2FbMmUTxABrnfuW7JOBKd5M6u3J5 DuIdU0W6n4RQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782831" 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:54 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:45 +0800 Message-Id: <1599207525-22123-38-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 38/38] tests/TestSuite_vxlan_gpe_support_in_i40e.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_gpe_support_in_i40e.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/TestSuite_vxlan_gpe_support_in_i40e.py b/tests/TestSuite_vxlan_gpe_support_in_i40e.py index 72f16e4..e797802 100644 --- a/tests/TestSuite_vxlan_gpe_support_in_i40e.py +++ b/tests/TestSuite_vxlan_gpe_support_in_i40e.py @@ -256,10 +256,11 @@ class TestVxlanGpeSupportInI40e(TestCase): """ 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, + path = self.dut.apps_name['test-pmd'] + pmd_cmd = pmd_temp % {'TARGET': path, 'COREMASK': self.coremask, 'CHANNEL': self.dut.get_memory_channels(), 'PORT': self.portMask}