From patchwork Tue Jun 1 12:47:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: miter X-Patchwork-Id: 1485976 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=outlook.com header.i=@outlook.com header.a=rsa-sha256 header.s=selector1 header.b=kXlN+Bui; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FvX4P04FCz9ssP for ; Tue, 1 Jun 2021 22:47:31 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id DD7F560817; Tue, 1 Jun 2021 12:47:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Hio_U1NVEA4v; Tue, 1 Jun 2021 12:47:27 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTP id 1446E60758; Tue, 1 Jun 2021 12:47:26 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id E67F9C000D; Tue, 1 Jun 2021 12:47:25 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5E7D8C0001 for ; Tue, 1 Jun 2021 12:47:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 3735840463 for ; Tue, 1 Jun 2021 12:47:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=outlook.com Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id peoOYahD3MnS for ; Tue, 1 Jun 2021 12:47:23 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from APC01-PU1-obe.outbound.protection.outlook.com (mail-oln040092254047.outbound.protection.outlook.com [40.92.254.47]) by smtp4.osuosl.org (Postfix) with ESMTPS id 8A7204045A for ; Tue, 1 Jun 2021 12:47:23 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MeKNhYXri9bOaVZX6mychLqzQ+sbU4f8Oc2iSJ2weYf6LXZHXp+fFmZV9pUEvxto209i5vafIq4t/9hlUih3wVLZBDwSArVDmnxw2RC+Bh4CvrchY8CwadFSWvCNoFJX9wGMN1DsC3dlFS4RGykO88zDBc7oblZBkLjpm/BfOcl+HV4rvICwPHgLMMRTZw1IbJ+wOyLwDD3Jv4OuhaASq6OvC/PB3E/bTkFfFw/rzErV62Cry3lF7XRQLLp2c1hUcQTJFEjdNqgH7KVaQrYBLOdosZku5U3Tj7U2SAV0uN7Lc1lLTlvEijBznUfL8I84DVaoVHNfvsm/LGCjMa2HcA== 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-SenderADCheck; bh=sYazDVL7y9I/Gp2Si6j5T3M5vBsZkbdKPssgCN66s74=; b=QIHwZ57JltiXcYvwhnSQ6pNjrHXh7jtc/4m5zd/eUZslGyAtTYdGcfVtemDL6RjEjYS8MjvNoQi72ArlcG8HPMCtsZtSLjRH/orhKP9S2CqIU1WbHw08Crs97ho6Hi/raFPtbMeB+IFwoE4GrMCh5KRqzkQN4QDaxTuIVU9/hQbxO6eRwp+Baq0UO8A2cT+N7MI5M1iw3PNSqeUB13Vm5c1Fgbg+0xfRsyc7f42Je8+0tIp1N3aTL9y7TrW38yaTrSIxWIGCcZHhpWha5XNUSEGiBThtmRcJC+hgCOVChLowiw35wurxmqLlJHbfsM9Lq4TkCmDsHCvIoSATVWrNJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sYazDVL7y9I/Gp2Si6j5T3M5vBsZkbdKPssgCN66s74=; b=kXlN+BuijOrswc0lX5buzAhh767etvNT4o7lqfJ9nos5mDCgS3Y3uNYuTQqh71EA1eY6odUSgP2qjb6goqVw91PnyM4Alg+5gj85gEdmz3zAvtERueDuCiyT/Gywk+JN8NdetvblHZWhf00GxBXYS3yTc62bZK7Ub6ekB0SRowbyDOmzYirUS2/AB9dVPCiLWHs56BE7UucyuGbw0OqLoYCKTiSOo5623elvY3UBQ//S8XTF7jLv4cFwSfAenm6oXlx/+AcDgDcP3gZc7orugM26uKuKGzCa1rNv641dLrBUKFrv98C0q3VX1y6WlrTpem0l7hZCI469p2NQg+8PDA== Received: from SG2PR03CA0158.apcprd03.prod.outlook.com (2603:1096:4:c9::13) by SG2PR01MB2298.apcprd01.prod.exchangelabs.com (2603:1096:4:52::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.24; Tue, 1 Jun 2021 12:47:19 +0000 Received: from SG2APC01FT055.eop-APC01.prod.protection.outlook.com (2603:1096:4:c9:cafe::a5) by SG2PR03CA0158.outlook.office365.com (2603:1096:4:c9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.9 via Frontend Transport; Tue, 1 Jun 2021 12:47:19 +0000 Received: from ME3PR01MB5781.ausprd01.prod.outlook.com (10.152.250.58) by SG2APC01FT055.mail.protection.outlook.com (10.152.251.60) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.28 via Frontend Transport; Tue, 1 Jun 2021 12:47:19 +0000 Received: from ME3PR01MB5781.ausprd01.prod.outlook.com ([fe80::70f7:fd46:87cc:96a]) by ME3PR01MB5781.ausprd01.prod.outlook.com ([fe80::70f7:fd46:87cc:96a%7]) with mapi id 15.20.4173.030; Tue, 1 Jun 2021 12:47:19 +0000 From: lin huang To: "dev@openvswitch.org" Thread-Topic: [PATCH] ovs-save: Fix awk command to return highest ofp version. Thread-Index: AQHXVuFZQW/dJuDULESIt3cRtl+q9Q== Date: Tue, 1 Jun 2021 12:47:19 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:F482F46520B482B06C29DF3D890FAB2BC74536C02B85C4AE383745460CDCC035; UpperCasedChecksum:DEDEF38D04D7D4A0920D8685BB4EDFAB93304D60CD72C40E705E4A3674BD97BA; SizeAsReceived:6640; Count:41 x-tmn: [mOoy8LHENYaontnpcKVAy/3B9Gan1Bjm] x-ms-publictraffictype: Email x-incomingheadercount: 41 x-eopattributedmessage: 0 x-ms-office365-filtering-correlation-id: 1cf3f370-09a2-4361-6e62-08d924fb64dd x-ms-traffictypediagnostic: SG2PR01MB2298: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: yKVQI+aXTfl067NFp6YkTDwat5ZnBaj9N1sE8bIOXxjDY5MuaMPCJVdoEivGS80UP/Gi61xNkeWb+15avu17CVt7RaakVfqybOe1oU9NpgRM1kEU3e3Ypo9U9qbA26jteZ+6SDtzySqex1n8r58PzEXsrOxW+SQ2Jj6/Idk53LdeBtJdXcaVmNQ8+GOSwj+Cc6IyBJ+uEjzjVCaL12qwfnmBmhJnIh2G/I7lRKbtzhJijeQuWaoyy7eHYxU9vwqP9MWvq4HMPE/dESQkktHaYELteQQ2gg/+KS4Aj4Q3eAsvwzRP3kCOOl5rpZhNoHW4/7h4vci2sq90xhPDNbqbdN4/QDCgUJELizw6kLhiu9ds7ZjDK7ktLGD0T5RsUXRCApyc52dB6Z0jgBZRTdMnFw== x-ms-exchange-antispam-messagedata: UqnHNMkUprOq9ICQutX2C94wN425ovYhm1Kr560EgXZKxZUjLVySQS5QhLT5bbIEdPfIu9uJMpboi5agjqNoJ3fdLtYpEUrrHYzVfuCFCNzB+Euur6SIOl9Zl1OoCKgpj1/RctdMcjjMfWxjNe5OgA== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-AuthSource: SG2APC01FT055.eop-APC01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 1cf3f370-09a2-4361-6e62-08d924fb64dd X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Jun 2021 12:47:19.6862 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR01MB2298 X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: [ovs-dev] [PATCH] ovs-save: Fix awk command to return highest ofp version. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" The quotes for strings like "br0" had been removed.In ovs-save file get_highest_ofp_version function still using quotes as field separator. That is, get_highest_ofp_version() always return OpenFlow14 version string, not the highest ofp version. This patch adds support for new string style to return highest ofp version. Signed-off-by: linhuang --- utilities/ovs-save | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 1.8.3.1 diff --git a/utilities/ovs-save b/utilities/ovs-save index 7d810cb..0a70e1d 100755 --- a/utilities/ovs-save +++ b/utilities/ovs-save @@ -101,7 +101,8 @@ save_interfaces () { get_highest_ofp_version() { ovs-vsctl get bridge "$1" protocols | \ - awk -F '"' '{ print (NF>1)? $(NF-1) : "OpenFlow14" }' + sed 's/[][]//g' | sed 's/\ //g' | \ + awk -F ',' '{ print (NF>1)? $(NF) : "OpenFlow14" }' } save_flows () {