From 05e4ec3798a759e733f5c4ec7744daec771a22e1 Mon Sep 17 00:00:00 2001 From: Renato Westphal Date: Thu, 23 Apr 2020 11:49:01 -0300 Subject: isisd: fix display of "isis bfd" in the running configuration Since this command is modeled using YANG, it's already displayed as part of the call to nb_cli_show_dnode_cmds(). Calling the 'isis_circuit_config_write' hook was only making that command to be displayed twice. The aforementioned hook is still necessary for fabricd, which wasn't converted to the new northbound model yet. Fixes #6281. Signed-off-by: Renato Westphal --- isisd/isis_bfd.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'isisd/isis_bfd.c') diff --git a/isisd/isis_bfd.c b/isisd/isis_bfd.c index 2ff5979d1..0f0d20e39 100644 --- a/isisd/isis_bfd.c +++ b/isisd/isis_bfd.c @@ -391,6 +391,7 @@ void isis_bfd_circuit_param_set(struct isis_circuit *circuit, isis_bfd_circuit_cmd(circuit, command); } +#ifdef FABRICD static int bfd_circuit_write_settings(struct isis_circuit *circuit, struct vty *vty) { @@ -402,6 +403,7 @@ static int bfd_circuit_write_settings(struct isis_circuit *circuit, vty_out(vty, " %s bfd\n", PROTO_NAME); return 1; } +#endif void isis_bfd_init(void) { @@ -413,6 +415,8 @@ void isis_bfd_init(void) zclient->bfd_dest_replay = isis_bfd_nbr_replay; hook_register(isis_adj_state_change_hook, bfd_handle_adj_state_change); +#ifdef FABRICD hook_register(isis_circuit_config_write, bfd_circuit_write_settings); +#endif } -- cgit v1.2.3