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 87821A0613 for ; Fri, 30 Aug 2019 05:02:57 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 55C251E4DB; Fri, 30 Aug 2019 05:02:57 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 966871DFF1 for ; Fri, 30 Aug 2019 05:02:55 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Aug 2019 20:02:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,445,1559545200"; d="scan'208";a="183670199" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga003.jf.intel.com with ESMTP; 29 Aug 2019 20:02:54 -0700 Received: from fmsmsx153.amr.corp.intel.com (10.18.125.6) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 29 Aug 2019 20:02:53 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX153.amr.corp.intel.com (10.18.125.6) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 29 Aug 2019 20:02:53 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.80]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.250]) with mapi id 14.03.0439.000; Fri, 30 Aug 2019 11:02:51 +0800 From: "Tu, Lijuan" To: "He, Zhiwei" , "dts@dpdk.org" CC: "He, Zhiwei" Thread-Topic: [dts] [PATCH] tests/TestSuite_uni_pkt: Enable cvl nic columbiaville to support uni pkt test case and delete time sync for DPDK15109 Thread-Index: AQHVVvucMooX/uyLmUKg0wUOPOgQyqcTELsg Date: Fri, 30 Aug 2019 03:02:50 +0000 Message-ID: <8CE3E05A3F976642AAB0F4675D0AD20E0BB077B1@SHSMSX101.ccr.corp.intel.com> References: <1566266651-106893-1-git-send-email-zhiwei.he@intel.com> In-Reply-To: <1566266651-106893-1-git-send-email-zhiwei.he@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.2.0.6 dlp-reaction: no-action x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZGIyN2U0YjYtMTllNS00YmI5LTk2ZmYtNjQxZWM4M2Y4MTI0IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiYnVEeWN1Sm9kNXBha3FMakd6YTRmK0ZcLzBwTFNTVkh3SGdwbjlSTHRLNW8wdnFuZm1oK3lNcUdwa1wvK21OMHVlIn0= 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/TestSuite_uni_pkt: Enable cvl nic columbiaville to support uni pkt test case and delete time sync for DPDK15109 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" Applied failed, because of code base changed. > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of zhiwei.he > Sent: Tuesday, August 20, 2019 10:04 AM > To: dts@dpdk.org > Cc: He, Zhiwei > Subject: [dts] [PATCH] tests/TestSuite_uni_pkt: Enable cvl nic columbiavi= lle > to support uni pkt test case and delete time sync for DPDK15109 >=20 > From: "zhiwei.he" >=20 > diff --git a/tests/TestSuite_uni_pkt.py b/tests/TestSuite_uni_pkt.py inde= x > 2b60320..bdc0c6f 100644 > --- a/tests/TestSuite_uni_pkt.py > +++ b/tests/TestSuite_uni_pkt.py > @@ -93,14 +93,21 @@ class TestUniPacket(TestCase): > """ > Check whether L2 packet can be detected" > """ > - self.verify(("fortville" in self.nic or "fortpark_TLV" in self.n= ic), > + self.verify(("fortville" in self.nic or "fortpark_TLV" in > + self.nic or "columbiaville" in self.nic), > "L2 packet detect only support by Fortville") > - self.L2_types =3D { > - "TIMESYNC": "L2_ETHER_TIMESYNC", > - "ARP": "L2_ETHER_ARP", > - "LLDP": "L2_ETHER_LLDP", > + #Change this code start for DPDK-15109, the share code doest not > support TIMESYNC, once supported then will enable > + if "columbiaville" in self.nic: > + self.L2_types =3D { > + "ARP": "L2_ETHER_ARP", > + "LLDP": "L2_ETHER_LLDP", > + } > + else: > + self.L2_types =3D { > + "TIMESYNC": "L2_ETHER_TIMESYNC", > + "ARP": "L2_ETHER_ARP", > + "LLDP": "L2_ETHER_LLDP", > } > - > + #Change this code end for DPDK-15109, the share code doest not > + support TIMESYNC, once supported then will enable > for l2_type in self.L2_types.keys(): > pkt_name =3D self.L2_types[l2_type] > pkt =3D Packet(pkt_type=3Dl2_type) @@ -115,7 +122,7 @@ class > TestUniPacket(TestCase): > """ > checked that whether L3 and L4 packet can be normally detected. > """ > - if "fortville" in self.nic or "fortpark_TLV" in self.nic: > + if "fortville" in self.nic or "fortpark_TLV" in self.nic or "col= umbiaville" in > self.nic: > outerL4Type =3D "L4_NONFRAG" > ipv4_default_packet_type =3D ["L2_ETHER", "L3_IPV4_EXT_UNKNO= WN"] > elif "niantic" in self.nic.lower() or "powerville" in self.nic.l= ower() or > "cavium" in self.nic.lower() or "twinpond" in self.nic.lower() or "twinvi= lle" in > self.nic.lower() or "sageville" in self.nic.lower() or "sagepond" in > self.nic.lower() or "springville" in self.nic.lower(): > @@ -133,7 +140,7 @@ class TestUniPacket(TestCase): > } >=20 > # delete the unsupported packet based on nic type > - if "fortville" in self.nic or "fortpark_TLV" in self.nic: > + if "fortville" in self.nic or "fortpark_TLV" in self.nic or "col= umbiaville" in > self.nic: > pktType.pop("MAC_IPihl_PKT") > pktType.pop("MAC_IPihl_SCTP_PKT") > elif "niantic" in self.nic.lower() or "powerville" in self.nic.l= ower() or > "cavium" in self.nic.lower() or "twinpond" in self.nic.lower() or "twinvi= lle" in > self.nic.lower() or "sageville" in self.nic.lower() or "sagepond" in > self.nic.lower() or "springville" in self.nic.lower(): > @@ -146,7 +153,7 @@ class TestUniPacket(TestCase): > """ > checked that whether IPv6 and L4 packet can be normally detected= . > """ > - if "fortville" in self.nic or "fortpark_TLV" in self.nic: > + if "fortville" in self.nic or "fortpark_TLV" in self.nic or "col= umbiaville" in > self.nic: > outerL4Type =3D "L4_NONFRAG" > ipv6_default_packet_type =3D ["L2_ETHER", "L3_IPV6_EXT_UNKNO= WN"] > elif "niantic" in self.nic.lower() or "powerville" in self.nic.l= ower() or > "cavium" in self.nic.lower() or "twinpond" in self.nic.lower() or "twinvi= lle" in > self.nic.lower() or "sageville" in self.nic.lower() or "sagepond" in > self.nic.lower() or "springville" in self.nic.lower(): > @@ -162,7 +169,7 @@ class TestUniPacket(TestCase): > } >=20 > # delete the unsupported packet based on nic type > - if "fortville" in self.nic or "fortpark_TLV" in self.nic: > + if "fortville" in self.nic or "fortpark_TLV" in self.nic or "col= umbiaville" in > self.nic: > pktType.pop("MAC_IPv6FRAG_PKT_N") > elif "niantic" in self.nic.lower() or "powerville" in self.nic.l= ower() or > "cavium" in self.nic.lower() or "twinpond" in self.nic.lower() or "twinvi= lle" in > self.nic.lower() or "sageville" in self.nic.lower() or "sagepond" in > self.nic.lower() or "springville" in self.nic.lower(): > pktType.pop("MAC_IPv6FRAG_PKT_F") @@ -174,7 +181,7 @@ class > TestUniPacket(TestCase): > checked that whether IP in IPv4 tunnel packet can be normally > detected by Fortville. > """ > - self.verify(("fortville" in self.nic or "fortpark_TLV" in self.n= ic), > + self.verify(("fortville" in self.nic or "fortpark_TLV" in > + self.nic or "columbiaville" in self.nic), > "IP in IPv4 tunnel packet type detect only support b= y Fortville") > ipv4_in_ipv4_packet_type =3D ["L2_ETHER", "L3_IPV4_EXT_UNKNOWN", > "TUNNEL_IP", "INNER_L3_IPV4_EXT_UNKNOWN"] > ipv6_in_ipv4_packet_type =3D ["L2_ETHER", "L3_IPV4_EXT_UNKNOWN", > "TUNNEL_IP", "INNER_L3_IPV6_EXT_UNKNOWN"] @@ -201,7 +208,7 @@ > class TestUniPacket(TestCase): > checked that whether IPv4 in IPv6 tunnel packet can be normally > detected. > """ > - self.verify(self.nic in ["niantic", "fortville_eagle", > "fortville_spirit","powerville", "fortpark_TLV", > + self.verify(self.nic in ["niantic", "columbiaville_25g", > + "columbiaville_100g", "fortville_eagle", > + "fortville_spirit","powerville", "fortpark_TLV", > "fortville_25g", "fortville_spirit_single"], "not support %s= " % self.nic) > pktType =3D { > "MAC_IP_IPv6_PKT": ["L2_ETHER", "L3_IPV4", "TUNNE= L_IP", > "INNER_L3_IPV6"], > @@ -352,7 +359,7 @@ class TestUniPacket(TestCase): > """ > checked that whether GRE tunnel packet can be normally detected = by > Fortville. > """ > - self.verify(("fortville" in self.nic or "fortpark_TLV" in self.n= ic), > + self.verify(("fortville" in self.nic or "fortpark_TLV" in > + self.nic or "columbiaville" in self.nic), > "GRE tunnel packet type detect only support by Fortv= ille") > base_packet_type =3D [" L2_ETHER", " L3_IPV4_EXT_UNKNOWN", > "TUNNEL_GRENAT"] > pktType =3D { > @@ -371,7 +378,7 @@ class TestUniPacket(TestCase): > checked that whether Vxlan tunnel packet can be normally detecte= d by > Fortville. > """ > - self.verify(("fortville" in self.nic or "fortpark_TLV" in self.n= ic), > + self.verify(("fortville" in self.nic or "fortpark_TLV" in > + self.nic or "columbiaville" in self.nic), > "Vxlan tunnel packet type detect only support by For= tville") >=20 > self.dut.send_expect("rx_vxlan_port add 4789 0", "testpmd>", 10) > -- > 1.8.3.1