From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 62CDC25B3 for ; Tue, 22 Jan 2019 05:17:28 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Jan 2019 20:17:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,504,1539673200"; d="scan'208";a="136601833" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga002.fm.intel.com with ESMTP; 21 Jan 2019 20:17:27 -0800 Received: from fmsmsx126.amr.corp.intel.com (10.18.125.43) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 21 Jan 2019 20:17:27 -0800 Received: from shsmsx107.ccr.corp.intel.com (10.239.4.96) by FMSMSX126.amr.corp.intel.com (10.18.125.43) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 21 Jan 2019 20:17:26 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.63]) by SHSMSX107.ccr.corp.intel.com ([169.254.9.239]) with mapi id 14.03.0415.000; Tue, 22 Jan 2019 12:17:24 +0800 From: "Zhu, WenhuiX" To: "Yao, BingX Y" , "dts@dpdk.org" CC: "Yao, BingX Y" Thread-Topic: [dts] [PATCH V1] tests/TestSuite_uni_pkt.py Thread-Index: AQHUsV36yoH/iRE2Qkmua+otGUe03KW6r/GQ Date: Tue, 22 Jan 2019 04:17:23 +0000 Message-ID: References: <1548057207-15616-1-git-send-email-bingx.y.yao@intel.com> In-Reply-To: <1548057207-15616-1-git-send-email-bingx.y.yao@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: 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 V1] tests/TestSuite_uni_pkt.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, 22 Jan 2019 04:17:29 -0000 Tested-by: Zhu, WenhuiX -----Original Message----- From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of yaobing Sent: Monday, January 21, 2019 3:53 PM To: dts@dpdk.org Cc: Yao, BingX Y Subject: [dts] [PATCH V1] tests/TestSuite_uni_pkt.py some packets are not match with packet type Signed-off-by: yaobing --- tests/TestSuite_uni_pkt.py | 52 ++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/tests/TestSuite_uni_pkt.py b/tests/TestSuite_uni_pkt.py index = 17de58f..d01e06f 100644 --- a/tests/TestSuite_uni_pkt.py +++ b/tests/TestSuite_uni_pkt.py @@ -305,9 +305,7 @@ class TestUniPacket(TestCase): "MAC_IPv6_NVGRE_MAC_IPv6FRAG_PKT": nvgre_ipv6_default_pac= ket_type + ["INNER_L4_FRAG"], "MAC_IPv6_NVGRE_MAC_IPv6_PKT": nvgre_ipv6_default_pac= ket_type + ["INNER_L4_NONFRAG"], "MAC_IPv6_NVGRE_MAC_IPv6_UDP_PKT": nvgre_ipv6_default_pac= ket_type + ["INNER_L4_UDP"], - "MAC_IPv6_NVGRE_MAC_IPv6_TCP_PKT": nvgre_ipv6_default_pac= ket_type + ["INNER_L4_TCP"],=20 - "MAC_IPv6_NVGRE_MAC_IPv6_SCTP_PKT": nvgre_ipv6_default_pac= ket_type + ["INNER_L4_NONFRAG"], - "MAC_IPv6_NVGRE_MAC_IPv6_ICMP_PKT": nvgre_ipv6_default_pac= ket_type + ["INNER_L4_NONFRAG"], + "MAC_IPv6_NVGRE_MAC_IPv6_TCP_PKT": nvgre_ipv6_default_pac= ket_type + ["INNER_L4_TCP"], =20 "MAC_IPv6_NVGRE_MAC_VLAN_IPFRAG_PKT": nvgre_ipv4_vlan_packet= _type + ["INNER_L4_FRAG"], "MAC_IPv6_NVGRE_MAC_VLAN_IP_PKT": nvgre_ipv4_vlan_packet= _type + ["INNER_L4_NONFRAG"], "MAC_IPv6_NVGRE_MAC_VLAN_IP_UDP_PKT": nvgre_ipv4_vlan_packet= _type + ["INNER_L4_UDP"], @@ -317,12 +315,38 @@ class TestUniPacket(TestCase): "MAC_IPv6_NVGRE_MAC_VLAN_IPv6FRAG_PKT": nvgre_ipv6_vlan_packet= _type + ["INNER_L4_FRAG"],=20 "MAC_IPv6_NVGRE_MAC_VLAN_IPv6_PKT": nvgre_ipv6_vlan_packet= _type + ["INNER_L4_NONFRAG"], "MAC_IPv6_NVGRE_MAC_VLAN_IPv6_UDP_PKT": nvgre_ipv6_vlan_packet= _type + ["INNER_L4_UDP"], - "MAC_IPv6_NVGRE_MAC_VLAN_IPv6_TCP_PKT": nvgre_ipv6_vlan_packet= _type + ["INNER_L4_TCP"], - "MAC_IPv6_NVGRE_MAC_VLAN_IPv6_SCTP_PKT":nvgre_ipv6_vlan_packet= _type + ["INNER_L4_NONFRAG"], - "MAC_IPv6_NVGRE_MAC_VLAN_IPv6_ICMP_PKT":nvgre_ipv6_vlan_packet= _type + ["INNER_L4_NONFRAG"] + "MAC_IPv6_NVGRE_MAC_VLAN_IPv6_TCP_PKT":=20 + nvgre_ipv6_vlan_packet_type + ["INNER_L4_TCP"] } =20 self.run_test(pkt_types) + pkt_special =3D [ + ["MAC_IPv6_NVGRE_MAC_IPv6_SCTP_PKT",nvgre_ipv6_defa= ult_packet_type + ["INNER_L4_SCTP"], + ['ether', 'ipv6', 'nvgre', 'inner_mac', 'inner_ipv6= ', 'inner_sctp', 'raw']], + ["MAC_IPv6_NVGRE_MAC_IPv6_ICMP_PKT",nvgre_ipv6_defa= ult_packet_type + ["INNER_L4_ICMP"], + ['ether', 'ipv6', 'nvgre', 'inner_mac', 'inner_ipv6= ', 'inner_icmp', 'raw']], + ["MAC_IPv6_NVGRE_MAC_VLAN_IPv6_SCTP_PKT",nvgre_ipv6= _vlan_packet_type + ["INNER_L4_SCTP"], + ['ether', 'ipv6', 'nvgre', 'inner_mac', 'inner_vlan= ', 'inner_ipv6', 'inner_sctp', 'raw']], + ["MAC_IPv6_NVGRE_MAC_VLAN_IPv6_ICMP_PKT",nvgre_ipv6= _vlan_packet_type + ["INNER_L4_ICMP"], + ['ether', 'ipv6', 'nvgre', 'inner_mac', 'inner_vlan= ', 'inner_ipv6', 'inner_icmp', 'raw']] + ] + self.run_special_cope(pkt_special) + + def run_special_cope(self, pkt_special): + time.sleep(1) + for pkts in pkt_special: + pkt =3D Packet() + pkt.assign_layers(pkts[2]) + if 'inner_icmp' in pkts[2]: + pkt.config_layers([('ipv6',{'nh':47}), ('inner_ipv6', {'nh= ': 58})]) + else: + pkt.config_layers([('ipv6',{'nh':47}),('inner_ipv6', {'nh'= : 132})]) + pkt.send_pkt(tx_port=3Dself.tester_iface) + out =3D self.dut.get_session_output(timeout=3D2) + for pkt_layer_name in pkts[1]: + if pkt_layer_name not in out: + print utils.RED("Fail to detect %s" % pkt_layer_name) + raise VerifyFailure("Failed to detect %s" % pkt_layer_= name) + print utils.GREEN("Detected %s successfully" % pkts[0]) =20 def test_GRE_tunnel(self): """ @@ -330,16 +354,16 @@ class TestUniPacket(TestCase): """ self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic= ), "GRE tunnel packet type detect only support by Fortvil= le") - IPv4_packet_type =3D [" L2_ETHER", " L3_IPV4_EXT_UNKNOWN", "L4_NON= FRAG"] + base_packet_type =3D [" L2_ETHER", " L3_IPV4_EXT_UNKNOWN",=20 + "TUNNEL_GRENAT"] =20 pktType =3D { - "MAC_IP_GRE_IPFRAG_PKT": IPv4_packet_type, - "MAC_IP_GRE_IP_PKT": IPv4_packet_type, - "MAC_IP_GRE_IP_UDP_PKT": IPv4_packet_type, - "MAC_IP_GRE_IP_TCP_PKT": IPv4_packet_type, - "MAC_IP_GRE_IP_SCTP_PKT": IPv4_packet_type, - "MAC_IP_GRE_IP_ICMP_PKT": IPv4_packet_type, - "MAC_IP_GRE_PKT": IPv4_packet_type + "MAC_IP_GRE_IPFRAG_PKT": base_packet_type + ["INNER_L= 3_IPV4_EXT_UNKNOWN", "INNER_L4_FRAG"], + "MAC_IP_GRE_IP_PKT": base_packet_type + ["INNER_L= 3_IPV4_EXT_UNKNOWN", "INNER_L4_NONFRAG"], + "MAC_IP_GRE_IP_UDP_PKT": base_packet_type + ["INNER_L= 3_IPV4_EXT_UNKNOWN", "INNER_L4_UDP"], + "MAC_IP_GRE_IP_TCP_PKT": base_packet_type + ["INNER_L= 3_IPV4_EXT_UNKNOWN", "INNER_L4_TCP"], + "MAC_IP_GRE_IP_SCTP_PKT": base_packet_type + ["INNER_L= 3_IPV4_EXT_UNKNOWN", "INNER_L4_SCTP"], + "MAC_IP_GRE_IP_ICMP_PKT": base_packet_type + ["INNER_L= 3_IPV4_EXT_UNKNOWN", "INNER_L4_ICMP"], + "MAC_IP_GRE_PKT": base_packet_type } self.run_test(pktType) =20 -- 2.17.2