From patchwork Wed Sep 2 09:15:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xie, WeiX" X-Patchwork-Id: 76312 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 C644AA04B7; Wed, 2 Sep 2020 11:14:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BF3251C0BD; Wed, 2 Sep 2020 11:14:21 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id B314C1C0BD for ; Wed, 2 Sep 2020 11:14:19 +0200 (CEST) IronPort-SDR: H3QLbrgRAzVA7ge59WFuiUR5CJ/VcY1rg/F4cuHg5tSxXdYjGWCIiI7bqsFpfbYCu5KgrJTPfZ kal61hyiEUiw== X-IronPort-AV: E=McAfee;i="6000,8403,9731"; a="158348273" X-IronPort-AV: E=Sophos;i="5.76,381,1592895600"; d="scan'208";a="158348273" 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:18 -0700 IronPort-SDR: izxu1iMXD+QAYXt/Otwx3v9WEpA+oq8WLwLT4O18vE6pnkscBKBwBl3joxORJv7GVXZrDiX76l 6dIBdvnMS9Qg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,381,1592895600"; d="scan'208";a="405099310" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by fmsmga001.fm.intel.com with ESMTP; 02 Sep 2020 02:14:17 -0700 From: Xie wei To: dts@dpdk.org Cc: Xie wei Date: Wed, 2 Sep 2020 17:15:07 +0800 Message-Id: <20200902091510.6043-6-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 5/8] tests/TestSuite_veb_switch: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_veb_switch.py | 37 +++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/tests/TestSuite_veb_switch.py b/tests/TestSuite_veb_switch.py index b6b4034..f51a8d3 100644 --- a/tests/TestSuite_veb_switch.py +++ b/tests/TestSuite_veb_switch.py @@ -164,6 +164,9 @@ class TestVEBSwitching(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.pf_kdriver_flag = 0 self.pf_ddriver_flag = 0 @@ -236,11 +239,11 @@ class TestVEBSwitching(TestCase): the packets. Check Inter VF-VF MAC switch. """ self.setup_env(driver='default') - self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test1 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.vf1_mac), "testpmd>", 120) + self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.vf1_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[1].pci), "testpmd>", 120) + self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[1].pci]) 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>", 5) @@ -262,12 +265,12 @@ class TestVEBSwitching(TestCase): Check if VF2 can receive the packets. Check Inter VF-VF MAC switch. """ self.setup_env(driver='default') - self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test1 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.vf1_mac), "testpmd>", 120) + self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.vf1_mac) self.dut.send_expect("set fwd mac", "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" % (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("set fwd rxonly", "testpmd>") self.session_secondary.send_expect("set promisc all off", "testpmd>") self.session_secondary.send_expect("start", "testpmd>") @@ -297,12 +300,12 @@ class TestVEBSwitching(TestCase): # the two vfs belongs to different vlans self.dut.send_expect("ip link set %s vf 0 vlan 1" % self.pf_interface, "# ", 1) self.dut.send_expect("ip link set %s vf 1 vlan 2" % self.pf_interface, "# ", 1) - self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test1 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.vf1_mac), "testpmd>", 120) + self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.vf1_mac) self.dut.send_expect("set fwd mac", "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" % (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("set fwd mac", "testpmd>") self.session_secondary.send_expect("set promisc all off", "testpmd>") self.session_secondary.send_expect("start", "testpmd>") @@ -324,12 +327,12 @@ class TestVEBSwitching(TestCase): # the two vfs belongs to the same vlan self.dut.send_expect("ip link set %s vf 1 vlan 1" % self.pf_interface, "# ", 1) - self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test1 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.vf1_mac), "testpmd>", 120) + self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.vf1_mac) self.dut.send_expect("set fwd mac", "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" % (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("set fwd mac", "testpmd>") self.session_secondary.send_expect("set promisc all off", "testpmd>") self.session_secondary.send_expect("start", "testpmd>") @@ -354,13 +357,13 @@ class TestVEBSwitching(TestCase): """ # VF->PF self.setup_env(driver=self.drivername) - self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test1 -- -i" % (self.target, self.pf_pci), "testpmd>", 120) + self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci]) self.dut.send_expect("set fwd rxonly", "testpmd>") self.dut.send_expect("set verbose 1", "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("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>") @@ -382,11 +385,11 @@ class TestVEBSwitching(TestCase): time.sleep(2) # PF->VF - self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s --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], 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>") @@ -406,13 +409,13 @@ class TestVEBSwitching(TestCase): time.sleep(2) # tester->VF - self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test1 -- -i" % (self.target, self.pf_pci), "testpmd>", 120) + self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci]) self.dut.send_expect("set fwd mac", "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" % (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>") @@ -450,15 +453,15 @@ class TestVEBSwitching(TestCase): time.sleep(2) # VF1->VF2 - self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test1 -- -i" % (self.target, self.pf_pci), "testpmd>", 120) + self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci]) 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 --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("set fwd txonly", "testpmd>") self.session_secondary.send_expect("set promisc all off", "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" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120) + self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[1].pci]) self.session_third.send_expect("mac_addr add 0 %s" % self.vf1_mac, "testpmd>") self.session_third.send_expect("set fwd rxonly", "testpmd>") self.session_third.send_expect("set promisc all off", "testpmd>")