From patchwork Fri Nov 4 09:00:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Huettner X-Patchwork-Id: 1699406 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mail.schwarz header.i=@mail.schwarz header.a=rsa-sha256 header.s=selector1 header.b=dKCUl8PZ; 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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N3ZMw45dtz1yqS for ; Fri, 4 Nov 2022 20:00:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id C3591610AA; Fri, 4 Nov 2022 09:00:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org C3591610AA Authentication-Results: smtp3.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key, unprotected) header.d=mail.schwarz header.i=@mail.schwarz header.a=rsa-sha256 header.s=selector1 header.b=dKCUl8PZ 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 K1n78bbp-Wtk; Fri, 4 Nov 2022 09:00:25 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id C03A1610AC; Fri, 4 Nov 2022 09:00:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org C03A1610AC Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9A3E0C0033; Fri, 4 Nov 2022 09:00:24 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 11AC9C002D for ; Fri, 4 Nov 2022 09:00:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id A189481F84 for ; Fri, 4 Nov 2022 09:00:15 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org A189481F84 Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=mail.schwarz header.i=@mail.schwarz header.a=rsa-sha256 header.s=selector1 header.b=dKCUl8PZ X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bkmy8gf4_IYs for ; Fri, 4 Nov 2022 09:00:14 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 8242081495 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2093.outbound.protection.outlook.com [40.107.105.93]) by smtp1.osuosl.org (Postfix) with ESMTPS id 8242081495 for ; Fri, 4 Nov 2022 09:00:14 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mFAHp4otC5OmcOESNoajnfUskU8SG87/MzHjt7W1d29YObP//xo/OrjzeVgA6pZaBGT+9TtMXU2rdQGs8BNizgsAezWa16XUjNm0LcD7UOqmiDbj9ulbFgR7stEH9Ewn8Y2etNkDdaVZ0Huy5TfkSKiZyixMIh+X3/Dkoc9cimwkms9VvrDQmKJGdjrywk0TkFcNhfl+HbUxxLwOibYcBxFanGN96kYAmFH/zVzEe4ndFy3W6fibinB2SpeEvwnJX3qVGCC/1FlUpg7o4beU250mktyVAZXEkyplxs7eofD/inj+smDGVtnjhn+W/ZVL5a+NIaJJvLeYad+AtBKa2A== 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=vshuOTHQ49x2Tj7OUJb0VPJkimhJ1W2vB3zbpuPPrA0=; b=M9hBmzozhs0rY8uXi4SjWVPcb08CaurUCIbIcyWT+E/Xg4CiL+cwJDJloRBm3bAQJe/p/+8sndovb0FbcsfsdaJ711YRdh2Hz0aQDGXkmYKmDRSiyFKmiB7DEPZPQYl+JU4Ki9T/Q/bH3mGDtixj3JFYFHor6anpBUHKHypzLmxGwa2ylsKoFQkEbXAETM/PgMNzIwCsBLeToryRjJSml51+++ngszBYo/+HFwtLt6kfG1xOQYylT0nj+0ybJN8kr353DGtnnDG9sMvMZ7NyiHvPsNFCJZ0NNjwIW6DfhG8KrL7HHIvCMSjvpIhpODbvmmVBzQv8i45FJCpzCqcnyQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mail.schwarz; dmarc=pass action=none header.from=mail.schwarz; dkim=pass header.d=mail.schwarz; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mail.schwarz; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vshuOTHQ49x2Tj7OUJb0VPJkimhJ1W2vB3zbpuPPrA0=; b=dKCUl8PZu+EymI3f7m9NQJwAgO+7+04MgnMbdQg0puRilBRBJK/Wwxdf9b8M748LxJyqCgTOcxMBuuv6AP7sgqLVzG9CYOC83Zgkc0Y3tWcdt7rZuvvuqCZTpWKQMptM7RETc+uELU2DzkDNcPILXTaYpEFuoCcVegzyejXE9vpR21NPEkbh9D4R0n9IXlWh88zl3GNxFpQbFhywOwpu7bYjmQmOYyCWTS2BKna9Y9VmRNKqO2UvljC2iWaRKBwmp3OafWVOMFjlK5PFsDhm5PQMB3vIwXIPoI4enG/QC9eN5YRKlB34GRzw4xRPGLaPe3YYyipBFzRLVI9mszX/jQ== Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:34c::22) by PAVPR10MB7057.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:302::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.16; Fri, 4 Nov 2022 09:00:12 +0000 Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::3e48:25c6:651f:2a9b]) by DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::3e48:25c6:651f:2a9b%6]) with mapi id 15.20.5791.022; Fri, 4 Nov 2022 09:00:12 +0000 To: "dev@openvswitch.org" Thread-Topic: [PATCH ovn v3 3/4] ovn-macros: support ipv6 in ovn_attach Thread-Index: AdjwKvsVQPC909QIRXCTlPf3s7Qj1A== Date: Fri, 4 Nov 2022 09:00:12 +0000 Message-ID: Accept-Language: de-DE, en-US Content-Language: de-DE X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=mail.schwarz; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DU0PR10MB5244:EE_|PAVPR10MB7057:EE_ x-ms-office365-filtering-correlation-id: fa7394cb-f924-41d2-a5a5-08dabe42fb6a x-mp-schwarz-dsgvo2: 1 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: z3xKfShSvsRZwcWkl+PUeCcauYBU96T+B/x9pAG9VMadWLG3mffmt9s7ZIZ+xQtKhVpxEDsqWAZzbK5+bFe7ebMAzhYCo3AA8hZrDPD28w5CiT1iZvotM8aECVZFZ+GcTw0rvAZPVmWEwxos5haiA1EgTfI50VIlImIlgOu4VhIf0qhv5FCq2ZaD9eGDA2rjehytYPQZp4uikRJqJnt+2rlagEGy6l/8vKtaFeBXaFE7sLOLQG8tbyJeCD32Xba17jNgS3FpnqjWCPzqw/sGT7ZT1/k2Fz0N2w0DxNwT23ynNuUKfHhYYRwS1C6cQjJM4OERNnstYJIdWC80BxrzwxnY7iRn4yme9BWSI7KZpU8rjKdKFoZx1qDJ5FFSXT3+jC8z39HLaoV5eINEO6mpOHv605TNBpGELLLDbtJBDbavN6PfaPgKb3ou6NTd90RHlmQJ/Il4+/O12USAo0H+kGFgASYnQSLZv2484V6UXU+7Lv3t7++lf/5m4Uvxki7bnSAfsJ9sFfrn8fNRoGmGTDMZMcaktAIKcjZ8x9c9eciLTLsqz9GjyfZkgwX4OK/e79dliwFdYOAngm7gNJjCTKh6yTeb6JHOV2p5ms5JX9lCgKJUNmBsPJ18onYEbwLlpNZDl7bs8qibHNAA5WH0vPGHTGpdSbuxn2/oAVugygiCJVuRHmI/PTvo92AVyEq2axcJDw0LNdxcRTrujmuX6BzospdVTAOqXaLoQNTOO+/w5P3s283k6TZyLqrqyiQnts9QRffWHN83YYq2zsFadMakJIf9JcQkB2A/U1ooL4o= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230022)(4636009)(376002)(346002)(396003)(366004)(136003)(39860400002)(451199015)(66946007)(66556008)(76116006)(71200400001)(66446008)(8936002)(41300700001)(52536014)(66476007)(5660300002)(8676002)(64756008)(38070700005)(6506007)(7696005)(33656002)(316002)(9686003)(66574015)(478600001)(6916009)(186003)(38100700002)(83380400001)(122000001)(55016003)(82960400001)(2906002)(86362001)(46492015); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?UtfC8jOiB6r9BBAl9Wl5D2G?= =?iso-8859-1?q?6ocQJzGeNq/NVOAYnWahFcmF6coJKMA2ZpQH8rY0I+tRixXCx73EPX3K8oRp?= =?iso-8859-1?q?c3wnjvFWQ2sWFOFcGxonb0Zv97YGjeHZ2IDdyeWlNG1YSdDHftmfnmkXz0si?= =?iso-8859-1?q?p3DczZDi1L1rhq9RPqiKC++6BMrs4Cz5K2PmD6O2DET4NI+rweEyzKGE/W6I?= =?iso-8859-1?q?tVYGKC1VWUyuY42mc3J9ptUnVj9BrGr/TJlps/rNYUuCdZdX83xRoXYHE5Ss?= =?iso-8859-1?q?hCTdHDpJaF4UyubtKl+ygcGz0y3Er808WJQ5AtopLueRhBK1Tbi25BJBga1o?= =?iso-8859-1?q?coj16YspVe9EgXstNFBzYVPYjbkuaco129yYlKv65AzK+/EAHg4PRa4WN6FW?= =?iso-8859-1?q?kKMZifea5pIJpNqLQ2f27qE8nDni2nb1D6qgLMivaYMUDIcsBKBUPOVzGMXD?= =?iso-8859-1?q?bOlfiyLxXBZl0Yerp6j7kR3MpL/dcPXl97CibcZoDwzHGwXp0i8ORGpy9gkG?= =?iso-8859-1?q?EgWad2LvDVjIeHDNiH1sHui8gd9X38lwxRol8xcNxgGkpiIxyUeAtgmt5e4x?= =?iso-8859-1?q?VChhpiE+V+E0eJ96CeBvSUtt9u2tkqPJ3feInrJbTLhLmBnbqt7iGZlbagiP?= =?iso-8859-1?q?x6Pa8CjvKGoMfvPd/eom89w2k2rriXUkx1SWoQczlXuhGAUBCUwi57lBFRFK?= =?iso-8859-1?q?SxubaSOqKG3Ara2xs+XyN4X3qNfqsTL93rB84Fbqot3xumgHP37y4YIgswuK?= =?iso-8859-1?q?BnoXS8skmV7O+MyfpVIJEEFqFg2MJZk322pFxFYbQyywVgW2Lru1b8N6hGL9?= =?iso-8859-1?q?S1Qrp/bnvWuJGUkVGDVfJsyGccWgxY/ylwOFDcLGWk549Vxpc+2DN8P6qyff?= =?iso-8859-1?q?srSwK02OVQPivEp0VjFfXB6bfz0E1Ly4l/28dIOeo6JGh6dTlSky7R6p70SK?= =?iso-8859-1?q?KXNcnR70+MAEOH9B4hpFC4AvcEyiuaacY71NbppM81DaSF3tyIiRKJQhvB/t?= =?iso-8859-1?q?EWKjprK3S95NcRcrIcdSAfUUiUP15nU0ZkTy8iQB9QzEStzN/gi2Yr5YLxe0?= =?iso-8859-1?q?6+qxSufk+a7ezfBUmmE38kLBboO1SUAngxoVsLpJR68/XcMCbA7bqyu+n0By?= =?iso-8859-1?q?lmjH4V0IGGWDANit/HMADHmq5PB+7N72C7CDtqV9w13w17ACGGbt5t4yteIL?= =?iso-8859-1?q?cnUizKo0JgQ+MVutngmiELqkIoQ0zSPx8vQwRvzhcoHJsGurpkgo9oF3od+8?= =?iso-8859-1?q?Z1bfEEBdAos1CCpbkjdsSYhAPHCiq9KzSehnecmvmuIduHzYKTHnym9UexSX?= =?iso-8859-1?q?wVEKceJJw3FiC6jSwbONqYmGO4/zUpAQvmxhGoQjV2yNXejzW1c7fnxDLdf3?= =?iso-8859-1?q?HQWtFJ7T2psQ+IZbMZYHp9MeDVgL1ZzXp5EmqtaET7GIqMFzX/tjW+LWRtS1?= =?iso-8859-1?q?ECm2cEVbCDms+LTjq2Lrt+tWYauHhvtyIONzMUxlf1wI+cWa5Y48yInp/JI5?= =?iso-8859-1?q?bwZSFep0cbdcMHUpKLLcGlUlIg1EFYOVjgG19Rlc7VDEECrsVnAdRazVzn5u?= =?iso-8859-1?q?2ovl6sdqiN9RKVLG7/pGQm1IgiCKTk4nSRe4vcZwPgX0Xgrac2PgvGQj5iYb?= =?iso-8859-1?q?r5NUE3eXZIWBi5CC+DXctktM1eXU+LmsNzOwcfM38+hLgDXqKY0BvA1p/dRs?= =?iso-8859-1?q?ObbhFcjy4gnpTvJQZFOVYmqrQGHDjSGUeIkg8/GFYlg=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: mail.schwarz X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: fa7394cb-f924-41d2-a5a5-08dabe42fb6a X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Nov 2022 09:00:12.1223 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d04f4717-5a6e-4b98-b3f9-6918e0385f4c X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: UupOLaRxbC81B2hkRxTpaap1mKUHjlYIQYKdRs30VS4ORSmlEwNF0R7o0Px72tYuDPZb9dQat/UuWNkkuccWL0bnSSxo9l5wCceG6jeazjw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAVPR10MB7057 Subject: [ovs-dev] [PATCH ovn v3 3/4] ovn-macros: support ipv6 in ovn_attach 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: , X-Patchwork-Original-From: =?iso-8859-1?q?Felix_H=FCttner?= via dev From: Felix Huettner Reply-To: =?iso-8859-1?q?Felix_H=FCttner?= Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" in order to easily add future ipv6 test cases the common `ovn_attach` function should also support ipv6 addresses. Acked-by: Numan Siddique Signed-off-by: Felix Huettner --- tests/ovn-macros.at | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -- 2.38.1 Diese E Mail enthält möglicherweise vertrauliche Inhalte und ist nur für die Verwertung durch den vorgesehenen Empfänger bestimmt. Sollten Sie nicht der vorgesehene Empfänger sein, setzen Sie den Absender bitte unverzüglich in Kenntnis und löschen diese E Mail. Hinweise zum Datenschutz finden Sie hier. diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at index b234019a9..ee6e09d39 100644 --- a/tests/ovn-macros.at +++ b/tests/ovn-macros.at @@ -288,14 +288,19 @@ net_attach () { || return 1 } -# ovn_az_attach AZ NETWORK BRIDGE IP [MASKLEN] +# ovn_az_attach AZ NETWORK BRIDGE IP [MASKLEN] [ENCAP] ovn_az_attach() { local az=$1 net=$2 bridge=$3 ip=$4 masklen=${5-24} encap=${6-geneve,vxlan} net_attach $net $bridge || return 1 mac=`ovs-vsctl get Interface $bridge mac_in_use | sed s/\"//g` arp_table="$arp_table $sandbox,$bridge,$ip,$mac" - ovs-appctl netdev-dummy/ip4addr $bridge $ip/$masklen >/dev/null || return 1 + if test -z $(echo $ip | sed '/:/d'); then + ipversion="6" + else + ipversion="4" + fi + ovs-appctl netdev-dummy/ip${ipversion}addr $bridge $ip/$masklen >/dev/null || return 1 ovs-appctl ovs/route/add $ip/$masklen $bridge >/dev/null || return 1 local ovn_remote @@ -329,7 +334,7 @@ ovn_az_attach() { start_daemon ovn-controller --enable-dummy-vif-plug || return 1 } -# ovn_attach NETWORK BRIDGE IP [MASKLEN] +# ovn_attach NETWORK BRIDGE IP [MASKLEN] [ENCAP] # # First, this command attaches BRIDGE to interconnection network NETWORK, just # like "net_attach NETWORK BRIDGE". Second, it configures (simulated) IP