lib, mgmtd: rename ignore_cbs to ignore_cfg_cbs

Setting this variable to true makes NB ignore only configuration-related
callbacks. CLI-related callbacks are still loaded and executed, so
rename the variable to make it clearer.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

diff --git a/doc/developer/mgmtd-dev.rst b/doc/developer/mgmtd-dev.rst
index fb171c4ae71f04efc5a5a65f84804fe43cda355b..92911bf65043e391debd92cf2ce546f6f6623730 100644 (file)
--- a/doc/developer/mgmtd-dev.rst
+++ b/doc/developer/mgmtd-dev.rst
@@ -89,7 +89,7 @@ An here is the addition to the modules array in ``mgmtd/mgmt_main.c``:
            ...
    #ifdef HAVE_STATICD
            &(struct frr_yang_module_info){.name = "frr-staticd",
-                                        .ignore_cbs = true},
+                                        .ignore_cfg_cbs = true},
    #endif
    }
 

diff --git a/lib/northbound.c b/lib/northbound.c
index 03d252ee52108c09983363eb6c885e36b7be2932..c72a8dfbe338492c9c55999ff85da67e3b988ecb 100644 (file)
--- a/lib/northbound.c
+++ b/lib/northbound.c
@@ -125,8 +125,8 @@ static int nb_node_new_cb(const struct lysc_node *snode, void *arg)
        assert(snode->priv == NULL);
        ((struct lysc_node *)snode)->priv = nb_node;
 
-       if (module && module->ignore_cbs)
-               SET_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS);
+       if (module && module->ignore_cfg_cbs)
+               SET_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS);
 
        return YANG_ITER_CONTINUE;
 }
@@ -250,7 +250,7 @@ static unsigned int nb_node_validate_cbs(const struct nb_node *nb_node)
 {
        unsigned int error = 0;
 
-       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
                return error;
 
        error += nb_node_validate_cb(nb_node, NB_OP_CREATE,
@@ -1171,7 +1171,7 @@ static int nb_callback_create(struct nb_context *context,
        bool unexpected_error = false;
        int ret;
 
-       assert(!CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS));
+       assert(!CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS));
 
        nb_log_config_callback(event, NB_OP_CREATE, dnode);
 
@@ -1222,7 +1222,7 @@ static int nb_callback_modify(struct nb_context *context,
        bool unexpected_error = false;
        int ret;
 
-       assert(!CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS));
+       assert(!CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS));
 
        nb_log_config_callback(event, NB_OP_MODIFY, dnode);
 
@@ -1273,7 +1273,7 @@ static int nb_callback_destroy(struct nb_context *context,
        bool unexpected_error = false;
        int ret;
 
-       assert(!CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS));
+       assert(!CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS));
 
        nb_log_config_callback(event, NB_OP_DESTROY, dnode);
 
@@ -1318,7 +1318,7 @@ static int nb_callback_move(struct nb_context *context,
        bool unexpected_error = false;
        int ret;
 
-       assert(!CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS));
+       assert(!CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS));
 
        nb_log_config_callback(event, NB_OP_MOVE, dnode);
 
