From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A5FF9A00C2; Thu, 23 Apr 2020 09:24:40 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 751981C23B; Thu, 23 Apr 2020 09:24:40 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 6C3671C23A for ; Thu, 23 Apr 2020 09:24:39 +0200 (CEST) IronPort-SDR: PSV8ApMI2oADLk2jcIStTF0jNiulzetMt63ysT5U3cf+6EcIQEhCpKraWIoG3p3iUBMm80dVz1 /8nc9vx6aKGg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2020 00:24:38 -0700 IronPort-SDR: tBAV5lbbv6zjOYIs064UcR6X5yuRa0xUeuVfCM/g/oF8oqHFs7lV8/sC8D7Sv3gySFxlQsgJTD yggtQcoCTY8Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,306,1583222400"; d="scan'208";a="274146959" Received: from unknown (HELO xqm-virtio_tester.sh.intel.com) ([10.240.183.52]) by orsmga002.jf.intel.com with ESMTP; 23 Apr 2020 00:24:36 -0700 From: Zhou Jun To: dts@dpdk.org Cc: Zhou jun Date: Thu, 23 Apr 2020 15:18:11 +0800 Message-Id: <1587626291-56898-1-git-send-email-junx.w.zhou@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dts] [PATCH V4] DTS adapts to foxville network card 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" From: Zhou jun Fixed errors caused by patch V2 1.pmdrssreta/test_pmdrss_reta testQueues not define 2.tests/TestSuite_rss_to_rte_flow.py Code format error Signed-off-by: Zhou jun --- tests/TestSuite_pmdrssreta.py | 1 + tests/TestSuite_rss_to_rte_flow.py | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/tests/TestSuite_pmdrssreta.py b/tests/TestSuite_pmdrssreta.py index 7f77ca9..3595ac5 100644 --- a/tests/TestSuite_pmdrssreta.py +++ b/tests/TestSuite_pmdrssreta.py @@ -212,6 +212,7 @@ class TestPmdrssreta(TestCase): } self.dut.kill_all() + global testQueues if self.nic == 'foxville': testQueues = [2] # test with different rss queues diff --git a/tests/TestSuite_rss_to_rte_flow.py b/tests/TestSuite_rss_to_rte_flow.py index a6375d0..b345a84 100644 --- a/tests/TestSuite_rss_to_rte_flow.py +++ b/tests/TestSuite_rss_to_rte_flow.py @@ -190,7 +190,7 @@ class TestRSS_to_Rteflow(TestCase): # Disable RSS hash function self.dut.send_expect( "flow create 0 ingress pattern end actions rss types none end / end", "created") - if self.nic == 'foxville': + if self.nic == 'foxville': self.dut.send_expect("flow flush 0", "testpmd> ") self.dut.send_expect( "show port 0 rss-hash", "RSS disabled") @@ -299,7 +299,7 @@ class TestRSS_to_Rteflow(TestCase): self.send_and_check(self.pkt7, rss_queue) else: if self.nic == 'foxville': - rss_queue = ["1", "2", "3"] + rss_queue = ["1", "2", "3"] self.send_and_check(self.pkt1, rss_queue) self.send_and_check(self.pkt2, rss_queue) self.send_and_check(self.pkt3, rss_queue) @@ -391,7 +391,7 @@ class TestRSS_to_Rteflow(TestCase): self.send_and_check(self.pkt2, rss_queue) self.send_and_check(self.pkt3, rss_queue) self.send_and_check(self.pkt6, rss_queue) - elif(self.nic in ["foxville"]): + elif(self.nic in ["foxville"]): rss_queue = ["1", "2", "3"] self.send_and_check(self.pkt2, rss_queue) self.send_and_check(self.pkt3, rss_queue) @@ -514,14 +514,14 @@ class TestRSS_to_Rteflow(TestCase): self.dut.send_expect("start", "testpmd> ", 120) time.sleep(2) # Create a rss queue rule - if self.nic == 'foxville': - self.dut.send_expect( + if self.nic == 'foxville': + self.dut.send_expect( "flow create 0 ingress pattern end actions rss types ipv6-tcp ipv4-udp sctp ipv6-other end queues 1 2 3 end / end", "created") - else: - self.dut.send_expect( - "flow create 0 ingress pattern end actions rss types ipv6-tcp ipv4-udp sctp ipv6-other end queues 5 6 7 end / end", "created") + else: + self.dut.send_expect( + "flow create 0 ingress pattern end actions rss types ipv6-tcp ipv4-udp sctp ipv6-other end queues 5 6 7 end / end", "created") # send the packets and verify the results - rss_queue = ["5", "6", "7"] + rss_queue = ["5", "6", "7"] if (self.nic in ["fortville_eagle", "fortville_spirit", "carlsville", "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "fortville_25g"]): self.send_and_check(self.pkt1, rss_queue) @@ -534,8 +534,8 @@ class TestRSS_to_Rteflow(TestCase): self.send_and_check(self.pkt4, rss_queue) self.send_and_check(self.pkt6, rss_queue) else: - if self.nic == 'foxville': - rss_queue = ["1", "2", "3"] + if self.nic == 'foxville': + rss_queue = ["1", "2", "3"] self.send_and_check(self.pkt2, rss_queue) self.send_and_check(self.pkt7, rss_queue) rss_queue = ["0"] @@ -570,12 +570,12 @@ class TestRSS_to_Rteflow(TestCase): time.sleep(2) # Create a rss queue rule - if self.nic == 'foxville': - self.dut.send_expect( + if self.nic == 'foxville': + self.dut.send_expect( "flow create 0 ingress pattern end actions rss types udp end queues 1 2 3 end / end", "created") - else: - self.dut.send_expect( - "flow create 0 ingress pattern end actions rss types udp end queues 3 4 5 end / end", "created") + else: + self.dut.send_expect( + "flow create 0 ingress pattern end actions rss types udp end queues 3 4 5 end / end", "created") # send the packets and verify the results rss_queue = ["1", "2", "3"] if self.nic == 'foxville' else ["3", "4", "5"] self.send_and_check(self.pkt2, rss_queue) -- 1.8.3.1