]> git.proxmox.com Git - mirror_frr.git/commitdiff
lib: remove prefix-list dup api in validation phase
authorChirag Shah <chirag@nvidia.com>
Fri, 18 Dec 2020 00:18:40 +0000 (16:18 -0800)
committerChirag Shah <chirag@nvidia.com>
Tue, 2 Mar 2021 00:04:31 +0000 (16:04 -0800)
Following patch
" lib: disallow access list duplicated values"
introduce a libyang dnode iterator for every prefix-list
config which adds an overhead of traversal all prefix dnodes
and degrades the performance in scaled prefix-list config.

This check is not necessary in prefix-list northbound callbacks
as there won't be a case where prefix-list config comes to nb
callback without sequence number.

The dup check is only necessary for the vtysh case for backward
compatiblity reason where cli can be accepted without sequence number.

Ticket: CM-32035
Reviewed By: CCR-11096
Testing Done:

Signed-off-by: Chirag Shah <chirag@nvidia.com>
lib/filter_nb.c

index cab108e4ba81363c4ab1acfe4bc40a4a98b21ea8..4e1bde676ecc3fac73e4b05f40bcda511ec436ba 100644 (file)
@@ -308,45 +308,6 @@ bool plist_is_dup(const struct lyd_node *dnode, struct plist_dup_args *pda)
        return pda->pda_found;
 }
 
-static bool plist_is_dup_nb(const struct lyd_node *dnode)
-{
-       const struct lyd_node *entry_dnode =
-               yang_dnode_get_parent(dnode, "entry");
-       struct plist_dup_args pda = {};
-       int idx = 0, arg_idx = 0;
-       static const char *entries[] = {
-               "./ipv4-prefix",
-               "./ipv4-prefix-length-greater-or-equal",
-               "./ipv4-prefix-length-lesser-or-equal",
-               "./ipv6-prefix",
-               "./ipv6-prefix-length-greater-or-equal",
-               "./ipv6-prefix-length-lesser-or-equal",
-               "./any",
-               NULL
-       };
-
-       /* Initialize. */
-       pda.pda_type = yang_dnode_get_string(entry_dnode, "../type");
-       pda.pda_name = yang_dnode_get_string(entry_dnode, "../name");
-       pda.pda_entry_dnode = entry_dnode;
-
-       /* Load all values/XPaths. */
-       while (entries[idx] != NULL) {
-               if (!yang_dnode_exists(entry_dnode, entries[idx])) {
-                       idx++;
-                       continue;
-               }
-
-               pda.pda_xpath[arg_idx] = entries[idx];
-               pda.pda_value[arg_idx] =
-                       yang_dnode_get_string(entry_dnode, entries[idx]);
-               arg_idx++;
-               idx++;
-       }
-
-       return plist_is_dup(entry_dnode, &pda);
-}
-
 /*
  * XPath: /frr-filter:lib/access-list
  */
@@ -1272,16 +1233,6 @@ static int lib_prefix_list_entry_ipv4_prefix_length_greater_or_equal_modify(
            prefix_list_length_validate(args) != NB_OK)
                return NB_ERR_VALIDATION;
 
-       if (args->event == NB_EV_VALIDATE) {
-               if (plist_is_dup_nb(args->dnode)) {
-                       snprintf(args->errmsg, args->errmsg_len,
-                                "duplicated prefix list value: %s",
-                                yang_dnode_get_string(args->dnode, NULL));
-                       return NB_ERR_VALIDATION;
-               }
-               return NB_OK;
-       }
-
        if (args->event != NB_EV_APPLY)
                return NB_OK;
 
@@ -1344,16 +1295,6 @@ static int lib_prefix_list_entry_ipv4_prefix_length_lesser_or_equal_modify(
            prefix_list_length_validate(args) != NB_OK)
                return NB_ERR_VALIDATION;
 
-       if (args->event == NB_EV_VALIDATE) {
-               if (plist_is_dup_nb(args->dnode)) {
-                       snprintf(args->errmsg, args->errmsg_len,
-                                "duplicated prefix list value: %s",
-                                yang_dnode_get_string(args->dnode, NULL));
-                       return NB_ERR_VALIDATION;
-               }
-               return NB_OK;
-       }
-
        if (args->event != NB_EV_APPLY)
                return NB_OK;
 
@@ -1427,12 +1368,6 @@ static int lib_prefix_list_entry_ipv6_prefix_length_greater_or_equal_modify(
                        return NB_ERR_VALIDATION;
                }
 
-               if (plist_is_dup_nb(args->dnode)) {
-                       snprintf(args->errmsg, args->errmsg_len,
-                                "duplicated prefix list value: %s",
-                                yang_dnode_get_string(args->dnode, NULL));
-                       return NB_ERR_VALIDATION;
-               }
                return NB_OK;
        }
 
@@ -1508,12 +1443,7 @@ static int lib_prefix_list_entry_ipv6_prefix_length_lesser_or_equal_modify(
                                 "prefix-list type %s is mismatched.", af_type);
                        return NB_ERR_VALIDATION;
                }
-               if (plist_is_dup_nb(args->dnode)) {
-                       snprintf(args->errmsg, args->errmsg_len,
-                                "duplicated prefix list value: %s",
-                                yang_dnode_get_string(args->dnode, NULL));
-                       return NB_ERR_VALIDATION;
-               }
+
                return NB_OK;
        }
 
@@ -1574,16 +1504,6 @@ static int lib_prefix_list_entry_any_create(struct nb_cb_create_args *args)
        struct prefix_list_entry *ple;
        int type;
 
-       if (args->event == NB_EV_VALIDATE) {
-               if (plist_is_dup_nb(args->dnode)) {
-                       snprintf(args->errmsg, args->errmsg_len,
-                                "duplicated prefix list value: %s",
-                                yang_dnode_get_string(args->dnode, NULL));
-                       return NB_ERR_VALIDATION;
-               }
-               return NB_OK;
-       }
-
        if (args->event != NB_EV_APPLY)
                return NB_OK;