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 7AB5B2C12 for ; Mon, 17 Apr 2017 08:35:22 +0200 (CEST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Apr 2017 23:35:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,213,1488873600"; d="scan'208";a="846740668" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by FMSMGA003.fm.intel.com with ESMTP; 16 Apr 2017 23:35:20 -0700 Received: from fmsmsx126.amr.corp.intel.com (10.18.125.43) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 16 Apr 2017 23:35:19 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by FMSMSX126.amr.corp.intel.com (10.18.125.43) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 16 Apr 2017 23:35:19 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.117]) by SHSMSX104.ccr.corp.intel.com ([10.239.4.70]) with mapi id 14.03.0319.002; Mon, 17 Apr 2017 14:35:17 +0800 From: "Liu, Yong" To: Angela Czubak , "dts@dpdk.org" Thread-Topic: [dts] [PATCH v2 02/28] framework dut and project_dpdk: using correct available binding scripts Thread-Index: AQHSsh1IspnLRtQHbkOq98Ot+aGVCqHJI20w Date: Mon, 17 Apr 2017 06:35:16 +0000 Message-ID: <86228AFD5BCD8E4EBFD2B90117B5E81E62DBE00C@SHSMSX103.ccr.corp.intel.com> References: <1491501092-14278-1-git-send-email-aczubak@caviumnetworks.com> <1491844162-16300-1-git-send-email-aczubak@caviumnetworks.com> <1491844162-16300-3-git-send-email-aczubak@caviumnetworks.com> In-Reply-To: <1491844162-16300-3-git-send-email-aczubak@caviumnetworks.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: 10.0.102.7 dlp-reaction: no-action 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 v2 02/28] framework dut and project_dpdk: using correct available binding scripts 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: Mon, 17 Apr 2017 06:35:23 -0000 Hi Angela, I guess you're trying to make DTS compact with different versions of DPDK. = Normally we handle that by creating tag on DTS code.=20 There's alternative way to do that. We can get dpdk version from rte_versio= n.h and then tools name will be explicit.=20 Thanks, Marvin > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Angela Czubak > Sent: Tuesday, April 11, 2017 1:09 AM > To: dts@dpdk.org > Cc: Angela Czubak > Subject: [dts] [PATCH v2 02/28] framework dut and project_dpdk: using > correct available binding scripts >=20 > Below patch makes scripts look for correct DPDK binding script, > checking whether 'usertools' or 'tools' directory is present and which > script exist in 'tools' directory ('dpdk-devbind.py' or > 'dpdk_nic_bind.py') >=20 > Signed-off-by: Angela Czubak > --- > framework/dut.py | 21 ++++++++++++++++++--- > framework/project_dpdk.py | 20 ++++++++++++++++++-- > 2 files changed, 36 insertions(+), 5 deletions(-) >=20 > diff --git a/framework/dut.py b/framework/dut.py > index 9cbdaf7..4ce5c3a 100644 > --- a/framework/dut.py > +++ b/framework/dut.py > @@ -377,8 +377,15 @@ class Dut(Crb): > if current_nic =3D=3D 0: > self.logger.info("Not nic need bind driver: %s" % driver) > return > - > - self.send_expect('usertools/dpdk-devbind.py %s' % binding_list, > '# ') > + op =3D self.send_command("ls") > + if "usertools" in op: > + self.send_expect('usertools/dpdk-devbind.py %s' % > binding_list, '# ') > + else: > + op =3D self.send_command("ls tools") > + if "dpdk_nic_bind.py" in op: > + self.send_expect('tools/dpdk_nic_bind.py %s' % > binding_list, '# ') > + else: > + self.send_expect('tools/dpdk-devbind.py %s' % > binding_list, '# ')=09 >=20 > def unbind_interfaces_linux(self, nics_to_bind=3DNone): > """ > @@ -402,7 +409,15 @@ class Dut(Crb): > self.logger.info("Not nic need unbind driver") > return >=20 > - self.send_expect('usertools/dpdk-devbind.py %s' % binding_list, > '# ', 30) > + op =3D self.send_command("ls") > + if "usertools" in op: > + self.send_expect('usertools/dpdk-devbind.py %s' % > binding_list, '# ') > + else: > + op =3D self.send_command("ls tools") > + if "dpdk_nic_bind.py" in op: > + self.send_expect('tools/dpdk_nic_bind.py %s' % > binding_list, '# ') > + else: > + self.send_expect('tools/dpdk-devbind.py %s' % > binding_list, '# ') >=20 > def get_ports(self, nic_type=3D'any', perf=3DNone, socket=3DNone): > """ > diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py > index a0cb4c2..50740f8 100644 > --- a/framework/project_dpdk.py > +++ b/framework/project_dpdk.py > @@ -314,7 +314,15 @@ class DPDKdut(Dut): > binding_list +=3D '%s ' % (port_info['pci']) > current_nic +=3D 1 >=20 > - self.send_expect('usertools/dpdk-devbind.py %s' % binding_list, > '# ') > + op =3D self.send_command("ls") > + if "usertools" in op: > + self.send_expect('usertools/dpdk-devbind.py %s' % > binding_list, '# ') > + else: > + op =3D self.send_command("ls tools") > + if "dpdk_nic_bind.py" in op: > + self.send_expect('tools/dpdk_nic_bind.py %s' % > binding_list, '# ') > + else: > + self.send_expect('tools/dpdk-devbind.py %s' % > binding_list, '# ') >=20 > def unbind_interfaces_linux(self, nics_to_bind=3DNone): > """ > @@ -329,7 +337,15 @@ class DPDKdut(Dut): > binding_list +=3D '%s ' % (port_info['pci']) > current_nic +=3D 1 >=20 > - self.send_expect('usertools/dpdk-devbind.py %s' % binding_list, > '# ', 30) > + op =3D self.send_command("ls") > + if "usertools" in op: > + self.send_expect('usertools/dpdk-devbind.py %s' % > binding_list, '# ') > + else: > + op =3D self.send_command("ls tools") > + if "dpdk_nic_bind.py" in op: > + self.send_expect('tools/dpdk_nic_bind.py %s' % > binding_list, '# ') > + else: > + self.send_expect('tools/dpdk-devbind.py %s' % > binding_list, '# ') >=20 > def build_dpdk_apps(self, folder, extra_options=3D''): > """ > -- > 2.7.4