From patchwork Mon Jul 3 19:25:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 129217 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3669142DC6; Mon, 3 Jul 2023 21:26:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E975F4111C; Mon, 3 Jul 2023 21:26:20 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by mails.dpdk.org (Postfix) with ESMTP id 32AA4400EF for ; Mon, 3 Jul 2023 21:26:19 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YTZxr/ZbHdjjMbysqZBNvMv26v497boWRnOduGhT3APkt6xSWdSH+4X3A2jGudErSygRIreYBpln6T6O1Z7bBrsTkfs5Fc03vs4GwXtTw2CQ1IAMUBOFC5o6hZi6O+2FK9C7W0kWZweTrt+JmyL0eLl5DKsYvzAw2jCHM0x8nydu1GBr+VDBaSK8LhuFevFyQRraWWUPScazCskWuBqWMGy2Lf0evZl+6GfJ2TEJ7E78d29M+CzjIg6FdQrAhWGiiFl77AvI70YCCIGmJCaMhvHF8OosDNfFTdmoJF2jruBFML8/K3ZQfwHZksvgKaCaQfdoPgu2AlwwzRzhT1LKdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1Iv9SBgOwlX6dbKb7wZ+4vpu5HaPPGIRrZYZcpYaxxo=; b=b/sN4FyiKMjWaqN6Nc1Eficq4CO6MPy6uX2MwBn3l0MqrJKCbPCBPigOvBumu6HQCn4vzXFRAazDDEvCMBDtpVlLY1n0uMUemuxEOQ06agMaMC0ahf40q6g2wcTatDxFIW3nPaVRkQEdFik8U6bah/iF1J7Aw2eudFu8vSGIse/KDs/IEvB6TtS7BN9mus+Tr/06WpkpHI7coBTZakbCGq+AHmcCETtwlod/Q6fSq/y7Q8TTUYn6dB7ckCNlMAC2x+s1IhUX6wvNt/D8I5TdnClMgfS7TgPujIDaKdxUVVU2aQR3uVC0WrECSjRpaauyvY7/SPTsqKUhdiUpX4BEBA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1Iv9SBgOwlX6dbKb7wZ+4vpu5HaPPGIRrZYZcpYaxxo=; b=FDOuMr/OdsbkRTpiDx5wWAM+1oJ2VhWAHXxu1DdM41adzGiYkItrT0n/7ZuKcpp1nJTfamtvfJDsxmtphWK7nWEVLJDwQEMd8H1Hu1YTMe+ArQHJ9F/JJpCyLua79RJO/A+5c50xhKX7mcGgAvfwYb4JPudsmy+WsEKuR3oOdrY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from BY3PR13MB4804.namprd13.prod.outlook.com (2603:10b6:a03:355::13) by MW5PR13MB5464.namprd13.prod.outlook.com (2603:10b6:303:191::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.24; Mon, 3 Jul 2023 19:26:16 +0000 Received: from BY3PR13MB4804.namprd13.prod.outlook.com ([fe80::5ae7:eda4:3881:4f4f]) by BY3PR13MB4804.namprd13.prod.outlook.com ([fe80::5ae7:eda4:3881:4f4f%4]) with mapi id 15.20.6544.024; Mon, 3 Jul 2023 19:26:16 +0000 From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: dts@dpdk.org Cc: oss-drivers@corigine.com, Qin Ke , =?utf-8?q?Niklas?= =?utf-8?q?_S=C3=B6derlund?= Subject: [PATCH 1/2] framework/pmd_output: report link speed in Mbps Date: Mon, 3 Jul 2023 21:25:41 +0200 Message-ID: <20230703192542.36809-2-niklas.soderlund@corigine.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230703192542.36809-1-niklas.soderlund@corigine.com> References: <20230703192542.36809-1-niklas.soderlund@corigine.com> X-ClientProxiedBy: BE1P281CA0095.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:79::10) To BY3PR13MB4804.namprd13.prod.outlook.com (2603:10b6:a03:355::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY3PR13MB4804:EE_|MW5PR13MB5464:EE_ X-MS-Office365-Filtering-Correlation-Id: b7f96e61-1658-4245-d063-08db7bfb5f1b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ImWX15n2CgJTbDSTZd5vbcRFQJwApbbP+oovGT7albH486M4ssSBTg8viw2B8fwj+Aqe+uZKqmzLqrOz8xzCSgwMIpSkVfWD2RbECtD98utdISlXcHK8oEjFxmdN+HS9aXj2fg1r1RHiyAfjQPMb7WltoCY5z1rVt0+zOCiOl+vhtQhn1KNpBiplC8tz+Mne9MjBMw6BWTenFfLQpA7mGHZmXqOtA1O61qgC8SWY8+ljJzz7OUdG0UrnYt0SKxNfewDDw/ti2ngkU4DIgEN8WTlF8kd7sMR2KynUN1OvOdHba/qoterA2MF0u0DtsnK3mYEx/2l6eFumFq81/eXrquxRPVYT23+pNd90v1QL/HnOf06s6ERc3uNDVr9SPu9onqwWUHOd+QG8prwIo/aMH9Aj4zLqZ5tjIxT/VHZA1/0uf92GcqZENNf38MfMIMoolYKGg7ou47f6tWXiiwhrMGXpxBQU1b62jUUs0siQgJbdfF2r25J642p9u4aQaVFknXfqKXVQ+hYJaAN7KTXv0mzyHTSGpOVBIVIGAOekzNHrVFtyuWTfiz4zCy+p5H2O3eKaaBH42A64Out2q3TOn7DBiEHysllI799LyixDD1HQhAFYRkR/uDy5qDZjbk+M5dZ8rloPK48p6EXA+0CMgRyxlirW4JMN9l4APsD3JvY= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BY3PR13MB4804.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(376002)(39840400004)(136003)(346002)(366004)(451199021)(54906003)(2906002)(478600001)(26005)(41300700001)(6666004)(6486002)(86362001)(36756003)(52116002)(8936002)(8676002)(5660300002)(316002)(6512007)(66946007)(66556008)(66476007)(38350700002)(4326008)(38100700002)(6916009)(1076003)(6506007)(2616005)(186003)(83380400001)(107886003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?aEPeEvEwX7DLKHnoTjVRDVg+2Whz?= =?utf-8?q?XP+KEvBSWj0eJzxZG7a2Yr73HjWzvGI8kvE4GC3acOuw6pmMTlOKAbjMWNhjzi1iW?= =?utf-8?q?x97u74gKVU7sMpfnGcvXRblfHHlkvMXm9rbe14xYk9bNP86vv+OgC6R+B9WjKRKIX?= =?utf-8?q?5BE5kP730lTwgucU+QvH+zT5k7reTOFaMc7os7eiWKVPHBeliTjImJTWRL8piFtPu?= =?utf-8?q?blKEsPKIZwut3TTxKiLe7MYiaGWg9H4zk6jKbCsAoWR+8eOMr2UCLR0jhe8uiSQ4d?= =?utf-8?q?6TRvQWONuQI9HLTog621sXcPajIOMNRWSopdClUilvwJ9WeqkGSKR2qArDl4vVQDD?= =?utf-8?q?xmK9VZarmiTf5gNB9vfB41adGrzBN0gVjfgetTzZngAy5Rb6b121JaVAwXKqb1aTq?= =?utf-8?q?yOuAxTEsdJczVJ79QXDtETwoza4bSqsG9/rvtFS+b3BFZW9ZvoqpaDb47kBEuCely?= =?utf-8?q?GecX8ztcBbrURHFhN+4EBmB9OUzRdlTWclpBG72lyOvbH1FgCLcNtwJt/WSpvpE/N?= =?utf-8?q?7pughg7NmQFpcEjKZzuHLi8SVN9Tozc6N7psptoJDiI2UKYPUb+VsEk4oKhNT7avS?= =?utf-8?q?WsGwOPr7LXGpw89tWDTY1x+qiiov2Z/EJgQ2f8GdfhbSqKdrPxkAUGgAoELB7NO1V?= =?utf-8?q?thphfxIl3Fz9iL2lGEU7vv2wSEc7venRNf1oAfahbhrrew241vbEkXn4R6t95eyMV?= =?utf-8?q?dh88/xdmcQbVxAjdL6MMZCExSeVaq8HyNVX3v1DO2qLc5aU2o8qseWLaLyBP16CFQ?= =?utf-8?q?HPyJ58jw21XDRHu3EqybwdZRRgarvxYcoEvBFIaPHasXUvumtplJzrGhlhY/SITs8?= =?utf-8?q?hJ/ToMog+LPTVZd0c8gP8iaoJlmj/0b0D+6Lr6eh2F34UvGU1rlL2NiWYD5Dx/ql3?= =?utf-8?q?chuvbrV6sG/GYilMMZm39dTFcxJaxCqVjcxZ6d9Pp0aupUguanLHYJuRR2dERXESX?= =?utf-8?q?Kvg2lV1X2zQl7/Z+5C4kXYyL3cX0Fd9nZx0DjcpKePLU7GUFdodOel9uEDgVKZpg8?= =?utf-8?q?IrovGANAKwH8yjysFVjSQK+9KV2eh/L0jhnUltyJ6BlSJgOmlo1aDG7PxlNb0klTm?= =?utf-8?q?e3h+1dygr4LISCgL78jSPA+O/GqJJjV7tz5n+MoKNaHoYRBDiF3YuHc/YVLm3s1yN?= =?utf-8?q?ErVrpB6i46Dsv5glzQ9vjlSji/QPNBHnw4WP0O3n8dqKyXP/wUMuXoZM7c6rS0UMF?= =?utf-8?q?Vp5cHyqy6Bn3v9ULlyEDAI0HCvZa5QVmRLU+H/gZYIcy1sJPhzkgEdv2xPDrebNcB?= =?utf-8?q?57ggsR7bePAkl1ljYoORaQr7nHR1eRSrLpZiYwkkduu/kCO8eVwgDZTPeuiXlN0ox?= =?utf-8?q?6U6y3XkGwk1ereKwqDIn5ZHixAyOiukopNghSw0QjkW7Hxqprt30O3tMa2jI/VBEs?= =?utf-8?q?6PCfxHP4g1zSLksJUDltDmrew23jY4Sc6w6KnggTP605QZL8+kPfNLCJ/hspYY9RZ?= =?utf-8?q?ulkL6osiy26r8Gg8jwDXv6JugKC07+S9bX5SxumrxCdriOkDl1dAbrx/MsNFhyWDr?= =?utf-8?q?JkNmr9IoCn9Rixd8lOO3MQT79xgdDCoaMQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7f96e61-1658-4245-d063-08db7bfb5f1b X-MS-Exchange-CrossTenant-AuthSource: BY3PR13MB4804.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2023 19:26:16.7013 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: RtgXzXMIwOcJixHMlMGaU4rVMWkDD/1Rm3vjVZGq7PnvIk0onvHuA8bu4NobupTOLbd/RE45m5yADSohSVw5yy0LcGmttGyic2xR+5k6Wmg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR13MB5464 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org From: Qin Ke Link speeds read with get_port_link_speed() have no documented unit. This leads to issues as different PMD reports speed in both Mbps and Gbps. The only test-case making use of get_port_link_speed(), TestSuite_speed_capabilities.py, assumes the speed is returned in Mbps or an empty string if the speed could not be read. Document this behavior and extend the get_port_link_speed() implementations to convert links speeds reported by in Gbps to Mbps. Signed-off-by: Qin Ke Reviewed-by: Niklas Söderlund --- framework/pmd_output.py | 12 +++++++++++- tests/TestSuite_pmd_bonded.py | 12 +++++++++++- tests/TestSuite_vf_pmd_bonded.py | 12 +++++++++++- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/framework/pmd_output.py b/framework/pmd_output.py index c8e8b50f1711..274a02eb32da 100644 --- a/framework/pmd_output.py +++ b/framework/pmd_output.py @@ -235,8 +235,18 @@ class PmdOutput: def get_port_link_speed(self, port_id): """ Get the specified port link speed now. + Return the link speed in Mbps or an empty string if speed can't be read. """ - return self.get_detail_from_port_info("Link speed: ", "\d+", port_id) + linkspeed = self.get_detail_from_port_info("Link speed: ", ".+", port_id) + s = re.compile(r"(\d+).*([MG])") + res = s.search(linkspeed) + if res: + if res.group(2) == "M": + return res.group(1) + + if res.group(2) == "G": + return f"{res.group(1)}000" + return "" def get_port_link_duplex(self, port_id): """ diff --git a/tests/TestSuite_pmd_bonded.py b/tests/TestSuite_pmd_bonded.py index f957d4e75077..931f74c77d5a 100644 --- a/tests/TestSuite_pmd_bonded.py +++ b/tests/TestSuite_pmd_bonded.py @@ -364,8 +364,18 @@ UDP(sport=srcport, dport=destport)/Raw(load="\x50"*%s)], iface="%s", count=%d)' def get_port_link_speed(self, port_id): """ Get the specified port link speed now. + Return the link speed in Mbps or an empty string if speed can't be read. """ - return self.get_detail_from_port_info("Link speed: ", "\d+", port_id) + linkspeed = self.get_detail_from_port_info("Link speed: ", ".+", port_id) + s = re.compile(r"(\d+).*([MG])") + res = s.search(linkspeed) + if res: + if res.group(2) == "M": + return res.group(1) + + if res.group(2) == "G": + return f"{res.group(1)}000" + return "" def get_port_link_duplex(self, port_id): """ diff --git a/tests/TestSuite_vf_pmd_bonded.py b/tests/TestSuite_vf_pmd_bonded.py index 8cc45380283a..ae74822ea259 100644 --- a/tests/TestSuite_vf_pmd_bonded.py +++ b/tests/TestSuite_vf_pmd_bonded.py @@ -335,8 +335,18 @@ UDP(sport=srcport, dport=destport)/Raw(load="\x50"*%s)], iface="%s", count=%d, v def get_port_link_speed(self, port_id): """ Get the specified port link speed now. + Return the link speed in Mbps or an empty string if speed can't be read. """ - return self.get_detail_from_port_info("Link speed: ", "\d+", port_id) + linkspeed = self.get_detail_from_port_info("Link speed: ", ".+", port_id) + s = re.compile(r"(\d+).*([MG])") + res = s.search(linkspeed) + if res: + if res.group(2) == "M": + return res.group(1) + + if res.group(2) == "G": + return f"{res.group(1)}000" + return "" def get_port_link_duplex(self, port_id): """ From patchwork Mon Jul 3 19:25:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 129218 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 98F9142DC7; Mon, 3 Jul 2023 21:26:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 16FC842C54; Mon, 3 Jul 2023 21:26:21 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by mails.dpdk.org (Postfix) with ESMTP id 7E38A40ED5 for ; Mon, 3 Jul 2023 21:26:19 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IZTtuR1L0ez1tpCzXEtx6bbH1Lf9fh9DOtB1JXi27wH/oo7Ns8/DwTf8uug6Q+rcpKLjTRo8o8Ts+/4RCN3HieHPLp+UoLceoj61mws5I7rJWVHMgCFfqT65QLZPOewG1LGHhhSBqzemswLGHoEJ7ia3Vg6cXfjnF5qlUGeONMs4db2EfeLeogEBbc7S11FT8/TD7qBdg7zxm6Xx8XsWcwmH1MNjjFlOK+KP5eggi0lssbva3ISuO29bM0I24B5qDuN+rH/44zbK0/cf4XvjTbB5BukaJ59nARnHzSsz1z+eRvJp11Wl7IxgIBueUP0LAC53O7cpyh94NMGOOVblSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wqPXvQh42E9X3Cf6hn+eD98hd0NVlZCHH61Yo2t6IB0=; b=n+cTdDVoh+JikcP7RheaFKuSe9+0wYuK0iCGfjwyrz9jmkX8Yuw4DDO2hZ9I3LQ7pq1kzi7p8qXre/G2lDq6E7Y2NFyPA1Ax62H3jDGHgCrqf+sc4NnYgRSbdjJ5I7cfPu6cd6JvL9H2u+lzUrW0HpwsNvF2aT3IHsSfiUqwwClqf6Z2J3ac2twUImhnMZ5/72xg7/I5SnfRHWFtzBB5Qa8zHKlaOdZbAyiMZbqg5k0MY0bfICW5M4Fvz9MDNiDpqYsXVUfDzCBq9BJlbray7mJ5mdWoCyv0iH5WOCjQisMgYTQEm1eNfR3yVU+65qsmCOYQrA63dHNwfPzoNKSDkQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wqPXvQh42E9X3Cf6hn+eD98hd0NVlZCHH61Yo2t6IB0=; b=BH2vheoolJvuXxJSFJNPo1ptt1jRcZC1ZhxtEcSuiFUxmrqNk10XBH6ZLG+i21+qsa5ozFEQ8F04sS7qqBeqOaEyEjw50AKx1KsEJoLL0cyzCV123GevtULaBDOJPc3VS5fbl2e/s0BIoIOC2yMHIxuc5LaxxgMfCpc61QzuIjU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from BY3PR13MB4804.namprd13.prod.outlook.com (2603:10b6:a03:355::13) by MW5PR13MB5464.namprd13.prod.outlook.com (2603:10b6:303:191::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.24; Mon, 3 Jul 2023 19:26:18 +0000 Received: from BY3PR13MB4804.namprd13.prod.outlook.com ([fe80::5ae7:eda4:3881:4f4f]) by BY3PR13MB4804.namprd13.prod.outlook.com ([fe80::5ae7:eda4:3881:4f4f%4]) with mapi id 15.20.6544.024; Mon, 3 Jul 2023 19:26:18 +0000 From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: dts@dpdk.org Cc: oss-drivers@corigine.com, Qin Ke , =?utf-8?q?Niklas?= =?utf-8?q?_S=C3=B6derlund?= Subject: [PATCH 2/2] tests/speed_capabilities: optimize code sequence of test case Date: Mon, 3 Jul 2023 21:25:42 +0200 Message-ID: <20230703192542.36809-3-niklas.soderlund@corigine.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230703192542.36809-1-niklas.soderlund@corigine.com> References: <20230703192542.36809-1-niklas.soderlund@corigine.com> X-ClientProxiedBy: BE1P281CA0095.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:79::10) To BY3PR13MB4804.namprd13.prod.outlook.com (2603:10b6:a03:355::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY3PR13MB4804:EE_|MW5PR13MB5464:EE_ X-MS-Office365-Filtering-Correlation-Id: fcd41035-e82c-4351-cf92-08db7bfb5fe8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x6xLQpUBRSTsl0iM1kEvkKxMHBUZE1Y/f1dZSnm5uqxKSAlTmvgOhS3h7fK8JXer0EuJa0+Tu6clf/278P1ErxpWEztBD1+Z65k4uLAiWbL4cQanLkdCxKv5WNabTFLCPnQJfPglzqbqfQTkzVSVrHbrnPtnz/H+QJIp3EMy7510vqEACeBD/uBsMoICj0n5LpKy9wutMwap83JbSu8FENdgNeRvxxqLiFsGexqIQ+AB3QuRhQgkovuGjb+YK6ikZrH8mLsH/cx7j4WZyLlEQK0YmO59cSgIOPB7OMRyHCy7uEQoYhwEaraCzF2GJmeAmRwBETKXPzoJtdShYE/VQlWV+V/A50AtvVCeYhtWPldxOkVxIk3+h4c8sj4VdCjgKitQeKQBT2potwqy8onp9WCUbgJUfafgQatnPF6SOdanQbnr+oRZGed/POyW5qmsTQ/POWwT/AU0Vllf5wm3glf3GzRqMLQFZ3JEJQsQfJPDPgesPGvuOL3ggg1qxMpWgt5uN0moo7SqmQx0gUt8tZnQ5aTEWXL1vOMM8mvNuhKId0PIC8TNMksr7E0nPoeOOaLP1S1UxCZFpMHHXTGnbYP8UMs0x6AurvU6k/OIw9nqBxPuB9/uVUq0nLxhrIZO X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BY3PR13MB4804.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(376002)(39840400004)(136003)(346002)(366004)(451199021)(54906003)(2906002)(478600001)(26005)(41300700001)(6666004)(6486002)(86362001)(36756003)(52116002)(8936002)(8676002)(5660300002)(316002)(6512007)(66946007)(66556008)(66476007)(38350700002)(4326008)(38100700002)(6916009)(1076003)(6506007)(2616005)(186003)(66574015)(83380400001)(107886003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?t4bWh1IEkpBE+g3KAAs2hHS2c+5X?= =?utf-8?q?8z3MT51/x5gntUnGzFYBSPLshL9yd7h2lBY+qmRKuWPNYuZ9Xr9CKDZnXiV5OS/xQ?= =?utf-8?q?ogQIWdbAOLkwynQIQeFrK0rvfcmpJu2Jc/vqo7MCfiJnQ9ODsaeHMaSnsZRbNW3Oh?= =?utf-8?q?9GfOSwMw4R6y8HUZfTutF/Hd2uETflVCE2l3d7eAB6zmYFaPPHWXXYR4S80bCSqQy?= =?utf-8?q?A7rrciF5T/WLk824CEzKKoozqoxSO/p8x5UsjTIpTrQ+CdEgVZvQQIoUzGB/ooiXH?= =?utf-8?q?FpcR4u7TK3ImbcxBO4lQBqDgbKHoADi6STOotxqxvAkHFeQjnTVPNShPNkNouwkkf?= =?utf-8?q?5Ancsrs/u+WaFqGAlY22rP4/mSBgHxX/hwMwxjigfTgbReStAcgGloAFw29KfKR4u?= =?utf-8?q?62GbNtq2E0ng27MBKNgZyZJBiZXaLlL9Uu8p7R5jC9UW4+hoVO4t2L/ze4c7pKflx?= =?utf-8?q?bHXZBptJA9DtywqGE4XfqXXABh39HLp0dkWMo/7DNe9HnMXyq/K99Rv3YTP4AXsm4?= =?utf-8?q?jv/j7agc/KUh3IgPwFv2vDQfj65VkcdtRqlJEQ0VFo2l2TFhDIIUJifI6h9qzABdx?= =?utf-8?q?9gtj7ztRrEy4A+XIGslMfp8ZrW9Qij9a5ECFQ5PcpRsJcTp+40/VELL4S/WUqHOz6?= =?utf-8?q?vEkzQuTKtvN9YdjN6nCusRSSQYjOl85QCrT31YXxKDDyMjitDDrrKRIZQay37SBPE?= =?utf-8?q?S2J57lxAFLGapPYbU3nhyahLwcHDhMw8/2SkrQ59ay3995CeaTacfIlqj2/Fii2Ud?= =?utf-8?q?9+33mVQwYb5x86r2pWagImDRCvW/4mA2jcSWJsD9Uh0dXnmGY2seojLVynMG4+GOz?= =?utf-8?q?oYg7Xb1uOCR4qtsrALBJsv5w2BfZ1Y2z73Tjxn6LampS7PKjxfGYI3Q2JY1Vk13lT?= =?utf-8?q?jGRwgiOTgSWvXTc0GUrGQKSm6S95jO/IjMU1B+6ZdDcA0m81TVr8qrLNdZqe4EdF3?= =?utf-8?q?EcQcE2A0pzoOog/+B2tpOCUPctoxXdzc8SNjvGvyCMHj7M/mX1KA1sSsoihlVti/I?= =?utf-8?q?vCN3vYQG3ZTZHaEFSoz5UOicntv1C6s/wdhhfMmaux8swZpkqJ5P3hYQIda2Rt76/?= =?utf-8?q?IfNSNpkD9Nq/k1LU84vT3ogu2ej2r9SWzEbvEFCwYf1dtVpMEdiW3N4GnrquPskoZ?= =?utf-8?q?L8MAGZLouptEZQY6fdLKbJT79xui3oZe7o2zVOICA3dx659V/32/uLorW21GlbaJX?= =?utf-8?q?30tbVUu4Ar/CCLFiJqNQKHwjcI9wzzg6i4NGEYbVEVPmfoCwGayooX2jX9CWfwSZi?= =?utf-8?q?Bg34yYjyA7MIgR5f0XjlfZlTIVpUyxOvjEJgtBUXXcDqbRctkGBqOsnTqK/Lzdu3h?= =?utf-8?q?vCPSPOTT6i6HWTKXA2jM7lrhxqcqho6vz6MAZkugqmwkYIbc9LB0bhc1SD9003Ork?= =?utf-8?q?5A0u3ZyE6M5jhoVFbduhttj17mQfcWP8Fm9AKA+6b9bEuVdbPXICqyr604uPGQIS1?= =?utf-8?q?psok+bgbCnQXlbwnNUyVYiQL4h1kCt8iP91lG7BwHQyLY0eeCb5HYvhKH9jfIBWrp?= =?utf-8?q?SjQ0RAuW4Jb1WEtlNM/7Dmp5+l4BK+/neA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: fcd41035-e82c-4351-cf92-08db7bfb5fe8 X-MS-Exchange-CrossTenant-AuthSource: BY3PR13MB4804.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2023 19:26:18.0667 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uZqeWgbhwANoNKpYoe1ZfRG9zo4refRjnRRhSvRONU6RAVAR6tzaQQobcTNeTYBzSMLyxD1BQYymWOXh7ZOl9AThtOCB3FL2/C3Y2M31QDs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR13MB5464 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org From: Qin Ke The verification code of interface_name and interface_speed can be moved forward, it can reduce unnecessary code execution if the verification failed. Adjust the code sequence of related code. Signed-off-by: Qin Ke Reviewed-by: Niklas Söderlund --- tests/TestSuite_speed_capabilities.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/TestSuite_speed_capabilities.py b/tests/TestSuite_speed_capabilities.py index 3bda904e8a81..2b950a541e7c 100644 --- a/tests/TestSuite_speed_capabilities.py +++ b/tests/TestSuite_speed_capabilities.py @@ -39,15 +39,20 @@ class TestSpeedCapabilities(TestCase): for port in self.ports: interface_name = self.tester.get_interface(self.tester.get_local_port(port)) - # Gives the speed in Mb/s - interface_speed = self.pmdout.get_port_link_speed(port) - self.verify( interface_name in expected_speeds, f"The interface {interface_name} does not have an expected " f"speed associated with it.", ) + # Gives the speed in Mb/s + interface_speed = self.pmdout.get_port_link_speed(port) + + self.verify( + len(interface_speed) > 0, + f"A valid speed could not be read for the interface {interface_name}.", + ) + detected_interfaces.append(interface_name) expected_speed = expected_speeds[interface_name] @@ -58,11 +63,6 @@ class TestSpeedCapabilities(TestCase): # Removes the unit from the speed expected_speed = "".join(i for i in expected_speed if i.isdigit()) - self.verify( - len(interface_speed) > 0, - f"A valid speed could not be read for the interface {interface_name}.", - ) - # Converts Gb/s to Mb/s for consistent comparison if expected_speed_unit == "G": expected_speed += "000"