From patchwork Mon Oct 24 10:47:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Huettner X-Patchwork-Id: 1693820 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=W9wmVgqY; 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 4MwsGn3Mj5z23kR for ; Mon, 24 Oct 2022 21:47:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id BEF6F60C14; Mon, 24 Oct 2022 10:47:42 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org BEF6F60C14 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=W9wmVgqY 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 lPnacvM2HeZ3; Mon, 24 Oct 2022 10:47:40 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 7A57E60BF2; Mon, 24 Oct 2022 10:47:39 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 7A57E60BF2 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3F396C007C; Mon, 24 Oct 2022 10:47:39 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 37062C0033 for ; Mon, 24 Oct 2022 10:47:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id E101340591 for ; Mon, 24 Oct 2022 10:47:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org E101340591 Authentication-Results: smtp2.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=W9wmVgqY X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id C0SHaX_n9GUq for ; Mon, 24 Oct 2022 10:47:25 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 94AB140594 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2139.outbound.protection.outlook.com [40.107.21.139]) by smtp2.osuosl.org (Postfix) with ESMTPS id 94AB140594 for ; Mon, 24 Oct 2022 10:47:25 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dsZF4It8ltkNMhfGYhuTlk5CGkA4xHp3zBKNB+ckFTSitLsY6b06t2WMR+AwED512bO4l3CZ+drIOpEhkKjVCf/sdV1A+BVUgNjndlvMn6+JQGvYJpk7naCKbn3PpqmsxF+Bq7Ip+LWvw4/6rI/db0QqGkJRpFxSTztHAEoOIINVSoHXOZoKQOfnw1zdCwvc7VujjtJA9YB4pTwV6qUYIZkOWOqs5h3JGZs4uc6d2s5Q7j4zAh3SaLmes3OKyu9wtGYWDd/oNOy/1aSrs7sg6+YWKriK1q6xN6E94cH7truuLwRov7AR6U/57LFOSGQzWtBuXushkS4rP1QSjlVreQ== 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=KAs2ha4bkT1mrqNgmL1FAmJx3R+lAig8/9TYP7Bi+P4=; b=KeLiwTw5aNQ8QNAJcwc/2jb6DSvgA81YPLTS2AwLFhgl5ayJcP2hm/bjXxG1CNOhsrWSeAhL2n/RRvArfJGxVOY10TecFu6sn920zxNveXPFUxqzRwSKDlToS0jF4pCYWdtCfOLOovMm/GqpsMT6HbBThLsZoCjQX7Bm0PLL709+sQ2V5OgR29mjkMpdzg8MXBn3sTXKl0gA9mjsQkKihpwXJzvfekiyAmAeXDxd2F5JXywFvnDhtDOU/sBFbP9mGw4ppRinLBTpKEXzXIHn67iKiI7Ueldaa6SO/53tqRj8LitpmosePZgAVMAsQBY8UTUllTuU5h1fXVHxzrumBw== 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=KAs2ha4bkT1mrqNgmL1FAmJx3R+lAig8/9TYP7Bi+P4=; b=W9wmVgqYoRXYKF22KaMFTQi5U2nC8uKH16KwWw8/zSLboNO4ZSKhkmNqUHNIClyu/s4Dd/ltioAkpHambp064QW/6yGvWH7crYooat2v/40Q+TH+2eznhUx+Siw+gue98WB2JSaQmGByaPJy5hjLKiEPNZCAF/ECOuFpAj2ViPzmaHyBBFkc0piQnefPOSIQjXCOfy/KB9fXiisd6y9XBKe7wnok7tAteQLtcxcZWE4tnHEIOPhJxYwhYrCLsOUyF6CouVDVtrqGyLgApEoPLOAVOh7mcskNqNE64cEZpwo5CtDxUJnaWVdKhpYJkm5+zdAVdZYOrdZG5xJBD8Fw/w== Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:34c::22) by AS8PR10MB7375.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:615::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.23; Mon, 24 Oct 2022 10:47:22 +0000 Received: from DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::b79:60bb:a806:948d]) by DU0PR10MB5244.EURPRD10.PROD.OUTLOOK.COM ([fe80::b79:60bb:a806:948d%5]) with mapi id 15.20.5746.023; Mon, 24 Oct 2022 10:47:22 +0000 To: "dev@openvswitch.org" Thread-Topic: [PATCH ovn 3/4] ovn-macros: support ipv6 in ovn_attach Thread-Index: AdjnlYS1d3WgZvJ5R8CTmAONeWnvxA== Date: Mon, 24 Oct 2022 10:47:22 +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_|AS8PR10MB7375:EE_ x-ms-office365-filtering-correlation-id: 45937510-9b04-4e64-3dcf-08dab5ad217f 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: ASzDeWTMBRlzEeAurJSa7IB7Uh5TnNB8C2cMsIVpIlbmoKdeKwZVlQYkgXKiUQj7xDxD+jKXzVrwVl33vi6FXgvIIgO2+wnlNZ71W8OzaI9f9rUrjKFGinfKXGvZaG/ohuCnHhReAmGnB7TiU5i5fWWpCkb+P3hVN6agC2rBdMcp2sp4QMxCtD83fVnPbdFTBmJZs0xjW6dWpjXVicjF/rah7BAE4h0eH2zL9hMocU/V2QlFvOKnRWVilXzZYm+lrhDJjp3tdyzqC/jdTAaZGcoVnb2KfEAbXf8Hg2DVmeCxro/G/+dLnxFwkS5qzrxvWQtGZDDuT+eogbrKmeuUK2PgsguFaqD2ZpNjURA1ztbRVETVtuZxcImkqDVK0D2h8X0mX5If7YFtNkGTHgoqHARxNIr3AD61jGA79Qc8dA5sfwjw5IUkI2ytY8UE+s/3mpczBBdNgDzEopvhlL1CZa8z/3BynKLOsPFFIXKPVUDoU3BiGpw4//PgZZP2n3WvHasMjsO4yZUU1gG3SAQcZUHn8cnPr9c5U38f9befXtoVrIL5BpUVlj1brNg+P3bVnIxk49Rzf/7zcrMUoJSA6mC4oSwCJfXXyVgQFl/i4VRIqjWoivd16Pu2IkQSUGDxPVRQFiY6CR8OyDIeDKYe9Teryz54EsfV8Sfvll/5IM3ac+fYhNXlAqyyytCZ7XGZyQe0E7YMfst4Ovmw6a9HtC7op6OAzs9b4sUa+6JOE7lmfSSVTXyBQ/Qv+t7PnbgW+bfXXQWLOtvkGB1Tp1ltq/Rpyps8/rXm5/1EZhmkdcY= 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)(136003)(376002)(39860400002)(396003)(366004)(346002)(451199015)(8676002)(33656002)(82960400001)(71200400001)(66574015)(83380400001)(76116006)(478600001)(52536014)(2906002)(9686003)(316002)(38070700005)(8936002)(41300700001)(122000001)(86362001)(38100700002)(6916009)(55016003)(186003)(5660300002)(7696005)(6506007)(64756008)(66556008)(66446008)(66946007)(66476007)(46492015); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?9r6P7K49yfwSYx+ZsV8hoFI?= =?iso-8859-1?q?RdLxz6IzqIOp1GkcHqs38d9SxmFEmT8uQsypFgLAKgRM5N98FX+ZkuKFfp04?= =?iso-8859-1?q?KDv5lGurC4adncQfSXOnvSaYj7UE6QbEWzsGLnypJyyGZZr7ycmFgtJozq3C?= =?iso-8859-1?q?1rYWAARdJgl8b0ZigGEkewOB4GxigjjeIWYANxFM2L0wyS5sDmJi/vVrBigz?= =?iso-8859-1?q?/2bK9OGnngbBB+rRnt1WqT8XrHIP89jz9mICUWPRYS6wMw//449bYo5ws891?= =?iso-8859-1?q?0vP1EVUV0WXXYZdGvqQBPFa15GI44G4+umP5AQOx9ZXgvV1VyHkFekJf2PER?= =?iso-8859-1?q?rPg6vjM7fypvAWiL0QTjZvJ7S1orkocW8skab0wMRoXHNll0z8Ps90BEP6kY?= =?iso-8859-1?q?y3iB+dpdYS4TuIsplG12JOii8LqTw65o2wdz5PZKzlqhmuJUwm4eRTJAtEvF?= =?iso-8859-1?q?cdm5UVMOu5V6E1kF5705POCum0ntHpwAzuCUCToMHAopwIX60nWYp/oOniNQ?= =?iso-8859-1?q?Sn3IWFbBkkoG+42y6AyDQyk4gaos1GYlqq9tyjWyK3hDPgdxSVdWzAHWL0jk?= =?iso-8859-1?q?2PkMf/kZov6nUuBx9+du/4GXkZslR4Q6uEKM/2DasH0PYi/LfpZonUjYfNBm?= =?iso-8859-1?q?3KgjnQrpKlYovSD0DE986qhYaiVqJkcqVFjFmrSx/XL7w+UHMy/R9BPZN66/?= =?iso-8859-1?q?Eqpm6O2qiGbZhiVf3BlYb3YxkefoqT4vQNjRjqz2/+kAsVeoJ/AYqB1jlIcN?= =?iso-8859-1?q?A7ame1DVCXBEJ0YnmUiY/qOfDCl7tQ03WNJqSi/epmWq7gaVyK9iTU42KdJ0?= =?iso-8859-1?q?kCHL8Sa1WbbwMfxm7ka1S4XFRssQZ06jNQzjMXnacx5qzund3l3G5MSsx71b?= =?iso-8859-1?q?BGd2omd2x8vDedafB02AJIrrlQhnENEH3vmg1GsbEaUfwAmpQe+Eb9p+gMl7?= =?iso-8859-1?q?vCzpeMFHm7a07bPzb5OHuBuikeg25F3D6s31Nt9KuEVU58JtzWpa2mgTWX1q?= =?iso-8859-1?q?yKfmxOCPMjbX+KclogveCTSCCKQwZo3CxBpXpzszg7wWN0nXgP7dAl2I2qiZ?= =?iso-8859-1?q?RaXvD8erBZkss3A6im7t5AqemclJlM5uEuiOzEZse6NBsruJU1i+c8O/bDhU?= =?iso-8859-1?q?eSUjN4W9nba94Tr+N4rISSVPPFeg6YX1ougoe0BqjjBinQkaK6MN6+83zkwE?= =?iso-8859-1?q?OvqErdeCSM3S4oFiOTiBL/f/YA0rRt1zV00rblJu8q0iplDmbOV/kdUxf7u1?= =?iso-8859-1?q?P68AVgY+oJE306pq8+0QLzGQqyKg9ae/s0YH8GRxG4imPc3BqBO8Kab1nxNi?= =?iso-8859-1?q?UvVG7cbryIEBtINzP6M6BU2VKseigDNEzPaD7AoepPoESuKLlcwdMsYRS/i1?= =?iso-8859-1?q?WfXZlnfWlQkUJQQMLHBwNHMxjzssQ0cU14+GqMQB698uBgJKtc4bM4LWrUbZ?= =?iso-8859-1?q?g7+vdOycm2osPjUN6BujfKwoXKhqs7+eNvp6wwkbEO0xtCpVuUusbCrk0W/f?= =?iso-8859-1?q?C80QehXOQHdoVZKdzFqctuy16SW86QG3RD/jkaMBUjkqQ3noOzKI2zH5R4wB?= =?iso-8859-1?q?n0/TXH4Nm1ETCZnc2DSRKPF5dPo4QfB3f/kvMfHV8iYq22WUNfO96G0BhbgB?= =?iso-8859-1?q?8ExCU5gbsv5HxKldmeeWKdXsIJT/mjqNGC8lcauKmdk3Q26sw/5lyoZF7ZqA?= =?iso-8859-1?q?=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: 45937510-9b04-4e64-3dcf-08dab5ad217f X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Oct 2022 10:47:22.1678 (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: cEMe6w95m02eM+UaWpV+hKffkk5NdsJ+Ix8AmJyw7aJf3250N2kyPsyNHquZOwi2xKyoLeArFUhqXWWK5fbugeQweR4rZcYcQDl/BxSHJZA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB7375 Subject: [ovs-dev] [PATCH ovn 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. Signed-off-by: Felix Huettner Acked-by: Numan Siddique --- tests/ovn-macros.at | 9 +++++---- tests/ovn.at | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 15 deletions(-) -- 2.38.0 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