| Message ID | 20210929153323.2047-2-zhiminx.huang@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [V2,1/2] test_plans/iavf_fdir_test_plan:modify unmatch pkt in pkt list | expand |
| Context | Check | Description |
|---|---|---|
| ci/Intel-dts-doc-test | fail | Testing issues |
| ci/Intel-dts-suite-test | warning | SKIPPED |
| ci/Intel-doc-dts-test | success | Testing OK |
> -----Original Message----- > From: dts <dts-bounces@dpdk.org> On Behalf Of Zhimin Huang > Sent: Wednesday, September 29, 2021 11:33 PM > To: dts@dpdk.org > Cc: Huang, ZhiminX <zhiminx.huang@intel.com> > Subject: [dts] [PATCH V2 2/2] tests/iavf_fdir:modify unmatch pkt in pkt list > > For gtpu sctp,sync with dev,it's not customer requirement, thus remove gtpu > sctp pkts. > For gtpu without inner ipv4/6,these PTYPEs were added the recent DDP > file,so add to match pkt list. > > Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com> Acked-by: Xueqin Lin <xueqin.lin@intel.com> > --- > tests/TestSuite_iavf_fdir.py | 14 +++++--------- > 1 file changed, 5 insertions(+), 9 deletions(-) > > diff --git a/tests/TestSuite_iavf_fdir.py b/tests/TestSuite_iavf_fdir.py index > 7f8dace3..20126297 100755 > --- a/tests/TestSuite_iavf_fdir.py > +++ b/tests/TestSuite_iavf_fdir.py > @@ -189,14 +189,12 @@ MAC_IPV4_GTPU_EH = { > 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/IPv6(nh= > 44)/Raw("x"*20)', > 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/IPv6()/U > DP()/Raw("x"*20)', > 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/IPv6()/TC > P(sport=22,dport=23)/Raw("x"*20)', > - 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/IPv6()/IC > MP()/Raw("x"*20)'], > + 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/IPv6()/IC > MP()/Raw("x"*20)', > + 'Ether(src="a4:bf:01:51:27:ca", > + dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > + dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > + > teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/Raw("x"* > 2 > + 0)'], > "mismatch": [ > - 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/IP()/SCTP > ()/Raw("x"*20)', > - 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/IPv6()/SC > TP()/Raw("x"*20)', > 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x1234567)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/IP()/Raw(" > x"*20)', > 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x35)/IP()/Raw( > "x"*20)', > - 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x12345678)/IP()/Raw("x"*20)', > - 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/Raw("x"* > 20)'] > + 'Ether(src="a4:bf:01:51:27:ca", > + dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > + dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > + teid=0x12345678)/IP()/Raw("x"*20)',] > } > > MAC_IPV4_GTPU = { > @@ -210,11 +208,9 @@ MAC_IPV4_GTPU = { > 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x12345678)/IPv6(nh=44)/Raw("x"*20)', > 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x12345678)/IPv6()/UDP()/Raw("x"*20)', > 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x12345678)/IPv6()/TCP(sport=22, dport=23)/Raw("x"*20)', > - 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x12345678)/IPv6()/ICMP()/Raw("x"*20)'], > + 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x12345678)/IPv6()/ICMP()/Raw("x"*20)', > + 'Ether(src="a4:bf:01:51:27:ca", > + dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > + dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > + teid=0x12345678)/Raw("x"*20)',], > "mismatch": [ > - 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x12345678)/Raw("x"*20)', > - 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x12345678)/IP()/SCTP()/Raw("x"*20)', > - 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x12345678)/IPv6()/SCTP()/Raw("x"*20)', > 'Ether(src="a4:bf:01:51:27:ca", > dst="00:11:22:33:44:55")/IP(src="192.168.0.20", > dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, > teid=0x1234567)/IP()/Raw("x"*20)'] > } > > -- > 2.17.1
> -----Original Message----- > From: dts <dts-bounces@dpdk.org> On Behalf Of Lin, Xueqin > Sent: 2021年10月26日 10:58 > To: Huang, ZhiminX <zhiminx.huang@intel.com>; dts@dpdk.org > Cc: Huang, ZhiminX <zhiminx.huang@intel.com> > Subject: Re: [dts] [PATCH V2 2/2] tests/iavf_fdir:modify unmatch pkt in pkt list > > > -----Original Message----- > > From: dts <dts-bounces@dpdk.org> On Behalf Of Zhimin Huang > > Sent: Wednesday, September 29, 2021 11:33 PM > > To: dts@dpdk.org > > Cc: Huang, ZhiminX <zhiminx.huang@intel.com> > > Subject: [dts] [PATCH V2 2/2] tests/iavf_fdir:modify unmatch pkt in > > pkt list > > > > For gtpu sctp,sync with dev,it's not customer requirement, thus remove > > gtpu sctp pkts. > > For gtpu without inner ipv4/6,these PTYPEs were added the recent DDP > > file,so add to match pkt list. > > > > Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com> > Acked-by: Xueqin Lin <xueqin.lin@intel.com> Applied
diff --git a/tests/TestSuite_iavf_fdir.py b/tests/TestSuite_iavf_fdir.py index 7f8dace3..20126297 100755 --- a/tests/TestSuite_iavf_fdir.py +++ b/tests/TestSuite_iavf_fdir.py @@ -189,14 +189,12 @@ MAC_IPV4_GTPU_EH = { 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/IPv6(nh=44)/Raw("x"*20)', 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/IPv6()/UDP()/Raw("x"*20)', 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/IPv6()/TCP(sport=22,dport=23)/Raw("x"*20)', - 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/IPv6()/ICMP()/Raw("x"*20)'], + 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/IPv6()/ICMP()/Raw("x"*20)', + 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/Raw("x"*20)'], "mismatch": [ - 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/IP()/SCTP()/Raw("x"*20)', - 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/IPv6()/SCTP()/Raw("x"*20)', 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x1234567)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/IP()/Raw("x"*20)', 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x35)/IP()/Raw("x"*20)', - 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/IP()/Raw("x"*20)', - 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/GTPPDUSessionContainer(type=1,P=1,QFI=0x34)/Raw("x"*20)'] + 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/IP()/Raw("x"*20)',] } MAC_IPV4_GTPU = { @@ -210,11 +208,9 @@ MAC_IPV4_GTPU = { 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/IPv6(nh=44)/Raw("x"*20)', 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/IPv6()/UDP()/Raw("x"*20)', 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/IPv6()/TCP(sport=22, dport=23)/Raw("x"*20)', - 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/IPv6()/ICMP()/Raw("x"*20)'], + 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/IPv6()/ICMP()/Raw("x"*20)', + 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/Raw("x"*20)',], "mismatch": [ - 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/Raw("x"*20)', - 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/IP()/SCTP()/Raw("x"*20)', - 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x12345678)/IPv6()/SCTP()/Raw("x"*20)', 'Ether(src="a4:bf:01:51:27:ca", dst="00:11:22:33:44:55")/IP(src="192.168.0.20", dst="192.168.0.21")/UDP(dport=2152)/GTP_U_Header(gtp_type=255, teid=0x1234567)/IP()/Raw("x"*20)'] }
For gtpu sctp,sync with dev,it's not customer requirement, thus remove gtpu sctp pkts. For gtpu without inner ipv4/6,these PTYPEs were added the recent DDP file,so add to match pkt list. Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com> --- tests/TestSuite_iavf_fdir.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)