@@ -1363,7 +1363,7 @@ static int nb_callback_pre_validate(struct nb_context *context,
        bool unexpected_error = false;
        int ret;
 
-       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
                return 0;
 
        nb_log_config_callback(NB_EV_VALIDATE, NB_OP_PRE_VALIDATE, dnode);
@@ -1397,7 +1397,7 @@ static void nb_callback_apply_finish(struct nb_context *context,
 {
        struct nb_cb_apply_finish_args args = {};
 
-       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
                return;
 
        nb_log_config_callback(NB_EV_APPLY, NB_OP_APPLY_FINISH, dnode);
@@ -1415,7 +1415,7 @@ struct yang_data *nb_callback_get_elem(const struct nb_node *nb_node,
 {
        struct nb_cb_get_elem_args args = {};
 
-       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
                return NULL;
 
        DEBUGD(&nb_dbg_cbs_state,
@@ -1433,7 +1433,7 @@ const void *nb_callback_get_next(const struct nb_node *nb_node,
 {
        struct nb_cb_get_next_args args = {};
 
-       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
                return NULL;
 
        DEBUGD(&nb_dbg_cbs_state,
@@ -1450,7 +1450,7 @@ int nb_callback_get_keys(const struct nb_node *nb_node, const void *list_entry,
 {
        struct nb_cb_get_keys_args args = {};
 
-       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
                return 0;
 
        DEBUGD(&nb_dbg_cbs_state,
@@ -1468,7 +1468,7 @@ const void *nb_callback_lookup_entry(const struct nb_node *nb_node,
 {
        struct nb_cb_lookup_entry_args args = {};
 
-       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
                return NULL;
 
        DEBUGD(&nb_dbg_cbs_state,
@@ -1487,7 +1487,7 @@ const void *nb_callback_lookup_node_entry(struct lyd_node *node,
        struct nb_cb_lookup_entry_args args = {};
        const struct nb_node *nb_node = node->schema->priv;
 
-       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
                return NULL;
 
        if (yang_get_node_keys(node, &keys)) {
@@ -1512,7 +1512,7 @@ const void *nb_callback_lookup_next(const struct nb_node *nb_node,
 {
        struct nb_cb_lookup_entry_args args = {};
 
-       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
                return NULL;
 
        DEBUGD(&nb_dbg_cbs_state,
@@ -1530,7 +1530,7 @@ int nb_callback_rpc(const struct nb_node *nb_node, const char *xpath,
 {
        struct nb_cb_rpc_args args = {};
 
-       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
                return 0;
 
        DEBUGD(&nb_dbg_cbs_rpc, "northbound RPC: %s", xpath);
@@ -1559,7 +1559,7 @@ static int nb_callback_configuration(struct nb_context *context,
        union nb_resource *resource;
        int ret = NB_ERR;
 
-       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+       if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
                return NB_OK;
 
        if (event == NB_EV_VALIDATE)

diff --git a/lib/northbound.h b/lib/northbound.h
index 37b7055c10df26f956e2ced7344bb6736320e2ec..2c238f3bcfa829fc7b1d617bb65439be01cc3b49 100644 (file)
--- a/lib/northbound.h
+++ b/lib/northbound.h
@@ -613,8 +613,8 @@ struct nb_node {
 #define F_NB_NODE_CONFIG_ONLY 0x01
 /* The YANG list doesn't contain key leafs. */
 #define F_NB_NODE_KEYLESS_LIST 0x02
-/* Ignore callbacks for this node */
-#define F_NB_NODE_IGNORE_CBS 0x04
+/* Ignore config callbacks for this node */
+#define F_NB_NODE_IGNORE_CFG_CBS 0x04
 
 /*
  * HACK: old gcc versions (< 5.x) have a bug that prevents C99 flexible arrays
@@ -628,10 +628,11 @@ struct frr_yang_module_info {
        const char *name;
 
        /*
-        * Ignore callbacks for this module. Set this to true to
-        * load module without any callbacks.
+        * Ignore configuration callbacks for this module. Set this to true to
+        * load module with only CLI-related callbacks. This is useful for
+        * modules loaded in mgmtd.
         */
-       bool ignore_cbs;
+       bool ignore_cfg_cbs;
 
        /* Northbound callbacks. */
        const struct {

diff --git a/mgmtd/mgmt_main.c b/mgmtd/mgmt_main.c
index f0fb7f8a7b85d59607d83d26af0737c5e46b4845..a70235717f2186e14c70a7878202e9a25aa61b3b 100644 (file)
--- a/mgmtd/mgmt_main.c
+++ b/mgmtd/mgmt_main.c
@@ -197,19 +197,19 @@ extern const struct frr_yang_module_info frr_staticd_info;
  */
 const struct frr_yang_module_info zebra_info = {
        .name = "frr-zebra",
-       .ignore_cbs = true,
+       .ignore_cfg_cbs = true,
        .nodes = { { .xpath = NULL } },
 };
 
 const struct frr_yang_module_info affinity_map_info = {
        .name = "frr-affinity-map",
-       .ignore_cbs = true,
+       .ignore_cfg_cbs = true,
        .nodes = { { .xpath = NULL } },
 };
 
 const struct frr_yang_module_info zebra_route_map_info = {
        .name = "frr-zebra-route-map",
-       .ignore_cbs = true,
+       .ignore_cfg_cbs = true,
        .nodes = { { .xpath = NULL } },
 };
 

diff --git a/staticd/static_vty.c b/staticd/static_vty.c
index 70ea6c525a01e47cc96f2ef00dfa19e146d8717d..a641d1a09f28a320570a3308a6f9f1ce7b79ceff 100644 (file)
--- a/staticd/static_vty.c
+++ b/staticd/static_vty.c
@@ -1580,7 +1580,7 @@ static int static_path_list_cli_cmp(const struct lyd_node *dnode1,
 
 const struct frr_yang_module_info frr_staticd_info = {
        .name = "frr-staticd",
-       .ignore_cbs = true,
+       .ignore_cfg_cbs = true,
        .nodes = {
                {
                        .xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-staticd:staticd",