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 7B9D7A0613 for ; Fri, 30 Aug 2019 05:15:58 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2A1361E535; Fri, 30 Aug 2019 05:15:58 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id A2A961E4ED for ; Fri, 30 Aug 2019 05:15:56 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Aug 2019 20:15:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,445,1559545200"; d="scan'208";a="186171624" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga006.jf.intel.com with ESMTP; 29 Aug 2019 20:15:56 -0700 Received: from fmsmsx124.amr.corp.intel.com (10.18.125.39) 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:15:55 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx124.amr.corp.intel.com (10.18.125.39) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 29 Aug 2019 20:15:55 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.80]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.112]) with mapi id 14.03.0439.000; Fri, 30 Aug 2019 11:15:53 +0800 From: "Tu, Lijuan" To: "He, Zhiwei" , "dts@dpdk.org" CC: "He, Zhiwei" Thread-Topic: [dts] [PATCH] /tests/TestSuite_dual_vlan: Enable columbiaville_25g and columbiaville_100g in the dual_vlan case Thread-Index: AQHVVvwvsUD8IZoFCUS8Ppui2WNFeacTFHgQ Date: Fri, 30 Aug 2019 03:15:52 +0000 Message-ID: <8CE3E05A3F976642AAB0F4675D0AD20E0BB0784B@SHSMSX101.ccr.corp.intel.com> References: <1566266895-107241-1-git-send-email-zhiwei.he@intel.com> In-Reply-To: <1566266895-107241-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: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOWQ0NDNmYzgtMjZjOC00YzViLTg4ZTItNTJkMmMyYzk2ZTNiIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoicWF2OE5GZlwvNzdITnVjOVNuUnNhK3VqYUJwRnBZSkFCNHJlZ0dtekg0TE41WGx6ZmNLelV1NUdUTkZkSjEzdTAifQ== 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_dual_vlan: Enable columbiaville_25g and columbiaville_100g in the dual_vlan case 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 code base changed. > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of zhiwei.he > Sent: Tuesday, August 20, 2019 10:08 AM > To: dts@dpdk.org > Cc: He, Zhiwei > Subject: [dts] [PATCH] /tests/TestSuite_dual_vlan: Enable columbiaville_2= 5g > and columbiaville_100g in the dual_vlan case >=20 > From: "zhiwei.he" >=20 > Signed-off-by: zhiwei.he > --- > tests/TestSuite_dual_vlan.py | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) >=20 > diff --git a/tests/TestSuite_dual_vlan.py b/tests/TestSuite_dual_vlan.py > index a688096..d1cd0c5 100644 > --- a/tests/TestSuite_dual_vlan.py > +++ b/tests/TestSuite_dual_vlan.py > @@ -104,7 +104,7 @@ class TestDualVlan(TestCase): > self.pmdout =3D PmdOutput(self.dut) > self.pmdout.start_testpmd("Default", "--portmask=3D%s" % portMas= k, > socket=3Dself.ports_socket) >=20 > - if self.nic in ["fortville_eagle", "fortville_spirit", "fortvill= e_spirit_single", > "fortville_25g", "fortpark_TLV"]: > + if self.nic in ["fortville_eagle", "columbiaville_25g", > "columbiaville_100g", "fortville_spirit", "fortville_spirit_single", > "fortville_25g", "fortpark_TLV"]: > self.dut.send_expect("vlan set filter on all", "testpmd> ") > self.dut.send_expect("set promisc all off", "testpmd> ") >=20 > @@ -149,7 +149,7 @@ class TestDualVlan(TestCase): > """ >=20 > for mode in modeName: > - if self.nic in ["fortville_eagle", "fortville_spirit", > "fortville_spirit_single", "fortville_25g", "fortpark_TLV"]: > + if self.nic in ["columbiaville_25g", > "columbiaville_100g","fortville_eagle", "fortville_spirit", > "fortville_spirit_single", "fortville_25g", "fortpark_TLV"]: > # fortville NIC vlan filter can't close, if want close n= eed remove > rx_vlan > if mode =3D=3D "filter": > if modeName[mode] =3D=3D "off": > @@ -166,7 +166,7 @@ class TestDualVlan(TestCase): >=20 > out =3D self.dut.send_expect("show port info %s" % dutRxPortId, > "testpmd> ") > for mode in modeName: > - if self.nic in ["fortville_eagle", "fortville_spirit", > "fortville_spirit_single", "fortville_25g","fortpark_TLV"]: > + if self.nic in ["columbiaville_25g", > "columbiaville_100g","fortville_eagle", "fortville_spirit", > "fortville_spirit_single", "fortville_25g","fortpark_TLV"]: > # fortville NIC vlan filter can't close, if want close n= eed remove > rx_vlan > if mode =3D=3D "filter": > if modeName[mode] =3D=3D "off": > @@ -283,7 +283,7 @@ class TestDualVlan(TestCase): > print out > self.verify(out is not None and "vlan %s" % outvlan not in out, = "Vlan > filter enable error: " + out) >=20 > - if self.nic not in ["fortville_eagle", "fortville_spirit", > "fortville_spirit_single", "fortville_25g", "fortpark_TLV"]: > + if self.nic not in ["columbiaville_25g", > "columbiaville_100g","fortville_eagle", "fortville_spirit", > "fortville_spirit_single", "fortville_25g", "fortpark_TLV"]: > self.mode_config(filter=3D"off") > self.vlan_send_packet(outvlan) > out =3D self.get_tcpdump_package() @@ -322,7 +322,7 @@ class > TestDualVlan(TestCase): > self.mode_config(filter=3D"off") > self.mode_config(qinq=3D"off") > self.mode_config(strip=3D"on") > - if self.nic in ["fortville_eagle", "fortville_spirit", "fortvill= e_spirit_single", > "fortville_25g", "fortpark_TLV"]: > + if self.nic in ["columbiaville_25g", "columbiaville_100g", > "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortvi= lle_25g", > "fortpark_TLV"]: > self.dut.send_expect('rx_vlan add %s %s' % (outvlan, dutRxPo= rtId), > "testpmd> ") > self.vlan_send_packet(outvlan) > out =3D self.get_tcpdump_package() @@ -332,20 +332,20 @@ class > TestDualVlan(TestCase): > self.vlan_send_packet(outvlan) > out =3D self.get_tcpdump_package() > self.verify("vlan %s" % outvlan in out, "Vlan strip disable erro= r: " + out) > - if self.nic in ["fortville_eagle", "fortville_spirit", "fortvill= e_spirit_single", > "fortville_25g", "fortpark_TLV"]: > + if self.nic in ["columbiaville_25g", > "columbiaville_100g","fortville_eagle", "fortville_spirit", > "fortville_spirit_single", "fortville_25g", "fortpark_TLV"]: > self.dut.send_expect('rx_vlan rm %s %s' % (outvlan, dutRxPor= tId), > "testpmd> ") >=20 > def test_vlan_stripq_config(self): > """ > Enable/Disable VLAN packets strip on queue > """ > - self.verify(self.nic not in ["fortville_eagle", "fortville_spiri= t", > "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "cavium_a063"= , > "cavium_a064"], "%s NIC not support queue vlan strip " % self.nic) > + self.verify(self.nic not in ["columbiaville_25g", > + "columbiaville_100g", "fortville_eagle", "fortville_spirit", > + "fortville_spirit_single", "fortville_25g", "fortpark_TLV", > + "cavium_a063", "cavium_a064"], "%s NIC not support queue vlan strip " > + % self.nic) >=20 > self.mode_config(filter=3D"off") > self.mode_config(qinq=3D"off") > self.mode_config(strip=3D"off") > self.mode_config(stripq=3D"off") > - if self.nic in ["fortville_eagle", "fortville_spirit", "fortvill= e_spirit_single", > "fortville_25g", "fortpark_TLV"]: > + if self.nic in ["columbiaville_25g", "columbiaville_100g", > "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortvi= lle_25g", > "fortpark_TLV"]: > self.dut.send_expect('rx_vlan add %s %s' % (outvlan, dutRxPo= rtId), > "testpmd> ") > self.vlan_send_packet(outvlan) > out =3D self.get_tcpdump_package() @@ -361,7 +361,7 @@ class > TestDualVlan(TestCase): > self.vlan_send_packet(outvlan) > out =3D self.get_tcpdump_package() > self.verify("vlan %s" % outvlan in out, "vlan strip queue disabl= e error: " > + out) > - if self.nic in ["fortville_eagle", "fortville_spirit", "fortvill= e_spirit_single", > "fortville_25g", "fortpark_TLV"]: > + if self.nic in ["columbiaville_25g", "columbiaville_100g", > "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortvi= lle_25g", > "fortpark_TLV"]: > self.dut.send_expect('rx_vlan rm %s %s' % (outvlan, dutRxPor= tId), > "testpmd> ") >=20 > def test_vlan_insert_config(self): > @@ -401,7 +401,7 @@ class TestDualVlan(TestCase): > """ > Configure receive port out vlan TPID > """ > - self.verify(self.nic not in ["fortville_eagle", "fortville_spiri= t", > "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "hartwell"], = "%s NIC > not support tcpid " % self.nic) > + self.verify(self.nic not in ["columbiaville_25g", > + "columbiaville_100g", "fortville_eagle", "fortville_spirit", > + "fortville_spirit_single", "fortville_25g", "fortpark_TLV", > + "hartwell"], "%s NIC not support tcpid " % self.nic) >=20 > self.mode_config(filter=3D"on", strip=3D"on", qinq=3D"on") > # nic only support inner model, except fortville nic > -- > 1.8.3.1