From patchwork Mon Oct 24 10:47:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Huettner X-Patchwork-Id: 1693821 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::133; helo=smtp2.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=su2Hc9SB; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (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 4MwsGr3lJzz23kR for ; Mon, 24 Oct 2022 21:47:48 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 927B0405E0; Mon, 24 Oct 2022 10:47:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 927B0405E0 Authentication-Results: smtp2.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=su2Hc9SB 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 4THftppZGavV; Mon, 24 Oct 2022 10:47:44 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id 2F39F405C2; Mon, 24 Oct 2022 10:47:43 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2F39F405C2 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 88115C0086; Mon, 24 Oct 2022 10:47:40 +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 3A22DC002D for ; Mon, 24 Oct 2022 10:47:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 8C92E4059C for ; Mon, 24 Oct 2022 10:47:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 8C92E4059C 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 hSDooUhyz_X9 for ; Mon, 24 Oct 2022 10:47:26 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 20B9D4056F 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 20B9D4056F for ; Mon, 24 Oct 2022 10:47:26 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nmtCEpaepIfeJB8tsh+0xN9CFRTDo2puTcf6t+mMDL0po/pGgZco/qJ+B/LeouGnyGfOgdMDF3fRKU+TNlG128CQyDRDA/Wuikt7njyLM71ROzWg1pOeXrzqtbsY0DiWLMRlVmnZ1zvTm4WmIAZPWiCU4ooJPwuB8LYnu1k/jeQGEFyQRSxRX+Kvw+qm/NBCCYxgD37UnFa21Y268JZrE2gqgCh62IIevl9nn5o2NT3/umO7WfZLkKi4dRj8tDc1Y3JweGEbsZygWVTVwWyESJAKHWbSiX9uQuFzEopuJVIfw7JPvYXpWydZVqH/+DxiAAdogm372qMNVwGbGj6Xgg== 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=9L8fjtbO2zJXyLbSANZSzTHE3SEM/0/um5H7fCoGYU0=; b=UvfOm1282ZX7oqIitSZbKdR8qesmpVlZ/alitcIIUT+ZMfcZ2WjQwRTZzO0kbZ9G96GqwLyDXmSxKyIrP0c+1m32+oTmZU6GhY5L/q+ISe12NqYELiBtUCxKi1ldJh7n1P2np+kfH/mHd2KUPfpgxo+UY7DMXRObFqCFhopMXslLjYkleZQqYoBrZTqF12ddi1AOK0gK1Y6XJB5NjWnWkurlWvF/mINYchNJapXoUYmR/wQWnS5QgdUN85O/SAxydz5sPhAf3RjhNP9Fo9Ybdsp0Ncu8nCfHlqkj2VRQgoSQVOvS2Ismioh00qdVbYxuopUSG4xI5mfNzLq9+E3fOQ== 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=9L8fjtbO2zJXyLbSANZSzTHE3SEM/0/um5H7fCoGYU0=; b=su2Hc9SB3OL70C0QBGKiyjcjYVSexsSQl499goKOILrDLIduPuv0LP6NV0RhBuSo5tpX3T/iHkb5Rvl1UhK2V0kk5uccTHvkzyz+AGiKCy1ppqMGT4g12sy+WQTC10fugRy9MHXLbHXtjOEh67xKeaZPWivISHmuQFL46fZPsVx+vf7AIOtvkm4bHlV4AV18miB7lQiTonnmQZhEbtHMq50+ThizZMceE9md6o+Q41ujSBrS2Hmq90AyfVsSWlC9j3S4P0skfGvM4rAZcH5YnwmmC44NoZk8bBGBCQoqF0QNZIoIf0eWuoRy0Jmsb7PCMyEgtzME4+JWONvMbl6sLQ== 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:23 +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:23 +0000 To: "dev@openvswitch.org" Thread-Topic: [PATCH ovn 4/4] pinctrl: Send RARPs for external ipv6 interfaces Thread-Index: Adjnlf6wmbop/Jk0SQ62gnDM1kTdBA== Date: Mon, 24 Oct 2022 10:47:23 +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: 14079238-5b8f-4900-1ea1-08dab5ad226e 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: ofu6l/O91UXLkU9/8ruLAjcmCLa6Xpmig0XrCMzCIqYBbgZeijf9isB9xanXI8hRq7B4DwgSi+4tA0FAHEs9pJEiyVdvQT9k5VqQzfr0JIBpjrszOWSIaUkdbq4Rz6QLbCZKftBc+8zqy5UXvQgaqOZpzwMJ/VmBitaDSflMyNN4vmMlA1onb5714dx5+hitx1SLsDyOLaeB6PYOtUO7tbSepmlWF7343d2lzplgAaJfIguXZnRO/BGuxB2zIHjY+ph9w9cealzIjamUMyiQlvmKqRFBu6YQPV04eS4AztKZOd4vBMELC0nhshIqc5qJq9wkd8rXc3Vnjw0BVmBLO7aJiy3RXgOjfSp+KHmoZk2Brzt+jKUILgsiBnUGTULWU7yTLQOHLphA6AfugfJJNnqUgtmW+bdca09o7GlKyLxaTkFBu+VoYdNSArZ1X2TLjQs0gdsfXHPNBwLh29zNU1w53n6BN2enurrnPMG9GqVaMlOWbiCeUf0RW92F4z9JU+TyetRhx3mO46jF6TuezLQr3eGf5aC+d7i37iUEp05xGCR5UKUMlddg0NE8dlpCJxgzkDIXKMMOBSDPgvoZvYAeGC4/IYLAuy0rZ4ewpfpKmA+7hgTTindMiJG4WYAyqHsHF/xaU4ST8cv8nOupC+lbOmEqlqn0qIpd6ycAO/cAMQZmgQXWa5KIkoqt9ahxfKnEWlhuBBFXo5TzxBj2g6Bkpn6uhZ0INqZeDfzPfPdoAnQeF0esA9/WfdT9Resy9D9A46C4CxhxV741yfPMjmenjSau1n0v7lofL8lZQXA= 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?HW7CxaONEBsvENu0FcnFDMF?= =?iso-8859-1?q?9TXf+9GOlP9zBiKNFO+LOZ37UTpjvB1Ql2/6Rh4OjuXvpzkSU5rl5CoZ+LGD?= =?iso-8859-1?q?jPCfxx5ixjFXcs0jNjbn53hvqFhYx8mVO56D2WsD0anV3O4/pUk5jS5bGBDd?= =?iso-8859-1?q?2qTHINz+3GwJV6Oc3JqK7/6B6c13dz5c32h3ywmAC6BTWUpvYoIi9gxEcGd/?= =?iso-8859-1?q?L0ZaiQomzfF8bBOIszgLL4KYkNhitl5Cp/jSLHNSyGyLbtRRBDQiRjLp2PzW?= =?iso-8859-1?q?TmCAJcWC1x2W0x3yd3pBSqNSzaRxWm36badduVv9Dy+iFSXj/69ahXXx7Sp3?= =?iso-8859-1?q?+o51dOsfX9fmQe4pIie/nTcX4G2DCUAA0vg9+0hn3oxofet7Ten+MU2qzJqw?= =?iso-8859-1?q?1yG7GWrNwcMqVRwX0w2erlLt5qc1xXAewemoSt3p+iky7ZbmsbkUTHFe2eEQ?= =?iso-8859-1?q?Hs+dyC+Wy/KAEnVuwxeCd3H4j5lowI0nnQmYVCiYhqMOF00b0Fz5t2RnzlFc?= =?iso-8859-1?q?QGYf0AXAOT4REOOHTR+YLMev7sVCcw/NWrUxG5vvDg3UFDPT3L/pFBcjPtgx?= =?iso-8859-1?q?3c3x/kM/5q4Z6hNQDGl/lTV7XDFU2ilRQVYlBkcA2XqvGSFFqw7YPaX5K/xU?= =?iso-8859-1?q?tIQMlNEDQCAwArwICu26uM9Rrtx6uNLLbnb3JKGY3k/Q8WniqP5GOIxapf4w?= =?iso-8859-1?q?rGrj2VUi9NftLur+BCKS1+E5ityh9SL4uoAseU6hUl6OCHvqr/XmVerB8fBh?= =?iso-8859-1?q?MU/YtreB/fFU9Ud6qBMfqV5RwjxyVZ38MgBmmRs+FsoL4aOmHmSmA1yMS983?= =?iso-8859-1?q?DgUv00ozKSSsxFwMblccDScO3nxh8IFjQrjnAlKqgMp9Y7+8aoLM8IGky1P9?= =?iso-8859-1?q?EjRQxSaGW5Q90bnd6hbTuSbqnfWv6/O87Ftu/QPqhPk/BdMi74wVcClxAopo?= =?iso-8859-1?q?xvYbdZxNNbzfC91igpdZ4aVbGacf+JAmTY85t5JKYxB+/I3mmlZpeLAWxg5M?= =?iso-8859-1?q?QYmE2ZXUjFZ6HUnwpgUmgivMiCAlyS0Y/uepvEzwVY2CD2CXtIIBQhg8+sef?= =?iso-8859-1?q?Q/2PsP27nfkjFbr0CiNaLDVbOhpiYHMcEwTI6XSNKLwVG94flcFL3xmAaw0/?= =?iso-8859-1?q?ER7+NA2BAwMYSJ9OeCnuJYLKqQo2EwIb5iubXx4ar2CTkgJPGQd/LODn5eWv?= =?iso-8859-1?q?fQNVB7POME/+baBRYSjPGrRe11FLGIDQN821komRUobYkFVmeHkJxPdnZOLs?= =?iso-8859-1?q?m6AAcuxCm7OmGwfYEFmiHm3Q0VHXt0M/G/whgIeK62KkF+WiA01q6blUTfCB?= =?iso-8859-1?q?VgA8dLFmug5yL+XR88Rkt4KChym60Eoz9z4msWmAj0E5C1fIcrktCacPiaeK?= =?iso-8859-1?q?M7fg8OCfnh/+pO9fwZndxZPzVZJGQMpoobZG+YxvNts+s4cB3B/bpbse+g3b?= =?iso-8859-1?q?RFZARr4rTSdkihwiM8QDdKsX7SRq4CDtiJ4efSx88h/+JbzUd88Oi5Sg3v6+?= =?iso-8859-1?q?CY0G5dO1FnaMqKMW4RPBB8lbKzrRhrEYxWpcqMUdweuiXMyZ0Zw7O9Dcrd2B?= =?iso-8859-1?q?Db2sZWAuv7bQs/mTyijdMpathnlkne7iFhU1jY7td8DZkncYfasIp+fCaduQ?= =?iso-8859-1?q?Ij7PDDXrhOVN1EnlysegScr9v11x6Bnk//nZhejGO7rDSxsOlfH4xTUWjd8o?= =?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: 14079238-5b8f-4900-1ea1-08dab5ad226e X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Oct 2022 10:47:23.7489 (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: 82rO6k2iOLYxrGGsPOVG6UMafl3kkP+tbl5+0V7PMuZL+wpJc0nDrzxa8xjKGWZV1F61DlYAUdkzsqRLpmjR0iB3mbecIb+wOFHJ4WcZMdM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB7375 Subject: [ovs-dev] [PATCH ovn 4/4] pinctrl: Send RARPs for external ipv6 interfaces 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" previously garps/rarps were only sent for NAT IPs if these had an ipv4 address attached. For lsp's on gateway routers that do not have an ipv4 address assigned (e.g. if they are ipv6 only) no rarps where send out. This causes traffic outages when changing the priority of a gateway chassis as the physical switches to not get the information where the mac address now resides. To fix this, we send out rarps with just the mac address of the interface and no ip address. This change has been tested in an environment with 600 logical routers on a single ipv6 external network. Signed-off-by: Felix Huettner Acked-by: Numan Siddique --- controller/pinctrl.c | 23 +++++++++++++ tests/ovn.at | 80 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 99 insertions(+), 4 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/controller/pinctrl.c b/controller/pinctrl.c index 8859cb080..767fa02d8 100644 --- a/controller/pinctrl.c +++ b/controller/pinctrl.c @@ -4512,6 +4512,24 @@ send_garp_rarp_update(struct ovsdb_idl_txn *ovnsb_idl_txn, } free(name); } + /* + * Send RARPs even if we do not have a ipv4 address as it e.g. + * happens on ipv6 only ports. + */ + if (laddrs->n_ipv4_addrs == 0) { + char *name = xasprintf("%s-noip", + binding_rec->logical_port); + garp_rarp = shash_find_data(&send_garp_rarp_data, name); + if (garp_rarp) { + garp_rarp->dp_key = binding_rec->datapath->tunnel_key; + garp_rarp->port_key = binding_rec->tunnel_key; + } else { + add_garp_rarp(name, laddrs->ea, + 0, binding_rec->datapath->tunnel_key, + binding_rec->tunnel_key); + } + free(name); + } destroy_lport_addresses(laddrs); free(laddrs); } @@ -5824,6 +5842,11 @@ consider_nat_address(struct ovsdb_idl_index *sbrec_port_binding_by_name, sset_add(nat_address_keys, name); free(name); } + if (laddrs->n_ipv4_addrs == 0) { + char *name = xasprintf("%s-noip", pb->logical_port); + sset_add(nat_address_keys, name); + free(name); + } shash_add(nat_addresses, pb->logical_port, laddrs); } diff --git a/tests/ovn.at b/tests/ovn.at index 3d54c9153..6b08ef124 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -9017,6 +9017,76 @@ OVN_CLEANUP([hv1]) AT_CLEANUP ]) +OVN_FOR_EACH_NORTHD([ +AT_SETUP([send reverse arp for router without ipv4 address]) +ovn_start +# Create logical switch +ovn-nbctl ls-add ls0 +# Create gateway router +ovn-nbctl create Logical_Router name=lr0 options:chassis=hv1 +# Add router port to gateway router +ovn-nbctl lrp-add lr0 lrp0 f0:00:00:00:00:01 fd12:3456:789a:1::1/64 +ovn-nbctl lsp-add ls0 lrp0-rp -- set Logical_Switch_Port lrp0-rp \ + type=router options:router-port=lrp0 addresses='"f0:00:00:00:00:01"' +# Add nat-address option +ovn-nbctl lsp-set-options lrp0-rp router-port=lrp0 nat-addresses="router" + +net_add n1 +sim_add hv1 +as hv1 +ovs-vsctl \ + -- add-br br-phys \ + -- add-br br-eth0 + +ovn_attach n1 br-phys fd12:3456:789a:1::1 64 6 + +AT_CHECK([ovs-vsctl set Open_vSwitch . external-ids:ovn-bridge-mappings=physnet1:br-eth0]) +AT_CHECK([ovs-vsctl add-port br-eth0 snoopvif -- set Interface snoopvif options:tx_pcap=hv1/snoopvif-tx.pcap options:rxq_pcap=hv1/snoopvif-rx.pcap]) + +# Create a localnet port. +AT_CHECK([ovn-nbctl lsp-add ls0 ln_port]) +AT_CHECK([ovn-nbctl lsp-set-addresses ln_port unknown]) +AT_CHECK([ovn-nbctl lsp-set-type ln_port localnet]) +AT_CHECK([ovn-nbctl lsp-set-options ln_port network_name=physnet1]) + +# Wait until the patch ports are created to connect br-int to br-eth0 +OVS_WAIT_UNTIL([test 1 = `ovs-vsctl show | \ +grep "Port patch-br-int-to-ln_port" | wc -l`]) + +ovn-sbctl list port_binding lrp0-rp +echo "*****" +ovn-nbctl list logical_switch_port lrp0-rp +ovn-nbctl list logical_router_port lrp0 +ovn-nbctl show +# Wait for packet to be received. +OVS_WAIT_UNTIL([test `wc -c < "hv1/snoopvif-tx.pcap"` -ge 50]) +$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/snoopvif-tx.pcap | sort | uniq > packets +expected="fffffffffffff0000000000180350001080006040003f0000000000100000000f0000000000100000000" +echo $expected > expout +AT_CHECK([sort packets], [0], [expout]) + +# Temporarily remove nat-addresses option to avoid race conditions +# due to GARP backoff +ovn-nbctl lsp-set-options lrp0-rp router-port=lrp0 nat-addresses="" + +as hv1 reset_pcap_file snoopvif hv1/snoopvif + +# Re-add nat-addresses option +ovn-nbctl lsp-set-options lrp0-rp router-port=lrp0 nat-addresses="router" exclude-lb-vips-from-garp="true" + +# Wait for packets to be received. +OVS_WAIT_UNTIL([test `wc -c < "hv1/snoopvif-tx.pcap"` -ge 50]) + +$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/snoopvif-tx.pcap > packets +expected="fffffffffffff0000000000180350001080006040003f0000000000100000000f0000000000100000000" +echo $expected > expout +AT_CHECK([sort packets], [0], [expout]) + +OVN_CLEANUP([hv1]) + +AT_CLEANUP +]) + OVN_FOR_EACH_NORTHD([ AT_SETUP([delete mac bindings]) ovn_start @@ -13867,10 +13937,11 @@ $mcast_node_ip $nd_target $nd_src_ip OVS_WAIT_WHILE([test 24 = $(wc -c hv1/br-phys_n1-tx.pcap | cut -d " " -f1)]) OVS_WAIT_WHILE([test 24 = $(wc -c hv1/br-phys-tx.pcap | cut -d " " -f1)]) +# Use the grep here to filter out rarp packets that might have arrived $PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/br-phys_n1-tx.pcap | \ -trim_zeros > 1.packets +grep -v ffffffffffff | trim_zeros > 1.packets $PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/br-phys-tx.pcap | \ -trim_zeros > 2.packets +grep -v ffffffffffff | trim_zeros > 2.packets cat ipv6_ns.expected | cut -c -112 > expout AT_CHECK([cat 1.packets | cut -c -112], [0], [expout]) @@ -13907,10 +13978,11 @@ $mcast_node_ip $nd_target $nd_src_ip OVS_WAIT_WHILE([test 24 = $(wc -c hv1/br-phys_n1-tx.pcap | cut -d " " -f1)]) OVS_WAIT_WHILE([test 24 = $(wc -c hv1/br-phys-tx.pcap | cut -d " " -f1)]) +# Use the grep here to filter out rarp packets that might have arrived $PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/br-phys_n1-tx.pcap | \ -trim_zeros > 1.packets +grep -v ffffffffffff | trim_zeros > 1.packets $PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/br-phys-tx.pcap | \ -trim_zeros > 2.packets +grep -v ffffffffffff | trim_zeros > 2.packets cat ipv6_ns.expected | cut -c -112 > expout AT_CHECK([cat 1.packets | cut -c -112], [0], [expout])