isisd: improvements based on feedback

  * Remove sanity checks that are already done by northbound;
  * Show error message on circuit absence;
  * Use a better idiom for the configuration display code;

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>

diff --git a/isisd/isis_cli.c b/isisd/isis_cli.c
index 7ca4c8795c7595746aeb7ab264f0c7f6d2d66680..4b432607731af74447825fe9d39288ea29c3f4a3 100644 (file)
--- a/isisd/isis_cli.c
+++ b/isisd/isis_cli.c
@@ -346,8 +346,10 @@ DEFPY(isis_bfd,
 
        dnode = yang_dnode_get(vty->candidate_config->dnode,
                               "%s/frr-isisd:isis", VTY_CURR_XPATH);
-       if (dnode == NULL)
+       if (dnode == NULL) {
+               vty_out(vty, "ISIS is not enabled on this circuit\n");
                return CMD_SUCCESS;
+       }
 
        nb_cli_enqueue_change(vty, "./frr-isisd:isis/bfd-monitoring",
                              NB_OP_MODIFY, no ? "false" : "true");
@@ -358,11 +360,10 @@ DEFPY(isis_bfd,
 void cli_show_ip_isis_bfd_monitoring(struct vty *vty, struct lyd_node *dnode,
                                     bool show_defaults)
 {
-       if (show_defaults == false)
-               vty_out(vty, " %s" PROTO_NAME " bfd\n",
-                       yang_dnode_get_bool(dnode, NULL) ? "" : "no ");
-       else
-               vty_out(vty, " no " PROTO_NAME " bfd\n");
+       if (!yang_dnode_get_bool(dnode, NULL))
+               vty_out(vty, " no");
+
+       vty_out(vty, "isis bfd\n");
 }
 
 /*

diff --git a/isisd/isis_northbound.c b/isisd/isis_northbound.c
index d596aecc1c15bb9607e0cf6af5d1e2ba3b63a960..0982a468a62ed5ab98825d49ba46752e9ee2fe42 100644 (file)
--- a/isisd/isis_northbound.c
+++ b/isisd/isis_northbound.c
@@ -1721,18 +1721,10 @@ static int lib_interface_isis_bfd_monitoring_modify(enum nb_event event,
        bfd_monitoring = yang_dnode_get_bool(dnode, NULL);
 
        if (bfd_monitoring) {
-               /* Sanity check: BFD session is already registered. */
-               if (circuit->bfd_info != NULL)
-                       return NB_OK;
-
                isis_bfd_circuit_param_set(circuit, BFD_DEF_MIN_RX,
                                           BFD_DEF_MIN_TX, BFD_DEF_DETECT_MULT,
                                           true);
        } else {
-               /* Sanity check: no BFD session was registered. */
-               if (circuit->bfd_info == NULL)
-                       return NB_OK;
-
                isis_bfd_circuit_cmd(circuit, ZEBRA_BFD_DEST_DEREGISTER);
                bfd_info_free(&circuit->bfd_info);
        }