ALIAS removal for bgp, ospf, pim, isis, rip, ripng, lib and zebra

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

1 files changed, 21 insertions, 19 deletions

diff --git a/lib/if_rmap.c b/lib/if_rmap.c
index 0e1199f21..240a03cab 100644
--- a/lib/if_rmap.c
+++ b/lib/if_rmap.c
@@ -209,6 +209,16 @@ if_rmap_unset (const char *ifname, enum if_rmap_type type,
   return 1;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "route-map RMAP_NAME (in|out) IFNAME",
+ *     "Route map set\n"
+ *     "Route map name\n"
+ *     "Route map set for input filtering\n"
+ *     "Route map set for output filtering\n"
+ *     "Route map interface name\n"
+ *
+ */
 DEFUN (if_rmap,
        if_rmap_cmd,
        "route-map RMAP_NAME (in|out) IFNAME",
@@ -235,15 +245,18 @@ DEFUN (if_rmap,
   return CMD_SUCCESS;
 }      
 
-ALIAS (if_rmap,
-       if_ipv6_rmap_cmd,
-       "route-map RMAP_NAME (in|out) IFNAME",
-       "Route map set\n"
-       "Route map name\n"
-       "Route map set for input filtering\n"
-       "Route map set for output filtering\n"
-       "Route map interface name\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no route-map ROUTEMAP_NAME (in|out) IFNAME",
+ *     NO_STR
+ *     "Route map unset\n"
+ *     "Route map name\n"
+ *     "Route map for input filtering\n"
+ *     "Route map for output filtering\n"
+ *     "Route map interface name\n"
+ *
+ */
 DEFUN (no_if_rmap,
        no_if_rmap_cmd,
        "no route-map ROUTEMAP_NAME (in|out) IFNAME",
@@ -276,15 +289,6 @@ DEFUN (no_if_rmap,
   return CMD_SUCCESS;
 }      
 
-ALIAS (no_if_rmap,
-       no_if_ipv6_rmap_cmd,
-       "no route-map ROUTEMAP_NAME (in|out) IFNAME",
-       NO_STR
-       "Route map unset\n"
-       "Route map name\n"
-       "Route map for input filtering\n"
-       "Route map for output filtering\n"
-       "Route map interface name\n")
 
 /* Configuration write function. */
 int
@@ -333,8 +337,6 @@ if_rmap_init (int node)
 {
   ifrmaphash = hash_create (if_rmap_hash_make, if_rmap_hash_cmp);
   if (node == RIPNG_NODE) {
-    install_element (RIPNG_NODE, &if_ipv6_rmap_cmd);
-    install_element (RIPNG_NODE, &no_if_ipv6_rmap_cmd);
   } else if (node == RIP_NODE) {
     install_element (RIP_NODE, &if_rmap_cmd);
     install_element (RIP_NODE, &no_if_rmap_cmd);