From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0041.outbound.protection.outlook.com [104.47.34.41]) by dpdk.org (Postfix) with ESMTP id 3A7BB2C6E for ; Thu, 6 Apr 2017 19:51:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=G/70Co4x5j3Ck0YujPdRzhixDGw+cwlNmDlbkLzsKow=; b=YYhzWndPDGWKRBl/W/Yi8bi09k9L7cSC7a28jhfxJ1s869R8o2O1dJer34K/5mIwebm/W79Q6O6xU+gwID8hHYjFV3FkwujbuNDNRkA6nPah6Vd1xWCaq1eoAfIVm6X0baNikFSjQ7zCUAyrs0NHRpWYOm6+ar/BrihX4RFDYC0= Authentication-Results: dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from angela-H81M-S1.semihalf.local (31.172.191.173) by DM2PR0701MB810.namprd07.prod.outlook.com (10.242.127.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10; Thu, 6 Apr 2017 17:51:47 +0000 From: Angela Czubak To: dts@dpdk.org Cc: Angela Czubak Date: Thu, 6 Apr 2017 19:51:08 +0200 Message-Id: <1491501092-14278-3-git-send-email-aczubak@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491501092-14278-1-git-send-email-aczubak@caviumnetworks.com> References: <1491501092-14278-1-git-send-email-aczubak@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [31.172.191.173] X-ClientProxiedBy: AM5PR0701CA0051.eurprd07.prod.outlook.com (10.169.145.141) To DM2PR0701MB810.namprd07.prod.outlook.com (10.242.127.24) X-MS-Office365-Filtering-Correlation-Id: 8bb8c171-20c2-474a-3de5-08d47d1598cd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:DM2PR0701MB810; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB810; 3:UL71DjtXpAtT1/IrMaL1qdlDEK7wiPr3J5T0YMTVa751R2C1jCjLpGVDh0HdjC8y0kwIYK4dOS1MeThvwTmo4pLklSTSd0KbUKGDVlUtmwXyVZJjhuTGySH70R3+kq5my2AXKxbbrHSTyJRf0gqUzgtLO9FVEqsevo9wQlkrRx9hWmkRyXlvPgNef9OrtSzATta/iryvfOEVv+cL07aWvwZOhPr9fddYOj0vfp72WW7g1vRgtqQvN+wYrX5ESh+tiCBmEnv6FtCKl2x0+jc061zyzVO9WBHRXEvoTJXU46AiWM68EPtpaXLrdc/GciMMTrr1oBQyYHKAuq4R71Xtxg==; 25:nB8pPMcEKV28Rqg10Dg0Cqymg5EPa1YA69vw8GpP7PmWOLqiGXdeYwZtj/FwlmtpDZ9Qm69rACFAOSqhBazM3ximMvKpup4ZhGZeJVY+RoxJK46676TkaQlSrDea2wrvIi/J8YsE2IZ2dYC2WK4/BurELgtGhhToUoJvvSY0c8UmJF//muZBPNxRc181ai2YZKFAutEAwGt/UyWZc5/G9AowOZXcukF8MkDC6qA7GPPG/Cq9W28I6RJnmh80SSl0Sfm67Ods1ynZ7BYpzYMKedozv3F/ExeTV4jCglR67xMcneL/f5z/8idXtozRPh+lYbmFLDK8McN/llBJtz05kBhWMQz6uGo8GqV1JUZFWSeYgiI+BV4k0Hy0t2cC/mWDOGLqID9PW7rQ+qnVhiY8fl6OwIxRfM0Otiduo/kqmTlYFSum7OC9B7s3+uHR5sXUxPQE2+fWVSp6rmGMIe2nwg== X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB810; 31:dxWjTMVrMNb5yVjtXSJWHWzk/4F3BlqpcJirLcuGsVPaNd6+RMhSkdtllU5AyW6q2ppTliZI3YirKa4hOCnXo3xCQ2CKNZLbE6VXngHnoQ6qzG4nzu0dsac6e/OqIgN5M8moDJGBr8mR/5PZi3umoo6gRA2TEBVCfH7DAd/pZuTyLVxCRrYNM+c5g41vVlUxG3kRXIyJ3naMl9szj7ukZc07J7kUn52ykh4FFPW+HhiafX+zJv3eOJMSD5aBOZDY; 20:nGz3sY15iOPDr+hr+6JjvairbZb0tenbAj6H5wlzhdsRgLYj7LWAgRBomFSO0B/sWwwzOgvB7TX3W0KWKsDmOCRnPyFMCpSMl5+YfzVmsyEl2r651QnbWFKx8F4Ya3G6p0OjmugdkFNG4AO6cqddV96uNsZKgILhXeqUj/irzmZlS5IMyUMsVbtLmbTa2U4VjnZnDinLRhqNHYbWlcTHBVsgodKTeaZjye46L3QqJ5zEvMRQc9RrcRT5sbJdlrG3UIwlgh71jU8EhRlpcw00VMNp/YFSHjWaAzToh6A2kX59rWdJi6FQUHb3aq4yeLoN211ItmKJ8xn9ck3OPbz81N6oC6vKCVwDr/RPxecaEoiMrikSfms226jhgqsztuKp/hH/bzCWzS8FRxiraObuFxoHq8FlkYPOu+dzuuf54JznXihQlyRe/qsLz3GXFPWlpvGGaeJp15Ls4tldbZjyBZCDh384czNSZJJsidO8dpRyjigWeMSh9POgJeUkMkCL+0byAgzknbKgwEmW03sUc47Jtv8eo5yxJyUtEu2y97P+a3vU3rbNS3kO579vh7a3VTDDCD7n6a6ZGTxErNITCpVkpRmn0vEj6hM6Vs4bxP8= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(127540120423786); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(10201501046)(3002001)(6041248)(20161123555025)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(20161123562025)(6072148); SRVR:DM2PR0701MB810; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0701MB810; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB810; 4:hRDPaGmMqX5eMNZeITNHAXN++qPO9aPr6wJwkhNMnOZskr891AZK5Rw5rmxDFHikBppKQgFR9U446A/FYgu5xy1A/VICvePKEHvd+Bh64OH4tkTuSaVjOcbeSoHTTVBF7Qmojzs204b+xGYDZw8BFCIPMQ4uw2hNJUyIQ0dOm2Gk41wqmTlWYcjsTf/fsbZVbnzRplE5NWnyxlXDwxZ3jec8+XW9NtOYUaf/YZmrxAnkSE55/MEOhBYRtQ2jDPaLxxXHvPOtyMUNa6SlOjoApxqAGerJMO+DcJ35V48+iyJgrnrdVbZONUFiG8bmBtItaZvFpSywJ3FV2queWS/b8b71BZzVmBHMQ0GZ4EJXK1SS5NLrhSXgVo0ynMsgTj+5Qkmnj6B0RgQJafZQarikDQJJJ6TNDufv1AP6HdFHxqElbnupqN7Y5afBvPCIoSMfOgBumKWXkH7rNTo4zc+kZFQeAsiR1Y6O5hbE57FHL6OJpJzuFllcu9IBT0/OwHl9/rTQuQVlUJKZgMtjR4y/gOP7A1Qmmsjl07Ni9fBqrfjoSfEXI4Hpazu+Wh6yZdjXFtyoCDwIO/iUW/gnZoJIBW1ap37/O8opzMOob1YeV4gR//2yPq0YxaBnJnxohozEsWYwpMOEm0vuNyyHzU+PcacwI9r/lftgK9Xzu2RnjkaLDMb3jcPTsCz/bY73sHdHWr95QEgzCcLtik6H7FSwd7mdZNjgKj9x/sgn8PajnNuisba988ToVA+u+CHJ//d+ X-Forefront-PRVS: 02698DF457 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39830400002)(39450400003)(39400400002)(39410400002)(3846002)(50226002)(6116002)(47776003)(33646002)(6506006)(189998001)(6486002)(48376002)(50466002)(36756003)(66066001)(8676002)(5003940100001)(2361001)(42882006)(110136004)(107886003)(38730400002)(76176999)(25786009)(2351001)(575784001)(6666003)(81166006)(42186005)(50986999)(6916009)(6512007)(7736002)(53936002)(4326008)(5660300001)(305945005)(2950100002)(2906002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0701MB810; H:angela-H81M-S1.semihalf.local; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0701MB810; 23:ZM6aIVh7etqaNw3VtQwXwJdbzSZI4kldF8KHyD6z?= =?us-ascii?Q?/EzcwK+SpregMromixHoyyijHeQ3eqA1B5zE/XtzcFZELkCvqjEugcCNb3cN?= =?us-ascii?Q?8sTootBZH7GVmtnNUmKhYDTYbCmNYmJ6SwgSAT+lnLDjiVwj0pdePpalEXc4?= =?us-ascii?Q?9q8yr8CoBTDrojQhswsF5u/ycHTVRNeAgukwLenpegVnBFqKGJpkOcXHyUcM?= =?us-ascii?Q?eeK4qJPJ8XyTQI8jQTknE8Z0jQkf8jDEcbfqHHvHj1y6sBque3kS0mCD78NK?= =?us-ascii?Q?TBiCV7G8jF5qokHNL2JoSV45mw4dla0dQW9ZSStS+36BXNqTCa+N8wEjAY/N?= =?us-ascii?Q?jqlRNOKae212tQnnOD9qi/hBrPEme5fQThWjdOxUHoGd91O8AHw6Spi6pq0U?= =?us-ascii?Q?WXvgR+B6Ei8jbMR7Zcvl43KoD5AYxX9Mew7oeNmzoxM6WISKTR4AuWjbEis6?= =?us-ascii?Q?GESxV60izb/qRkqUh4zKqKbMbSqu4UnaDSGG7qPKmpW8uj3roq3kIxmgmP5g?= =?us-ascii?Q?8fDeDoQ92hJkVLhlAeLaXT3XGF4oyOqXyiOQ/U8k1UgW4/YOAK9Dm+skJ5AF?= =?us-ascii?Q?coJVsC0hLpMh4aZ4d/8xvLI677x6i8ao6k/2mUQ6Wy3C87oDKyaW2SVWBtaY?= =?us-ascii?Q?vP6Ubd9b0+3wifi09R7zcaRnWF+VNfaKTG2UOJUFZcgQZzqE3OOY9gra6teN?= =?us-ascii?Q?FS8JgFK/c4dpu00nDvKfSCv8UR7qaEKPAw/Djk5ETAoC6OcKMAGEWb5EULzv?= =?us-ascii?Q?0Xy0q76kRStMNwuRtYvdw73seYEIKK7mr+NdxCbzy8TT8L/jNH/ijCa5YKUM?= =?us-ascii?Q?2GFTP7C9L1HpidbBl+3N6Vi5MMiaMlNB/NktKI6P9AJesJOycolV+ooYZR9i?= =?us-ascii?Q?AFkjPYHyJiSrnQYvXCdkpzhSIM9C1MEBaSqS4Ddd7P5jopVXGOVlrMJdTsNy?= =?us-ascii?Q?1XXQbshcZQmbOr8QQQdXrGiCCZD3z0o4BWKroF4PCK93zJVUvyS6h+Ff0L76?= =?us-ascii?Q?QWMZnU9lYBjVq5oUQdZHbvn6ChfjYKEcyiDXdxlLvzA+1BptlfNg4ipf4maf?= =?us-ascii?Q?Tu19sKA=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB810; 6:m8I/GV/1Td+kTgmr2ND7yDQzOe/dJT7U0UPi+NDcoIcyvBx3QuaD0lYIObspYqSn9XIbpe0s4hFVxrcPNft0FVDIEvYZi+mwfMbUPaRq1RloiDOBUwKhRFhplBmcvk4LO4W1DrYdn6c0gYDj5FQuviLBNRl6Vcbd81cAJeFi3Zd10J7ir1WZ2jPAqD15Ycr2jnuKfyIRySk2t0x4+V6UblH4z0VbgIy0aHkHbngnCsArsBqgNamQQ+43RsqB4ouFBHUj04bEd3M95Xhdl+x/+e0LgKw/wMxAF1C83URWi0QBB3VPWILLj3abNN1lCdTvIxOtv9gonlMNHrMbs+ICTnqNV45KPYcIPY42J/kN+A3pYlV+/jF5IE+Y7T80hcuf84Ekf2PfdJx81aYmWDc2jg==; 5:Ty6SJrUy0RoW4YDnsewVyDKqowXMVF/N6vQCZweK8np73cXqcJOxAGVOvrux92HeP9gQyzeUJyEJBXY/q0GCCZ9AT6Xmd/fwDjQ65/HRbUDa6h8t6wcEAsLrlGV1PhJis3rEsA6y9DOS6HABQQOE4w==; 24:NECiCK836BM4WPDwtoyj8YXyVPbyEjGoyk1xoLjRRnouLhKEDo0L/rccfW43KsNqqlZSkrx7CBjb5SdjqU6V6R7V8xIrnGr35dGUim33NNU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB810; 7:3N5HwwdNTLYwICkzG32nuhPmYBUv0vQV3aAalVOdU6GCnkw5COA/bkMzbnJlXRHltj2DKizXOq4rJGyiHUDd8WDmQ6EalWejR/b+jJ2Je3P+uo+E4qf7eive9xS87Qvc/CDbyol631hSjetmuT4voi99+RZln5UX/Q3XMK2SUwrHPmxXcr3jY1z4R9MEDvW/OqS7Hpr6YtQRiLzTdCeppqN7L4714SkfTYqhJhEjJpj+kABvyBa933znYJgUlVxYijs45P+ZR3tVzDPfVTbT/04oArU97VDF18/mcLAxp+zRaSzPTUt4DyXkpi592vu3xAYcixjZTFNre+ytep2WVQ== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2017 17:51:47.1450 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0701MB810 Subject: [dts] [PATCH 02/26] 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: Thu, 06 Apr 2017 17:51:51 -0000 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') Signed-off-by: Angela Czubak --- framework/dut.py | 21 ++++++++++++++++++--- framework/project_dpdk.py | 20 ++++++++++++++++++-- 2 files changed, 36 insertions(+), 5 deletions(-) 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 == 0: self.logger.info("Not nic need bind driver: %s" % driver) return - - self.send_expect('usertools/dpdk-devbind.py %s' % binding_list, '# ') + op = self.send_command("ls") + if "usertools" in op: + self.send_expect('usertools/dpdk-devbind.py %s' % binding_list, '# ') + else: + op = 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, '# ') def unbind_interfaces_linux(self, nics_to_bind=None): """ @@ -402,7 +409,15 @@ class Dut(Crb): self.logger.info("Not nic need unbind driver") return - self.send_expect('usertools/dpdk-devbind.py %s' % binding_list, '# ', 30) + op = self.send_command("ls") + if "usertools" in op: + self.send_expect('usertools/dpdk-devbind.py %s' % binding_list, '# ') + else: + op = 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, '# ') def get_ports(self, nic_type='any', perf=None, socket=None): """ 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 += '%s ' % (port_info['pci']) current_nic += 1 - self.send_expect('usertools/dpdk-devbind.py %s' % binding_list, '# ') + op = self.send_command("ls") + if "usertools" in op: + self.send_expect('usertools/dpdk-devbind.py %s' % binding_list, '# ') + else: + op = 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, '# ') def unbind_interfaces_linux(self, nics_to_bind=None): """ @@ -329,7 +337,15 @@ class DPDKdut(Dut): binding_list += '%s ' % (port_info['pci']) current_nic += 1 - self.send_expect('usertools/dpdk-devbind.py %s' % binding_list, '# ', 30) + op = self.send_command("ls") + if "usertools" in op: + self.send_expect('usertools/dpdk-devbind.py %s' % binding_list, '# ') + else: + op = 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, '# ') def build_dpdk_apps(self, folder, extra_options=''): """ -- 2.7.4