Adding upstream version 10.1.1.upstream/10.1.1

Signed-off-by: Daniel Baumann <daniel@debian.org>

8 files changed, 605 insertions, 0 deletions

diff --git a/tests/topotests/ospf_topo2/__init__.py b/tests/topotests/ospf_topo2/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tests/topotests/ospf_topo2/__init__.py
diff --git a/tests/topotests/ospf_topo2/r1/frr.conf b/tests/topotests/ospf_topo2/r1/frr.conf
new file mode 100644
index 00000000..9bc33618
--- /dev/null
+++ b/tests/topotests/ospf_topo2/r1/frr.conf
@@ -0,0 +1,61 @@
+frr defaults traditional
+hostname r1
+log syslog informational
+service integrated-vtysh-config
+!
+ip router-id 192.0.2.1
+!
+interface eth1
+ ip address 192.0.2.1/32
+ ip ospf area 0.0.0.0
+ ip ospf dead-interval minimal hello-multiplier 4
+ ip ospf network point-to-point
+ ipv6 address 2001:db8::1/128
+ ipv6 ospf6 area 0.0.0.0
+ ipv6 ospf6 dead-interval 4
+ ipv6 ospf6 hello-interval 1
+ ipv6 ospf6 network point-to-point
+exit
+!
+interface eth2
+ ip address 192.0.2.1/32
+ ip ospf area 0.0.0.0
+ ip ospf dead-interval minimal hello-multiplier 4
+ ip ospf network point-to-point
+ ipv6 address 2001:db8::1/128
+ ipv6 ospf6 area 0.0.0.0
+ ipv6 ospf6 dead-interval 4
+ ipv6 ospf6 hello-interval 1
+ ipv6 ospf6 network point-to-point
+exit
+!
+interface eth3
+ ip address 192.0.2.1/32
+ ip ospf area 0.0.0.0
+ ip ospf dead-interval minimal hello-multiplier 4
+ ip ospf network point-to-point
+ ipv6 address 2001:db8::1/128
+ ipv6 ospf6 area 0.0.0.0
+ ipv6 ospf6 dead-interval 4
+ ipv6 ospf6 hello-interval 1
+ ipv6 ospf6 network point-to-point
+exit
+!
+interface lo
+ ip address 192.0.2.1/32
+ ip ospf area 0.0.0.0
+ ip ospf passive
+ ipv6 address 2001:db8::1/128
+ ipv6 ospf6 area 0.0.0.0
+ ipv6 ospf6 passive
+exit
+!
+router ospf
+ log-adjacency-changes
+exit
+!
+router ospf6
+ log-adjacency-changes
+exit
+!
+end
\ No newline at end of file
diff --git a/tests/topotests/ospf_topo2/r2/frr.conf b/tests/topotests/ospf_topo2/r2/frr.conf
new file mode 100644
index 00000000..d2ffb733
--- /dev/null
+++ b/tests/topotests/ospf_topo2/r2/frr.conf
@@ -0,0 +1,61 @@
+frr defaults traditional
+hostname r2
+log syslog informational
+service integrated-vtysh-config
+!
+ip router-id 192.0.2.2
+!
+interface eth1
+ ip address 192.0.2.2/32
+ ip ospf area 0.0.0.0
+ ip ospf dead-interval minimal hello-multiplier 4
+ ip ospf network point-to-point
+ ipv6 address 2001:db8::2/128
+ ipv6 ospf6 area 0.0.0.0
+ ipv6 ospf6 dead-interval 4
+ ipv6 ospf6 hello-interval 1
+ ipv6 ospf6 network point-to-point
+exit
+!
+interface eth2
+ ip address 192.0.2.2/32
+ ip ospf area 0.0.0.0
+ ip ospf dead-interval minimal hello-multiplier 4
+ ip ospf network point-to-point
+ ipv6 address 2001:db8::2/128
+ ipv6 ospf6 area 0.0.0.0
+ ipv6 ospf6 dead-interval 4
+ ipv6 ospf6 hello-interval 1
+ ipv6 ospf6 network point-to-point
+exit
+!
+interface eth3
+ ip address 192.0.2.2/32
+ ip ospf area 0.0.0.0
+ ip ospf dead-interval minimal hello-multiplier 4
+ ip ospf network point-to-point
+ ipv6 address 2001:db8::2/128
+ ipv6 ospf6 area 0.0.0.0
+ ipv6 ospf6 dead-interval 4
+ ipv6 ospf6 hello-interval 1
+ ipv6 ospf6 network point-to-point
+exit
+!
+interface lo
+ ip address 192.0.2.2/32
+ ip ospf area 0.0.0.0
+ ip ospf passive
+ ipv6 address 2001:db8::2/128
+ ipv6 ospf6 area 0.0.0.0
+ ipv6 ospf6 passive
+exit
+!
+router ospf
+ log-adjacency-changes
+exit
+!
+router ospf6
+ log-adjacency-changes
+exit
+!
+end
\ No newline at end of file
diff --git a/tests/topotests/ospf_topo2/r3/frr.conf b/tests/topotests/ospf_topo2/r3/frr.conf
new file mode 100644
index 00000000..e87b8972
--- /dev/null
+++ b/tests/topotests/ospf_topo2/r3/frr.conf
@@ -0,0 +1,61 @@
+frr defaults traditional
+hostname r3
+log syslog informational
+service integrated-vtysh-config
+!
+ip router-id 192.0.2.3
+!
+interface eth1
+ ip address 192.0.2.3/32
+ ip ospf area 0.0.0.0
+ ip ospf dead-interval minimal hello-multiplier 4
+ ip ospf network point-to-point
+ ipv6 address 2001:db8::3/128
+ ipv6 ospf6 area 0.0.0.0
+ ipv6 ospf6 dead-interval 4
+ ipv6 ospf6 hello-interval 1
+ ipv6 ospf6 network point-to-point
+exit
+!
+interface eth2
+ ip address 192.0.2.3/32
+ ip ospf area 0.0.0.0
+ ip ospf dead-interval minimal hello-multiplier 4
+ ip ospf network point-to-point
+ ipv6 address 2001:db8::3/128
+ ipv6 ospf6 area 0.0.0.0
+ ipv6 ospf6 dead-interval 4
+ ipv6 ospf6 hello-interval 1
+ ipv6 ospf6 network point-to-point
+exit
+!
+interface eth3
+ ip address 192.0.2.3/32
+ ip ospf area 0.0.0.0
+ ip ospf dead-interval minimal hello-multiplier 4
+ ip ospf network point-to-point
+ ipv6 address 2001:db8::3/128
+ ipv6 ospf6 area 0.0.0.0
+ ipv6 ospf6 dead-interval 4
+ ipv6 ospf6 hello-interval 1
+ ipv6 ospf6 network point-to-point
+exit
+!
+interface lo
+ ip address 192.0.2.3/32
+ ip ospf area 0.0.0.0
+ ip ospf passive
+ ipv6 address 2001:db8::3/128
+ ipv6 ospf6 area 0.0.0.0
+ ipv6 ospf6 passive
+exit
+!
+router ospf
+ log-adjacency-changes
+exit
+!
+router ospf6
+ log-adjacency-changes
+exit
+!
+end
\ No newline at end of file
diff --git a/tests/topotests/ospf_topo2/r4/frr.conf b/tests/topotests/ospf_topo2/r4/frr.conf
new file mode 100644
index 00000000..4e33d752
--- /dev/null
+++ b/tests/topotests/ospf_topo2/r4/frr.conf
@@ -0,0 +1,61 @@
+frr defaults traditional
+hostname r4
+log syslog informational
+service integrated-vtysh-config
+!
+ip router-id 192.0.2.4
+!
+interface eth1
+ ip address 192.0.2.4/32
+ ip ospf area 0.0.0.0
+ ip ospf dead-interval minimal hello-multiplier 4
+ ip ospf network point-to-point
+ ipv6 address 2001:db8::4/128
+ ipv6 ospf6 area 0.0.0.0
+ ipv6 ospf6 dead-interval 4
+ ipv6 ospf6 hello-interval 1
+ ipv6 ospf6 network point-to-point
+exit
+!
+interface eth2
+ ip address 192.0.2.4/32
+ ip ospf area 0.0.0.0
+ ip ospf dead-interval minimal hello-multiplier 4
+ ip ospf network point-to-point
+ ipv6 address 2001:db8::4/128
+ ipv6 ospf6 area 0.0.0.0
+ ipv6 ospf6 dead-interval 4
+ ipv6 ospf6 hello-interval 1
+ ipv6 ospf6 network point-to-point
+exit
+!
+interface eth3
+ ip address 192.0.2.4/32
+ ip ospf area 0.0.0.0
+ ip ospf dead-interval minimal hello-multiplier 4
+ ip ospf network point-to-point
+ ipv6 address 2001:db8::4/128
+ ipv6 ospf6 area 0.0.0.0
+ ipv6 ospf6 dead-interval 4
+ ipv6 ospf6 hello-interval 1
+ ipv6 ospf6 network point-to-point
+exit
+!
+interface lo
+ ip address 192.0.2.4/32
+ ip ospf area 0.0.0.0
+ ip ospf passive
+ ipv6 address 2001:db8::4/128
+ ipv6 ospf6 area 0.0.0.0
+ ipv6 ospf6 passive
+exit
+!
+router ospf
+ log-adjacency-changes
+exit
+!
+router ospf6
+ log-adjacency-changes
+exit
+!
+end
\ No newline at end of file
diff --git a/tests/topotests/ospf_topo2/test_ospf_topo2.dot b/tests/topotests/ospf_topo2/test_ospf_topo2.dot
new file mode 100644
index 00000000..e35afbba
--- /dev/null
+++ b/tests/topotests/ospf_topo2/test_ospf_topo2.dot
@@ -0,0 +1,44 @@
+graph template {
+    label="ospf_topo2";
+    splines = "line"
+
+    # Routers
+    r1 [
+        shape=doubleoctagon,
+        label="r1\n192.0.2.1\n2001:db8::1",
+        fillcolor="#f08080",
+        style=filled,
+    ];
+    r2 [
+        shape=doubleoctagon,
+        label="r2\n\192.0.2.2\n2001:db8::2",
+        fillcolor="#f08080",
+        style=filled,
+    ];
+    r3 [
+        shape=doubleoctagon,
+        label="r3\n192.0.2.3\n2001:db8::3",
+        fillcolor="#f08080",
+        style=filled,
+    ];
+    r4 [
+        shape=doubleoctagon,
+        label="r4\n192.0.2.4\n2001:db8::4",
+        fillcolor="#f08080",
+        style=filled,
+    ];
+
+    # Connections
+    r1 -- r2 [label="eth1"];
+    r1 -- r2 [label="eth2"];
+
+    r2 -- r3 [label="eth3\neth1"];
+    r1 -- r4 [label="eth3\neth1"];
+
+    r4 -- r3 [label="eth2"];
+    r4 -- r3 [label="eth3"];
+
+    # Group r1 and r2 above, r3 and r4 below
+    { rank=min; r1; r2; }
+    { rank=max; r3; r4; }
+}
diff --git a/tests/topotests/ospf_topo2/test_ospf_topo2.png b/tests/topotests/ospf_topo2/test_ospf_topo2.png
new file mode 100644
index 00000000..7eb0a1d6
--- /dev/null
+++ b/tests/topotests/ospf_topo2/test_ospf_topo2.png
diff --git a/tests/topotests/ospf_topo2/test_ospf_topo2.py b/tests/topotests/ospf_topo2/test_ospf_topo2.py
new file mode 100644
index 00000000..8be06e41
--- /dev/null
+++ b/tests/topotests/ospf_topo2/test_ospf_topo2.py
@@ -0,0 +1,317 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 eval: (blacken-mode 1) -*-
+# SPDX-License-Identifier: ISC
+#
+# test_ospf_topo2.py
+# Part of NetDEF Topology Tests
+#
+# Copyright (c) 2017 by
+# Network Device Education Foundation, Inc. ("NetDEF")
+#
+
+"""
+test_ospf_topo2.py: Test correct route removal.
+
+Proofs the following issue:
+https://github.com/FRRouting/frr/issues/14488
+
+"""
+
+import ipaddress
+import json
+import pytest
+import sys
+import time
+
+from lib.topogen import Topogen
+
+
+pytestmark = [
+    pytest.mark.ospf6d,
+    pytest.mark.ospfd,
+]
+
+
+def build_topo(tgen):
+    """Build the topology used by all tests below."""
+
+    # Create 4 routers
+    r1 = tgen.add_router("r1")
+    r2 = tgen.add_router("r2")
+    r3 = tgen.add_router("r3")
+    r4 = tgen.add_router("r4")
+
+    # The r1/r2 and r3/r4 router pairs have two connections each
+    tgen.add_link(r1, r2, ifname1="eth1", ifname2="eth1")
+    tgen.add_link(r1, r2, ifname1="eth2", ifname2="eth2")
+    tgen.add_link(r3, r4, ifname1="eth2", ifname2="eth2")
+    tgen.add_link(r3, r4, ifname1="eth3", ifname2="eth3")
+
+    # The r1/r4 and r2/r3 router pairs have one connection each
+    tgen.add_link(r1, r4, ifname1="eth3", ifname2="eth1")
+    tgen.add_link(r2, r3, ifname1="eth3", ifname2="eth1")
+
+
+@pytest.fixture(scope="function")
+def tgen(request):
+    """Setup/Teardown the environment and provide tgen argument to tests.
+
+    Do this once per function as some of the tests will leave the router
+    in an unclean state.
+
+    """
+
+    tgen = Topogen(build_topo, request.module.__name__)
+    tgen.start_topology()
+
+    router_list = tgen.routers()
+
+    for rname, router in router_list.items():
+        router.load_frr_config("frr.conf")
+
+    tgen.start_router()
+
+    yield tgen
+
+    tgen.stop_topology()
+
+
+def ospf_neighbors(router, ip_version):
+    """List the OSPF neighbors for the given router and IP version."""
+
+    if ip_version == 4:
+        cmd = "show ip ospf neighbor json"
+    else:
+        cmd = "show ipv6 ospf neighbor json"
+
+    output = router.vtysh_cmd(cmd)
+
+    if ip_version == 4:
+        return [v for n in json.loads(output)["neighbors"].values() for v in n]
+    else:
+        return json.loads(output)["neighbors"]
+
+
+def ospf_neighbor_uptime(router, interface, ip_version):
+    """Uptime of the neighbor with the given interface name in seconds."""
+
+    for neighbor in ospf_neighbors(router, ip_version):
+        if ip_version == 4:
+            if not neighbor["ifaceName"].startswith("{}:".format(interface)):
+                continue
+
+            return neighbor["upTimeInMsec"] / 1000
+        else:
+            if neighbor["interfaceName"] != interface:
+                continue
+
+            h, m, s = [int(d) for d in neighbor["duration"].split(":")]
+            return h * 3600 + m * 60 + s
+
+    raise KeyError(
+        "No IPv{} neighbor with interface name {} on {}".format(
+            ip_version, interface, router.name
+        )
+    )
+
+
+def ospf_routes(router, prefix):
+    """List the OSPF routes for the given router and prefix."""
+
+    if ipaddress.ip_interface(prefix).ip.version == 4:
+        cmd = "show ip route {} json"
+    else:
+        cmd = "show ipv6 route {} json"
+
+    output = router.vtysh_cmd(cmd.format(prefix))
+    return json.loads(output)[prefix]
+
+
+def ospf_nexthops(router, prefix, protocol):
+    """List the OSPF nexthops for the given prefix."""
+
+    for route in ospf_routes(router, prefix):
+        if route["protocol"] != protocol:
+            continue
+
+        for nexthop in route["nexthops"]:
+            yield nexthop
+
+
+def ospf_directly_connected_interfaces(router, ip_version):
+    """The names of the directly connected interfaces, as discovered
+    through the OSPF nexthops.
+
+    """
+
+    if ip_version == 4:
+        prefix = "192.0.2.{}/32".format(router.name.strip("r"))
+    else:
+        prefix = "fe80::/64"
+
+    hops = ospf_nexthops(router, prefix, protocol="connected")
+    return sorted([n["interfaceName"] for n in hops if n["directlyConnected"]])
+
+
+def wait_for_ospf(router, ip_version, neighbors, timeout=60):
+    """Wait until the router has the given number of neighbors that are
+    fully converged.
+
+    Note that this checks for the exact number of neighbors, so if one neighbor
+    is requested and three are converged, the wait continues.
+
+    """
+
+    until = time.monotonic() + timeout
+
+    if ip_version == 4:
+        filter = {"converged": "Full"}
+    else:
+        filter = {"state": "Full"}
+
+    def is_match(neighbor):
+        for k, v in filter.items():
+            if neighbor[k] != v:
+                return False
+
+        return True
+
+    while time.monotonic() < until:
+        found = sum(1 for n in ospf_neighbors(router, ip_version) if is_match(n))
+
+        if neighbors == found:
+            return
+
+    raise TimeoutError(
+        "Waited over {}s for {} neighbors to reach {}".format(
+            timeout, neighbors, filter
+        )
+    )
+
+
+@pytest.mark.parametrize("ip_version", [4, 6])
+def test_interface_up(tgen, ip_version):
+    """Verify the initial routing table, before any changes."""
+
+    # Wait for the routers to be ready
+    routers = {id: tgen.gears[id] for id in ("r1", "r2", "r3", "r4")}
+
+    for router in routers.values():
+        wait_for_ospf(router, ip_version=ip_version, neighbors=3)
+
+    # Verify that the link-local routes are correct
+    for router in routers.values():
+        connected = ospf_directly_connected_interfaces(router, ip_version)
+
+        if ip_version == 4:
+            expected = ["eth1", "eth2", "eth3", "lo"]
+        else:
+            expected = ["eth1", "eth2", "eth3"]
+
+        assert (
+            connected == expected
+        ), "Expected all interfaces to be connected on {}".format(router.name)
+
+
+@pytest.mark.parametrize("ip_version", [4, 6])
+def test_interface_down(tgen, ip_version):
+    """Verify the routing table after taking interfaces down."""
+
+    # Wait for the routers to be ready
+    routers = {id: tgen.gears[id] for id in ("r1", "r2", "r3", "r4")}
+
+    for id, router in routers.items():
+        wait_for_ospf(router, ip_version=ip_version, neighbors=3)
+
+    # Keep track of the uptime of the eth3 neighbor
+    uptime = ospf_neighbor_uptime(routers["r1"], "eth3", ip_version)
+    before = time.monotonic()
+
+    # Take the links between r1 and r2 down
+    routers["r1"].cmd_raises("ip link set down dev eth1")
+    routers["r1"].cmd_raises("ip link set down dev eth2")
+
+    # Wait for OSPF to converge
+    wait_for_ospf(routers["r1"], ip_version=ip_version, neighbors=1)
+
+    # The uptime of the unaffected eth3 neighbor should be monotonic
+    new_uptime = ospf_neighbor_uptime(routers["r1"], "eth3", ip_version)
+    took = round(time.monotonic() - before, 3)
+
+    # IPv6 has a resolution of 1s, for IPv4 some slack is necesssary.
+    if ip_version == 4:
+        offset = 0.25
+    else:
+        offset = 1
+
+    assert (
+        new_uptime + offset >= uptime + took
+    ), "The eth3 neighbor uptime must not decrease"
+
+    # We should only find eth3 once OSPF has converged
+    connected = ospf_directly_connected_interfaces(routers["r1"], ip_version)
+
+    if ip_version == 4:
+        expected = ["eth3", "lo"]
+    else:
+        expected = ["eth3"]
+
+    assert connected == expected, "Expected only eth1 and eth2 to be disconnected"
+
+
+@pytest.mark.parametrize("ip_version", [4, 6])
+def test_interface_flap(tgen, ip_version):
+    """Verify the routing table after enabling an interface that was down."""
+
+    # Wait for the routers to be ready
+    routers = {id: tgen.gears[id] for id in ("r1", "r2", "r3", "r4")}
+
+    for id, router in routers.items():
+        wait_for_ospf(router, ip_version=ip_version, neighbors=3)
+
+    # Keep track of the uptime of the eth3 neighbor
+    uptime = ospf_neighbor_uptime(routers["r1"], "eth3", ip_version)
+    before = time.monotonic()
+
+    # Take the links between r1 and r2 down
+    routers["r1"].cmd_raises("ip link set down dev eth1")
+    routers["r2"].cmd_raises("ip link set down dev eth2")
+
+    # Wait for OSPF to converge
+    wait_for_ospf(routers["r1"], ip_version=ip_version, neighbors=1)
+
+    # Take the links between r1 and r2 up
+    routers["r1"].cmd_raises("ip link set up dev eth1")
+    routers["r2"].cmd_raises("ip link set up dev eth2")
+
+    # Wait for OSPF to converge
+    wait_for_ospf(routers["r1"], ip_version=ip_version, neighbors=3)
+
+    # The uptime of the unaffected eth3 neighbor should be monotonic
+    new_uptime = ospf_neighbor_uptime(routers["r1"], "eth3", ip_version)
+    took = round(time.monotonic() - before, 3)
+
+    # IPv6 has a resolution of 1s, for IPv4 some slack is necesssary.
+    if ip_version == 4:
+        offset = 0.25
+    else:
+        offset = 1
+
+    assert (
+        new_uptime + offset >= uptime + took
+    ), "The eth3 neighbor uptime must not decrease"
+
+    # We should find all interfaces again
+    connected = ospf_directly_connected_interfaces(routers["r1"], ip_version)
+
+    if ip_version == 4:
+        expected = ["eth1", "eth2", "eth3", "lo"]
+    else:
+        expected = ["eth1", "eth2", "eth3"]
+
+    assert connected == expected, "Expected all interfaces to be connected"
+
+
+if __name__ == "__main__":
+    args = ["-s"] + sys.argv[1:]
+    sys.exit(pytest.main(args))