From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B288C43381 for ; Thu, 28 Mar 2019 12:12:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A95A217D7 for ; Thu, 28 Mar 2019 12:12:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="cB5zEtCe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726915AbfC1MMu (ORCPT ); Thu, 28 Mar 2019 08:12:50 -0400 Received: from mail-eopbgr10046.outbound.protection.outlook.com ([40.107.1.46]:63188 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726659AbfC1MMu (ORCPT ); Thu, 28 Mar 2019 08:12:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p9jlettqITibg7UoqJ9IruojJQB4dpvVsmP9acZ5T6k=; b=cB5zEtCesVZ0bq/aeMR5q2iEBtoaKVmBdM/Nr4pwY33nLVb5RUJvlPXdirlXj97ARN9aoDVM3cDyVfCfjUnusnmNM8FK3Vv7xFomw3VoFYiuI8PuhUyCVr+IiGoVIg3fdoXoK6qGhNmfM2b3MsisC8PTQ1hi7PfHCQY20SqdmXg= Received: from AM0PR05MB6100.eurprd05.prod.outlook.com (20.178.119.209) by AM0PR05MB5251.eurprd05.prod.outlook.com (20.178.18.211) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1730.18; Thu, 28 Mar 2019 12:12:24 +0000 Received: from AM0PR05MB6100.eurprd05.prod.outlook.com ([fe80::85ee:723:721e:51f9]) by AM0PR05MB6100.eurprd05.prod.outlook.com ([fe80::85ee:723:721e:51f9%4]) with mapi id 15.20.1730.019; Thu, 28 Mar 2019 12:12:24 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , mlxsw , Petr Machata , Ido Schimmel Subject: [PATCH net-next 5/9] selftests: forwarding: devlink_lib: Simplify deduction of DEVLINK_DEV Thread-Topic: [PATCH net-next 5/9] selftests: forwarding: devlink_lib: Simplify deduction of DEVLINK_DEV Thread-Index: AQHU5V+Ay0CDETSQb02luUH25su1Pw== Date: Thu, 28 Mar 2019 12:12:23 +0000 Message-ID: <20190328121144.22911-6-idosch@mellanox.com> References: <20190328121144.22911-1-idosch@mellanox.com> In-Reply-To: <20190328121144.22911-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LO2P265CA0425.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a0::29) To AM0PR05MB6100.eurprd05.prod.outlook.com (2603:10a6:208:12e::17) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9497760a-be87-40bf-2b28-08d6b376a2b5 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020);SRVR:AM0PR05MB5251; x-ms-traffictypediagnostic: AM0PR05MB5251: x-microsoft-antispam-prvs: x-forefront-prvs: 0990C54589 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(396003)(136003)(39860400002)(376002)(366004)(346002)(189003)(199004)(102836004)(54906003)(66066001)(53936002)(26005)(476003)(11346002)(71200400001)(446003)(2616005)(106356001)(3846002)(71190400001)(486006)(1076003)(99286004)(2906002)(5660300002)(14454004)(81156014)(81166006)(8676002)(6506007)(386003)(316002)(76176011)(52116002)(1730700003)(7736002)(305945005)(6512007)(105586002)(2351001)(6116002)(478600001)(97736004)(25786009)(2501003)(5640700003)(186003)(68736007)(6436002)(50226002)(8936002)(256004)(4326008)(107886003)(6486002)(86362001)(6916009)(36756003);DIR:OUT;SFP:1101;SCL:1;SRVR:AM0PR05MB5251;H:AM0PR05MB6100.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Xb+Hy3vcGXKQfTWhBTDtPivILYlx4R/7J3cLrPuKpSsv8li/jgn7qz9Z3KQypRnMq1K7lZ3taxWXSJDazEKQr/7eX71pnYbc1w6adHT7Advdq/PBrO4cHVTc0bb8cuqjAZEETwBuRU45WY9LqSOBzBYqGyMN6B4P76PWzKQJ2njygyqRVphclgMhSDGaT905urJst3cPXrAsXWFFe1srtF/mc6k/90A+5qxRzOxttAipogF0N+b7BroIOSaA6Cr/a9w2D23Evv/pgaxmqHqYNz9hq7jcIyDtg5d+XNwok6GmEzhsaFG5/lSfzD24EMBOXBMDQCrOjNel1Oq10EngdNWLL+pRLpFl+cOwN2SStODOQwpb8XKsSUHIPvQm5HDktenCK+Z4Yor66nO+TtHGlehFTa+uqPszV03qQ8+rtDA= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9497760a-be87-40bf-2b28-08d6b376a2b5 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Mar 2019 12:12:23.9610 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5251 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Petr Machata Use devlink -j and jq for more accurate querying. Use cut -f-2 instead of rev-cut-rev combo. Signed-off-by: Petr Machata Signed-off-by: Ido Schimmel --- tools/testing/selftests/net/forwarding/devlink_lib.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/devlink_lib.sh b/tools/= testing/selftests/net/forwarding/devlink_lib.sh index 981b897d418d..61d3579a62af 100644 --- a/tools/testing/selftests/net/forwarding/devlink_lib.sh +++ b/tools/testing/selftests/net/forwarding/devlink_lib.sh @@ -4,9 +4,8 @@ ##########################################################################= #### # Defines =20 -DEVLINK_DEV=3D$(devlink port show | grep "${NETIFS[p1]}" | \ - grep -v "${NETIFS[p1]}[0-9]" | cut -d" " -f1 | \ - rev | cut -d"/" -f2- | rev) +DEVLINK_DEV=3D$(devlink port show "${NETIFS[p1]}" -j \ + | jq -r '.port | keys[]' | cut -d/ -f-2) if [ -z "$DEVLINK_DEV" ]; then echo "SKIP: ${NETIFS[p1]} has no devlink device registered for it" exit 1 --=20 2.20.1