commit 62f936e7960a7c08f4ae42ad43726d8d6e8e949d
author Daniel Walton <dwalton@cumulusnetworks.com> Mon Nov 09 20:21:59 2015 -0500
committer Paul Jakma <paul.jakma@hpe.com> Tue Sep 13 10:36:45 2016 +0100
tree 53dbbf703d51c38e0bf41cc979434b32c3b5d430
parent 92992c69afd0095b183a3b905598d194115b27a7

ospf6d, ripd, vtysh: Fix "no set metric" for ospf6 and RIP

Allow the user to actually turn off the set metric command
in ospf6d and rip.

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

ripd/rip_routemap.c

diff --git a/ripd/rip_routemap.c b/ripd/rip_routemap.c
index 37a986c..9bafdcd 100644
--- a/ripd/rip_routemap.c
+++ b/ripd/rip_routemap.c
@@ -1000,11 +1000,18 @@
 
 ALIAS (no_set_metric,
        no_set_metric_val_cmd,
-       "no set metric (<0-4294967295>|<+/-metric>)",
+       "no set metric <0-4294967295>",
        NO_STR
        SET_STR
        "Metric value for destination routing protocol\n"
-       "Metric value\n"
+       "Metric value\n")
+
+ALIAS (no_set_metric,
+       no_set_metric_addsub_cmd,
+       "no set metric <+/-metric>",
+       NO_STR
+       SET_STR
+       "Metric value for destination routing protocol\n"
        "Add or subtract metric\n")
 
 DEFUN (set_ip_nexthop,
@@ -1135,6 +1142,7 @@
   install_element (RMAP_NODE, &set_metric_addsub_cmd);
   install_element (RMAP_NODE, &no_set_metric_cmd);
   install_element (RMAP_NODE, &no_set_metric_val_cmd);
+  install_element (RMAP_NODE, &no_set_metric_addsub_cmd);
   install_element (RMAP_NODE, &set_ip_nexthop_cmd);
   install_element (RMAP_NODE, &no_set_ip_nexthop_cmd);
   install_element (RMAP_NODE, &no_set_ip_nexthop_val_cmd);