Merge pull request #17326 from anlancs/fix/zebra-no-ifp-down

zebra: fix missing kernel routes

3 files changed, 46 insertions, 1 deletions

diff --git a/tests/topotests/zebra_multiple_connected/r1/ip_route_kernel_blackhole.json b/tests/topotests/zebra_multiple_connected/r1/ip_route_kernel_blackhole.json
new file mode 100644
index 0000000000..c8ea930370
--- /dev/null
+++ b/tests/topotests/zebra_multiple_connected/r1/ip_route_kernel_blackhole.json
@@ -0,0 +1,24 @@
+{
+  "0.0.0.0/0":[
+    {
+      "prefix":"0.0.0.0/0",
+      "prefixLen":0,
+      "protocol":"kernel",
+      "vrfName":"default",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":254,
+      "nexthops":[
+        {
+          "fib":true,
+          "unreachable":true,
+          "blackhole":true,
+          "active":true
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/zebra_multiple_connected/test_zebra_multiple_connected.py b/tests/topotests/zebra_multiple_connected/test_zebra_multiple_connected.py
index 7dbeb6f1cc..eda8c88706 100644
--- a/tests/topotests/zebra_multiple_connected/test_zebra_multiple_connected.py
+++ b/tests/topotests/zebra_multiple_connected/test_zebra_multiple_connected.py
@@ -202,6 +202,27 @@ def test_zebra_kernel_route_add():
     assert result, "Connected Route should have been added\n{}".format(_)
 
 
+def test_zebra_kernel_route_blackhole_add():
+    "Test that a blackhole route is not affected by interface's link change"
+
+    tgen = get_topogen()
+    if tgen.routers_have_failure():
+        pytest.skip(tgen.errors)
+
+    router = tgen.gears["r1"]
+    router.run("ip route add blackhole default")
+    router.run("ip link set dev r1-eth1 down")
+
+    kernel = "{}/{}/ip_route_kernel_blackhole.json".format(CWD, router.name)
+    expected = json.loads(open(kernel).read())
+
+    test_func = partial(
+        topotest.router_json_cmp, router, "show ip route 0.0.0.0/0 json", expected
+    )
+    result, _ = topotest.run_and_expect(test_func, None, count=20, wait=1)
+    assert result, "Blackhole Route should have not been removed\n{}".format(_)
+
+
 if __name__ == "__main__":
     args = ["-s"] + sys.argv[1:]
     sys.exit(pytest.main(args))
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 59e7696ed2..b2543ca0e8 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -4555,7 +4555,7 @@ rib_update_handle_kernel_route_down_possibility(struct route_node *rn,
 		struct interface *ifp = if_lookup_by_index(nexthop->ifindex,
 							   nexthop->vrf_id);
 
-		if (ifp && if_is_up(ifp)) {
+		if ((ifp && if_is_up(ifp)) || nexthop->type == NEXTHOP_TYPE_BLACKHOLE) {
 			alive = true;
 			break;
 		}