From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0041.outbound.protection.outlook.com [104.47.40.41]) by dpdk.org (Postfix) with ESMTP id BE5C22BD1 for ; Mon, 10 Apr 2017 19:09:37 +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=IeJPrVB2vEDdHlsnpROtkEclE/PISitMxZCWBGBgZen8Gg3X9Mb0jXa6PHE1kfCG7aW8/hy3RHVfhwHvle/rg5KIsn3H2SqmMaW3yWUryUuWl+uwLajWlnypsiFZ07kjcFc8xdUU41HyOdq0+2GMv0PMwEqd+nV1U7/VieBw9Gs= 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 DM2PR0701MB812.namprd07.prod.outlook.com (10.242.127.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Mon, 10 Apr 2017 17:09:35 +0000 From: Angela Czubak To: dts@dpdk.org Cc: Angela Czubak Date: Mon, 10 Apr 2017 19:08:56 +0200 Message-Id: <1491844162-16300-3-git-send-email-aczubak@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491844162-16300-1-git-send-email-aczubak@caviumnetworks.com> References: <1491501092-14278-1-git-send-email-aczubak@caviumnetworks.com> <1491844162-16300-1-git-send-email-aczubak@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [31.172.191.173] X-ClientProxiedBy: DB6PR05CA0010.eurprd05.prod.outlook.com (10.170.218.23) To DM2PR0701MB812.namprd07.prod.outlook.com (10.242.127.26) X-MS-Office365-Filtering-Correlation-Id: f6d29edb-7836-4198-be3c-08d480345dad X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:DM2PR0701MB812; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB812; 3:wfg7CbYLXQE1k7ZeKTcJpoCzehQexWy8VuFYUdNnfy/VHh5jXjJvEK0Q1CmfeamlDf/gCFCGLs1j5L1F3YayeSGFL6O9iU6J1Qzzox7uAfoHyx9n+lOEhVoxkU7r83en6W/wplaBYggbzNbn5YM3UFtDeF4CLZCooBmL/gGv/6ni0eLBxV4cFLJ1gk2p1sn4DO0oQyZ7pjK6DKQ4f/FNH6dGgWvL9hZ8XTWJkNhUB1NcW5trVsw2OY0oiR7BjOEsm8vvyg0ZcOjGfMTh7I5oUWXLoUbuk5ydjB3mvowGgq+pLqqCMQkgNSfLdlPMqWjmIUVxTkTTk2CIqdsHuiDzsA==; 25:8OBvTic45ri0xz076rCr1lY+CbU3n5Y/h5WZBmOMZQpAWAucqhjAgPg7ElwdvwZssIxOBq2v2ZWmsYdZ48txkr/aSX3q4hKmLm/JuHRFeKyM7pGMiv/cNAaa2iDzl2PtHGVd7/bUrksHN93+Xm+R5OPhAWZz4qkFP6Sxwwt9Q9Qjzwb0utb3I4oe7yPCnS2Ze3L2PpFHwTzg5/LeUr5sr8Y38zgQMZ7rMyQBUcFavA45kwBIn/2xaxQCDTKyAzUnuaqn5WiCfI3YVTRmFfFwrtNUkYnGpZnQuch/09LrC/dik+dWfiZ1VeLowPz8JLlyU6Kg1OZ9oZ9lC51CqJkpghoqBeaKbRt9hS2j051sTsobtay8Fy96SpqIKpuacYARDg2vX11B+HkIb0uQ4PxcfrXDNMQpwi9QC5OW3BqtPx2j6sKzwIbL2mcG6IRDWzXE0H2muhZ2z97cjBKbuN914Q== X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB812; 31:HD4LTGPm7cbkQnXbec9xCuVua8u1CUYJP6a45jy2G2M3Uu1rxGgJDFWqfN8ZO2pRQNRaW0CC84z4dv2ZKP5ZorrfcGRkVVzl0GPziE/H0BsVgcG3sORzyGLcklhphhnPplOnQQpNQIjDmV/aDd2ZSTi8ea2QSLR4ey9bma3Ba/zCmeDUxIvE4eYqwrvUqaKo7zyWdQfgFspZOZ1IvZGs9WQFPBNEgO5MN4DLvA6ISq/IaMzYyZSMnc69NvUGk4Pd; 20:qpodJc3wJhu3Evtq2EjQefLCfyMvyRykdNc2bxTI3u8+z7wUHzdeDuS8gefOF7h7hFxNIHNFSA661pIU4YUZxk9WrHogLHU7kA6vmRnD6Sq/9ScP0W3B/mqDjsWNBJlXwyfX1CVx3Jd8RCUH2kz4CsKAbkQselHOjLo3njzK0U6BHzPh+Fts2AxJzB8zj/j+5WkR2GTlWdAtmDhZbU1a5tcL+jYD1RZIe4NOh51sYq6c644Vvdbdl2mxcPaJEuNm8drBqsq8AgMfS5On+ScJgFXrAJO77uOlUctWg2Lu0TietT5UVYJ29hFMhxgjTFnyzf21Th0pfTi/fsdtKyUW22mmCR9qqUlBvTIrF39ot7FOU/mM3a7xXLWTAN310TEqLJHi+9TPd7Bt8mpwhZ88V+FATdVH+gijoxfS8vRFdIM2a6xBv1ojfdPsr0veEAT0BKeUaMnfZbfr6EKuj7LjzO0belA06tQnSMDJzXKL4/r/f0IO6M3NAPof890yb27xP3MrQg/wG0Z5DlCpynWWj72NQdArr35EZgKwnzbp1LrFALnInotGE48RABL0rx7v7Vlnj3dAv3p/YvhmDBH+ARrA6DlvctmkfUMW9IUAR2Y= 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)(5005006)(8121501046)(3002001)(93006095)(10201501046)(6041248)(201703131423075)(201702281528075)(201703061421075)(20161123564025)(20161123560025)(20161123555025)(20161123562025)(6072148); SRVR:DM2PR0701MB812; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0701MB812; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB812; 4:eTMnFU2NFM3MT9UNu07w+8cHDx2zNGpy/Mza0wArmVbPecV5iBRRARV4xPo1pA1cQNwUk1BUvI1V7MbGdverpvownG3vJH/v0h453YyBkHZ0Z8akxX00NGpO96WEluZ1kOY8PL67MfHYFINcbkYP891dLeNaI/tKeuj1uWr0vaNTBvlvI8rLjFF3pw9Kczwme0Fav6OAfwNa2v7QCgwsx8CEm6okMZN3SnFDwZicxWK+8QoIpnuXwbOYrCz0fWpDEyrui2KUP2Jte9w6gQuuFrMzqq6zHJhX7O7xldVBgYadbQ9qDIuVMcL904ZhydU6J48vrVQjeL/k4VTBwocCAz8Bx7R0jU5bgkqlFi0TQ9XVjROQ2pDdEYS8YMjZ47vDouB2F8qUdKLoV2CsuU07N7DbuMpNC/ac7BRmxIu6dGcWK3xNQH+OWEy2tC4zqKhewRXhFM8TVc/wr9ONKmXWPI56ktHWiBT3gHnopeljYCVUtBgeLmfstRzCuuK0xy8R2iVBOVnR0B2GWNDcl67rqP5KEHII2tgId6NcVegt/d5D5YIOip51/1HZnRRI9QYsmnJfDD8Sdjb+A9SX4b8vOVRVliJbyxjEjg+jvIQl+/VpnkDDLB+qrNDvToRKinLh2zChoodaIDuM3+a8oqXcrbfJWAJ6yJy4hQfAri5OVkiBOxpB5YK6gvl6x5M6wIgLunR2Am1+E55QQtV19rf0sWca93AIWncidE3ZLlkhftqHZxmcSA7lsyQmvdKGgfGQ X-Forefront-PRVS: 027367F73D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39850400002)(39840400002)(39410400002)(39450400003)(39400400002)(8676002)(81166006)(2950100002)(305945005)(6512007)(7736002)(42882006)(6916009)(50226002)(48376002)(47776003)(6506006)(2906002)(53936002)(66066001)(6666003)(189998001)(6116002)(110136004)(33646002)(36756003)(38730400002)(107886003)(2361001)(5003940100001)(575784001)(4326008)(3846002)(2351001)(5660300001)(6486002)(50466002)(50986999)(76176999)(42186005)(25786009); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0701MB812; H:angela-H81M-S1.semihalf.local; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0701MB812; 23:wDrIYN20LFpDntkhQuIflKVEo1WVqn/TlKPhVGWJ?= =?us-ascii?Q?sHuRKbN0ynrHOAWNIu2LKBdZXjiRPmzk0Kl4L8Q5CQYSiF6qnqnVQxp4kPS4?= =?us-ascii?Q?MnrORv5R4P5l5s4rGVDwu0CAAhJ1XW5a4bx8y2A+ldoxzidmF+LmNdCfz+ns?= =?us-ascii?Q?oz8lYUjK7HO5/CAbsnPT6pkm4tDA5uti5WRgJAHXpAkM7/sDdlTHCUE0Bzq4?= =?us-ascii?Q?zP7broOby0gZ6CsEBrqdnM2WKx8e2Y293dGjoAu1F28U79ARXxb7ZnA5AJZM?= =?us-ascii?Q?3wvH5LjdYnPwN7+Bh7evQgrS2XCrx2nD6oYjyiPrAtAK2oNO/db9hRAPwfFh?= =?us-ascii?Q?zoTEn3AqrKgsuP9l5M0cqY+wZ+Lyn5cIJtZUZtwc59RFlj5Vo621FZ+tJpBd?= =?us-ascii?Q?ewC15dybv/ICjJiEhTY//A7lbtndhZfS0g6RrA8E3inDdWYSBExI9ZvH1lZY?= =?us-ascii?Q?FY3VNzrm0hbgJvCEO+8evbWXrPUDL8e23/Wf1MFRxp1G41BfuRTAbODjFkGD?= =?us-ascii?Q?qObbKzPwzgsSDQdvTGC6ewSagL8aj2svXz2Btq6i7sdnUbi8vtnuMPTX1SAc?= =?us-ascii?Q?OlIgyJb61/xXf/pP722kQRNN0Vi1EmVdAU6Zvwy6ES707N/d3O67+VVfw72T?= =?us-ascii?Q?laq05uwY4SZPAuUQbITMmhJhxaso8kgL+AoMSUEs2LpqOlXUZbIyou4lqzpl?= =?us-ascii?Q?p5wqcD4UCijpiuYjYQxy45zNgQx7RQp6pqm7rT7HtJeoFvWmkBT2WEMwHSJ9?= =?us-ascii?Q?MK11gIrZJDqTPGRmUvzUDSNeuAenXWE0Y4jab6/cH/ll3lpTU67ZrjZhOGK3?= =?us-ascii?Q?1bNTZHp+Y5RZTdviVPVLO/30VLVpI6+L34mowWa4I1oX20ytfKs3/IfLytqO?= =?us-ascii?Q?J7xHDCpj66gtgPVxpF5BrIZGnJs/YUIEfyADtgy8lMwQMoiIwTromkWNRVVq?= =?us-ascii?Q?I9PtspbwPV/SQ2zjcwH5PVcrHemFkQ9lEyq1wom6Y4k1v3L3iQP4Q3fHxSG3?= =?us-ascii?Q?vmh0gIBTmL5aQ04YWmiILZkyJAg8kbMxh3lof3lcDopKMr6OVHrnoXSeaIaX?= =?us-ascii?Q?BG3/KmKtYGbndU8TMIF6Mr22adz2?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB812; 6:fYqHX3bbWMsYWNXTgwgS2KhRua3bp0OAp3LyQ0YSIzi7qjYKxlkx8Xh0Ws8oCqxZN3PQNVdyImForQulAsax3sK5KwH5DVotuPYCbacU7wUFIceIMwu0i39b4yF7UQgSbEAqgv2Rs6ycYPr2KKpKcOlioi2c5Gi9MioFHivMVAmIpg02LRrbVHqr9pWf6pjps3wJ7q4DGSzaFYqDLC4Ugv70QmlngEeSelAN/I8ZrMjchV9OipKIT1jcVsZ72tuCp1wXT9kSltx6p7T8OdcPurrfuVVaU2gsXJ7f7+Dc20M7c5G1JL/t7T+rxdWqQTY0Vjy8tiaGr0DcOm1Vdg9grSsSmI0IVo54by472Yb09aINj7ldAQagMhsAkC/E+1QUjgU46vVEnx/4qh1Jcedh6V9VfAqiu/+n2rJMKRZUea52k3muwPHRnpG2DBHFHXTecW9nQZRHro9G1Kx3qfncfQ==; 5:jVMJZfxES2H1oNddYHXmBACSqCMxmpsboamigqoqunl3VC/wralE4f4uGfgQaAe2/9fYtF2p93UtD0O/wsiL/5KqITujYzuV6lDLU55h5skBWNNbl5cfFqxT4aRXA2+zb94iil1+BUfJdAnGdq64pg==; 24:v5V7dN+jQ1QZ5ZAtt17IqigApOZHgC4h80+RmjJCl5GqG1RFG+coNdkkg/ZUzoOZaW58hC+VWBrWbnNYqA6BQelc+dWalLMIcVJ/n++o0NY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB812; 7:o0qMD/yD6DWts8wSpRyPJMZyHCBQZCidcMMscCNVcELwzL3eIpgqtIctUpsva6N56tLTEcgH/YE0FfhuhBdgxlPjujNSChICUU+J/kcVP4Yr2R98cBqB87drhHmfF9Tm51Z7Wcx1gO530qcmHDUdPQWn4nNp5Ae5k7gcD1ZuIQR6JBPw9k29X/p3XjMpLwoq6/1/51fgDRKPUROwQT48EaKz56SbywWKautaQdFgDNhFh+aYG0QyfoVg5ZJg8f+iofOYvunNAIPaxt/tCH/+lmKIzMXPk+GxQKI5ApOfc1VM64FsA257nLxc0gDxcXvREZMqoOCXsM/MI5J4H5ft8w== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2017 17:09:35.8467 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0701MB812 Subject: [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, 10 Apr 2017 17:09:38 -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