From a64543e3e8f0210e12bf9749e4302dc216f93b61 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 9 Jun 2022 10:29:04 -0400 Subject: [PATCH] pimd: Show interface traffic even if interface is currently `down` the `show ip pim interface [x] traffic` command was deciding to skip display of interfaces if they happened to be down at that moment. This of course does not make a bunch of sense to limit the output for a interface that may have sent data in the past. This fixes this test crash: rnode = , dut = 'c1', input_dict = {'c1': {'c1-l1-eth2': ['helloTx', 'helloRx']}}, output_dict = {'c1': {}} def show_pim_intf_traffic(rnode, dut, input_dict, output_dict): show_pim_intf_traffic_json = run_frr_cmd( rnode, "show ip pim interface traffic json", isjson=True ) output_dict[dut] = {} for intf, data in input_dict[dut].items(): > interface_json = show_pim_intf_traffic_json[intf] E KeyError: 'c1-l1-eth2' /home/sharpd/frr8/tests/topotests/lib/pim.py:1496: KeyError Signed-off-by: Donald Sharp --- pimd/pim_cmd.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 2d6ce24381..07c4444937 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -867,8 +867,6 @@ static void pim_show_interface_traffic(struct pim_instance *pim, if (!pim_ifp) continue; - if (pim_ifp->pim_sock_fd < 0) - continue; if (uj) { json_row = json_object_new_object(); json_object_pim_ifp_add(json_row, ifp); @@ -958,9 +956,6 @@ static void pim_show_interface_traffic_single(struct pim_instance *pim, if (!pim_ifp) continue; - if (pim_ifp->pim_sock_fd < 0) - continue; - found_ifname = 1; if (uj) { json_row = json_object_new_object(); -- 2.39.5