From e8615867d08f0c79096c1270695fa5c52d689a87 Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Mon, 23 Oct 2023 11:15:37 +0300 Subject: [PATCH 1/4] tests: Check if OSPFv3 loopback interface gets cost as 0 Signed-off-by: Donatas Abraitis --- .../topotests/ospf6_loopback_cost/__init__.py | 0 .../topotests/ospf6_loopback_cost/r1/frr.conf | 16 ++++ .../topotests/ospf6_loopback_cost/r2/frr.conf | 16 ++++ .../test_ospf6_loopback_cost.py | 89 +++++++++++++++++++ 4 files changed, 121 insertions(+) create mode 100644 tests/topotests/ospf6_loopback_cost/__init__.py create mode 100644 tests/topotests/ospf6_loopback_cost/r1/frr.conf create mode 100644 tests/topotests/ospf6_loopback_cost/r2/frr.conf create mode 100644 tests/topotests/ospf6_loopback_cost/test_ospf6_loopback_cost.py diff --git a/tests/topotests/ospf6_loopback_cost/__init__.py b/tests/topotests/ospf6_loopback_cost/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/topotests/ospf6_loopback_cost/r1/frr.conf b/tests/topotests/ospf6_loopback_cost/r1/frr.conf new file mode 100644 index 000000000000..d85166bc6ca4 --- /dev/null +++ b/tests/topotests/ospf6_loopback_cost/r1/frr.conf @@ -0,0 +1,16 @@ +! +int lo + ipv6 address 2001:db8::1/128 + ipv6 ospf6 area 0.0.0.0 + ipv6 ospf6 passive +! +int r1-eth0 + ipv6 address 2001:db8:1::1/64 + ipv6 ospf6 area 0.0.0.0 + ipv6 ospf6 hello-interval 1 + ipv6 ospf6 dead-interval 4 +! +router ospf6 + ospf6 router-id 0.0.0.1 +exit +! diff --git a/tests/topotests/ospf6_loopback_cost/r2/frr.conf b/tests/topotests/ospf6_loopback_cost/r2/frr.conf new file mode 100644 index 000000000000..8f3e2caab653 --- /dev/null +++ b/tests/topotests/ospf6_loopback_cost/r2/frr.conf @@ -0,0 +1,16 @@ +! +int lo + ipv6 address 2001:db8::2/128 + ipv6 ospf6 area 0.0.0.0 + ipv6 ospf6 passive +! +int r2-eth0 + ipv6 address 2001:db8:1::2/64 + ipv6 ospf6 area 0.0.0.0 + ipv6 ospf6 hello-interval 1 + ipv6 ospf6 dead-interval 4 +! +router ospf6 + ospf6 router-id 0.0.0.2 +exit +! diff --git a/tests/topotests/ospf6_loopback_cost/test_ospf6_loopback_cost.py b/tests/topotests/ospf6_loopback_cost/test_ospf6_loopback_cost.py new file mode 100644 index 000000000000..8e7a7ea40ac3 --- /dev/null +++ b/tests/topotests/ospf6_loopback_cost/test_ospf6_loopback_cost.py @@ -0,0 +1,89 @@ +#!/usr/bin/env python +# SPDX-License-Identifier: ISC + +# Copyright (c) 2023 by +# Donatas Abraitis +# + +""" +Test if OSPFv3 loopback interfaces get a cost of 0. + +https://www.rfc-editor.org/rfc/rfc5340.html#page-37: + +If the interface type is point-to-multipoint or the interface is +in the state Loopback, the global scope IPv6 addresses associated +with the interface (if any) are copied into the intra-area-prefix-LSA +with the PrefixOptions LA-bit set, the PrefixLength set to 128, and +the metric set to 0. +""" + +import os +import sys +import json +import pytest +import functools + +pytestmark = pytest.mark.ospf6d + +CWD = os.path.dirname(os.path.realpath(__file__)) +sys.path.append(os.path.join(CWD, "../")) + +# pylint: disable=C0413 +from lib import topotest +from lib.topogen import Topogen, TopoRouter, get_topogen + + +def setup_module(mod): + topodef = {"s1": ("r1", "r2")} + tgen = Topogen(topodef, mod.__name__) + tgen.start_topology() + + router_list = tgen.routers() + + for _, (rname, router) in enumerate(router_list.items(), 1): + router.load_frr_config(os.path.join(CWD, "{}/frr.conf".format(rname))) + + tgen.start_router() + + +def teardown_module(mod): + tgen = get_topogen() + tgen.stop_topology() + + +def test_ospf6_loopback_cost(): + tgen = get_topogen() + + if tgen.routers_have_failure(): + pytest.skip(tgen.errors) + + r1 = tgen.gears["r1"] + + def _show_ipv6_route(): + output = json.loads(r1.vtysh_cmd("show ipv6 route json")) + expected = { + "2001:db8::1/128": [ + { + "metric": 0, + "distance": 110, + } + ], + "2001:db8::2/128": [ + { + "metric": 10, + "distance": 110, + } + ], + } + return topotest.json_cmp(output, expected) + + test_func = functools.partial( + _show_ipv6_route, + ) + _, result = topotest.run_and_expect(test_func, None, count=60, wait=1) + assert result is None, "Loopback cost isn't 0" + + +if __name__ == "__main__": + args = ["-s"] + sys.argv[1:] + sys.exit(pytest.main(args)) From 80dfa9e012ebdb3e88cbd6de3101ae6dd9109ad2 Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Mon, 23 Oct 2023 11:24:12 +0300 Subject: [PATCH 2/4] ospf6d: Set loopback interface cost to 0 https://www.rfc-editor.org/rfc/rfc5340.html#page-37 states: If the interface type is point- to-multipoint or the interface is in the state Loopback, the global scope IPv6 addresses associated with the interface (if any) are copied into the intra-area-prefix-LSA with the PrefixOptions LA-bit set, the PrefixLength set to 128, and the metric set to 0. Signed-off-by: Donatas Abraitis --- ospf6d/ospf6_interface.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index a20ddf6c1096..2a6b81684412 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -128,9 +128,19 @@ static uint8_t ospf6_default_iftype(struct interface *ifp) static uint32_t ospf6_interface_get_cost(struct ospf6_interface *oi) { /* If all else fails, use default OSPF cost */ - uint32_t cost; + uint32_t cost = 0; uint32_t bw, refbw; struct ospf6 *ospf6; + + /* If the interface type is point-to-multipoint or the interface + * is in the state Loopback, the global scope IPv6 addresses + * associated with the interface (if any) are copied into the + * intra-area-prefix-LSA with the PrefixOptions LA-bit set, the + * PrefixLength set to 128, and the metric set to 0. + */ + if (if_is_loopback(oi->interface)) + return cost; + /* interface speed and bw can be 0 in some platforms, * use ospf default bw. If bw is configured then it would * be used. From d7e97146439db054653c0fa12290a67c9bea3b80 Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Mon, 23 Oct 2023 12:53:18 +0300 Subject: [PATCH 3/4] tests: Use igpMetric as 10 not 20, after OSPFv3 loopback cost changes Fixes: fa3140f7927838c432a02ee4f1c1847387b7be6d ("ospf6d: Set loopback interface cost to 0") Signed-off-by: Donatas Abraitis --- .../bgp_vpn_5549_route_map/test_bgp_vpn_5549_route_map.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/topotests/bgp_vpn_5549_route_map/test_bgp_vpn_5549_route_map.py b/tests/topotests/bgp_vpn_5549_route_map/test_bgp_vpn_5549_route_map.py index 84ef603d6e3c..eb29875d5036 100644 --- a/tests/topotests/bgp_vpn_5549_route_map/test_bgp_vpn_5549_route_map.py +++ b/tests/topotests/bgp_vpn_5549_route_map/test_bgp_vpn_5549_route_map.py @@ -144,7 +144,7 @@ def _bgp_verify_v6_global_nexthop_validity(): "2001:db8:1::1": { "valid": True, "complete": True, - "igpMetric": 20, + "igpMetric": 10, "pathCount": 2, "peer": "2001:db8:1::1", "nexthops": [{"interfaceName": "pe2-eth0"}], From 8aeb17d692f3041841789a4c518d99a7a3e8a82b Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Tue, 24 Oct 2023 08:53:36 +0300 Subject: [PATCH 4/4] tests: Adopt ospf6_gr_topo1 tests for OSPFv3 loopback cost as 0 Signed-off-by: Donatas Abraitis --- .../ospf6_gr_topo1/rt1/show_ipv6_route.json | 14 +++++++------- .../ospf6_gr_topo1/rt2/show_ipv6_route.json | 14 +++++++------- .../ospf6_gr_topo1/rt3/show_ipv6_route.json | 14 +++++++------- .../ospf6_gr_topo1/rt4/show_ipv6_route.json | 14 +++++++------- .../ospf6_gr_topo1/rt5/show_ipv6_route.json | 14 +++++++------- .../ospf6_gr_topo1/rt6/show_ipv6_route.json | 14 +++++++------- .../ospf6_gr_topo1/rt7/show_ipv6_route.json | 14 +++++++------- 7 files changed, 49 insertions(+), 49 deletions(-) diff --git a/tests/topotests/ospf6_gr_topo1/rt1/show_ipv6_route.json b/tests/topotests/ospf6_gr_topo1/rt1/show_ipv6_route.json index 66ee57ce8419..181d3767744f 100644 --- a/tests/topotests/ospf6_gr_topo1/rt1/show_ipv6_route.json +++ b/tests/topotests/ospf6_gr_topo1/rt1/show_ipv6_route.json @@ -6,7 +6,7 @@ "vrfId":0, "vrfName":"default", "distance":110, - "metric":10, + "metric":0, "nexthops":[ { "directlyConnected":true, @@ -25,7 +25,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":20, + "metric":10, "installed":true, "nexthops":[ { @@ -45,7 +45,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":30, + "metric":20, "installed":true, "nexthops":[ { @@ -65,7 +65,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":40, + "metric":30, "installed":true, "nexthops":[ { @@ -85,7 +85,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":50, + "metric":40, "installed":true, "nexthops":[ { @@ -105,7 +105,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":40, + "metric":30, "installed":true, "nexthops":[ { @@ -125,7 +125,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":50, + "metric":40, "installed":true, "nexthops":[ { diff --git a/tests/topotests/ospf6_gr_topo1/rt2/show_ipv6_route.json b/tests/topotests/ospf6_gr_topo1/rt2/show_ipv6_route.json index 624ff709e37d..13b5cd4468cf 100644 --- a/tests/topotests/ospf6_gr_topo1/rt2/show_ipv6_route.json +++ b/tests/topotests/ospf6_gr_topo1/rt2/show_ipv6_route.json @@ -8,7 +8,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":20, + "metric":10, "installed":true, "nexthops":[ { @@ -26,7 +26,7 @@ "vrfId":0, "vrfName":"default", "distance":110, - "metric":10, + "metric":0, "nexthops":[ { "directlyConnected":true, @@ -45,7 +45,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":20, + "metric":10, "installed":true, "nexthops":[ { @@ -65,7 +65,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":30, + "metric":20, "installed":true, "nexthops":[ { @@ -85,7 +85,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":40, + "metric":30, "installed":true, "nexthops":[ { @@ -105,7 +105,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":30, + "metric":20, "installed":true, "nexthops":[ { @@ -125,7 +125,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":40, + "metric":30, "installed":true, "nexthops":[ { diff --git a/tests/topotests/ospf6_gr_topo1/rt3/show_ipv6_route.json b/tests/topotests/ospf6_gr_topo1/rt3/show_ipv6_route.json index f9b43dcdb90e..db6ec3e3a82a 100644 --- a/tests/topotests/ospf6_gr_topo1/rt3/show_ipv6_route.json +++ b/tests/topotests/ospf6_gr_topo1/rt3/show_ipv6_route.json @@ -8,7 +8,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":30, + "metric":20, "installed":true, "nexthops":[ { @@ -28,7 +28,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":20, + "metric":10, "installed":true, "nexthops":[ { @@ -46,7 +46,7 @@ "vrfId":0, "vrfName":"default", "distance":110, - "metric":10, + "metric":0, "nexthops":[ { "directlyConnected":true, @@ -65,7 +65,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":20, + "metric":10, "installed":true, "nexthops":[ { @@ -85,7 +85,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":30, + "metric":20, "installed":true, "nexthops":[ { @@ -105,7 +105,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":20, + "metric":10, "installed":true, "nexthops":[ { @@ -125,7 +125,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":30, + "metric":20, "installed":true, "nexthops":[ { diff --git a/tests/topotests/ospf6_gr_topo1/rt4/show_ipv6_route.json b/tests/topotests/ospf6_gr_topo1/rt4/show_ipv6_route.json index f5212da4f683..08ccff2fc591 100644 --- a/tests/topotests/ospf6_gr_topo1/rt4/show_ipv6_route.json +++ b/tests/topotests/ospf6_gr_topo1/rt4/show_ipv6_route.json @@ -8,7 +8,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":40, + "metric":30, "installed":true, "nexthops":[ { @@ -28,7 +28,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":30, + "metric":20, "installed":true, "nexthops":[ { @@ -48,7 +48,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":20, + "metric":10, "installed":true, "nexthops":[ { @@ -66,7 +66,7 @@ "vrfId":0, "vrfName":"default", "distance":110, - "metric":10, + "metric":0, "nexthops":[ { "directlyConnected":true, @@ -85,7 +85,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":20, + "metric":10, "installed":true, "nexthops":[ { @@ -105,7 +105,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":30, + "metric":20, "installed":true, "nexthops":[ { @@ -125,7 +125,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":40, + "metric":30, "installed":true, "nexthops":[ { diff --git a/tests/topotests/ospf6_gr_topo1/rt5/show_ipv6_route.json b/tests/topotests/ospf6_gr_topo1/rt5/show_ipv6_route.json index 5ea4f699fe06..8ddd55b13219 100644 --- a/tests/topotests/ospf6_gr_topo1/rt5/show_ipv6_route.json +++ b/tests/topotests/ospf6_gr_topo1/rt5/show_ipv6_route.json @@ -8,7 +8,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":50, + "metric":40, "installed":true, "nexthops":[ { @@ -28,7 +28,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":40, + "metric":30, "installed":true, "nexthops":[ { @@ -48,7 +48,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":30, + "metric":20, "installed":true, "nexthops":[ { @@ -68,7 +68,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":20, + "metric":10, "installed":true, "nexthops":[ { @@ -86,7 +86,7 @@ "vrfId":0, "vrfName":"default", "distance":110, - "metric":10, + "metric":0, "nexthops":[ { "directlyConnected":true, @@ -105,7 +105,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":40, + "metric":30, "installed":true, "nexthops":[ { @@ -125,7 +125,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":50, + "metric":40, "installed":true, "nexthops":[ { diff --git a/tests/topotests/ospf6_gr_topo1/rt6/show_ipv6_route.json b/tests/topotests/ospf6_gr_topo1/rt6/show_ipv6_route.json index 862f1baffb21..9d45b09be89b 100644 --- a/tests/topotests/ospf6_gr_topo1/rt6/show_ipv6_route.json +++ b/tests/topotests/ospf6_gr_topo1/rt6/show_ipv6_route.json @@ -8,7 +8,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":40, + "metric":30, "installed":true, "nexthops":[ { @@ -28,7 +28,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":30, + "metric":20, "installed":true, "nexthops":[ { @@ -48,7 +48,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":20, + "metric":10, "installed":true, "nexthops":[ { @@ -68,7 +68,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":30, + "metric":20, "installed":true, "nexthops":[ { @@ -88,7 +88,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":40, + "metric":30, "installed":true, "nexthops":[ { @@ -106,7 +106,7 @@ "vrfId":0, "vrfName":"default", "distance":110, - "metric":10, + "metric":0, "nexthops":[ { "directlyConnected":true, @@ -125,7 +125,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":20, + "metric":10, "installed":true, "nexthops":[ { diff --git a/tests/topotests/ospf6_gr_topo1/rt7/show_ipv6_route.json b/tests/topotests/ospf6_gr_topo1/rt7/show_ipv6_route.json index f5f8f710e5b7..c4f841468de5 100644 --- a/tests/topotests/ospf6_gr_topo1/rt7/show_ipv6_route.json +++ b/tests/topotests/ospf6_gr_topo1/rt7/show_ipv6_route.json @@ -8,7 +8,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":50, + "metric":40, "installed":true, "nexthops":[ { @@ -28,7 +28,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":40, + "metric":30, "installed":true, "nexthops":[ { @@ -48,7 +48,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":30, + "metric":20, "installed":true, "nexthops":[ { @@ -68,7 +68,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":40, + "metric":30, "installed":true, "nexthops":[ { @@ -88,7 +88,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":50, + "metric":40, "installed":true, "nexthops":[ { @@ -108,7 +108,7 @@ "selected":true, "destSelected":true, "distance":110, - "metric":20, + "metric":10, "installed":true, "nexthops":[ { @@ -126,7 +126,7 @@ "vrfId":0, "vrfName":"default", "distance":110, - "metric":10, + "metric":0, "nexthops":[ { "directlyConnected":true,