From patchwork Thu Nov 3 09:45:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Huettner X-Patchwork-Id: 1698802 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=140.211.166.137; helo=smtp4.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=bIUSSSTB; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 4N2zR93lzrz23lK for ; Thu, 3 Nov 2022 20:46:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 41329417AC; Thu, 3 Nov 2022 09:46:10 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 41329417AC Authentication-Results: smtp4.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=bIUSSSTB X-Virus-Scanned: amavisd-new at osuosl.org 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 rXDGyyfjaaoL; Thu, 3 Nov 2022 09:46:08 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 2B5694179A; Thu, 3 Nov 2022 09:46:07 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 2B5694179A Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 12F71C0080; Thu, 3 Nov 2022 09:46:06 +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 DB358C0033 for ; Thu, 3 Nov 2022 09:46:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 6AA184098B for ; Thu, 3 Nov 2022 09:46:02 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6AA184098B X-Virus-Scanned: amavisd-new at osuosl.org 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 IZVDm4cN7-A1 for ; Thu, 3 Nov 2022 09:46:01 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org EA8E9409B2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2115.outbound.protection.outlook.com [40.107.21.115]) by smtp4.osuosl.org (Postfix) with ESMTPS id EA8E9409B2 for ; Thu, 3 Nov 2022 09:46:00 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H35Je5URrfpMYvbf3/1z/+eva5wM1r1BKFCuzpoVby4dQXNvt88L4u1vWCynHsWwJBHzq+SsVZ1eVmx3AG3+Q77JHagXr3KO9Vb1mmK2BiuiyrRXqzP8rztm8byYTpnICrsMs+JjJVtUPIiz/C4yE7Et3PYLiQP5+w7ceuGeb2HMCw4VcbwgXRnuiG/UcBoLyXIn16eF1S03Dsc+sWxWxRUw2/qMmjU7DsYVkwx3/tXpJF4iNh7dEgMOnW77aGZ6Ugvrjl+vTwv1oGusMO3cSSoVng3hhXBI+r3oSF9ox4INIkJcVpy8FwFNJOchytOd9ht09Ff8zfguLdFpS8KNTA== 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=zHlgnFvDkt+kyIShrlX39PZhZYEwlfsCRkmH5HZzZYk=; b=JUKRbPGFqfqKUiRkXL3bRoFuow5EFNdxDbmqgxlypq1sD3XrAn4TSFqgCWtQ8zE2b6VxyJQlNaczHUl8KLXxrV23Uyl6RqN4xafYu+o2UNz2diYzM7rpSFqDiBhyKkm62grqPWFquFHRLpDVp9MjmGAeD8Ut8F0tp+hVdUJLa9ieXWEaY9Sh5qaGmrV7K/abwZX/lScYG/BnIo4j0FOOYvzGitzmIHvAb4QHuThcU1mPjXRlCi44K8cr+UsEC4+81pyB7FbfFhXUKYozvD7RfTSoutIrpFKYmbd0+2o38lHkZsz6HjMUZrHjmuUQd4/E+2BuwcXRnG7Kaugk6aCDuw== 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=zHlgnFvDkt+kyIShrlX39PZhZYEwlfsCRkmH5HZzZYk=; b=bIUSSSTB+Z9Zr6oLKAcu3DHOoLSbm9Gv5usSc/fzPMoMsZLoHwvVn4N/skrMaDPEbOBrknDHcmQgV7LWrtlYSfdbkLynLa77uiX3QWc2+EayauNCil7Oukn81XI2ABTJJiiVRfkvJkc/B71J9QNwxhwI4Lq2jyb/vBS+sQe86gMOQFZZ5Y7rwzOufSgxf/b3h9ZKQJK3+NRXzjQ/mUxxp4JT2Ltc1Ljray8JUw7hOY/n7Wp/V1iah9XQ9zKP6d/aUupB7YlZRXIileo+Is9iKrrJ1AgtpsgpEX1VjCQzhPdXV+JrlcSLO6Q5bdPnFaDpgUOcGUsTJ+IX0Ug7/Vl9eg== Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:34c::22) by AM7PR10MB3624.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:13e::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Thu, 3 Nov 2022 09:45:59 +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; Thu, 3 Nov 2022 09:45:59 +0000 To: "dev@openvswitch.org" Thread-Topic: [PATCH ovn v2 3/4] ovn-macros: support ipv6 in ovn_attach Thread-Index: AdjvaRLjxpHzWtUkSH+nv0xi+D5HGg== Date: Thu, 3 Nov 2022 09:45:59 +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_|AM7PR10MB3624:EE_ x-ms-office365-filtering-correlation-id: 7eba6d0d-70c3-40c4-b386-08dabd803687 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: XvAhoebqrHFWK12DqHz6wKxzR+sgAmhXHbYHLQYLoDMkv9Ow2LU1K0IA6JRsRpX9gQgYJ7ZPRDdAUozE0YQKXAQBqrwUfG5SZ2f+Rwo8ClmKrb4K3d//UE/1O/hUsoie1ro5IIY+aTShoBLNMsigZ4MxeGQnQ2MSn0iw/AXQs5PEkrgfgLjjy+uysWpwJ5tZwkN2CSDeuYmKlRcGC8FYnPGs2aCfERZINFkiY03UHMTIRzBktd/5ZKFq6MkZUeGPXrHUmRD+tt417PHk4RWc3CUIN7UpmVtg+BkwKn9JPg5qoNM4XSbJDk5jqnqycxwRq2qtganqprgZLz0bSUV0shPlNi/8Emc5SgOewLzyi8ic1ZJwQl3bLn51WhMtSNRVwuOD0C/NHWg0/bW70/2uetLbyKTI2yH7cSNAN8GAt9BURW36qqE4T/04B//vtalKueOllxNz+g5xm7YoWf3jk/yGLUQtHF/D0JmN1qZLvtFTD0AOMRdXA77kdpBvIayRLuSgf40U1M7QzvOHFK5dXtLuI92JGj0bXkurqEGCZ0IbSdpYo8Z8BM1yjAYuJ8WoFrQ3AlJmMAhr0RBUzewZNS46WE+rA75RYl/FcMwXHUKcW67lGw/IOl3cWnVDfqPkkd9NOMqMNNFsBOFQ98EwCWtPCUyuuaVXk7S9Fu0K9+cKWl2rnau3+Mp8jTKGF5V5j5NA4bMt9mStTCwX0/tMQJUtRro1yAVVN6YamMDzqFc6NIvAOPG14o0iipQf4TLeeNieEA18/0uroH2bMn253yS7FFolvdeDgCShp3XFjls= 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)(346002)(39860400002)(376002)(396003)(136003)(366004)(451199015)(186003)(83380400001)(9686003)(7696005)(6506007)(26005)(82960400001)(66574015)(2906002)(55016003)(5660300002)(66556008)(6916009)(316002)(478600001)(71200400001)(41300700001)(8936002)(8676002)(76116006)(52536014)(66446008)(64756008)(66476007)(66946007)(33656002)(38100700002)(122000001)(38070700005)(86362001)(46492015); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?qVnYS63LQ5x7ufLjgM5MZpM?= =?iso-8859-1?q?bbLQfbczFtwyQ7jfLFVkHHUIwoP8c2L5a859dHI673Zi70Ae3k+UNkQf3bPq?= =?iso-8859-1?q?OiW53b6R6BpTTuBsbfVZACrEeHQPLoLkxRlDOyK5yGQSu3C2Jm3tBEEdYXWt?= =?iso-8859-1?q?OSmoWfTXeM1DIsljPMFusbSY7tSdrq4lsJUxP0e2w2uspWX1WtOxAA4BoNcK?= =?iso-8859-1?q?nFrv4ai+S0i7vbWP3kL0h1g3/+nKRSxajEcJeUJO3yfleOccYLYDYqr0DRCB?= =?iso-8859-1?q?suguvRXRyAjBI8AzjWSS+Ax2x/ccytw4fhS8k8WwcBLRymmTmiQT1pEjpdqK?= =?iso-8859-1?q?zr5EVrKlxP8feqGBNLyPOeNrdV4Z1UeQQfUHJAsvKswbRTc4NRW7uEAHEF9l?= =?iso-8859-1?q?mMH8IvzQvg6FFD0+mkuexuj+NFdBVVTxO7zFp+TAGdu34IZvzZQyjJZK84qA?= =?iso-8859-1?q?OBK8RcAEu+Orki4UUUkV0c3NY/kV0VOhmbPwk8Zvk12LIpIsrRa4GuJuxvSK?= =?iso-8859-1?q?6r6/IpQH1Rk70BqDkPZdRNrtZRYT5k3mWlrFzP1L/hMapvsfV6IMSnl+ONmI?= =?iso-8859-1?q?l7r19SsFK3WB+85OHtUHUXswb61bHQooPrbipi3DEysIitoM6SyLU0rWKW9b?= =?iso-8859-1?q?brxmwxMfQ5AlL6e2qvGKrpLFijN8m1mW3MsjauZKfWRX3LVisIqdcLUC1pRh?= =?iso-8859-1?q?s7NEzIznpTgLU/rfOWtPKxht6WvAIB6coMS3z9eQsfdrG/TdXyqREi6hs/C7?= =?iso-8859-1?q?gXVe9/dpJ/E7pgJwLon1O03E9Lm1sPyZzTSdS3bb3B2iKGOf+0k70iBw49/x?= =?iso-8859-1?q?onq3Bqyhzps7fTjnkT9MTX9zHDOZz+0XJIslifRq7xbAjQbYQySeFw8Y4jow?= =?iso-8859-1?q?oKI0stuqNiH2mKG3fT1PFNRnxvlfljbtkp8gbKC7I/NoQ97YfAWBK758xQAu?= =?iso-8859-1?q?I4kmbOxc3KaSqW9JR+YR9aW2AFPGQOmCnL1DXPHeaVUOd78QI5YwPw02PoSi?= =?iso-8859-1?q?tjWHnfa9d5BGRUCpN6BQbNrZQHbqVqiRsqkfeAocCgRbpkrP1JpSgyN9rLkI?= =?iso-8859-1?q?jqpqt0VgiGZvkJeeL+eUkhS5jx5cdyXLk+oHyp0Sl+7l5imBg95ub5T6WkhM?= =?iso-8859-1?q?03FoAWq7a1wUcQe9ypwHi+5gHQGGhTE92mEQS3URAgX2i+FM+0s+N1SbE97K?= =?iso-8859-1?q?pnRCUa/Zl2nSnTRvlHpByJGJ7sxouiDMpJ3EkwBhHBDp2wFcoVOdcUo9ALnu?= =?iso-8859-1?q?Q2XgAm9Qq09FdoNWcT5FHOxyLNUaMshbtLua5bLr8A4WsbyoOTO1vQjuAvoP?= =?iso-8859-1?q?OfgrJSbuB0Ff712tkdLGvnZ6CTYvHHNGVKjEStmioKCRHX5meHwHMo0nbje6?= =?iso-8859-1?q?6bkyN0Z1AkD2I7FJ1KNrzxA2LrNwUpr1W2sDDhaQw8p53A7I3WICemd3nbaa?= =?iso-8859-1?q?Ys7+U0XM5OCP46ftlSiHG7fmyBe+lE87HsZJ+cr6stMhom6fxIjumEdKzT/2?= =?iso-8859-1?q?VdSICKnoAaDlSuxcZ50G4p9/OFN3gzD1RIQl3JeXFqn1vz6YIJSC7Ygt7UrB?= =?iso-8859-1?q?GOr0J2fdYprTqhjTbLWa5EHAzfleG9m7TCk2sGqKq0kqwDh1wYi2lG1SAFvF?= =?iso-8859-1?q?yQ2eeD780ULcEa84IpnhvFY3ABT5iiZBJS57hCw=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: 7eba6d0d-70c3-40c4-b386-08dabd803687 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Nov 2022 09:45:59.4203 (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: a/TvUMgBZq8PbclxBT2qdK0oPA7/jYM1IawtupgIXGWnHa39inTraxFolET+arZS0e0KexOWxnwnu+1632TDtqpEwo+zBgWuzWtC6+MYXUY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3624 Subject: [ovs-dev] [PATCH ovn v2 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 | 9 +++++---- tests/ovn.at | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 15 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..9c7f60113 100644 --- a/tests/ovn-macros.at +++ b/tests/ovn-macros.at @@ -288,14 +288,14 @@ net_attach () { || return 1 } -# ovn_az_attach AZ NETWORK BRIDGE IP [MASKLEN] +# ovn_az_attach AZ NETWORK BRIDGE IP [MASKLEN] [IPVERSION] [ENCAP] ovn_az_attach() { - local az=$1 net=$2 bridge=$3 ip=$4 masklen=${5-24} encap=${6-geneve,vxlan} + local az=$1 net=$2 bridge=$3 ip=$4 masklen=${5-24} ipversion=${6-4} encap=${7-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 + 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,13 +329,14 @@ 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] [IPVERSION] [ENCAP] # # First, this command attaches BRIDGE to interconnection network NETWORK, just # like "net_attach NETWORK BRIDGE". Second, it configures (simulated) IP # address IP (with network mask length MASKLEN, which defaults to 24) on # BRIDGE. Finally, it configures the Open vSwitch database to work with OVN # and starts ovn-controller. +# IPVERSION must be set to 6 for ipv6 addresses. ovn_attach() { ovn_az_attach NONE $@ } diff --git a/tests/ovn.at b/tests/ovn.at index 184fc0fdd..3d54c9153 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -3534,7 +3534,7 @@ for i in 1 2; do as hv-$i check ovs-vsctl add-br br-phys check ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys - ovn_attach net br-phys 192.168.0.$i 24 vxlan + ovn_attach net br-phys 192.168.0.$i 24 4 vxlan done check ovn-nbctl ls-add ls @@ -3983,7 +3983,7 @@ ovn_start net_add net check ovs-vsctl add-br br-phys check ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys -ovn_attach net br-phys 192.168.0.1 24 vxlan +ovn_attach net br-phys 192.168.0.1 24 4 vxlan check ovn-nbctl --wait=sb sync OVS_WAIT_UNTIL([ovn-sbctl get chassis main _uuid]) @@ -22432,7 +22432,7 @@ m4_define([DVR_N_S_ARP_HANDLING], ovs-vsctl add-br br-phys ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys ovs-vsctl set open . external-ids:ovn-chassis-mac-mappings="phys:aa:bb:cc:dd:ee:$i$i" - ovn_attach n1 br-phys 192.168.0.$i 24 $encap + ovn_attach n1 br-phys 192.168.0.$i 24 4 $encap ovs-vsctl add-port br-int vif$i$i -- \ set Interface vif$i$i external-ids:iface-id=lp$i$i \ @@ -22473,14 +22473,14 @@ m4_define([DVR_N_S_ARP_HANDLING], as hv3 ovs-vsctl add-br br-phys as hv3 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys as hv3 ovs-vsctl set open . external-ids:ovn-chassis-mac-mappings="phys:aa:bb:cc:dd:ee:33" - as hv3 ovn_attach n1 br-phys 192.168.0.3 24 $encap + as hv3 ovn_attach n1 br-phys 192.168.0.3 24 4 $encap # Add 4th hypervisor sim_add hv4 as hv4 ovs-vsctl add-br br-phys as hv4 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys as hv4 ovs-vsctl set open . external-ids:ovn-chassis-mac-mappings="phys:aa:bb:cc:dd:ee:44" - as hv4 ovn_attach n1 br-phys 192.168.0.4 24 $encap + as hv4 ovn_attach n1 br-phys 192.168.0.4 24 4 $encap as hv4 ovs-vsctl add-port br-int vif-north -- \ set Interface vif-north external-ids:iface-id=lp-north \ @@ -22704,7 +22704,7 @@ m4_define([DVR_N_S_PING], ovs-vsctl add-br br-phys ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys ovs-vsctl set open . external-ids:ovn-chassis-mac-mappings="phys:aa:bb:cc:dd:ee:$i$i" - ovn_attach n1 br-phys 192.168.0.$i 24 $encap + ovn_attach n1 br-phys 192.168.0.$i 24 4 $encap ovs-vsctl add-port br-int vif$i$i -- \ set Interface vif$i$i external-ids:iface-id=lp$i$i \ @@ -22745,14 +22745,14 @@ m4_define([DVR_N_S_PING], as hv3 ovs-vsctl add-br br-phys as hv3 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys as hv3 ovs-vsctl set open . external-ids:ovn-chassis-mac-mappings="phys:aa:bb:cc:dd:ee:33" - as hv3 ovn_attach n1 br-phys 192.168.0.3 24 $encap + as hv3 ovn_attach n1 br-phys 192.168.0.3 24 4 $encap # Add 4th hypervisor sim_add hv4 as hv4 ovs-vsctl add-br br-phys as hv4 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys as hv4 ovs-vsctl set open . external-ids:ovn-chassis-mac-mappings="phys:aa:bb:cc:dd:ee:44" - as hv4 ovn_attach n1 br-phys 192.168.0.4 24 $encap + as hv4 ovn_attach n1 br-phys 192.168.0.4 24 4 $encap as hv4 ovs-vsctl add-port br-int vif-north -- \ set Interface vif-north external-ids:iface-id=lp-north \ @@ -28487,7 +28487,7 @@ as hv1 ovs-vsctl add-br br-phys # Just set the encap type to be geneve for this test. -ovn_attach n1 br-phys 192.168.0.1 24 geneve +ovn_attach n1 br-phys 192.168.0.1 24 4 geneve # Get the encap rec, should be just one - with geneve/192.168.0.1 encap_rec=$(ovn-sbctl --data=bare --no-heading --column encaps list chassis hv1) @@ -31088,7 +31088,7 @@ for i in 1 2 3 4 5; do as hv$i ovs-vsctl add-br br-phys ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys - ovn_attach n1 br-phys 192.168.0.$i 24 $encap + ovn_attach n1 br-phys 192.168.0.$i 24 4 $encap done # Add a vif on HV1 @@ -32667,7 +32667,7 @@ for i in $(seq 1 $n_hv); do as hv$i check ovs-vsctl add-br br-phys ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys - ovn_attach n1 br-phys 192.168.0.$i 24 geneve + ovn_attach n1 br-phys 192.168.0.$i 24 4 geneve done check ovn-sbctl set connection . inactivity_probe=0