From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id CB0601E34 for ; Tue, 26 Feb 2019 08:11:06 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Feb 2019 23:11:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,414,1544515200"; d="scan'208";a="129387943" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga003.jf.intel.com with ESMTP; 25 Feb 2019 23:11:05 -0800 Received: from fmsmsx122.amr.corp.intel.com (10.18.125.37) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 25 Feb 2019 23:11:04 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx122.amr.corp.intel.com (10.18.125.37) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 25 Feb 2019 23:11:04 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.110]) by shsmsx102.ccr.corp.intel.com ([169.254.2.207]) with mapi id 14.03.0415.000; Tue, 26 Feb 2019 15:11:00 +0800 From: "Tu, Lijuan" To: "Peng, Yuan" , "dts@dpdk.org" CC: "Peng, Yuan" Thread-Topic: [dts] [PATCH] tests: re-encapsulate cases of TestSuite_fortville_rss_granularity_config.py Thread-Index: AQHUx19qJEh2nYJNqkG5/hDou+3dE6XxthGQ Date: Tue, 26 Feb 2019 07:10:59 +0000 Message-ID: <8CE3E05A3F976642AAB0F4675D0AD20E0BA2745D@SHSMSX101.ccr.corp.intel.com> References: <1550476741-11270-1-git-send-email-yuan.peng@intel.com> In-Reply-To: <1550476741-11270-1-git-send-email-yuan.peng@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMjcyZmRjOGUtZjk1NC00YzgyLWIwMjYtODk3NWE4MjlkYzhhIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiRXpyV3A2RGtQUjFOQVc1NU0wNXNmSUxwanBGOGxJMEl4NEdVdStlZUowYllmZWc2XC8zYUQ1cmZLcENxbERwQ1MifQ== x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dts] [PATCH] tests: re-encapsulate cases of TestSuite_fortville_rss_granularity_config.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: , X-List-Received-Date: Tue, 26 Feb 2019 07:11:07 -0000 Applied, thanks > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Peng Yuan > Sent: Monday, February 18, 2019 3:59 PM > To: dts@dpdk.org > Cc: Peng, Yuan > Subject: [dts] [PATCH] tests: re-encapsulate cases of > TestSuite_fortville_rss_granularity_config.py >=20 > Re-encapsulate cases of TestSuite_fortville_rss_granularity_config.py >=20 > Signed-off-by: Peng Yuan >=20 > diff --git a/tests/TestSuite_fortville_rss_granularity_config.py > b/tests/TestSuite_fortville_rss_granularity_config.py > index 58ae0ef..6aaf857 100644 > --- a/tests/TestSuite_fortville_rss_granularity_config.py > +++ b/tests/TestSuite_fortville_rss_granularity_config.py > @@ -56,7 +56,6 @@ import dut > testQueues =3D [16] > reta_entries =3D [] > reta_lines =3D [] > -reta_num =3D 128 >=20 > # Use scapy to send packets with different source and dest ip. > # and collect the hash result of five tuple and the queue id. > @@ -81,62 +80,62 @@ class TestFortvilleRssGranularityConfig(TestCase): > self.verify(self.nic in ["fortville_eagle", "fortville_spirit", > "fortville_spirit_single", "fortville_25g"], > "NIC Unsupported: " + str(self.nic)) > - global reta_num > - reta_num =3D 512 > ports =3D self.dut.get_ports(self.nic) > self.verify(len(ports) >=3D 1, "Not enough ports available") > + dutPorts =3D self.dut.get_ports(self.nic) > + localPort =3D self.tester.get_local_port(dutPorts[0]) > + self.itf =3D self.tester.get_interface(localPort) >=20 > def set_up(self): > """ > Run before each test case. > """ > - pass > + global reta_lines > + reta_lines =3D [] >=20 > def send_packet(self, itf, tran_type): > """ > Sends packets. > """ > global reta_lines > - global reta_num > self.tester.scapy_foreground() > self.dut.send_expect("start", "testpmd>") > mac =3D self.dut.get_mac_address(0) >=20 > # send packet with different source and dest ip > - i =3D 0 > if tran_type =3D=3D "ipv4-other": > - packet =3D r'sendp([Ether(dst=3D"%s", > src=3Dget_if_hwaddr("%s"))/IP(src=3D"192.168.0.%d", dst=3D"192.168.0.%d", > proto=3D47)/GRE(key_present=3D1,proto=3D2048,key=3D67108863)/IP()], iface= =3D"%s")' % > ( > - mac, itf, i + 1, i + 2, itf) > + packet =3D r'sendp([Ether(dst=3D"%s", > src=3Dget_if_hwaddr("%s"))/IP(src=3D"192.168.0.1", dst=3D"192.168.0.2", > proto=3D47)/GRE(key_present=3D1,proto=3D2048,key=3D67108863)/IP()], iface= =3D"%s")' % > ( > + mac, itf, itf) > self.tester.scapy_append(packet) > self.tester.scapy_execute() > time.sleep(.5) > elif tran_type =3D=3D "ipv4-tcp": > - packet =3D r'sendp([Ether(dst=3D"%s", > src=3Dget_if_hwaddr("%s"))/IP(src=3D"192.168.0.%d", > dst=3D"192.168.0.%d")/TCP(sport=3D1024,dport=3D1024)], iface=3D"%s")' % ( > - mac, itf, i + 1, i + 2, itf) > + packet =3D r'sendp([Ether(dst=3D"%s", > src=3Dget_if_hwaddr("%s"))/IP(src=3D"192.168.0.1", > dst=3D"192.168.0.2")/TCP(sport=3D1024,dport=3D1025)], iface=3D"%s")' % ( > + mac, itf, itf) > self.tester.scapy_append(packet) > self.tester.scapy_execute() > time.sleep(.5) > elif tran_type =3D=3D "ipv4-udp": > - packet =3D r'sendp([Ether(dst=3D"%s", > src=3Dget_if_hwaddr("%s"))/IP(src=3D"192.168.0.%d", > dst=3D"192.168.0.%d")/UDP(sport=3D1024,dport=3D1024)], iface=3D"%s")' % ( > - mac, itf, i + 1, i + 2, itf) > + packet =3D r'sendp([Ether(dst=3D"%s", > src=3Dget_if_hwaddr("%s"))/IP(src=3D"192.168.0.1", > dst=3D"192.168.0.2")/UDP(sport=3D1024,dport=3D1025)], iface=3D"%s")' % ( > + mac, itf, itf) > self.tester.scapy_append(packet) > self.tester.scapy_execute() > time.sleep(.5) > elif tran_type =3D=3D "l2_payload": > - packet =3D r'sendp([Ether(dst=3D"%s", > src=3Dget_if_hwaddr("%s"))/Dot1Q(id=3D0x8100,vlan=3D%s)/Dot1Q(id=3D0x8100= ,vlan=3D% > s)], iface=3D"%s")' % ( > - mac, itf, i + 1, i + 2, itf) > + packet =3D r'sendp([Ether(dst=3D"%s", > src=3Dget_if_hwaddr("%s"))/Dot1Q(id=3D0x8100,vlan=3D1)/Dot1Q(id=3D0x8100,= vlan=3D2)], > iface=3D"%s")' % ( > + mac, itf, itf) > self.tester.scapy_append(packet) > self.tester.scapy_execute() > time.sleep(.5) > elif tran_type =3D=3D "ipv6-tcp": > - packet =3D r'sendp([Ether(dst=3D"%s", > src=3Dget_if_hwaddr("%s"))/IPv6(src=3D"3ffe:2501:200:1fff::%d", > dst=3D"3ffe:2501:200:3::%d")/TCP(sport=3D1024,dport=3D1024)], iface=3D"%s= ")' % ( > - mac, itf, i + 1, i + 2, itf) > + packet =3D r'sendp([Ether(dst=3D"%s", > src=3Dget_if_hwaddr("%s"))/IPv6(src=3D"3ffe:2501:200:1fff::1", > dst=3D"3ffe:2501:200:3::2")/TCP(sport=3D1024,dport=3D1025)], iface=3D"%s"= )' % ( > + mac, itf, itf) > self.tester.scapy_append(packet) > self.tester.scapy_execute() > time.sleep(.5) > elif tran_type =3D=3D "ipv6-udp": > - packet =3D r'sendp([Ether(dst=3D"%s", > src=3Dget_if_hwaddr("%s"))/IPv6(src=3D"3ffe:2501:200:1fff::%d", > dst=3D"3ffe:2501:200:3::%d")/UDP(sport=3D1024,dport=3D1024)], iface=3D"%s= ")' % ( > - mac, itf, i + 1, i + 2, itf) > + packet =3D r'sendp([Ether(dst=3D"%s", > src=3Dget_if_hwaddr("%s"))/IPv6(src=3D"3ffe:2501:200:1fff::1", > dst=3D"3ffe:2501:200:3::2")/UDP(sport=3D1024,dport=3D1025)], iface=3D"%s"= )' % ( > + mac, itf, itf) > self.tester.scapy_append(packet) > self.tester.scapy_execute() > time.sleep(.5) > @@ -175,7 +174,6 @@ class TestFortvilleRssGranularityConfig(TestCase): > """ >=20 > global reta_lines > - global reta_num >=20 > # append the the hash value and queue id into table > self.result_table_create( > @@ -185,24 +183,21 @@ class TestFortvilleRssGranularityConfig(TestCase): > for tmp_reta_line in reta_lines: >=20 > # compute the hash result of five tuple into the 7 LSBs valu= e. > - hash_index =3D int(tmp_reta_line["RSS hash"], 16) % reta_num > + hash_index =3D int(tmp_reta_line["RSS hash"], 16) > self.result_table_add( > [i, tmp_reta_line["RSS hash"], hash_index, tmp_reta_line= ["queue"]]) > i =3D i + 1 >=20 > def test_ipv4_tcp(self): > - dutPorts =3D self.dut.get_ports(self.nic) > - localPort =3D self.tester.get_local_port(dutPorts[0]) > - itf =3D self.tester.get_interface(localPort) > - global reta_num > - global reta_lines > + """ > + Test with flow type ipv4-tcp. > + """ > flag =3D 1 > - self.dut.kill_all() >=20 > # test with different rss queues > for queue in testQueues: > self.dut.send_expect( > - "./%s/app/testpmd -c fffff -n %d -- -i --coremask=3D0xf= fffe -- > portmask=3D0x3 --rxq=3D%d --txq=3D%d" % > + "./%s/app/testpmd -c fffff -n %d -- -i > + --coremask=3D0xffffe --portmask=3D0x1 --rxq=3D%d --txq=3D%d" % > (self.target, self.dut.get_memory_channels(), queue, que= ue), "testpmd> > ", 120) >=20 > self.dut.send_expect("set verbose 8", "testpmd> ") @@ -214,2= 7 +209,27 > @@ class TestFortvilleRssGranularityConfig(TestCase): > self.dut.send_expect("port start all", "testpmd> ") > self.dut.send_expect( > "port config all rss tcp", "testpmd> ") > - self.send_packet(itf, "ipv4-tcp") > + self.send_packet(self.itf, "ipv4-tcp") >=20 > # set hash input set to "none" by testpmd on dut > self.dut.send_expect("set_hash_input_set 0 ipv4-tcp none sel= ect", > "testpmd> ") > - self.send_packet(itf, "ipv4-tcp") > + self.send_packet(self.itf, "ipv4-tcp") >=20 > # set hash input set by testpmd on dut, enable src-ipv4 & ds= t-ipv4 > self.dut.send_expect("set_hash_input_set 0 ipv4-tcp src-ipv4= add", > "testpmd> ") > self.dut.send_expect("set_hash_input_set 0 ipv4-tcp dst-ipv4= add", > "testpmd> ") > - self.send_packet(itf, "ipv4-tcp") > + self.send_packet(self.itf, "ipv4-tcp") >=20 > # set hash input set by testpmd on dut, enable src-ipv4, dst= -ipv4, tcp-src- > port, tcp-dst-port > self.dut.send_expect("set_hash_input_set 0 ipv4-tcp tcp-src-= port add", > "testpmd> ") > self.dut.send_expect("set_hash_input_set 0 ipv4-tcp tcp-dst-= port add", > "testpmd> ") > - self.send_packet(itf, "ipv4-tcp") > + self.send_packet(self.itf, "ipv4-tcp") >=20 > # set hash input set by testpmd on dut, enable tcp-src-port,= tcp-dst-port > self.dut.send_expect("set_hash_input_set 0 ipv4-tcp none sel= ect", > "testpmd> ") > self.dut.send_expect("set_hash_input_set 0 ipv4-tcp tcp-src-= port add", > "testpmd> ") > self.dut.send_expect("set_hash_input_set 0 ipv4-tcp tcp-dst-= port add", > "testpmd> ") > - self.send_packet(itf, "ipv4-tcp") > + self.send_packet(self.itf, "ipv4-tcp") >=20 > self.dut.send_expect("quit", "# ", 30) >=20 > @@ -264,21 +259,16 @@ class TestFortvilleRssGranularityConfig(TestCase): > flag =3D 0 > self.verify(flag, "The two hash values are different, > rss_granularity_config failed!") >=20 > - reta_lines =3D [] > - > def test_ipv4_udp(self): > - dutPorts =3D self.dut.get_ports(self.nic) > - localPort =3D self.tester.get_local_port(dutPorts[0]) > - itf =3D self.tester.get_interface(localPort) > - global reta_num > - global reta_lines > + """ > + Test with flow type ipv4-udp. > + """ > flag =3D 1 > - self.dut.kill_all() >=20 > # test with different rss queues > for queue in testQueues: > self.dut.send_expect( > - "./%s/app/testpmd -c fffff -n %d -- -i --coremask=3D0xf= fffe -- > portmask=3D0x3 --rxq=3D%d --txq=3D%d" % > + "./%s/app/testpmd -c fffff -n %d -- -i > + --coremask=3D0xffffe --portmask=3D0x1 --rxq=3D%d --txq=3D%d" % > (self.target, self.dut.get_memory_channels(), queue, que= ue), "testpmd> > ", 120) >=20 > self.dut.send_expect("set verbose 8", "testpmd> ") @@ -290,2= 7 +280,27 > @@ class TestFortvilleRssGranularityConfig(TestCase): > self.dut.send_expect("port start all", "testpmd> ") > self.dut.send_expect( > "port config all rss udp", "testpmd> ") > - self.send_packet(itf, "ipv4-udp") > + self.send_packet(self.itf, "ipv4-udp") >=20 > # set hash input set to "none" by testpmd on dut > self.dut.send_expect("set_hash_input_set 0 ipv4-udp none sel= ect", > "testpmd> ") > - self.send_packet(itf, "ipv4-udp") > + self.send_packet(self.itf, "ipv4-udp") >=20 > # set hash input set by testpmd on dut, enable src-ipv4 & ds= t-ipv4 > self.dut.send_expect("set_hash_input_set 0 ipv4-udp src-ipv4= add", > "testpmd> ") > self.dut.send_expect("set_hash_input_set 0 ipv4-udp dst-ipv4= add", > "testpmd> ") > - self.send_packet(itf, "ipv4-udp") > + self.send_packet(self.itf, "ipv4-udp") >=20 > # set hash input set by testpmd on dut, enable src-ipv4, dst= -ipv4, udp-src- > port, udp-dst-port > self.dut.send_expect("set_hash_input_set 0 ipv4-udp udp-src-= port add", > "testpmd> ") > self.dut.send_expect("set_hash_input_set 0 ipv4-udp udp-dst-= port add", > "testpmd> ") > - self.send_packet(itf, "ipv4-udp") > + self.send_packet(self.itf, "ipv4-udp") >=20 > # set hash input set by testpmd on dut, enable udp-src-port,= udp-dst-port > self.dut.send_expect("set_hash_input_set 0 ipv4-udp none sel= ect", > "testpmd> ") > self.dut.send_expect("set_hash_input_set 0 ipv4-udp udp-src-= port add", > "testpmd> ") > self.dut.send_expect("set_hash_input_set 0 ipv4-udp udp-dst-= port add", > "testpmd> ") > - self.send_packet(itf, "ipv4-udp") > + self.send_packet(self.itf, "ipv4-udp") >=20 > self.dut.send_expect("quit", "# ", 30) >=20 > @@ -341,21 +331,16 @@ class TestFortvilleRssGranularityConfig(TestCase): > flag =3D 0 > self.verify(flag, "The two hash values are different, > rss_granularity_config failed!") >=20 > - reta_lines =3D [] > - > def test_ipv6_tcp(self): > - dutPorts =3D self.dut.get_ports(self.nic) > - localPort =3D self.tester.get_local_port(dutPorts[0]) > - itf =3D self.tester.get_interface(localPort) > - global reta_num > - global reta_lines > + """ > + Test with flow type ipv6-tcp. > + """ > flag =3D 1 > - self.dut.kill_all() >=20 > # test with different rss queues > for queue in testQueues: > self.dut.send_expect( > - "./%s/app/testpmd -c fffff -n %d -- -i --coremask=3D0xf= fffe -- > portmask=3D0x3 --rxq=3D%d --txq=3D%d" % > + "./%s/app/testpmd -c fffff -n %d -- -i > + --coremask=3D0xffffe --portmask=3D0x1 --rxq=3D%d --txq=3D%d" % > (self.target, self.dut.get_memory_channels(), queue, que= ue), "testpmd> > ", 120) >=20 > self.dut.send_expect("set verbose 8", "testpmd> ") @@ -367,2= 7 +352,27 > @@ class TestFortvilleRssGranularityConfig(TestCase): > self.dut.send_expect("port start all", "testpmd> ") > self.dut.send_expect( > "port config all rss tcp", "testpmd> ") > - self.send_packet(itf, "ipv6-tcp") > + self.send_packet(self.itf, "ipv6-tcp") >=20 > # set hash input set to "none" by testpmd on dut > self.dut.send_expect("set_hash_input_set 0 ipv6-tcp none sel= ect", > "testpmd> ") > - self.send_packet(itf, "ipv6-tcp") > + self.send_packet(self.itf, "ipv6-tcp") >=20 > # set hash input set by testpmd on dut, enable src-ipv6 & ds= t-ipv6 > self.dut.send_expect("set_hash_input_set 0 ipv6-tcp src-ipv6= add", > "testpmd> ") > self.dut.send_expect("set_hash_input_set 0 ipv6-tcp dst-ipv6= add", > "testpmd> ") > - self.send_packet(itf, "ipv6-tcp") > + self.send_packet(self.itf, "ipv6-tcp") >=20 > # set hash input set by testpmd on dut, enable src-ipv6, dst= -ipv6, tcp-src- > port, tcp-dst-port > self.dut.send_expect("set_hash_input_set 0 ipv6-tcp tcp-src-= port add", > "testpmd> ") > self.dut.send_expect("set_hash_input_set 0 ipv6-tcp tcp-dst-= port add", > "testpmd> ") > - self.send_packet(itf, "ipv6-tcp") > + self.send_packet(self.itf, "ipv6-tcp") >=20 > # set hash input set by testpmd on dut, enable tcp-src-port,= tcp-dst-port > self.dut.send_expect("set_hash_input_set 0 ipv6-tcp none sel= ect", > "testpmd> ") > self.dut.send_expect("set_hash_input_set 0 ipv6-tcp tcp-src-= port add", > "testpmd> ") > self.dut.send_expect("set_hash_input_set 0 ipv6-tcp tcp-dst-= port add", > "testpmd> ") > - self.send_packet(itf, "ipv6-tcp") > + self.send_packet(self.itf, "ipv6-tcp") >=20 > self.dut.send_expect("quit", "# ", 30) >=20 > @@ -411,28 +396,23 @@ class TestFortvilleRssGranularityConfig(TestCase): > elif ((result_rows[2][1] =3D=3D result_rows[5][1])or(result_rows= [2][3] =3D=3D > result_rows[5][3])): > flag =3D 0 > self.verify(flag, "The two hash values are the same, > rss_granularity_config failed!") > - elif ((result_rows[3][1] =3D=3D result_rows[5][1])or(result_rows= [3][3] =3D=3D > result_rows[5][3])): > + elif ((result_rows[3][1] =3D=3D result_rows[5][1])and(result_row= s[3][3] =3D=3D > result_rows[5][3])): > flag =3D 0 > self.verify(flag, "The two hash values are the same, > rss_granularity_config failed!") > elif ((result_rows[1][1] !=3D result_rows[4][1])or(result_rows[1= ][3] !=3D > result_rows[4][3])): > flag =3D 0 > self.verify(flag, "The two hash values are different, > rss_granularity_config failed!") >=20 > - reta_lines =3D [] > - > def test_ipv6_udp(self): > - dutPorts =3D self.dut.get_ports(self.nic) > - localPort =3D self.tester.get_local_port(dutPorts[0]) > - itf =3D self.tester.get_interface(localPort) > - global reta_num > - global reta_lines > + """ > + Test with flow type ipv6-udp. > + """ > flag =3D 1 > - self.dut.kill_all() >=20 > # test with different rss queues > for queue in testQueues: > self.dut.send_expect( > - "./%s/app/testpmd -c fffff -n %d -- -i --coremask=3D0xf= fffe -- > portmask=3D0x3 --rxq=3D%d --txq=3D%d" % > + "./%s/app/testpmd -c fffff -n %d -- -i > + --coremask=3D0xffffe --portmask=3D0x1 --rxq=3D%d --txq=3D%d" % > (self.target, self.dut.get_memory_channels(), queue, que= ue), "testpmd> > ", 120) >=20 > self.dut.send_expect("set verbose 8", "testpmd> ") @@ -444,2= 7 +424,27 > @@ class TestFortvilleRssGranularityConfig(TestCase): > self.dut.send_expect("port start all", "testpmd> ") > self.dut.send_expect( > "port config all rss udp", "testpmd> ") > - self.send_packet(itf, "ipv6-udp") > + self.send_packet(self.itf, "ipv6-udp") >=20 > # set hash input set to "none" by testpmd on dut > self.dut.send_expect("set_hash_input_set 0 ipv6-udp none sel= ect", > "testpmd> ") > - self.send_packet(itf, "ipv6-udp") > + self.send_packet(self.itf, "ipv6-udp") >=20 > # set hash input set by testpmd on dut, enable src-ipv6 & ds= t-ipv6 > self.dut.send_expect("set_hash_input_set 0 ipv6-udp src-ipv6= add", > "testpmd> ") > self.dut.send_expect("set_hash_input_set 0 ipv6-udp dst-ipv6= add", > "testpmd> ") > - self.send_packet(itf, "ipv6-udp") > + self.send_packet(self.itf, "ipv6-udp") >=20 > # set hash input set by testpmd on dut, enable src-ipv6, dst= -ipv6, udp-src- > port, udp-dst-port > self.dut.send_expect("set_hash_input_set 0 ipv6-udp udp-src-= port add", > "testpmd> ") > self.dut.send_expect("set_hash_input_set 0 ipv6-udp udp-dst-= port add", > "testpmd> ") > - self.send_packet(itf, "ipv6-udp") > + self.send_packet(self.itf, "ipv6-udp") >=20 > # set hash input set by testpmd on dut, enable udp-src-port,= udp-dst-port > self.dut.send_expect("set_hash_input_set 0 ipv6-udp none sel= ect", > "testpmd> ") > self.dut.send_expect("set_hash_input_set 0 ipv6-udp udp-src-= port add", > "testpmd> ") > self.dut.send_expect("set_hash_input_set 0 ipv6-udp udp-dst-= port add", > "testpmd> ") > - self.send_packet(itf, "ipv6-udp") > + self.send_packet(self.itf, "ipv6-udp") >=20 > self.dut.send_expect("quit", "# ", 30) >=20 > @@ -488,28 +468,23 @@ class TestFortvilleRssGranularityConfig(TestCase): > elif ((result_rows[2][1] =3D=3D result_rows[5][1])or(result_rows= [2][3] =3D=3D > result_rows[5][3])): > flag =3D 0 > self.verify(flag, "The two hash values are the same, > rss_granularity_config failed!") > - elif ((result_rows[3][1] =3D=3D result_rows[5][1])or(result_rows= [3][3] =3D=3D > result_rows[5][3])): > + elif ((result_rows[3][1] =3D=3D result_rows[5][1])and(result_row= s[3][3] =3D=3D > result_rows[5][3])): > flag =3D 0 > self.verify(flag, "The two hash values are the same, > rss_granularity_config failed!") > elif ((result_rows[1][1] !=3D result_rows[4][1])or(result_rows[1= ][3] !=3D > result_rows[4][3])): > flag =3D 0 > self.verify(flag, "The two hash values are different, > rss_granularity_config failed!") >=20 > - reta_lines =3D [] > - > def test_dual_vlan(self): > - dutPorts =3D self.dut.get_ports(self.nic) > - localPort =3D self.tester.get_local_port(dutPorts[0]) > - itf =3D self.tester.get_interface(localPort) > - global reta_num > - global reta_lines > + """ > + Test with flow type dual vlan(QinQ). > + """ > flag =3D 1 > - self.dut.kill_all() >=20 > # test with different rss queues > for queue in testQueues: > self.dut.send_expect( > - "./%s/app/testpmd -c fffff -n %d -- -i --coremask=3D0xf= fffe -- > portmask=3D0x3 --rxq=3D%d --txq=3D%d" % > + "./%s/app/testpmd -c fffff -n %d -- -i > + --coremask=3D0xffffe --portmask=3D0x1 --rxq=3D%d --txq=3D%d" % > (self.target, self.dut.get_memory_channels(), queue, que= ue), "testpmd> > ", 120) >=20 > self.dut.send_expect("set verbose 8", "testpmd> ") @@ -522,1= 9 +497,19 > @@ class TestFortvilleRssGranularityConfig(TestCase): > self.dut.send_expect("port start all", "testpmd> ") > self.dut.send_expect( > "port config all rss ether", "testpmd> ") > - self.send_packet(itf, "l2_payload") > + self.send_packet(self.itf, "l2_payload") >=20 > # set hash input set to "none" by testpmd on dut > self.dut.send_expect("set_hash_input_set 0 l2_payload none s= elect", > "testpmd> ") > - self.send_packet(itf, "l2_payload") > + self.send_packet(self.itf, "l2_payload") >=20 > # set hash input set by testpmd on dut, enable ovlan > self.dut.send_expect("set_hash_input_set 0 l2_payload ovlan = add", > "testpmd> ") > - self.send_packet(itf, "l2_payload") > + self.send_packet(self.itf, "l2_payload") >=20 > # set hash input set by testpmd on dut, enable ovlan & ivlan > self.dut.send_expect("set_hash_input_set 0 l2_payload ivlan = add", > "testpmd> ") > - self.send_packet(itf, "l2_payload") > + self.send_packet(self.itf, "l2_payload") >=20 > self.dut.send_expect("quit", "# ", 30) >=20 > @@ -556,21 +531,16 @@ class TestFortvilleRssGranularityConfig(TestCase): > flag =3D 0 > self.verify(flag, "The two hash values are the same, > rss_granularity_config failed!") >=20 > - reta_lines =3D [] > - > def test_GRE_keys(self): > - dutPorts =3D self.dut.get_ports(self.nic) > - localPort =3D self.tester.get_local_port(dutPorts[0]) > - itf =3D self.tester.get_interface(localPort) > - global reta_num > - global reta_lines > + """ > + Test with 32-bit GRE keys and 24-bit GRE keys. > + """ > flag =3D 1 > - self.dut.kill_all() >=20 > # test with different rss queues > for queue in testQueues: > self.dut.send_expect( > - "./%s/app/testpmd -c fffff -n %d -- -i --coremask=3D0xf= fffe -- > portmask=3D0x3 --rxq=3D%d --txq=3D%d" % > + "./%s/app/testpmd -c fffff -n %d -- -i > + --coremask=3D0xffffe --portmask=3D0x1 --rxq=3D%d --txq=3D%d" % > (self.target, self.dut.get_memory_channels(), queue, que= ue), "testpmd> > ", 120) >=20 > self.dut.send_expect("set verbose 8", "testpmd> ") @@ -582,2= 5 +552,25 > @@ class TestFortvilleRssGranularityConfig(TestCase): > self.dut.send_expect("port start all", "testpmd> ") > self.dut.send_expect( > "port config all rss all", "testpmd> ") > - self.send_packet(itf, "ipv4-other") > + self.send_packet(self.itf, "ipv4-other") >=20 > # set hash input set to "none" by testpmd on dut > self.dut.send_expect("set_hash_input_set 0 ipv4-other none s= elect", > "testpmd> ") > - self.send_packet(itf, "ipv4-other") > + self.send_packet(self.itf, "ipv4-other") >=20 > # set hash input set by testpmd on dut, enable src-ipv4 & ds= t-ipv4 > self.dut.send_expect("set_hash_input_set 0 ipv4-other src-ip= v4 add", > "testpmd> ") > self.dut.send_expect("set_hash_input_set 0 ipv4-other dst-ip= v4 add", > "testpmd> ") > - self.send_packet(itf, "ipv4-other") > + self.send_packet(self.itf, "ipv4-other") >=20 > # set hash input set by testpmd on dut, enable src-ipv4, dst= -ipv4, gre-key- > len 3 > self.dut.send_expect("global_config 0 gre-key-len 3", "testp= md> ") > self.dut.send_expect("set_hash_input_set 0 ipv4-other gre-ke= y add", > "testpmd> ") > - self.send_packet(itf, "ipv4-other") > + self.send_packet(self.itf, "ipv4-other") >=20 > # set hash input set by testpmd on dut, enable src-ipv4, dst= -ipv4, gre-key- > len 4 > self.dut.send_expect("global_config 0 gre-key-len 4", "testp= md> ") > - self.send_packet(itf, "ipv4-other") > + self.send_packet(self.itf, "ipv4-other") >=20 > self.dut.send_expect("quit", "# ", 30) >=20 > @@ -622,13 +592,11 @@ class TestFortvilleRssGranularityConfig(TestCase): > flag =3D 0 > self.verify(flag, "The two hash values are the same, > rss_granularity_config failed!") >=20 > - reta_lines =3D [] > - > def tear_down(self): > """ > Run after each test case. > """ > - pass > + self.dut.kill_all() >=20 > def tear_down_all(self): > """ > -- > 2.5.0