From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 0A76C2C51 for ; Tue, 8 Mar 2016 04:35:51 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP; 07 Mar 2016 19:35:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,555,1449561600"; d="scan'208";a="904526117" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga001.jf.intel.com with ESMTP; 07 Mar 2016 19:35:27 -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.248.2; Mon, 7 Mar 2016 19:35:27 -0800 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx122.amr.corp.intel.com (10.18.125.37) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 7 Mar 2016 19:35:27 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.24]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.132]) with mapi id 14.03.0248.002; Tue, 8 Mar 2016 11:35:25 +0800 From: "Liu, Yong" To: "Xu, Qian Q" , "dts@dpdk.org" Thread-Topic: [dts] [PATCH]fix: set 100g ixia configuration disable Thread-Index: AQHReE9joA1LCcHP5kq1dniLXu1ckJ9O5m7Q Date: Tue, 8 Mar 2016 03:35:24 +0000 Message-ID: <86228AFD5BCD8E4EBFD2B90117B5E81E1450457F@SHSMSX103.ccr.corp.intel.com> References: <1457341012-18743-1-git-send-email-qian.q.xu@intel.com> In-Reply-To: <1457341012-18743-1-git-send-email-qian.q.xu@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMDQyMzI5Y2YtNTc4OS00NmU2LWFlOTYtZjNmZWUwNDUxNmM4IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6IlJ2cVFlaCtIVGNiVkIydGtOckpYbTd4M1UxY2Q1VzE2TjAyN0Q5R2FLWDA9In0= x-ctpclassification: CTP_IC 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]fix: set 100g ixia configuration disable 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, 08 Mar 2016 03:35:52 -0000 Applied. Thanks. > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Qian Xu > Sent: Monday, March 07, 2016 4:57 PM > To: dts@dpdk.org > Subject: [dts] [PATCH]fix: set 100g ixia configuration disable >=20 > This patch fix an issue that if the ixia.cfg doesn't set the enable_rsfec= . > 1. Change the enable_rsfec to force100g for better understanding. > 2. Set force100g disable if user didn't set the value in config file. >=20 > Signed-off-by: Qian Xu >=20 > diff --git a/conf/ixia.cfg b/conf/ixia.cfg > index 8874801..9deba60 100644 > --- a/conf/ixia.cfg > +++ b/conf/ixia.cfg > @@ -3,7 +3,7 @@ > # Version : IXIA TCL server version > # IP : IXIA server IP address > # Ports : [IXIA port list] > -# ixia_enable_rsfec: We need to set this to enable if we need IXIA port > work in 100G mode. > +# ixia_force100g: We need to set this to enable if we need IXIA port > work in 100G mode. > [IXIA Group] > ixia_version=3D6.62 > ixia_ip=3Dxxx.xxx.xxx.xxx > @@ -12,4 +12,4 @@ ixia_ports=3D > card=3D1,port=3D2; > card=3D1,port=3D3; > card=3D1,port=3D4; > -ixia_enable_rsfec=3Ddisable > +ixia_force100g=3Ddisable > diff --git a/framework/etgen.py b/framework/etgen.py > index e272fd6..081155c 100644 > --- a/framework/etgen.py > +++ b/framework/etgen.py > @@ -155,7 +155,11 @@ class IxiaPacketGenerator(SSHConnection): >=20 > self.ixiaVersion =3D ixiaPorts[ixiaRef]["Version"] > self.ports =3D ixiaPorts[ixiaRef]["Ports"] > - self.enable_rsfec =3D ixiaPorts[ixiaRef]['enable_rsfec'] > + > + if ixiaPorts[ixiaRef].has_key('force100g'): > + self.enable100g =3D ixiaPorts[ixiaRef]['force100g'] > + else: > + self.enable100g =3D 'disable' >=20 > self.logger.info(self.ixiaVersion) > self.logger.info(self.ports) > @@ -414,7 +418,7 @@ class IxiaPacketGenerator(SSHConnection): > item['card'], item['port'])) > #if the line rate is 100G and we need this port work in 100G > mode, > #we need to add some configure to make it so. > - if int(self.get_line_rate(self.chasId, item).strip()) =3D=3D > 100000 and self.enable_rsfec =3D=3D 'enable': > + if int(self.get_line_rate(self.chasId, item).strip()) =3D=3D > 100000 and self.enable100g =3D=3D 'enable': > self.add_tcl_cmd("port config -ieeeL1Defaults 0") > self.add_tcl_cmd("port config -autonegotiate false") > self.add_tcl_cmd("port config -enableRsFec true") > -- > 2.1.0