lib: enforce vrf_name_to_id by returning default_vrf when name is null

[mirror_frr.git] / isisd / isis_circuit.c

diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index e76e27a7dce636ba91468f7a6ff64edf3628777e..81b4b397ecb0eda77620eddc650fac68b0e02360 100644 (file)
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -38,6 +38,7 @@
 #include "prefix.h"
 #include "stream.h"
 #include "qobj.h"
+#include "lib/northbound_cli.h"
 
 #include "isisd/dict.h"
 #include "isisd/isis_constants.h"
@@ -78,6 +79,47 @@ struct isis_circuit *isis_circuit_new()
        /*
         * Default values
         */
+#ifndef FABRICD
+       circuit->is_type = yang_get_default_enum(
+               "/frr-interface:lib/interface/frr-isisd:isis/circuit-type");
+       circuit->flags = 0;
+
+       circuit->pad_hellos = yang_get_default_bool(
+               "/frr-interface:lib/interface/frr-isisd:isis/hello/padding");
+       circuit->hello_interval[0] = yang_get_default_uint32(
+               "/frr-interface:lib/interface/frr-isisd:isis/hello/interval/level-1");
+       circuit->hello_interval[1] = yang_get_default_uint32(
+               "/frr-interface:lib/interface/frr-isisd:isis/hello/interval/level-2");
+       circuit->hello_multiplier[0] = yang_get_default_uint32(
+               "/frr-interface:lib/interface/frr-isisd:isis/hello/multiplier/level-1");
+       circuit->hello_multiplier[1] = yang_get_default_uint32(
+               "/frr-interface:lib/interface/frr-isisd:isis/hello/multiplier/level-2");
+       circuit->csnp_interval[0] = yang_get_default_uint16(
+               "/frr-interface:lib/interface/frr-isisd:isis/csnp-interval/level-1");
+       circuit->csnp_interval[1] = yang_get_default_uint16(
+               "/frr-interface:lib/interface/frr-isisd:isis/csnp-interval/level-2");
+       circuit->psnp_interval[0] = yang_get_default_uint16(
+               "/frr-interface:lib/interface/frr-isisd:isis/psnp-interval/level-1");
+       circuit->psnp_interval[1] = yang_get_default_uint16(
+               "/frr-interface:lib/interface/frr-isisd:isis/psnp-interval/level-2");
+       circuit->priority[0] = yang_get_default_uint8(
+               "/frr-interface:lib/interface/frr-isisd:isis/priority/level-1");
+       circuit->priority[1] = yang_get_default_uint8(
+               "/frr-interface:lib/interface/frr-isisd:isis/priority/level-2");
+       circuit->metric[0] = yang_get_default_uint32(
+               "/frr-interface:lib/interface/frr-isisd:isis/metric/level-1");
+       circuit->metric[1] = yang_get_default_uint32(
+               "/frr-interface:lib/interface/frr-isisd:isis/metric/level-2");
+       circuit->te_metric[0] = yang_get_default_uint32(
+               "/frr-interface:lib/interface/frr-isisd:isis/metric/level-1");
+       circuit->te_metric[1] = yang_get_default_uint32(
+               "/frr-interface:lib/interface/frr-isisd:isis/metric/level-2");
+
+       for (i = 0; i < 2; i++) {
+               circuit->level_arg[i].level = i + 1;
+               circuit->level_arg[i].circuit = circuit;
+       }
+#else
        circuit->is_type = IS_LEVEL_1_AND_2;
        circuit->flags = 0;
        circuit->pad_hellos = 1;
@@ -92,6 +134,7 @@ struct isis_circuit *isis_circuit_new()
                circuit->level_arg[i].level = i + 1;
                circuit->level_arg[i].circuit = circuit;
        }
+#endif /* ifndef FABRICD */
 
        circuit->mtc = mpls_te_circuit_new();
 
@@ -666,11 +709,21 @@ int isis_circuit_up(struct isis_circuit *circuit)
 
        circuit->tx_queue = isis_tx_queue_new(circuit, send_lsp);
 
+#ifndef FABRICD
+       /* send northbound notification */
+       isis_notif_if_state_change(circuit, false);
+#endif /* ifndef FABRICD */
+
        return ISIS_OK;
 }
 
 void isis_circuit_down(struct isis_circuit *circuit)
 {
+#ifndef FABRICD
+       /* send northbound notification */
+       isis_notif_if_state_change(circuit, true);
+#endif /* ifndef FABRICD */
+
        /* Clear the flags for all the lsps of the circuit. */
        isis_circuit_update_all_srmflags(circuit, 0);
 
@@ -919,6 +972,7 @@ DEFINE_HOOK(isis_circuit_config_write,
            (struct isis_circuit *circuit, struct vty *vty),
            (circuit, vty))
 
+#ifdef FABRICD
 int isis_interface_config_write(struct vty *vty)
 {
        struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT);
@@ -1141,6 +1195,33 @@ int isis_interface_config_write(struct vty *vty)
 
        return write;
 }
+#else
+int isis_interface_config_write(struct vty *vty)
+{
+       struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT);
+       int write = 0;
+       struct interface *ifp;
+       struct isis_circuit *circuit;
+       struct lyd_node *dnode;
+
+       FOR_ALL_INTERFACES (vrf, ifp) {
+               dnode = yang_dnode_get(
+                       running_config->dnode,
+                       "/frr-interface:lib/interface[name='%s'][vrf='%s']",
+                       ifp->name, vrf->name);
+               if (dnode == NULL)
+                       continue;
+
+               write++;
+               nb_cli_show_dnode_cmds(vty, dnode, false);
+               circuit = circuit_scan_by_ifp(ifp);
+               if (circuit)
+                       write += hook_call(isis_circuit_config_write, circuit,
+                                          vty);
+       }
+       return write;
+}
+#endif /* ifdef FABRICD */
 
 struct isis_circuit *isis_circuit_create(struct isis_area *area,
                                         struct interface *ifp)
@@ -1261,35 +1342,22 @@ struct cmd_node interface_node = {
        INTERFACE_NODE, "%s(config-if)# ", 1,
 };
 
-ferr_r isis_circuit_circ_type_set(struct isis_circuit *circuit, int circ_type)
+void isis_circuit_circ_type_set(struct isis_circuit *circuit, int circ_type)
 {
        if (circuit->circ_type == circ_type)
-               return ferr_ok();
-
-       /* Changing the network type to/of loopback or unknown interfaces
-        * is not supported. */
-       if (circ_type == CIRCUIT_T_UNKNOWN || circ_type == CIRCUIT_T_LOOPBACK
-           || circuit->circ_type == CIRCUIT_T_LOOPBACK) {
-               return ferr_cfg_invalid(
-                       "cannot change network type on unknown interface");
-       }
+               return;
 
        if (circuit->state != C_STATE_UP) {
                circuit->circ_type = circ_type;
                circuit->circ_type_config = circ_type;
        } else {
                struct isis_area *area = circuit->area;
-               if (circ_type == CIRCUIT_T_BROADCAST
-                   && !if_is_broadcast(circuit->interface))
-                       return ferr_cfg_reality(
-                               "cannot configure non-broadcast interface for broadcast operation");
 
                isis_csm_state_change(ISIS_DISABLE, circuit, area);
                circuit->circ_type = circ_type;
                circuit->circ_type_config = circ_type;
                isis_csm_state_change(ISIS_ENABLE, circuit, area);
        }
-       return ferr_ok();
 }
 
 int isis_circuit_mt_enabled_set(struct isis_circuit *circuit, uint16_t mtid,