eigrpd: use correct autocompletion for distribute-list commands

Currently, we always use access-list autocompletion, even if configuring
prefix-lists. We should differentiate. Also, use address-family-specific
autocompletion.

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

diff --git a/eigrpd/eigrp_cli.c b/eigrpd/eigrp_cli.c
index 8e90d42ba27f66d626098cd9c2a4ab6ecf966b6d..4bd3434aebadd9b30144be5b3ec6dabf1a9b1431 100644 (file)
--- a/eigrpd/eigrp_cli.c
+++ b/eigrpd/eigrp_cli.c
@@ -406,9 +406,8 @@ void eigrp_cli_show_neighbor(struct vty *vty, const struct lyd_node *dnode,
  */
 DEFPY_YANG (eigrp_distribute_list,
        eigrp_distribute_list_cmd,
-       "distribute-list [prefix]$prefix ACCESSLIST_NAME$name <in|out>$dir [WORD$ifname]",
+       "distribute-list ACCESSLIST4_NAME$name <in|out>$dir [WORD$ifname]",
        "Filter networks in routing updates\n"
-       "Specify a prefix\n"
        "Access-list name\n"
        "Filter incoming routing updates\n"
        "Filter outgoing routing updates\n"
@@ -417,8 +416,28 @@ DEFPY_YANG (eigrp_distribute_list,
        char xpath[XPATH_MAXLEN];
 
        snprintf(xpath, sizeof(xpath),
-                "./distribute-list[interface='%s']/%s/%s-list",
-                ifname ? ifname : "", dir, prefix ? "prefix" : "access");
+                "./distribute-list[interface='%s']/%s/access-list",
+                ifname ? ifname : "", dir);
+       /* nb_cli_enqueue_change(vty, ".", NB_OP_CREATE, NULL); */
+       nb_cli_enqueue_change(vty, xpath, NB_OP_MODIFY, name);
+       return nb_cli_apply_changes(vty, NULL);
+}
+
+DEFPY_YANG (eigrp_distribute_list_prefix,
+       eigrp_distribute_list_prefix_cmd,
+       "distribute-list prefix PREFIXLIST4_NAME$name <in|out>$dir [WORD$ifname]",
+       "Filter networks in routing updates\n"
+       "Specify a prefix list\n"
+       "Prefix-list name\n"
+       "Filter incoming routing updates\n"
+       "Filter outgoing routing updates\n"
+       "Interface name\n")
+{
+       char xpath[XPATH_MAXLEN];
+
+       snprintf(xpath, sizeof(xpath),
+                "./distribute-list[interface='%s']/%s/prefix-list",
+                ifname ? ifname : "", dir);
        /* nb_cli_enqueue_change(vty, ".", NB_OP_CREATE, NULL); */
        nb_cli_enqueue_change(vty, xpath, NB_OP_MODIFY, name);
        return nb_cli_apply_changes(vty, NULL);
@@ -426,10 +445,9 @@ DEFPY_YANG (eigrp_distribute_list,
 
 DEFPY_YANG (eigrp_no_distribute_list,
        eigrp_no_distribute_list_cmd,
-       "no distribute-list [prefix]$prefix ACCESSLIST_NAME$name <in|out>$dir [WORD$ifname]",
+       "no distribute-list [ACCESSLIST4_NAME$name] <in|out>$dir [WORD$ifname]",
        NO_STR
        "Filter networks in routing updates\n"
-       "Specify a prefix\n"
        "Access-list name\n"
        "Filter incoming routing updates\n"
        "Filter outgoing routing updates\n"
@@ -439,8 +457,43 @@ DEFPY_YANG (eigrp_no_distribute_list,
        char xpath[XPATH_MAXLEN];
 
        snprintf(xpath, sizeof(xpath),
-                "./distribute-list[interface='%s']/%s/%s-list",
-                ifname ? ifname : "", dir, prefix ? "prefix" : "access");
+                "./distribute-list[interface='%s']/%s/access-list",
+                ifname ? ifname : "", dir);
+       /*
+        * See if the user has specified specific list so check it exists.
+        *
+        * NOTE: Other FRR CLI commands do not do this sort of verification and
+        * there may be an official decision not to.
+        */
+       if (name) {
+               value_node = yang_dnode_getf(vty->candidate_config->dnode, "%s/%s",
+                                            VTY_CURR_XPATH, xpath);
+               if (!value_node || strcmp(name, lyd_get_value(value_node))) {
+                       vty_out(vty, "distribute list doesn't exist\n");
+                       return CMD_WARNING_CONFIG_FAILED;
+               }
+       }
+       nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
+       return nb_cli_apply_changes(vty, NULL);
+}
+
+DEFPY_YANG (eigrp_no_distribute_list_prefix,
+       eigrp_no_distribute_list_prefix_cmd,
+       "no distribute-list prefix [PREFIXLIST4_NAME$name] <in|out>$dir [WORD$ifname]",
+       NO_STR
+       "Filter networks in routing updates\n"
+       "Specify a prefix list\n"
+       "Prefix-list name\n"
+       "Filter incoming routing updates\n"
+       "Filter outgoing routing updates\n"
+       "Interface name\n")
+{
+       const struct lyd_node *value_node;
+       char xpath[XPATH_MAXLEN];
+
+       snprintf(xpath, sizeof(xpath),
+                "./distribute-list[interface='%s']/%s/prefix-list",
+                ifname ? ifname : "", dir);
        /*
         * See if the user has specified specific list so check it exists.
         *
@@ -934,7 +987,9 @@ eigrp_cli_init(void)
        install_element(EIGRP_NODE, &eigrp_network_cmd);
        install_element(EIGRP_NODE, &eigrp_neighbor_cmd);
        install_element(EIGRP_NODE, &eigrp_distribute_list_cmd);
+       install_element(EIGRP_NODE, &eigrp_distribute_list_prefix_cmd);
        install_element(EIGRP_NODE, &eigrp_no_distribute_list_cmd);
+       install_element(EIGRP_NODE, &eigrp_no_distribute_list_prefix_cmd);
        install_element(EIGRP_NODE, &eigrp_redistribute_source_metric_cmd);
 
        vrf_cmd_init(NULL);