From d346d1ac414c7ce5db6cc7e6b539dc8820d499d3 Mon Sep 17 00:00:00 2001 From: Louis Scalbert Date: Wed, 27 Mar 2024 15:04:38 +0100 Subject: [PATCH 01/13] Revert "bgpd: fix 6vpe nexthop" This reverts commit 0325116a27258e1df773a046e8668a029bead60c. It was causing an issue where a nexthop for IPv6 over an IPv4 session was always rewritten to an IPv4-mapped IPv6 address even when a valid IPv6 global address was existing. Link: https://github.com/FRRouting/frr/issues/15610 Signed-off-by: Louis Scalbert --- bgpd/bgp_updgrp_packet.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c index bff52c80d8c7..7502bf2ec6dc 100644 --- a/bgpd/bgp_updgrp_packet.c +++ b/bgpd/bgp_updgrp_packet.c @@ -523,16 +523,11 @@ struct stream *bpacket_reformat_for_peer(struct bpacket *pkt, gnh_modified = 1; } - if (peer->nexthop.v4.s_addr != INADDR_ANY && - (IN6_IS_ADDR_UNSPECIFIED(mod_v6nhg) || - (peer->connection->su.sa.sa_family == AF_INET && - paf->afi == AFI_IP6))) { - /* set a IPv4 mapped IPv6 address if no global IPv6 - * address is found or if announcing IPv6 prefix - * over an IPv4 BGP session. - */ - ipv4_to_ipv4_mapped_ipv6(mod_v6nhg, peer->nexthop.v4); - gnh_modified = 1; + if (IN6_IS_ADDR_UNSPECIFIED(mod_v6nhg)) { + if (peer->nexthop.v4.s_addr != INADDR_ANY) { + ipv4_to_ipv4_mapped_ipv6(mod_v6nhg, + peer->nexthop.v4); + } } if (IS_MAPPED_IPV6(&peer->nexthop.v6_global)) { From 8599fe2b5e34b2ac1a46a14983ddcc2336e9116d Mon Sep 17 00:00:00 2001 From: Louis Scalbert Date: Thu, 28 Mar 2024 11:07:23 +0100 Subject: [PATCH 02/13] bgpd: optimize bgp_interface_address_add Move common checks outside of the loop. Signed-off-by: Louis Scalbert --- bgpd/bgp_zebra.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index 9a819657734e..520b01b768f1 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -335,13 +335,11 @@ static int bgp_interface_address_add(ZAPI_CALLBACK_ARGS) if (IN6_IS_ADDR_LINKLOCAL(&ifc->address->u.prefix6) && !list_isempty(ifc->ifp->nbr_connected)) bgp_start_interface_nbrs(bgp, ifc->ifp); - else { + else if (ifc->address->family == AF_INET6 && + !IN6_IS_ADDR_LINKLOCAL(&ifc->address->u.prefix6)) { addr = ifc->address; for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) { - if (addr->family == AF_INET) - continue; - /* * If the Peer's interface name matches the * interface name for which BGP received the @@ -355,7 +353,6 @@ static int bgp_interface_address_add(ZAPI_CALLBACK_ARGS) if ((peer->conf_if && (strcmp(peer->conf_if, ifc->ifp->name) == 0)) && - !IN6_IS_ADDR_LINKLOCAL(&addr->u.prefix6) && ((IS_MAPPED_IPV6( &peer->nexthop.v6_global)) || IN6_IS_ADDR_LINKLOCAL( From 778e0df87b7a846f46d84f61ea889a32fe578e49 Mon Sep 17 00:00:00 2001 From: Louis Scalbert Date: Thu, 28 Mar 2024 15:49:58 +0100 Subject: [PATCH 03/13] bgpd: reduce bgp_interface_address_add indentation Reduce bgp_interface_address_add indentation Signed-off-by: Louis Scalbert --- bgpd/bgp_zebra.c | 84 ++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 45 deletions(-) diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index 520b01b768f1..a6d2a30013a3 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -325,53 +325,47 @@ static int bgp_interface_address_add(ZAPI_CALLBACK_ARGS) if (!bgp) return 0; - if (if_is_operative(ifc->ifp)) { - bgp_connected_add(bgp, ifc); + if (!if_is_operative(ifc->ifp)) + return 0; - /* If we have learnt of any neighbors on this interface, - * check to kick off any BGP interface-based neighbors, - * but only if this is a link-local address. - */ - if (IN6_IS_ADDR_LINKLOCAL(&ifc->address->u.prefix6) - && !list_isempty(ifc->ifp->nbr_connected)) - bgp_start_interface_nbrs(bgp, ifc->ifp); - else if (ifc->address->family == AF_INET6 && - !IN6_IS_ADDR_LINKLOCAL(&ifc->address->u.prefix6)) { - addr = ifc->address; - - for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) { - /* - * If the Peer's interface name matches the - * interface name for which BGP received the - * update and if the received interface address - * is a globalV6 and if the peer is currently - * using a v4-mapped-v6 addr or a link local - * address, then copy the Rxed global v6 addr - * into peer's v6_global and send updates out - * with new nexthop addr. - */ - if ((peer->conf_if && - (strcmp(peer->conf_if, ifc->ifp->name) == - 0)) && - ((IS_MAPPED_IPV6( - &peer->nexthop.v6_global)) || - IN6_IS_ADDR_LINKLOCAL( - &peer->nexthop.v6_global))) { - - if (bgp_debug_zebra(ifc->address)) { - zlog_debug( - "Update peer %pBP's current intf addr %pI6 and send updates", - peer, - &peer->nexthop - .v6_global); - } - memcpy(&peer->nexthop.v6_global, - &addr->u.prefix6, - IPV6_MAX_BYTELEN); - FOREACH_AFI_SAFI (afi, safi) - bgp_announce_route(peer, afi, - safi, true); + bgp_connected_add(bgp, ifc); + + /* If we have learnt of any neighbors on this interface, + * check to kick off any BGP interface-based neighbors, + * but only if this is a link-local address. + */ + if (IN6_IS_ADDR_LINKLOCAL(&ifc->address->u.prefix6) && + !list_isempty(ifc->ifp->nbr_connected)) + bgp_start_interface_nbrs(bgp, ifc->ifp); + else if (ifc->address->family == AF_INET6 && + !IN6_IS_ADDR_LINKLOCAL(&ifc->address->u.prefix6)) { + addr = ifc->address; + + for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) { + /* + * If the Peer's interface name matches the + * interface name for which BGP received the + * update and if the received interface address + * is a globalV6 and if the peer is currently + * using a v4-mapped-v6 addr or a link local + * address, then copy the Rxed global v6 addr + * into peer's v6_global and send updates out + * with new nexthop addr. + */ + if ((peer->conf_if && + (strcmp(peer->conf_if, ifc->ifp->name) == 0)) && + ((IS_MAPPED_IPV6(&peer->nexthop.v6_global)) || + IN6_IS_ADDR_LINKLOCAL(&peer->nexthop.v6_global))) { + if (bgp_debug_zebra(ifc->address)) { + zlog_debug("Update peer %pBP's current intf addr %pI6 and send updates", + peer, + &peer->nexthop.v6_global); } + memcpy(&peer->nexthop.v6_global, + &addr->u.prefix6, IPV6_MAX_BYTELEN); + FOREACH_AFI_SAFI (afi, safi) + bgp_announce_route(peer, afi, safi, + true); } } } From b083885198157555bbb916ecae9809c5d67a567b Mon Sep 17 00:00:00 2001 From: Louis Scalbert Date: Thu, 28 Mar 2024 11:07:24 +0100 Subject: [PATCH 04/13] bgpd: log new ipv6 global in bgp_interface_address_add Log new IPv6 global address in bgp_interface_address_add Signed-off-by: Louis Scalbert --- bgpd/bgp_zebra.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index a6d2a30013a3..5977180ce513 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -357,9 +357,10 @@ static int bgp_interface_address_add(ZAPI_CALLBACK_ARGS) ((IS_MAPPED_IPV6(&peer->nexthop.v6_global)) || IN6_IS_ADDR_LINKLOCAL(&peer->nexthop.v6_global))) { if (bgp_debug_zebra(ifc->address)) { - zlog_debug("Update peer %pBP's current intf addr %pI6 and send updates", + zlog_debug("Update peer %pBP's current intf global addr from %pI6 to %pI6 and send updates", peer, - &peer->nexthop.v6_global); + &peer->nexthop.v6_global, + &addr->u.prefix6); } memcpy(&peer->nexthop.v6_global, &addr->u.prefix6, IPV6_MAX_BYTELEN); From 424fe0bf809c1d84f16aba3f5e5f8249af29083b Mon Sep 17 00:00:00 2001 From: Louis Scalbert Date: Thu, 28 Mar 2024 11:11:05 +0100 Subject: [PATCH 05/13] bgpd: fix sending ipv6 local nexthop if global present bgpd keeps on advertising IPv6 prefixes with a IPv6 link-local nexthop after a valid IPv6 global appears. At bgpd startup, the IPv6 global is announced by zebra after the link-local. Only the link-local is advertised. Clearing the BGP sessions make the global to to be announced. Update the nexthops with the global IPv6 when available. Signed-off-by: Louis Scalbert --- bgpd/bgp_zebra.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index 5977180ce513..5c0a6a09c3df 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -303,11 +303,12 @@ static int bgp_ifp_down(struct interface *ifp) static int bgp_interface_address_add(ZAPI_CALLBACK_ARGS) { - struct connected *ifc; + struct connected *ifc, *connected; struct bgp *bgp; struct peer *peer; struct prefix *addr; struct listnode *node, *nnode; + bool v6_ll_in_nh_global; afi_t afi; safi_t safi; @@ -342,6 +343,27 @@ static int bgp_interface_address_add(ZAPI_CALLBACK_ARGS) addr = ifc->address; for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) { + v6_ll_in_nh_global = false; + + if (IN6_IS_ADDR_LINKLOCAL(&peer->nexthop.v6_global)) { + frr_each (if_connected, ifc->ifp->connected, + connected) { + if (connected->address->family != + AF_INET6) + continue; + if (!IPV6_ADDR_SAME(&connected->address + ->u.prefix6, + &peer->nexthop + .v6_global)) + continue; + /* peer->nexthop.v6_global contains a link-local address + * that needs to be replaced by the global address. + */ + v6_ll_in_nh_global = true; + break; + } + } + /* * If the Peer's interface name matches the * interface name for which BGP received the @@ -352,10 +374,11 @@ static int bgp_interface_address_add(ZAPI_CALLBACK_ARGS) * into peer's v6_global and send updates out * with new nexthop addr. */ - if ((peer->conf_if && - (strcmp(peer->conf_if, ifc->ifp->name) == 0)) && - ((IS_MAPPED_IPV6(&peer->nexthop.v6_global)) || - IN6_IS_ADDR_LINKLOCAL(&peer->nexthop.v6_global))) { + if (v6_ll_in_nh_global || + (peer->conf_if && + strcmp(peer->conf_if, ifc->ifp->name) == 0 && + (IS_MAPPED_IPV6(&peer->nexthop.v6_global) || + IN6_IS_ADDR_LINKLOCAL(&peer->nexthop.v6_global)))) { if (bgp_debug_zebra(ifc->address)) { zlog_debug("Update peer %pBP's current intf global addr from %pI6 to %pI6 and send updates", peer, From 62913cb15d8195c41229c2f6090d7e189e04646e Mon Sep 17 00:00:00 2001 From: Louis Scalbert Date: Wed, 27 Mar 2024 16:13:46 +0100 Subject: [PATCH 06/13] topotests: add bgp_nexthop_mp_ipv4_6 test Add bgp_nexthop_mp_ipv4_6 topotest to test to nexhop value with MP-BGP IPv4 and IPv6 on IPv4 peering. The test has route-reflector, route-server, iBGP and eBGP peers. Signed-off-by: Louis Scalbert --- .../bgp_nexthop_mp_ipv4_6/__init__.py | 0 .../bgp_nexthop_mp_ipv4_6/h1/zebra.conf | 6 + .../bgp_nexthop_mp_ipv4_6/h2/zebra.conf | 6 + .../bgp_nexthop_mp_ipv4_6/h3/zebra.conf | 6 + .../bgp_nexthop_mp_ipv4_6/r1/bgp_ipv4.json | 70 ++++++ .../r1/bgp_ipv6_step1.json | 90 +++++++ .../bgp_nexthop_mp_ipv4_6/r1/bgpd.conf | 23 ++ .../bgp_nexthop_mp_ipv4_6/r1/zebra.conf | 16 ++ .../bgp_nexthop_mp_ipv4_6/r2/bgp_ipv4.json | 46 ++++ .../r2/bgp_ipv6_step1.json | 53 ++++ .../bgp_nexthop_mp_ipv4_6/r2/bgpd.conf | 11 + .../bgp_nexthop_mp_ipv4_6/r2/isisd.conf | 24 ++ .../bgp_nexthop_mp_ipv4_6/r2/zebra.conf | 12 + .../bgp_nexthop_mp_ipv4_6/r3/bgp_ipv4.json | 46 ++++ .../r3/bgp_ipv6_step1.json | 53 ++++ .../bgp_nexthop_mp_ipv4_6/r3/bgpd.conf | 11 + .../bgp_nexthop_mp_ipv4_6/r3/isisd.conf | 24 ++ .../bgp_nexthop_mp_ipv4_6/r3/zebra.conf | 12 + .../bgp_nexthop_mp_ipv4_6/r4/bgp_ipv4.json | 46 ++++ .../r4/bgp_ipv6_step1.json | 49 ++++ .../bgp_nexthop_mp_ipv4_6/r4/bgpd.conf | 13 + .../bgp_nexthop_mp_ipv4_6/r4/isisd.conf | 26 ++ .../bgp_nexthop_mp_ipv4_6/r4/zebra.conf | 12 + .../bgp_nexthop_mp_ipv4_6/r5/bgp_ipv4.json | 46 ++++ .../r5/bgp_ipv6_step1.json | 49 ++++ .../bgp_nexthop_mp_ipv4_6/r5/bgpd.conf | 13 + .../bgp_nexthop_mp_ipv4_6/r5/isisd.conf | 26 ++ .../bgp_nexthop_mp_ipv4_6/r5/zebra.conf | 12 + .../bgp_nexthop_mp_ipv4_6/r6/bgp_ipv4.json | 46 ++++ .../r6/bgp_ipv6_step1.json | 48 ++++ .../bgp_nexthop_mp_ipv4_6/r6/bgpd.conf | 17 ++ .../bgp_nexthop_mp_ipv4_6/r6/isisd.conf | 31 +++ .../bgp_nexthop_mp_ipv4_6/r6/zebra.conf | 16 ++ .../bgp_nexthop_mp_ipv4_6/r7/bgp_ipv4.json | 46 ++++ .../r7/bgp_ipv6_step1.json | 48 ++++ .../bgp_nexthop_mp_ipv4_6/r7/bgpd.conf | 21 ++ .../bgp_nexthop_mp_ipv4_6/r7/zebra.conf | 12 + .../bgp_nexthop_mp_ipv4_6/r8/bgp_ipv4.json | 46 ++++ .../r8/bgp_ipv6_step1.json | 48 ++++ .../bgp_nexthop_mp_ipv4_6/r8/bgpd.conf | 21 ++ .../bgp_nexthop_mp_ipv4_6/r8/zebra.conf | 12 + .../bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv4.json | 58 +++++ .../rr1/bgp_ipv6_step1.json | 62 +++++ .../bgp_nexthop_mp_ipv4_6/rr1/bgpd.conf | 26 ++ .../bgp_nexthop_mp_ipv4_6/rr1/isisd.conf | 40 +++ .../bgp_nexthop_mp_ipv4_6/rr1/zebra.conf | 21 ++ .../bgp_nexthop_mp_ipv4_6/rs1/bgpd.conf | 21 ++ .../bgp_nexthop_mp_ipv4_6/rs1/isisd.conf | 36 +++ .../bgp_nexthop_mp_ipv4_6/rs1/zebra.conf | 8 + .../test_nexthop_mp_ipv4_6.py | 231 ++++++++++++++++++ 50 files changed, 1716 insertions(+) create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/__init__.py create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/h1/zebra.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/h2/zebra.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/h3/zebra.conf create mode 100755 tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv4.json create mode 100755 tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step1.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgpd.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r1/zebra.conf create mode 100755 tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv4.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step1.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgpd.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r2/isisd.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r2/zebra.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv4.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step1.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgpd.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r3/isisd.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r3/zebra.conf create mode 100755 tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv4.json create mode 100755 tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step1.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgpd.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r4/isisd.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r4/zebra.conf create mode 100755 tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv4.json create mode 100755 tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step1.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgpd.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r5/isisd.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r5/zebra.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv4.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step1.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgpd.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r6/isisd.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r6/zebra.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv4.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step1.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgpd.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r7/zebra.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv4.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step1.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgpd.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r8/zebra.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv4.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step1.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgpd.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/isisd.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/zebra.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/bgpd.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/isisd.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/zebra.conf create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/test_nexthop_mp_ipv4_6.py diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/__init__.py b/tests/topotests/bgp_nexthop_mp_ipv4_6/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/h1/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/h1/zebra.conf new file mode 100644 index 000000000000..9b19b2cfbd36 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/h1/zebra.conf @@ -0,0 +1,6 @@ +ipv6 route ::/0 fd00:100::2 +ip route 0.0.0.0/0 192.168.1.2 +interface eth-r1 + ip address 192.168.1.1/24 + ipv6 address fd00:100::1/64 +! diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/h2/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/h2/zebra.conf new file mode 100644 index 000000000000..2bf4a666808a --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/h2/zebra.conf @@ -0,0 +1,6 @@ +ipv6 route ::/0 fd00:700::2 +ip route 0.0.0.0/0 192.168.7.2 +interface eth-r7 + ip address 192.168.7.1/24 + ipv6 address fd00:700::1/64 +! diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/h3/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/h3/zebra.conf new file mode 100644 index 000000000000..e8b6ac6e268e --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/h3/zebra.conf @@ -0,0 +1,6 @@ +ipv6 route ::/0 fd00:800::2 +ip route 0.0.0.0/0 192.168.8.2 +interface eth-r8 + ip address 192.168.8.1/24 + ipv6 address fd00:800::1/64 +! diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv4.json new file mode 100755 index 000000000000..12fecee39fdf --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv4.json @@ -0,0 +1,70 @@ +{ + "routes": { + "192.168.1.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "", + "nexthops": [ + { + "ip": "0.0.0.0", + "afi": "ipv4", + "used": true + } + ] + } + ], + "192.168.7.0/24": [ + { + "valid": true, + "multipath": true, + "path": "65000 65700", + "nexthops": [ + { + "ip": "172.16.1.3", + "afi": "ipv4", + "used": true + } + ] + }, + { + "valid": true, + "bestpath": true, + "path": "65000 65700", + "nexthops": [ + { + "ip": "172.16.0.2", + "afi": "ipv4", + "used": true + } + ] + } + ], + "192.168.8.0/24": [ + { + "valid": true, + "multipath": true, + "path": "65000 65800", + "nexthops": [ + { + "ip": "172.16.1.3", + "afi": "ipv4", + "used": true + } + ] + }, + { + "valid": true, + "bestpath": true, + "path": "65000 65800", + "nexthops": [ + { + "ip": "172.16.0.2", + "afi": "ipv4", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step1.json new file mode 100755 index 000000000000..f7c5c7c3b56a --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step1.json @@ -0,0 +1,90 @@ +{ + "routes": { + "fd00:100::/64": [ + { + "valid": true, + "bestpath": true, + "path": "", + "nexthops": [ + { + "ip": "::", + "afi": "ipv6", + "used": true + } + ] + } + ], + "fd00:700::/64": [ + { + "valid": true, + "multipath": true, + "path": "65000 65700", + "nexthops": [ + { + "ip": "fd00:0:2::3", + "afi": "ipv6", + "scope": "global" + }, + { + "afi": "ipv6", + "scope": "link-local", + "used": true + } + ] + }, + { + "valid": true, + "bestpath": true, + "path": "65000 65700", + "nexthops": [ + { + "ip": "fd00:0:1::2", + "afi": "ipv6", + "scope": "global" + }, + { + "afi": "ipv6", + "scope": "link-local", + "used": true + } + ] + } + ], + "fd00:800::/64": [ + { + "valid": true, + "multipath": true, + "path": "65000 65800", + "nexthops": [ + { + "ip": "fd00:0:2::3", + "afi": "ipv6", + "scope": "global" + }, + { + "afi": "ipv6", + "scope": "link-local", + "used": true + } + ] + }, + { + "valid": true, + "bestpath": true, + "path": "65000 65800", + "nexthops": [ + { + "ip": "fd00:0:1::2", + "afi": "ipv6", + "scope": "global" + }, + { + "afi": "ipv6", + "scope": "link-local", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgpd.conf new file mode 100644 index 000000000000..23b986d1301a --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgpd.conf @@ -0,0 +1,23 @@ +router bgp 65100 + no bgp ebgp-requires-policy + neighbor 172.16.0.2 remote-as external + neighbor 172.16.1.3 remote-as external + ! neighbor 172.16.0.2 capability extended-nexthop + ! + address-family ipv4 unicast + redistribute connected route-map RMAP4 + ! + address-family ipv6 unicast + redistribute connected route-map RMAP6 + neighbor 172.16.0.2 activate + neighbor 172.16.1.3 activate + ! + +ip prefix-list RANGE4 seq 10 permit 192.168.0.0/16 le 24 +ipv6 prefix-list RANGE6 seq 10 permit fd00:100::0/64 + +route-map RMAP4 permit 10 + match ip address prefix-list RANGE4 +! +route-map RMAP6 permit 10 + match ipv6 address prefix-list RANGE6 diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/zebra.conf new file mode 100644 index 000000000000..79cbafb5b817 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/zebra.conf @@ -0,0 +1,16 @@ +! +interface eth-h1 + ip address 192.168.1.2/24 + ipv6 address fd00:100::2/64 +! +interface eth-r2 + ip address 172.16.0.1/24 + ipv6 address fd00:0:1::1/64 +! +interface eth-r3 + ip address 172.16.1.1/24 + ipv6 address fd00:0:2::1/64 +! +interface lo + ip address 192.0.2.1/32 + ipv6 address 2001:db8::1/128 diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv4.json new file mode 100755 index 000000000000..64dadf680c0b --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv4.json @@ -0,0 +1,46 @@ +{ + "routes": { + "192.168.1.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65100", + "nexthops": [ + { + "ip": "172.16.0.1", + "afi": "ipv4", + "used": true + } + ] + } + ], + "192.168.7.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "172.17.0.7", + "afi": "ipv4", + "used": true + } + ] + } + ], + "192.168.8.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "172.17.0.8", + "afi": "ipv4", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step1.json new file mode 100644 index 000000000000..4f86a1a648a5 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step1.json @@ -0,0 +1,53 @@ +{ + "routes": { + "fd00:100::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65100", + "nexthops": [ + { + "ip": "fd00:0:1::1", + "afi": "ipv6", + "scope": "global" + }, + { + "afi": "ipv6", + "scope": "link-local", + "used": true + } + ] + } + ], + "fd00:700::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "fd00:0:9::7", + "scope": "global", + "afi": "ipv6", + "used": true + } + ] + } + ], + "fd00:800::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "fd00:0:9::8", + "scope": "global", + "afi": "ipv6", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgpd.conf new file mode 100644 index 000000000000..badb11cbebe2 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgpd.conf @@ -0,0 +1,11 @@ +router bgp 65000 + no bgp ebgp-requires-policy + neighbor 172.16.0.1 remote-as external + ! neighbor 172.16.0.1 capability extended-nexthop + neighbor 192.0.2.101 remote-as internal + neighbor 192.0.2.101 update-source 192.0.2.2 + ! + address-family ipv6 unicast + neighbor 172.16.0.1 activate + neighbor 192.0.2.101 activate + ! diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/isisd.conf new file mode 100644 index 000000000000..16963798f817 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/isisd.conf @@ -0,0 +1,24 @@ +! +interface lo + ip router isis 1 + ipv6 router isis 1 + isis passive +! +interface eth-rr1 + ip router isis 1 + ipv6 router isis 1 + isis hello-interval 1 + isis hello-multiplier 3 + isis network point-to-point +! +interface eth-r1 + ip router isis 1 + ipv6 router isis 1 + isis passive +! +router isis 1 + net 49.0000.0000.0000.0002.00 + is-type level-1 + lsp-gen-interval 1 + topology ipv6-unicast +! diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/zebra.conf new file mode 100644 index 000000000000..8997115d87cc --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/zebra.conf @@ -0,0 +1,12 @@ +! +interface eth-r1 + ip address 172.16.0.2/24 + ipv6 address fd00:0:1::2/64 +! +interface eth-rr1 + ip address 10.0.0.2/24 + ipv6 address fd00:0:3::2/64 +! +interface lo + ip address 192.0.2.2/32 + ipv6 address 2001:db8::2/128 diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv4.json new file mode 100644 index 000000000000..0f18a43bf54a --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv4.json @@ -0,0 +1,46 @@ +{ + "routes": { + "192.168.1.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65100", + "nexthops": [ + { + "ip": "172.16.1.1", + "afi": "ipv4", + "used": true + } + ] + } + ], + "192.168.7.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "172.17.0.7", + "afi": "ipv4", + "used": true + } + ] + } + ], + "192.168.8.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "172.17.0.8", + "afi": "ipv4", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step1.json new file mode 100644 index 000000000000..f44121c30ef8 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step1.json @@ -0,0 +1,53 @@ +{ + "routes": { + "fd00:100::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65100", + "nexthops": [ + { + "ip": "fd00:0:2::1", + "afi": "ipv6", + "scope": "global" + }, + { + "afi": "ipv6", + "scope": "link-local", + "used": true + } + ] + } + ], + "fd00:700::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "fd00:0:9::7", + "scope": "global", + "afi": "ipv6", + "used": true + } + ] + } + ], + "fd00:800::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "fd00:0:9::8", + "scope": "global", + "afi": "ipv6", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgpd.conf new file mode 100644 index 000000000000..4dec311f511d --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgpd.conf @@ -0,0 +1,11 @@ +router bgp 65000 + no bgp ebgp-requires-policy + neighbor 172.16.1.1 remote-as external + ! neighbor 172.16.1.1 capability extended-nexthop + neighbor 192.0.2.101 remote-as internal + neighbor 192.0.2.101 update-source 192.0.2.3 + ! + address-family ipv6 unicast + neighbor 172.16.1.1 activate + neighbor 192.0.2.101 activate + ! diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/isisd.conf new file mode 100644 index 000000000000..fe3e307b42ee --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/isisd.conf @@ -0,0 +1,24 @@ +! +interface lo + ip router isis 1 + ipv6 router isis 1 + isis passive +! +interface eth-rr1 + ip router isis 1 + ipv6 router isis 1 + isis hello-interval 1 + isis hello-multiplier 3 + isis network point-to-point +! +interface eth-r1 + ip router isis 1 + ipv6 router isis 1 + isis passive +! +router isis 1 + net 49.0000.0000.0000.0003.00 + is-type level-1 + lsp-gen-interval 1 + topology ipv6-unicast +! diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/zebra.conf new file mode 100644 index 000000000000..8074bbdcde43 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/zebra.conf @@ -0,0 +1,12 @@ +! +interface eth-r1 + ip address 172.16.1.3/24 + ipv6 address fd00:0:2::3/64 +! +interface eth-rr1 + ip address 10.0.1.3/24 + ipv6 address fd00:0:4::3/64 +! +interface lo + ip address 192.0.2.3/32 + ipv6 address 2001:db8::3/128 diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv4.json new file mode 100755 index 000000000000..64dadf680c0b --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv4.json @@ -0,0 +1,46 @@ +{ + "routes": { + "192.168.1.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65100", + "nexthops": [ + { + "ip": "172.16.0.1", + "afi": "ipv4", + "used": true + } + ] + } + ], + "192.168.7.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "172.17.0.7", + "afi": "ipv4", + "used": true + } + ] + } + ], + "192.168.8.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "172.17.0.8", + "afi": "ipv4", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step1.json new file mode 100755 index 000000000000..756a78e3b141 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step1.json @@ -0,0 +1,49 @@ +{ + "routes": { + "fd00:100::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65100", + "nexthops": [ + { + "ip": "fd00:0:1::1", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ], + "fd00:700::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "fd00:0:9::7", + "scope": "global", + "afi": "ipv6", + "used": true + } + ] + } + ], + "fd00:800::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "fd00:0:9::8", + "scope": "global", + "afi": "ipv6", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgpd.conf new file mode 100644 index 000000000000..2dbc4acddc11 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgpd.conf @@ -0,0 +1,13 @@ +router bgp 65000 + neighbor 192.0.2.5 remote-as internal + neighbor 192.0.2.6 remote-as internal + neighbor 192.0.2.101 remote-as internal + neighbor 192.0.2.5 update-source 192.0.2.4 + neighbor 192.0.2.6 update-source 192.0.2.4 + neighbor 192.0.2.101 update-source 192.0.2.4 + ! + address-family ipv6 unicast + neighbor 192.0.2.5 activate + neighbor 192.0.2.6 activate + neighbor 192.0.2.101 activate + ! diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/isisd.conf new file mode 100644 index 000000000000..21eb80f58b44 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/isisd.conf @@ -0,0 +1,26 @@ +! +interface lo + ip router isis 1 + ipv6 router isis 1 + isis passive +! +interface eth-rr1 + ip router isis 1 + ipv6 router isis 1 + isis hello-interval 1 + isis hello-multiplier 3 + isis network point-to-point +! +interface eth-r6 + ip router isis 1 + ipv6 router isis 1 + isis hello-interval 1 + isis hello-multiplier 3 + isis network point-to-point +! +router isis 1 + net 49.0000.0000.0000.0004.00 + is-type level-1 + lsp-gen-interval 1 + topology ipv6-unicast +! diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/zebra.conf new file mode 100644 index 000000000000..c598b345e506 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/zebra.conf @@ -0,0 +1,12 @@ +! +interface eth-r6 + ip address 10.0.4.4/24 + ipv6 address fd00:0:7::4/64 +! +interface eth-rr1 + ip address 10.0.2.4/24 + ipv6 address fd00:0:5::4/64 +! +interface lo + ip address 192.0.2.4/32 + ipv6 address 2001:db8::4/128 diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv4.json new file mode 100755 index 000000000000..64dadf680c0b --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv4.json @@ -0,0 +1,46 @@ +{ + "routes": { + "192.168.1.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65100", + "nexthops": [ + { + "ip": "172.16.0.1", + "afi": "ipv4", + "used": true + } + ] + } + ], + "192.168.7.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "172.17.0.7", + "afi": "ipv4", + "used": true + } + ] + } + ], + "192.168.8.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "172.17.0.8", + "afi": "ipv4", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step1.json new file mode 100755 index 000000000000..756a78e3b141 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step1.json @@ -0,0 +1,49 @@ +{ + "routes": { + "fd00:100::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65100", + "nexthops": [ + { + "ip": "fd00:0:1::1", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ], + "fd00:700::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "fd00:0:9::7", + "scope": "global", + "afi": "ipv6", + "used": true + } + ] + } + ], + "fd00:800::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "fd00:0:9::8", + "scope": "global", + "afi": "ipv6", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgpd.conf new file mode 100644 index 000000000000..101edbd71b21 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgpd.conf @@ -0,0 +1,13 @@ +router bgp 65000 + neighbor 192.0.2.4 remote-as internal + neighbor 192.0.2.6 remote-as internal + neighbor 192.0.2.101 remote-as internal + neighbor 192.0.2.4 update-source 192.0.2.5 + neighbor 192.0.2.6 update-source 192.0.2.5 + neighbor 192.0.2.101 update-source 192.0.2.5 + ! + address-family ipv6 unicast + neighbor 192.0.2.4 activate + neighbor 192.0.2.6 activate + neighbor 192.0.2.101 activate + ! diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/isisd.conf new file mode 100644 index 000000000000..f998e805b5d9 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/isisd.conf @@ -0,0 +1,26 @@ +! +interface lo + ip router isis 1 + ipv6 router isis 1 + isis passive +! +interface eth-rr1 + ip router isis 1 + ipv6 router isis 1 + isis hello-interval 1 + isis hello-multiplier 3 + isis network point-to-point +! +interface eth-r6 + ip router isis 1 + ipv6 router isis 1 + isis hello-interval 1 + isis hello-multiplier 3 + isis network point-to-point +! +router isis 1 + net 49.0000.0000.0000.0005.00 + is-type level-1 + lsp-gen-interval 1 + topology ipv6-unicast +! diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/zebra.conf new file mode 100644 index 000000000000..7b43db0958cd --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/zebra.conf @@ -0,0 +1,12 @@ +! +interface eth-r6 + ip address 10.0.5.5/24 + ipv6 address fd00:0:8::5/64 +! +interface eth-rr1 + ip address 10.0.3.5/24 + ipv6 address fd00:0:6::5/64 +! +interface lo + ip address 192.0.2.5/32 + ipv6 address 2001:db8::5/128 diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv4.json new file mode 100644 index 000000000000..64dadf680c0b --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv4.json @@ -0,0 +1,46 @@ +{ + "routes": { + "192.168.1.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65100", + "nexthops": [ + { + "ip": "172.16.0.1", + "afi": "ipv4", + "used": true + } + ] + } + ], + "192.168.7.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "172.17.0.7", + "afi": "ipv4", + "used": true + } + ] + } + ], + "192.168.8.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "172.17.0.8", + "afi": "ipv4", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step1.json new file mode 100644 index 000000000000..1a01ead2cd14 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step1.json @@ -0,0 +1,48 @@ +{ + "routes": { + "fd00:100::/64": [ + { + "valid": true, + "bestpath": true, + "nexthops": [ + { + "ip": "fd00:0:1::1", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ], + "fd00:700::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "fd00:0:9::7", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ], + "fd00:800::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "fd00:0:9::8", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgpd.conf new file mode 100644 index 000000000000..e036a779ae32 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgpd.conf @@ -0,0 +1,17 @@ +router bgp 65000 + no bgp ebgp-requires-policy + no bgp enforce-first-as + neighbor 192.0.2.4 remote-as internal + neighbor 192.0.2.5 remote-as internal + neighbor 192.0.2.101 remote-as internal + neighbor 172.17.0.201 remote-as external + neighbor 192.0.2.4 update-source 192.0.2.6 + neighbor 192.0.2.5 update-source 192.0.2.6 + neighbor 192.0.2.101 update-source 192.0.2.6 + ! + address-family ipv6 unicast + neighbor 192.0.2.4 activate + neighbor 192.0.2.5 activate + neighbor 192.0.2.101 activate + neighbor 172.17.0.201 activate + ! diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/isisd.conf new file mode 100644 index 000000000000..b575290e9b0b --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/isisd.conf @@ -0,0 +1,31 @@ +! +interface lo + ip router isis 1 + ipv6 router isis 1 + isis passive +! +interface eth-r4 + ip router isis 1 + ipv6 router isis 1 + isis hello-interval 1 + isis hello-multiplier 3 + isis network point-to-point +! +interface eth-r5 + ip router isis 1 + ipv6 router isis 1 + isis hello-interval 1 + isis hello-multiplier 3 + isis network point-to-point +! +interface eth-sw1 + ip router isis 1 + ipv6 router isis 1 + isis passive +! +router isis 1 + net 49.0000.0000.0000.0006.00 + is-type level-1 + lsp-gen-interval 1 + topology ipv6-unicast +! diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/zebra.conf new file mode 100644 index 000000000000..fce74c146c2d --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/zebra.conf @@ -0,0 +1,16 @@ +! +interface eth-r4 + ip address 10.0.4.6/24 + ipv6 address fd00:0:7::6/64 +! +interface eth-r5 + ip address 10.0.5.6/24 + ipv6 address fd00:0:8::6/64 +! +interface eth-sw1 + ip address 172.17.0.6/24 + ipv6 address fd00:0:9::6/64 +! +interface lo + ip address 192.0.2.6/32 + ipv6 address 2001:db8::6/128 diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv4.json new file mode 100644 index 000000000000..72b0f03c5139 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv4.json @@ -0,0 +1,46 @@ +{ + "routes": { + "192.168.1.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65000 65100", + "nexthops": [ + { + "ip": "172.17.0.6", + "afi": "ipv4", + "used": true + } + ] + } + ], + "192.168.7.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "", + "nexthops": [ + { + "ip": "0.0.0.0", + "afi": "ipv4", + "used": true + } + ] + } + ], + "192.168.8.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "172.17.0.8", + "afi": "ipv4", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step1.json new file mode 100644 index 000000000000..8fe5f7c1de48 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step1.json @@ -0,0 +1,48 @@ +{ + "routes": { + "fd00:100::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65000 65100", + "nexthops": [ + { + "ip": "fd00:0:9::6", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ], + "fd00:700::/64": [ + { + "valid": true, + "bestpath": true, + "path": "", + "nexthops": [ + { + "ip": "::", + "afi": "ipv6", + "used": true + } + ] + } + ], + "fd00:800::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "fd00:0:9::8", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgpd.conf new file mode 100644 index 000000000000..a707b23af0c2 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgpd.conf @@ -0,0 +1,21 @@ +router bgp 65700 + no bgp ebgp-requires-policy + no bgp enforce-first-as + neighbor 172.17.0.201 remote-as external + ! + address-family ipv4 unicast + redistribute connected route-map RMAP4 + ! + address-family ipv6 unicast + redistribute connected route-map RMAP6 + neighbor 172.17.0.201 activate + ! + +ip prefix-list RANGE4 seq 10 permit 192.168.0.0/16 le 24 +ipv6 prefix-list RANGE6 seq 10 permit fd00:700::0/64 + +route-map RMAP4 permit 10 + match ip address prefix-list RANGE4 +! +route-map RMAP6 permit 10 + match ipv6 address prefix-list RANGE6 diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/zebra.conf new file mode 100644 index 000000000000..75448297eb78 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/zebra.conf @@ -0,0 +1,12 @@ +! +interface eth-h2 + ip address 192.168.7.2/24 + ipv6 address fd00:700::2/64 +! +interface eth-sw1 + ip address 172.17.0.7/24 + ipv6 address fd00:0:9::7/64 +! +interface lo + ip address 192.0.2.7/32 + ipv6 address 2001:db8::7/128 diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv4.json new file mode 100644 index 000000000000..596ee4b40bcf --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv4.json @@ -0,0 +1,46 @@ +{ + "routes": { + "192.168.1.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65000 65100", + "nexthops": [ + { + "ip": "172.17.0.6", + "afi": "ipv4", + "used": true + } + ] + } + ], + "192.168.7.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "172.17.0.7", + "afi": "ipv4", + "used": true + } + ] + } + ], + "192.168.8.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "", + "nexthops": [ + { + "ip": "0.0.0.0", + "afi": "ipv4", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step1.json new file mode 100644 index 000000000000..20f4940328f7 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step1.json @@ -0,0 +1,48 @@ +{ + "routes": { + "fd00:100::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65000 65100", + "nexthops": [ + { + "ip": "fd00:0:9::6", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ], + "fd00:700::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "fd00:0:9::7", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ], + "fd00:800::/64": [ + { + "valid": true, + "bestpath": true, + "path": "", + "nexthops": [ + { + "ip": "::", + "afi": "ipv6", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgpd.conf new file mode 100644 index 000000000000..d57712dcddbf --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgpd.conf @@ -0,0 +1,21 @@ +router bgp 65800 + no bgp ebgp-requires-policy + no bgp enforce-first-as + neighbor 172.17.0.201 remote-as external + ! + address-family ipv4 unicast + redistribute connected route-map RMAP4 + ! + address-family ipv6 unicast + redistribute connected route-map RMAP6 + neighbor 172.17.0.201 activate + ! + +ip prefix-list RANGE4 seq 10 permit 192.168.0.0/16 le 24 +ipv6 prefix-list RANGE6 seq 10 permit fd00:800::0/64 + +route-map RMAP4 permit 10 + match ip address prefix-list RANGE4 +! +route-map RMAP6 permit 10 + match ipv6 address prefix-list RANGE6 diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/zebra.conf new file mode 100644 index 000000000000..7e2479b751d9 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/zebra.conf @@ -0,0 +1,12 @@ +! +interface eth-h3 + ip address 192.168.8.2/24 + ipv6 address fd00:800::2/64 +! +interface eth-sw1 + ip address 172.17.0.8/24 + ipv6 address fd00:0:9::8/64 +! +interface lo + ip address 192.0.2.8/32 + ipv6 address 2001:db8::8/128 diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv4.json new file mode 100644 index 000000000000..ac67fe069c8b --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv4.json @@ -0,0 +1,58 @@ +{ + "routes": { + "192.168.1.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65100", + "nexthops": [ + { + "ip": "172.16.0.1", + "afi": "ipv4", + "used": true + } + ] + }, + { + "valid": true, + "multipath": true, + "path": "65100", + "nexthops": [ + { + "ip": "172.16.1.1", + "afi": "ipv4", + "used": true + } + ] + } + ], + "192.168.7.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "172.17.0.7", + "afi": "ipv4", + "used": true + } + ] + } + ], + "192.168.8.0/24": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "172.17.0.8", + "afi": "ipv4", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step1.json new file mode 100644 index 000000000000..4e359fd97ff9 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step1.json @@ -0,0 +1,62 @@ +{ + "routes": { + "fd00:100::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65100", + "nexthops": [ + { + "ip": "fd00:0:1::1", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + }, + { + "valid": true, + "multipath": true, + "path": "65100", + "nexthops": [ + { + "ip": "fd00:0:2::1", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ], + "fd00:700::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "fd00:0:9::7", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ], + "fd00:800::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "fd00:0:9::8", + "scope": "global", + "afi": "ipv6", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgpd.conf new file mode 100644 index 000000000000..9bbac8b68e9e --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgpd.conf @@ -0,0 +1,26 @@ +router bgp 65000 + neighbor 192.0.2.2 remote-as internal + neighbor 192.0.2.3 remote-as internal + neighbor 192.0.2.4 remote-as internal + neighbor 192.0.2.5 remote-as internal + neighbor 192.0.2.6 remote-as internal + neighbor 192.0.2.2 update-source 192.0.2.101 + neighbor 192.0.2.3 update-source 192.0.2.101 + neighbor 192.0.2.4 update-source 192.0.2.101 + neighbor 192.0.2.5 update-source 192.0.2.101 + neighbor 192.0.2.6 update-source 192.0.2.101 + ! + address-family ipv4 unicast + neighbor 192.0.2.2 route-reflector-client + neighbor 192.0.2.3 route-reflector-client + + ! + address-family ipv6 unicast + neighbor 192.0.2.2 activate + neighbor 192.0.2.3 activate + neighbor 192.0.2.4 activate + neighbor 192.0.2.5 activate + neighbor 192.0.2.6 activate + neighbor 192.0.2.2 route-reflector-client + neighbor 192.0.2.3 route-reflector-client + ! diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/isisd.conf new file mode 100644 index 000000000000..fe5bcfb9f1bc --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/isisd.conf @@ -0,0 +1,40 @@ +! +interface lo + ip router isis 1 + ipv6 router isis 1 + isis passive +! +interface eth-r2 + ip router isis 1 + ipv6 router isis 1 + isis hello-interval 1 + isis hello-multiplier 3 + isis network point-to-point +! +interface eth-r3 + ip router isis 1 + ipv6 router isis 1 + isis hello-interval 1 + isis hello-multiplier 3 + isis network point-to-point +! +interface eth-r4 + ip router isis 1 + ipv6 router isis 1 + isis hello-interval 1 + isis hello-multiplier 3 + isis network point-to-point +! +interface eth-r5 + ip router isis 1 + ipv6 router isis 1 + isis hello-interval 1 + isis hello-multiplier 3 + isis network point-to-point +! +router isis 1 + net 49.0000.0000.0000.0101.00 + is-type level-1 + lsp-gen-interval 1 + topology ipv6-unicast +! diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/zebra.conf new file mode 100644 index 000000000000..7f5c8d1c61a1 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/zebra.conf @@ -0,0 +1,21 @@ +! +interface eth-r2 + ip address 10.0.0.101/24 + ipv6 address fd00:0:3::101/64 +! +interface eth-r3 + ip address 10.0.1.101/24 + ipv6 address fd00:0:4::101/64 +! +interface eth-r4 + ip address 10.0.2.101/24 + ipv6 address fd00:0:5::101/64 +! +interface eth-r5 + ip address 10.0.3.101/24 + ipv6 address fd00:0:6::101/64 +! +interface lo + ip address 192.0.2.101/32 + ipv6 address 2001:db8::101/128 + diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/bgpd.conf new file mode 100644 index 000000000000..596cc3e25cb0 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/bgpd.conf @@ -0,0 +1,21 @@ +router bgp 65200 view RS + bgp router-id 192.0.2.201 + no bgp ebgp-requires-policy + neighbor 172.17.0.6 remote-as external + neighbor 172.17.0.7 remote-as external + neighbor 172.17.0.8 remote-as external + ! + address-family ipv4 unicast + neighbor 172.17.0.6 route-server-client + neighbor 172.17.0.7 route-server-client + neighbor 172.17.0.8 route-server-client + + ! + address-family ipv6 unicast + neighbor 172.17.0.6 activate + neighbor 172.17.0.7 activate + neighbor 172.17.0.8 activate + neighbor 172.17.0.6 route-server-client + neighbor 172.17.0.7 route-server-client + neighbor 172.17.0.8 route-server-client + ! diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/isisd.conf new file mode 100644 index 000000000000..892b4e7b74e8 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/isisd.conf @@ -0,0 +1,36 @@ +! +interface lo + ip router isis 1 + ipv6 router isis 1 + isis passive +! +interface eth-r2 + ip router isis 1 + ipv6 router isis 1 + isis hello-interval 1 + isis hello-multiplier 3 +! +interface eth-r3 + ip router isis 1 + ipv6 router isis 1 + isis hello-interval 1 + isis hello-multiplier 3 +! +interface eth-r4 + ip router isis 1 + ipv6 router isis 1 + isis hello-interval 1 + isis hello-multiplier 3 +! +interface eth-r5 + ip router isis 1 + ipv6 router isis 1 + isis hello-interval 1 + isis hello-multiplier 3 +! +router isis 1 + net 49.0000.0000.0000.0101.00 + is-type level-1 + lsp-gen-interval 1 + topology ipv6-unicast +! diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/zebra.conf new file mode 100644 index 000000000000..75ee08363ae4 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/zebra.conf @@ -0,0 +1,8 @@ +interface eth-sw1 + ip address 172.17.0.201/24 + ipv6 address fd00:0:9::201/64 +! +interface lo + ip address 192.0.2.201/32 + ipv6 address 2001:db8::201/128 + diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/test_nexthop_mp_ipv4_6.py b/tests/topotests/bgp_nexthop_mp_ipv4_6/test_nexthop_mp_ipv4_6.py new file mode 100644 index 000000000000..a58debd3e286 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/test_nexthop_mp_ipv4_6.py @@ -0,0 +1,231 @@ +#!/usr/bin/env python +# SPDX-License-Identifier: ISC + +# +# Copyright (c) 2024 by 6WIND +# + +""" +Test BGP nexthop conformity with IPv4,6 MP-BGP over IPv4 peering +""" + +import os +import sys +import json +import functools +from functools import partial +import pytest + +# Save the Current Working Directory to find configuration files. +CWD = os.path.dirname(os.path.realpath(__file__)) +sys.path.append(os.path.join(CWD, "../")) + +# pylint: disable=C0413 +# Import topogen and topotest helpers +from lib import topotest +from lib.topogen import Topogen, TopoRouter, get_topogen +from lib.topolog import logger +from lib.checkping import check_ping +from lib.bgp import verify_bgp_convergence_from_running_config + +pytestmark = [pytest.mark.bgpd, pytest.mark.isisd] + + +def build_topo(tgen): + """ + +---+ + | h1| + +---+ + | + +---+ + | r1| AS 65100 + +---+ + / \ _____________ + / \ + +---+ +---+ + | r2| | r3| rr1 is route-reflector + +---+ +---+ for r2 and r3 + \ / + \ / + +---+ + |rr1| AS 65000 + +---+ + / \ + / \ + +---+ +---+ + | r4| | r5| iBGP full-mesh between + +---+ +---+ rr1, r4, r5 and r6 + \ / + \ / + +---+ + | r6| + +---+ + | _____________ + | + | +---+ + [sw1]-----|rs1| AS 65200 + /\ +---+ rs1: route-server + / \ + / \ _____________ + +---+ +---+ + | r7| | r8| AS 65700 (r7) + +---+ +---+ AS 65800 (r8) + | | + +---+ +---+ + | h2| | h3| + +---+ +---+ + """ + + def connect_routers(tgen, left, right): + for rname in [left, right]: + if rname not in tgen.routers().keys(): + tgen.add_router(rname) + + switch = tgen.add_switch("s-{}-{}".format(left, right)) + switch.add_link(tgen.gears[left], nodeif="eth-{}".format(right)) + switch.add_link(tgen.gears[right], nodeif="eth-{}".format(left)) + + def connect_switchs(tgen, rname, switch): + if rname not in tgen.routers().keys(): + tgen.add_router(rname) + + switch.add_link(tgen.gears[rname], nodeif="eth-{}".format(switch.name)) + + connect_routers(tgen, "h1", "r1") + connect_routers(tgen, "r1", "r2") + connect_routers(tgen, "r1", "r3") + connect_routers(tgen, "r2", "rr1") + connect_routers(tgen, "r3", "rr1") + connect_routers(tgen, "rr1", "r4") + connect_routers(tgen, "rr1", "r5") + connect_routers(tgen, "r4", "r6") + connect_routers(tgen, "r5", "r6") + + sw1 = tgen.add_switch("sw1") + connect_switchs(tgen, "r6", sw1) + connect_switchs(tgen, "rs1", sw1) + connect_switchs(tgen, "r7", sw1) + connect_switchs(tgen, "r8", sw1) + + connect_routers(tgen, "r7", "h2") + connect_routers(tgen, "r8", "h3") + + +def setup_module(mod): + "Sets up the pytest environment" + + tgen = Topogen(build_topo, mod.__name__) + tgen.start_topology() + logger.info("setup_module") + + for rname, router in tgen.routers().items(): + router.load_config( + TopoRouter.RD_ZEBRA, os.path.join(CWD, "{}/zebra.conf".format(rname)) + ) + if "h" in rname: + # hosts + continue + + router.load_config( + TopoRouter.RD_BGP, os.path.join(CWD, "{}/bgpd.conf".format(rname)) + ) + + if rname in ["r1", "r7", "r8", "rs1"]: + # external routers + continue + + router.load_config( + TopoRouter.RD_ISIS, os.path.join(CWD, "{}/isisd.conf".format(rname)) + ) + + # Initialize all routers. + tgen.start_router() + + +def teardown_module(_mod): + "Teardown the pytest environment" + tgen = get_topogen() + tgen.stop_topology() + + +def test_bgp_convergence(): + "Assert that BGP is converging." + tgen = get_topogen() + if tgen.routers_have_failure(): + pytest.skip(tgen.errors) + + logger.info("waiting for bgp peers to go up") + + for rname in tgen.routers().keys(): + if "h" in rname: + # hosts + continue + result = verify_bgp_convergence_from_running_config(tgen, dut=rname) + assert result is True, "BGP is not converging on {}".format(rname) + + +def test_bgp_ipv4_nexthop_step1(): + "Assert that BGP has correct ipv4 nexthops." + tgen = get_topogen() + if tgen.routers_have_failure(): + pytest.skip(tgen.errors) + + for rname, router in tgen.routers().items(): + if "h" in rname: + # hosts + continue + if "rs1" in rname: + continue + ref_file = "{}/{}/bgp_ipv4.json".format(CWD, rname) + expected = json.loads(open(ref_file).read()) + test_func = partial( + topotest.router_json_cmp, + router, + "show bgp ipv4 unicast json", + expected, + ) + _, res = topotest.run_and_expect(test_func, None, count=30, wait=1) + assertmsg = "{}: BGP IPv4 Nexthop failure".format(rname) + assert res is None, assertmsg + + +def test_bgp_ipv6_nexthop_step1(): + "Assert that BGP has correct ipv6 nexthops." + tgen = get_topogen() + if tgen.routers_have_failure(): + pytest.skip(tgen.errors) + + for rname, router in tgen.routers().items(): + if "h" in rname: + # hosts + continue + if "rs1" in rname: + continue + ref_file = "{}/{}/bgp_ipv6_step1.json".format(CWD, rname) + expected = json.loads(open(ref_file).read()) + test_func = partial( + topotest.router_json_cmp, + router, + "show bgp ipv6 unicast json", + expected, + ) + _, res = topotest.run_and_expect(test_func, None, count=30, wait=1) + assertmsg = "{}: BGP IPv6 Nexthop failure".format(rname) + assert res is None, assertmsg + + +def test_bgp_ping_ok_step1(): + "Check that h1 pings h2 and h3" + tgen = get_topogen() + if tgen.routers_have_failure(): + pytest.skip(tgen.errors) + + check_ping("h1", "192.168.7.1", True, 5, 1) + check_ping("h1", "fd00:700::1", True, 5, 1) + check_ping("h1", "192.168.8.1", True, 5, 1) + check_ping("h1", "fd00:800::1", True, 5, 1) + + +if __name__ == "__main__": + args = ["-s"] + sys.argv[1:] + sys.exit(pytest.main(args)) From fc1dd2e5060b6e470daa203080bdb9473a637407 Mon Sep 17 00:00:00 2001 From: Louis Scalbert Date: Thu, 28 Mar 2024 13:58:32 +0100 Subject: [PATCH 07/13] bgpd: optimize bgp_interface_address_del Move common checks outside of the loop. Signed-off-by: Louis Scalbert --- bgpd/bgp_zebra.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index 5c0a6a09c3df..590d192c4b53 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -404,6 +404,8 @@ static int bgp_interface_address_delete(ZAPI_CALLBACK_ARGS) struct peer *peer; struct bgp *bgp; struct prefix *addr; + afi_t afi; + safi_t safi; bgp = bgp_lookup_by_vrf_id(vrf_id); @@ -422,7 +424,8 @@ static int bgp_interface_address_delete(ZAPI_CALLBACK_ARGS) addr = ifc->address; - if (bgp) { + if (bgp && addr->family == AF_INET6 && + !IN6_IS_ADDR_LINKLOCAL(&addr->u.prefix)) { /* * When we are using the v6 global as part of the peering * nexthops and we are removing it, then we need to @@ -431,17 +434,10 @@ static int bgp_interface_address_delete(ZAPI_CALLBACK_ARGS) * we do not want the peering to bounce. */ for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) { - afi_t afi; - safi_t safi; - - if (addr->family == AF_INET) - continue; - - if (!IN6_IS_ADDR_LINKLOCAL(&addr->u.prefix6) - && memcmp(&peer->nexthop.v6_global, - &addr->u.prefix6, 16) - == 0) { - memset(&peer->nexthop.v6_global, 0, 16); + if (IPV6_ADDR_SAME(&peer->nexthop.v6_global, + &addr->u.prefix6)) { + memset(&peer->nexthop.v6_global, 0, + IPV6_MAX_BYTELEN); FOREACH_AFI_SAFI (afi, safi) bgp_announce_route(peer, afi, safi, true); From ee0378cdbb458f9d3710f1fb557368ace8d72477 Mon Sep 17 00:00:00 2001 From: Louis Scalbert Date: Thu, 28 Mar 2024 14:29:26 +0100 Subject: [PATCH 08/13] bgpd: fix removing ipv6 global nexhop When the IPv6 global is removed on an interface towards a peer, the IPv6 nexthop global that is sent is a IPv4-mapped IPv6 address. It should be the link-local. At removal, replace the global by the next global address or the link-local as last resort. Signed-off-by: Louis Scalbert --- bgpd/bgp_zebra.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index 590d192c4b53..5deea3f32f4f 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -400,10 +400,12 @@ static int bgp_interface_address_add(ZAPI_CALLBACK_ARGS) static int bgp_interface_address_delete(ZAPI_CALLBACK_ARGS) { struct listnode *node, *nnode; - struct connected *ifc; + struct connected *ifc, *connected; struct peer *peer; struct bgp *bgp; struct prefix *addr; + struct in6_addr *v6_global = NULL; + struct in6_addr *v6_local = NULL; afi_t afi; safi_t safi; @@ -425,7 +427,17 @@ static int bgp_interface_address_delete(ZAPI_CALLBACK_ARGS) addr = ifc->address; if (bgp && addr->family == AF_INET6 && - !IN6_IS_ADDR_LINKLOCAL(&addr->u.prefix)) { + !IN6_IS_ADDR_LINKLOCAL(&addr->u.prefix6)) { + /* find another IPv6 global if possible and find the IPv6 link-local */ + frr_each (if_connected, ifc->ifp->connected, connected) { + if (connected->address->family != AF_INET6) + continue; + if (IN6_IS_ADDR_LINKLOCAL(&connected->address->u.prefix6)) + v6_local = &connected->address->u.prefix6; + else + v6_global = &connected->address->u.prefix6; + } + /* * When we are using the v6 global as part of the peering * nexthops and we are removing it, then we need to @@ -436,8 +448,15 @@ static int bgp_interface_address_delete(ZAPI_CALLBACK_ARGS) for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) { if (IPV6_ADDR_SAME(&peer->nexthop.v6_global, &addr->u.prefix6)) { - memset(&peer->nexthop.v6_global, 0, - IPV6_MAX_BYTELEN); + if (v6_global) + IPV6_ADDR_COPY(&peer->nexthop.v6_global, + v6_global); + else if (v6_local) + IPV6_ADDR_COPY(&peer->nexthop.v6_global, + v6_local); + else + memset(&peer->nexthop.v6_global, 0, + IPV6_MAX_BYTELEN); FOREACH_AFI_SAFI (afi, safi) bgp_announce_route(peer, afi, safi, true); From 2de4dfc97adfec788e45e148b4204196d612c81c Mon Sep 17 00:00:00 2001 From: Louis Scalbert Date: Thu, 28 Mar 2024 15:00:37 +0100 Subject: [PATCH 09/13] bgpd: fix "used" json key on link-local nexthop When a peer has no IPv6 global address to send as nexthop, it sends the IPv6 link-local instead as global. "show bgp ipv6 json" displays the same address in global and link-local scopes. > "nexthops": [ > { > "ip": "fe80::a495:38ff:fea6:6ea3", > "afi": "ipv6", > "scope": "global", > "used": true > }, > { > "ip": "fe80::a495:38ff:fea6:6ea3", > "afi": "ipv6", > "scope": "link-local" > } > ] However, "used" key is set on the global nexthop but not in link-local. It is correct but it makes difficult to test JSON to expect the usage of a link-local. The contrary is also correct. Set "used" key on the link-local nexhop instead to facilitate the tests. Signed-off-by: Louis Scalbert --- bgpd/bgp_route.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 848e8ffd8d87..185ad0e31727 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -9629,10 +9629,7 @@ void route_vty_out(struct vty *vty, const struct prefix *p, json_object_string_add(json_nexthop_ll, "scope", "link-local"); - if ((IPV6_ADDR_CMP(&attr->mp_nexthop_global, - &attr->mp_nexthop_local) != - 0) && - !CHECK_FLAG(attr->nh_flags, + if (!CHECK_FLAG(attr->nh_flags, BGP_ATTR_NH_MP_PREFER_GLOBAL)) json_object_boolean_true_add( json_nexthop_ll, "used"); From 04c220bedb63334a65677a46ef84938cc812221f Mon Sep 17 00:00:00 2001 From: Louis Scalbert Date: Thu, 28 Mar 2024 13:58:33 +0100 Subject: [PATCH 10/13] tests: ipv6 global removal in bgp_nexthop_mp_ipv4_6 Test ipv6 global removal in bgp_nexthop_mp_ipv4_6 Signed-off-by: Louis Scalbert --- .../r1/bgp_ipv6_step2.json | 90 +++++++++++++++++++ .../r2/bgp_ipv6_step2.json | 48 ++++++++++ .../r3/bgp_ipv6_step2.json | 48 ++++++++++ .../r4/bgp_ipv6_step2.json | 49 ++++++++++ .../r5/bgp_ipv6_step2.json | 49 ++++++++++ .../r6/bgp_ipv6_step2.json | 48 ++++++++++ .../r7/bgp_ipv6_step2.json | 48 ++++++++++ .../r8/bgp_ipv6_step2.json | 48 ++++++++++ .../rr1/bgp_ipv6_step2.json | 62 +++++++++++++ .../test_nexthop_mp_ipv4_6.py | 52 +++++++++++ 10 files changed, 542 insertions(+) create mode 100755 tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step2.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step2.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step2.json create mode 100755 tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step2.json create mode 100755 tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step2.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step2.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step2.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step2.json create mode 100644 tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step2.json diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step2.json new file mode 100755 index 000000000000..f7c5c7c3b56a --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step2.json @@ -0,0 +1,90 @@ +{ + "routes": { + "fd00:100::/64": [ + { + "valid": true, + "bestpath": true, + "path": "", + "nexthops": [ + { + "ip": "::", + "afi": "ipv6", + "used": true + } + ] + } + ], + "fd00:700::/64": [ + { + "valid": true, + "multipath": true, + "path": "65000 65700", + "nexthops": [ + { + "ip": "fd00:0:2::3", + "afi": "ipv6", + "scope": "global" + }, + { + "afi": "ipv6", + "scope": "link-local", + "used": true + } + ] + }, + { + "valid": true, + "bestpath": true, + "path": "65000 65700", + "nexthops": [ + { + "ip": "fd00:0:1::2", + "afi": "ipv6", + "scope": "global" + }, + { + "afi": "ipv6", + "scope": "link-local", + "used": true + } + ] + } + ], + "fd00:800::/64": [ + { + "valid": true, + "multipath": true, + "path": "65000 65800", + "nexthops": [ + { + "ip": "fd00:0:2::3", + "afi": "ipv6", + "scope": "global" + }, + { + "afi": "ipv6", + "scope": "link-local", + "used": true + } + ] + }, + { + "valid": true, + "bestpath": true, + "path": "65000 65800", + "nexthops": [ + { + "ip": "fd00:0:1::2", + "afi": "ipv6", + "scope": "global" + }, + { + "afi": "ipv6", + "scope": "link-local", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step2.json new file mode 100644 index 000000000000..21f36089b6dd --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step2.json @@ -0,0 +1,48 @@ +{ + "routes": { + "fd00:100::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65100", + "nexthops": [ + { + "afi": "ipv6", + "scope": "link-local", + "used": true + } + ] + } + ], + "fd00:700::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "fd00:0:9::7", + "scope": "global", + "afi": "ipv6", + "used": true + } + ] + } + ], + "fd00:800::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "fd00:0:9::8", + "scope": "global", + "afi": "ipv6", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step2.json new file mode 100644 index 000000000000..21f36089b6dd --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step2.json @@ -0,0 +1,48 @@ +{ + "routes": { + "fd00:100::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65100", + "nexthops": [ + { + "afi": "ipv6", + "scope": "link-local", + "used": true + } + ] + } + ], + "fd00:700::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "fd00:0:9::7", + "scope": "global", + "afi": "ipv6", + "used": true + } + ] + } + ], + "fd00:800::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "fd00:0:9::8", + "scope": "global", + "afi": "ipv6", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step2.json new file mode 100755 index 000000000000..7d0786c0ef7b --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step2.json @@ -0,0 +1,49 @@ +{ + "routes": { + "fd00:100::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65100", + "nexthops": [ + { + "ip": "2001:db8::2", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ], + "fd00:700::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "fd00:0:9::7", + "scope": "global", + "afi": "ipv6", + "used": true + } + ] + } + ], + "fd00:800::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "fd00:0:9::8", + "scope": "global", + "afi": "ipv6", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step2.json new file mode 100755 index 000000000000..7d0786c0ef7b --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step2.json @@ -0,0 +1,49 @@ +{ + "routes": { + "fd00:100::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65100", + "nexthops": [ + { + "ip": "2001:db8::2", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ], + "fd00:700::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "fd00:0:9::7", + "scope": "global", + "afi": "ipv6", + "used": true + } + ] + } + ], + "fd00:800::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "fd00:0:9::8", + "scope": "global", + "afi": "ipv6", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step2.json new file mode 100644 index 000000000000..55912dd74ca4 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step2.json @@ -0,0 +1,48 @@ +{ + "routes": { + "fd00:100::/64": [ + { + "valid": true, + "bestpath": true, + "nexthops": [ + { + "ip": "2001:db8::2", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ], + "fd00:700::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "fd00:0:9::7", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ], + "fd00:800::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "fd00:0:9::8", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step2.json new file mode 100644 index 000000000000..8fe5f7c1de48 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step2.json @@ -0,0 +1,48 @@ +{ + "routes": { + "fd00:100::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65000 65100", + "nexthops": [ + { + "ip": "fd00:0:9::6", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ], + "fd00:700::/64": [ + { + "valid": true, + "bestpath": true, + "path": "", + "nexthops": [ + { + "ip": "::", + "afi": "ipv6", + "used": true + } + ] + } + ], + "fd00:800::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "fd00:0:9::8", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step2.json new file mode 100644 index 000000000000..20f4940328f7 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step2.json @@ -0,0 +1,48 @@ +{ + "routes": { + "fd00:100::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65000 65100", + "nexthops": [ + { + "ip": "fd00:0:9::6", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ], + "fd00:700::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "fd00:0:9::7", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ], + "fd00:800::/64": [ + { + "valid": true, + "bestpath": true, + "path": "", + "nexthops": [ + { + "ip": "::", + "afi": "ipv6", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step2.json new file mode 100644 index 000000000000..4ab0e1c2aec5 --- /dev/null +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step2.json @@ -0,0 +1,62 @@ +{ + "routes": { + "fd00:100::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65100", + "nexthops": [ + { + "ip": "2001:db8::2", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + }, + { + "valid": true, + "multipath": true, + "path": "65100", + "nexthops": [ + { + "ip": "2001:db8::3", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ], + "fd00:700::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65700", + "nexthops": [ + { + "ip": "fd00:0:9::7", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ], + "fd00:800::/64": [ + { + "valid": true, + "bestpath": true, + "path": "65800", + "nexthops": [ + { + "ip": "fd00:0:9::8", + "afi": "ipv6", + "scope": "global", + "used": true + } + ] + } + ] + } +} diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/test_nexthop_mp_ipv4_6.py b/tests/topotests/bgp_nexthop_mp_ipv4_6/test_nexthop_mp_ipv4_6.py index a58debd3e286..0058f213da81 100644 --- a/tests/topotests/bgp_nexthop_mp_ipv4_6/test_nexthop_mp_ipv4_6.py +++ b/tests/topotests/bgp_nexthop_mp_ipv4_6/test_nexthop_mp_ipv4_6.py @@ -226,6 +226,58 @@ def test_bgp_ping_ok_step1(): check_ping("h1", "fd00:800::1", True, 5, 1) +def test_bgp_ipv6_nexthop_step2(): + """ + Remove IPv6 global on r1 and r7 + Assert that BGP has correct ipv6 nexthops. + """ + + tgen = get_topogen() + if tgen.routers_have_failure(): + pytest.skip(tgen.errors) + + tgen.gears["r1"].vtysh_cmd( + """ +configure +interface eth-r2 + no ipv6 address fd00:0:1::1/64 +! +interface eth-r3 + no ipv6 address fd00:0:2::1/64 +""" + ) + + for rname, router in tgen.routers().items(): + if "h" in rname: + # hosts + continue + if "rs1" in rname: + continue + ref_file = "{}/{}/bgp_ipv6_step2.json".format(CWD, rname) + expected = json.loads(open(ref_file).read()) + test_func = partial( + topotest.router_json_cmp, + router, + "show bgp ipv6 unicast json", + expected, + ) + _, res = topotest.run_and_expect(test_func, None, count=30, wait=1) + assertmsg = "{}: BGP IPv6 Nexthop failure".format(rname) + assert res is None, assertmsg + + +def test_bgp_ping_ok_step2(): + "Check that h1 pings h2 and h3" + tgen = get_topogen() + if tgen.routers_have_failure(): + pytest.skip(tgen.errors) + + check_ping("h1", "192.168.7.1", True, 5, 1) + check_ping("h1", "fd00:700::1", True, 5, 1) + check_ping("h1", "192.168.8.1", True, 5, 1) + check_ping("h1", "fd00:800::1", True, 5, 1) + + if __name__ == "__main__": args = ["-s"] + sys.argv[1:] sys.exit(pytest.main(args)) From fc5a738409eac9ca938cbb398872ea77d9cc5023 Mon Sep 17 00:00:00 2001 From: Louis Scalbert Date: Fri, 29 Mar 2024 16:14:14 +0100 Subject: [PATCH 11/13] bgpd: set ipv4-mapped ipv6 for ipv4 with ipv6 nexthop The code was expected that no IPv6 global address was present but the previous commit was replacing nexthop.v6global by the link-local address instead of un-setting it in case of removal of the IPv6 global. Set also ipv4-mapped ipv6 address as nexthop when a link-local is found and it is an ipv4 prefix over ipv6 nexthop. Signed-off-by: Louis Scalbert --- bgpd/bgp_updgrp_packet.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c index 7502bf2ec6dc..1f691b6a9e19 100644 --- a/bgpd/bgp_updgrp_packet.c +++ b/bgpd/bgp_updgrp_packet.c @@ -523,11 +523,13 @@ struct stream *bpacket_reformat_for_peer(struct bpacket *pkt, gnh_modified = 1; } - if (IN6_IS_ADDR_UNSPECIFIED(mod_v6nhg)) { - if (peer->nexthop.v4.s_addr != INADDR_ANY) { - ipv4_to_ipv4_mapped_ipv6(mod_v6nhg, - peer->nexthop.v4); - } + if (peer->nexthop.v4.s_addr != INADDR_ANY && + (IN6_IS_ADDR_UNSPECIFIED(mod_v6nhg) || + (IN6_IS_ADDR_LINKLOCAL(mod_v6nhg) && + peer->connection->su.sa.sa_family == AF_INET6 && + paf->afi == AFI_IP))) { + ipv4_to_ipv4_mapped_ipv6(mod_v6nhg, peer->nexthop.v4); + gnh_modified = 1; } if (IS_MAPPED_IPV6(&peer->nexthop.v6_global)) { From 5dd731af8421e8b3070eec0b3af4ad234c95c6bb Mon Sep 17 00:00:00 2001 From: Louis Scalbert Date: Mon, 8 Apr 2024 13:18:20 +0200 Subject: [PATCH 12/13] bgpd: prefer link-local to a ipv4-mapped ipv6 global When a peer sends an IPv4-mapped IPv6 global and a IPv6 link-local nexthop, prefer the link-local unless a route-map tells to use the global. Signed-off-by: Louis Scalbert --- bgpd/bgp_nht.c | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c index 80ec9bcf7730..fcaf2aebe37b 100644 --- a/bgpd/bgp_nht.c +++ b/bgpd/bgp_nht.c @@ -320,11 +320,6 @@ int bgp_find_or_add_nexthop(struct bgp *bgp_route, struct bgp *bgp_nexthop, afi = BGP_ATTR_MP_NEXTHOP_LEN_IP6(pi->attr) ? AFI_IP6 : AFI_IP; - /* Validation for the ipv4 mapped ipv6 nexthop. */ - if (IS_MAPPED_IPV6(&pi->attr->mp_nexthop_global)) { - afi = AFI_IP; - } - /* This will return true if the global IPv6 NH is a link local * addr */ if (make_prefix(afi, pi, &p) < 0) @@ -1043,19 +1038,11 @@ static int make_prefix(int afi, struct bgp_path_info *pi, struct prefix *p) p->u.prefix4 = p_orig->u.prefix4; p->prefixlen = p_orig->prefixlen; } else { - if (IS_MAPPED_IPV6(&pi->attr->mp_nexthop_global)) { - ipv4_mapped_ipv6_to_ipv4( - &pi->attr->mp_nexthop_global, &ipv4); - p->u.prefix4 = ipv4; - p->prefixlen = IPV4_MAX_BITLEN; - } else { - if (p_orig->family == AF_EVPN) - p->u.prefix4 = - pi->attr->mp_nexthop_global_in; - else - p->u.prefix4 = pi->attr->nexthop; - p->prefixlen = IPV4_MAX_BITLEN; - } + if (p_orig->family == AF_EVPN) + p->u.prefix4 = pi->attr->mp_nexthop_global_in; + else + p->u.prefix4 = pi->attr->nexthop; + p->prefixlen = IPV4_MAX_BITLEN; } break; case AFI_IP6: @@ -1071,6 +1058,7 @@ static int make_prefix(int afi, struct bgp_path_info *pi, struct prefix *p) /* If we receive MP_REACH nexthop with ::(LL) * or LL(LL), use LL address as nexthop cache. */ + p->prefixlen = IPV6_MAX_BITLEN; if (pi->attr && pi->attr->mp_nexthop_len == BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL && @@ -1085,15 +1073,22 @@ static int make_prefix(int afi, struct bgp_path_info *pi, struct prefix *p) pi->attr->mp_nexthop_len == BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL) { if (CHECK_FLAG(pi->attr->nh_flags, - BGP_ATTR_NH_MP_PREFER_GLOBAL)) - p->u.prefix6 = - pi->attr->mp_nexthop_global; - else + BGP_ATTR_NH_MP_PREFER_GLOBAL)) { + if (IS_MAPPED_IPV6( + &pi->attr->mp_nexthop_global)) { + ipv4_mapped_ipv6_to_ipv4( + &pi->attr->mp_nexthop_global, + &ipv4); + p->u.prefix4 = ipv4; + p->prefixlen = IPV4_MAX_BITLEN; + } else + p->u.prefix6 = + pi->attr->mp_nexthop_global; + } else p->u.prefix6 = pi->attr->mp_nexthop_local; } else p->u.prefix6 = pi->attr->mp_nexthop_global; - p->prefixlen = IPV6_MAX_BITLEN; } break; default: From f1b8364ab3784cebfc0689883efdb21ac7d06213 Mon Sep 17 00:00:00 2001 From: Louis Scalbert Date: Sat, 30 Mar 2024 11:32:32 +0100 Subject: [PATCH 13/13] topotests: update bgp_vrf_leaking_5549_routes Before the patch-set, ce1 was sending an IPv6 Link-local as global and link-local nexthop to pe1. Set bgp_vrf_leaking_5549_routes in accordance with the previous fixes. Signed-off-by: Louis Scalbert --- .../pe1/results/vrf10_ipv4_unicast.json | 7 ++++--- .../pe1/results/vrf20_ipv4_unicast.json | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/topotests/bgp_vrf_leaking_5549_routes/pe1/results/vrf10_ipv4_unicast.json b/tests/topotests/bgp_vrf_leaking_5549_routes/pe1/results/vrf10_ipv4_unicast.json index 768bffbe9d71..f664bb6b526a 100644 --- a/tests/topotests/bgp_vrf_leaking_5549_routes/pe1/results/vrf10_ipv4_unicast.json +++ b/tests/topotests/bgp_vrf_leaking_5549_routes/pe1/results/vrf10_ipv4_unicast.json @@ -15,15 +15,16 @@ "origin": "incomplete", "nexthops": [ { + "ip": "::ffff:c000:202", "hostname": "ce1", "afi": "ipv6", - "scope": "global", - "used": true + "scope": "global" }, { "hostname": "ce1", "afi": "ipv6", - "scope": "link-local" + "scope": "link-local", + "used": true } ] } diff --git a/tests/topotests/bgp_vrf_leaking_5549_routes/pe1/results/vrf20_ipv4_unicast.json b/tests/topotests/bgp_vrf_leaking_5549_routes/pe1/results/vrf20_ipv4_unicast.json index 1e93715270cf..3498ed4326b4 100644 --- a/tests/topotests/bgp_vrf_leaking_5549_routes/pe1/results/vrf20_ipv4_unicast.json +++ b/tests/topotests/bgp_vrf_leaking_5549_routes/pe1/results/vrf20_ipv4_unicast.json @@ -17,15 +17,16 @@ "nhVrfName": "vrf10", "nexthops": [ { + "ip": "::ffff:c000:202", "hostname": "pe1", "afi": "ipv6", - "scope": "global", - "used": true + "scope": "global" }, { "hostname": "pe1", "afi": "ipv6", - "scope": "link-local" + "scope": "link-local", + "used": true } ] }