From patchwork Wed Sep 2 09:15:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xie, WeiX" X-Patchwork-Id: 76315 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 53F2DA04B8; Wed, 2 Sep 2020 11:14:25 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 497631C0BF; Wed, 2 Sep 2020 11:14:25 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 7B8751C07D for ; Wed, 2 Sep 2020 11:14:23 +0200 (CEST) IronPort-SDR: Ljtbin5/qwA5fG36kNlWkmz+71BjQQqyDsVEZ5l6lCfxsJPv2snHyynIJoRzHaTcryHT+OCESY RbKU7X8O9g4Q== X-IronPort-AV: E=McAfee;i="6000,8403,9731"; a="158348284" X-IronPort-AV: E=Sophos;i="5.76,381,1592895600"; d="scan'208";a="158348284" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Sep 2020 02:14:23 -0700 IronPort-SDR: FVWUru7TVYaLOA38X57ucsKAXCcTvoLsUXx7DCdWzydTRfniDO1v1hBPbh99scjWO4xphMGGQ1 D1IKfnveiyMQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,381,1592895600"; d="scan'208";a="405099337" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by fmsmga001.fm.intel.com with ESMTP; 02 Sep 2020 02:14:21 -0700 From: Xie wei To: dts@dpdk.org Cc: Xie wei Date: Wed, 2 Sep 2020 17:15:10 +0800 Message-Id: <20200902091510.6043-9-weix.xie@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200902091510.6043-1-weix.xie@intel.com> References: <20200902091510.6043-1-weix.xie@intel.com> Subject: [dts] [dts 8/8] tests/TestSuite_floating_veb:support meson build method 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: Xie wei --- tests/TestSuite_floating_veb.py | 56 ++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/tests/TestSuite_floating_veb.py b/tests/TestSuite_floating_veb.py index bf83cb5..f4d62de 100644 --- a/tests/TestSuite_floating_veb.py +++ b/tests/TestSuite_floating_veb.py @@ -141,6 +141,9 @@ class TestFloatingVEBSwitching(TestCase): self.verify(len(self.dut_ports) >= 1, "Insufficient ports") self.session_secondary = self.dut.new_session() self.session_third = self.dut.new_session() + self.pmdout = PmdOutput(self.dut) + self.pmdout_2 = PmdOutput(self.dut, self.session_secondary) + self.pmdout_3 = PmdOutput(self.dut, self.session_third) self.setup_1pf_ddriver_1vf_env_flag = 0 self.setup_1pf_ddriver_2vf_env_flag = 0 @@ -156,6 +159,7 @@ class TestFloatingVEBSwitching(TestCase): self.pf_interface = self.dut.ports_info[self.used_dut_port]['intf'] self.pf_mac_address = self.dut.get_mac_address(0) self.pf_pci = self.dut.ports_info[self.used_dut_port]['pci'] + self.path = self.dut.apps_name['test-pmd'] def set_up(self): """ @@ -212,12 +216,12 @@ class TestFloatingVEBSwitching(TestCase): """ # VF->PF self.setup_env(driver=self.drivername, vf_num=1) - self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s,enable_floating_veb=1 --file-prefix=test1 -- -i" % (self.target, self.pf_pci), "testpmd>", 120) + self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci], port_options={self.pf_pci:"enable_floating_veb=1"}) self.dut.send_expect("set fwd rxonly", "testpmd>") self.dut.send_expect("set promisc all off", "testpmd>") self.dut.send_expect("start", "testpmd>") time.sleep(2) - self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.pf_mac_address), "testpmd>", 120) + self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.pf_mac_address) self.session_secondary.send_expect("set fwd txonly", "testpmd>") self.session_secondary.send_expect("set promisc all off", "testpmd>") self.session_secondary.send_expect("start", "testpmd>") @@ -236,11 +240,11 @@ class TestFloatingVEBSwitching(TestCase): time.sleep(2) #PF->VF - self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s,enable_floating_veb=1 --file-prefix=test1 -- -i --eth-peer=0,%s" % (self.target, self.pf_pci, self.vf0_mac), "testpmd>", 120) + self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci], port_options={self.pf_pci:"enable_floating_veb=1"}, param="--eth-peer=0,%s" % self.vf0_mac) self.dut.send_expect("set fwd txonly", "testpmd>") self.dut.send_expect("set promisc all off", "testpmd>") - self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120) + self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci]) self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>") self.session_secondary.send_expect("set fwd rxonly", "testpmd>") self.session_secondary.send_expect("set promisc all off", "testpmd>") @@ -265,13 +269,13 @@ class TestFloatingVEBSwitching(TestCase): """ #outside world ->VF self.setup_env(driver=self.drivername, vf_num=1) - self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s,enable_floating_veb=1 --file-prefix=test1 -- -i --eth-peer=0,%s" % (self.target, self.pf_pci, self.vf0_mac), "testpmd>", 120) + self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci], port_options={self.pf_pci:"enable_floating_veb=1"}, param="--eth-peer=0,%s" % self.vf0_mac) self.dut.send_expect("set fwd mac", "testpmd>") self.dut.send_expect("set promisc all on", "testpmd>") self.dut.send_expect("start", "testpmd>") time.sleep(2) - self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120) + self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci]) self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>") self.session_secondary.send_expect("set fwd mac", "testpmd>") self.session_secondary.send_expect("set promisc all on", "testpmd>") @@ -296,18 +300,18 @@ class TestFloatingVEBSwitching(TestCase): # PF link up, VF0->VF1 self.setup_env(driver=self.drivername, vf_num=2) # start PF - self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s,enable_floating_veb=1 --file-prefix=test1 -- -i" % (self.target, self.pf_pci), "testpmd>", 120) + self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci], port_options={self.pf_pci:"enable_floating_veb=1"}) self.dut.send_expect("port start all", "testpmd>") time.sleep(2) # start VF0 - self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120) + self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci]) self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>") self.session_secondary.send_expect("set fwd rxonly", "testpmd>") self.session_secondary.send_expect("set promisc all off", "testpmd>") self.session_secondary.send_expect("start", "testpmd>") time.sleep(2) # start VF1 - self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[1].pci, self.vf0_mac), "testpmd>", 120) + self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[1].pci], param="--eth-peer=0,%s" % self.vf0_mac) self.session_third.send_expect("set fwd txonly", "testpmd>") self.session_third.send_expect("set promisc all off", "testpmd>") self.session_third.send_expect("start", "testpmd>") @@ -357,17 +361,18 @@ class TestFloatingVEBSwitching(TestCase): """ self.setup_env(driver=self.drivername, vf_num=4) # start PF - self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w \"%s,enable_floating_veb=1,floating_veb_list=0;2-3\" --file-prefix=test1 -- -i" % (self.target, self.pf_pci), "testpmd>", 120) + cmd = self.path + "-c 0xf -n 4 --socket-mem 1024,1024 -w \"%s,enable_floating_veb=1,floating_veb_list=0;2-3\" --file-prefix=test1 -- -i" % self.pf_pci + self.dut.send_expect(cmd, "testpmd> ", 120) self.dut.send_expect("port start all", "testpmd>") time.sleep(2) # VF1->VF0 # start VF0 - self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.vf1_mac), "testpmd>", 120) + self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.vf1_mac) self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>") self.session_secondary.send_expect("set fwd rxonly", "testpmd>") self.session_secondary.send_expect("set promisc all off", "testpmd>") # start VF1 - self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[1].pci, self.vf0_mac), "testpmd>", 120) + self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[1].pci], param="--eth-peer=0,%s" % self.vf0_mac) self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf1_mac, "testpmd>") self.session_third.send_expect("set fwd txonly", "testpmd>") self.session_third.send_expect("set promisc all off", "testpmd>") @@ -410,12 +415,12 @@ class TestFloatingVEBSwitching(TestCase): # VF0->VF2 # start VF0 self.dut.send_expect("port start all", "testpmd>") - self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.vf2_mac), "testpmd>", 120) + self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.vf2_mac) self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>") self.session_secondary.send_expect("set fwd txonly", "testpmd>") self.session_secondary.send_expect("set promisc all off", "testpmd>") # start VF2 - self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i" % (self.target, self.sriov_vfs_port[2].pci), "testpmd>", 120) + self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[2].pci]) self.session_third.send_expect("mac_addr add 0 %s" % self.vf2_mac, "testpmd>") self.session_third.send_expect("set fwd rxonly", "testpmd>") self.session_third.send_expect("set promisc all off", "testpmd>") @@ -444,12 +449,12 @@ class TestFloatingVEBSwitching(TestCase): # VF3->VF2 # start VF3 self.dut.send_expect("port start all", "testpmd>") - self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[3].pci, self.vf2_mac), "testpmd>", 120) + self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[3].pci], param="--eth-peer=0,%s" % self.vf2_mac) self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>") self.session_secondary.send_expect("set fwd txonly", "testpmd>") self.session_secondary.send_expect("set promisc all off", "testpmd>") # start VF2 - self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i" % (self.target, self.sriov_vfs_port[2].pci), "testpmd>", 120) + self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[2].pci]) self.session_third.send_expect("mac_addr add 0 %s" % self.vf2_mac, "testpmd>") self.session_third.send_expect("set fwd rxonly", "testpmd>") self.session_third.send_expect("set promisc all off", "testpmd>") @@ -486,12 +491,13 @@ class TestFloatingVEBSwitching(TestCase): """ self.setup_env(driver=self.drivername, vf_num=4) # VF0->PF - self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w \"%s,enable_floating_veb=1,floating_veb_list=0;3\" --file-prefix=test1 -- -i" % (self.target, self.pf_pci), "testpmd>", 120) + cmd = self.path + "-c 0xf -n 4 --socket-mem 1024,1024 -w \"%s,enable_floating_veb=1,floating_veb_list=0;3\" --file-prefix=test1 -- -i" % self.pf_pci + self.dut.send_expect(cmd, "testpmd> ", 120) self.dut.send_expect("set fwd rxonly", "testpmd>") self.dut.send_expect("set promisc all off", "testpmd>") self.dut.send_expect("start", "testpmd>") time.sleep(2) - self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.pf_mac_address), "testpmd>", 120) + self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.pf_mac_address) self.session_secondary.send_expect("set fwd txonly", "testpmd>") self.session_secondary.send_expect("set promisc all off", "testpmd>") self.session_secondary.send_expect("start", "testpmd>") @@ -508,7 +514,7 @@ class TestFloatingVEBSwitching(TestCase): time.sleep(2) # VF1->PF - self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[1].pci, self.pf_mac_address), "testpmd>", 120) + self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[1].pci], param="--eth-peer=0,%s" % self.pf_mac_address) self.session_secondary.send_expect("set fwd txonly", "testpmd>") self.session_secondary.send_expect("set promisc all off", "testpmd>") self.dut.send_expect("start", "testpmd>") @@ -533,7 +539,7 @@ class TestFloatingVEBSwitching(TestCase): self.dut.send_expect("start", "testpmd>") time.sleep(2) - self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120) + self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci]) self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>") self.session_secondary.send_expect("set fwd rxonly", "testpmd>") self.session_secondary.send_expect("set promisc all off", "testpmd>") @@ -551,7 +557,7 @@ class TestFloatingVEBSwitching(TestCase): time.sleep(2) # tester->VF1 - self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120) + self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[1].pci]) self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf1_mac, "testpmd>") self.session_secondary.send_expect("set fwd rxonly", "testpmd>") self.session_secondary.send_expect("set promisc all off", "testpmd>") @@ -569,14 +575,14 @@ class TestFloatingVEBSwitching(TestCase): time.sleep(2) # VF2->VF1 - self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120) + self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[1].pci]) self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf1_mac, "testpmd>") self.session_secondary.send_expect("set fwd rxonly", "testpmd>") self.session_secondary.send_expect("set promisc all off", "testpmd>") self.session_secondary.send_expect("start", "testpmd>") time.sleep(2) - self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[2].pci, self.vf1_mac), "testpmd>", 120) + self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[2].pci], param="--eth-peer=0,%s" % self.vf1_mac) self.session_third.send_expect("set fwd txonly", "testpmd>") self.session_third.send_expect("set promisc all off", "testpmd>") self.session_third.send_expect("start", "testpmd>") @@ -596,12 +602,12 @@ class TestFloatingVEBSwitching(TestCase): time.sleep(2) # PF link down, VF2->VF1 - self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120) + self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[1].pci]) self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf1_mac, "testpmd>") self.session_secondary.send_expect("set fwd rxonly", "testpmd>") self.session_secondary.send_expect("set promisc all off", "testpmd>") - self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[2].pci, self.vf1_mac), "testpmd>", 120) + self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[2].pci], param="--eth-peer=0,%s" % self.vf1_mac) self.session_third.send_expect("set fwd txonly", "testpmd>") self.session_third.send_expect("set promisc all off", "testpmd>")