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

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

1 files changed, 316 insertions, 288 deletions

diff --git a/isisd/isis_vty.c b/isisd/isis_vty.c
index 79fbdc4d2..b0976177f 100644
--- a/isisd/isis_vty.c
+++ b/isisd/isis_vty.c
@@ -323,6 +323,17 @@ DEFUN (isis_passwd,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis password (md5|clear) WORD",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Configure the authentication password for a circuit\n"
+ *     "HMAC-MD5 authentication\n"
+ *     "Cleartext password\n"
+ *     "Circuit password\n"
+ *
+ */
 DEFUN (no_isis_passwd,
        no_isis_passwd_cmd,
        "no isis password",
@@ -339,15 +350,6 @@ DEFUN (no_isis_passwd,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_passwd,
-       no_isis_passwd_arg_cmd,
-       "no isis password (md5|clear) WORD",
-       NO_STR
-       "IS-IS commands\n"
-       "Configure the authentication password for a circuit\n"
-       "HMAC-MD5 authentication\n"
-       "Cleartext password\n"
-       "Circuit password\n")
 
 DEFUN (isis_priority,
        isis_priority_cmd,
@@ -375,6 +377,15 @@ DEFUN (isis_priority,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis priority <0-127>",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set priority for Designated Router election\n"
+ *     "Priority value\n"
+ *
+ */
 DEFUN (no_isis_priority,
        no_isis_priority_cmd,
        "no isis priority",
@@ -392,13 +403,6 @@ DEFUN (no_isis_priority,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_priority,
-       no_isis_priority_arg_cmd,
-       "no isis priority <0-127>",
-       NO_STR
-       "IS-IS commands\n"
-       "Set priority for Designated Router election\n"
-       "Priority value\n")
 
 DEFUN (isis_priority_l1,
        isis_priority_l1_cmd,
@@ -426,6 +430,16 @@ DEFUN (isis_priority_l1,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis priority <0-127> level-1",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set priority for Designated Router election\n"
+ *     "Priority value\n"
+ *     "Specify priority for level-1 routing\n"
+ *
+ */
 DEFUN (no_isis_priority_l1,
        no_isis_priority_l1_cmd,
        "no isis priority level-1",
@@ -443,14 +457,6 @@ DEFUN (no_isis_priority_l1,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_priority_l1,
-       no_isis_priority_l1_arg_cmd,
-       "no isis priority <0-127> level-1",
-       NO_STR
-       "IS-IS commands\n"
-       "Set priority for Designated Router election\n"
-       "Priority value\n"
-       "Specify priority for level-1 routing\n")
 
 DEFUN (isis_priority_l2,
        isis_priority_l2_cmd,
@@ -478,6 +484,16 @@ DEFUN (isis_priority_l2,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis priority <0-127> level-2",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set priority for Designated Router election\n"
+ *     "Priority value\n"
+ *     "Specify priority for level-2 routing\n"
+ *
+ */
 DEFUN (no_isis_priority_l2,
        no_isis_priority_l2_cmd,
        "no isis priority level-2",
@@ -495,14 +511,6 @@ DEFUN (no_isis_priority_l2,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_priority_l2,
-       no_isis_priority_l2_arg_cmd,
-       "no isis priority <0-127> level-2",
-       NO_STR
-       "IS-IS commands\n"
-       "Set priority for Designated Router election\n"
-       "Priority value\n"
-       "Specify priority for level-2 routing\n")
 
 /* Metric command */
 DEFUN (isis_metric,
@@ -544,6 +552,15 @@ DEFUN (isis_metric,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis metric <0-16777215>",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set default metric for circuit\n"
+ *     "Default metric value\n"
+ *
+ */
 DEFUN (no_isis_metric,
        no_isis_metric_cmd,
        "no isis metric",
@@ -560,13 +577,6 @@ DEFUN (no_isis_metric,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_metric,
-       no_isis_metric_arg_cmd,
-       "no isis metric <0-16777215>",
-       NO_STR
-       "IS-IS commands\n"
-       "Set default metric for circuit\n"
-       "Default metric value\n")
 
 DEFUN (isis_metric_l1,
        isis_metric_l1_cmd,
@@ -607,6 +617,16 @@ DEFUN (isis_metric_l1,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis metric <0-16777215> level-1",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set default metric for circuit\n"
+ *     "Default metric value\n"
+ *     "Specify metric for level-1 routing\n"
+ *
+ */
 DEFUN (no_isis_metric_l1,
        no_isis_metric_l1_cmd,
        "no isis metric level-1",
@@ -623,14 +643,6 @@ DEFUN (no_isis_metric_l1,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_metric_l1,
-       no_isis_metric_l1_arg_cmd,
-       "no isis metric <0-16777215> level-1",
-       NO_STR
-       "IS-IS commands\n"
-       "Set default metric for circuit\n"
-       "Default metric value\n"
-       "Specify metric for level-1 routing\n")
 
 DEFUN (isis_metric_l2,
        isis_metric_l2_cmd,
@@ -671,6 +683,16 @@ DEFUN (isis_metric_l2,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis metric <0-16777215> level-2",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set default metric for circuit\n"
+ *     "Default metric value\n"
+ *     "Specify metric for level-2 routing\n"
+ *
+ */
 DEFUN (no_isis_metric_l2,
        no_isis_metric_l2_cmd,
        "no isis metric level-2",
@@ -687,14 +709,6 @@ DEFUN (no_isis_metric_l2,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_metric_l2,
-       no_isis_metric_l2_arg_cmd,
-       "no isis metric <0-16777215> level-2",
-       NO_STR
-       "IS-IS commands\n"
-       "Set default metric for circuit\n"
-       "Default metric value\n"
-       "Specify metric for level-2 routing\n")
 /* end of metrics */
 
 DEFUN (isis_hello_interval,
@@ -724,6 +738,16 @@ DEFUN (isis_hello_interval,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis hello-interval <1-600>",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set Hello interval\n"
+ *     "Hello interval value\n"
+ *     "Holdtime 1 second, interval depends on multiplier\n"
+ *
+ */
 DEFUN (no_isis_hello_interval,
        no_isis_hello_interval_cmd,
        "no isis hello-interval",
@@ -741,14 +765,6 @@ DEFUN (no_isis_hello_interval,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_hello_interval,
-       no_isis_hello_interval_arg_cmd,
-       "no isis hello-interval <1-600>",
-       NO_STR
-       "IS-IS commands\n"
-       "Set Hello interval\n"
-       "Hello interval value\n"
-       "Holdtime 1 second, interval depends on multiplier\n")
 
 DEFUN (isis_hello_interval_l1,
        isis_hello_interval_l1_cmd,
@@ -777,6 +793,17 @@ DEFUN (isis_hello_interval_l1,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis hello-interval <1-600> level-1",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set Hello interval\n"
+ *     "Hello interval value\n"
+ *     "Holdtime 1 second, interval depends on multiplier\n"
+ *     "Specify hello-interval for level-1 IIHs\n"
+ *
+ */
 DEFUN (no_isis_hello_interval_l1,
        no_isis_hello_interval_l1_cmd,
        "no isis hello-interval level-1",
@@ -794,15 +821,6 @@ DEFUN (no_isis_hello_interval_l1,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_hello_interval_l1,
-       no_isis_hello_interval_l1_arg_cmd,
-       "no isis hello-interval <1-600> level-1",
-       NO_STR
-       "IS-IS commands\n"
-       "Set Hello interval\n"
-       "Hello interval value\n"
-       "Holdtime 1 second, interval depends on multiplier\n"
-       "Specify hello-interval for level-1 IIHs\n")
 
 DEFUN (isis_hello_interval_l2,
        isis_hello_interval_l2_cmd,
@@ -831,6 +849,17 @@ DEFUN (isis_hello_interval_l2,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis hello-interval <1-600> level-2",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set Hello interval\n"
+ *     "Hello interval value\n"
+ *     "Holdtime 1 second, interval depends on multiplier\n"
+ *     "Specify hello-interval for level-2 IIHs\n"
+ *
+ */
 DEFUN (no_isis_hello_interval_l2,
        no_isis_hello_interval_l2_cmd,
        "no isis hello-interval level-2",
@@ -848,15 +877,6 @@ DEFUN (no_isis_hello_interval_l2,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_hello_interval_l2,
-       no_isis_hello_interval_l2_arg_cmd,
-       "no isis hello-interval <1-600> level-2",
-       NO_STR
-       "IS-IS commands\n"
-       "Set Hello interval\n"
-       "Hello interval value\n"
-       "Holdtime 1 second, interval depends on multiplier\n"
-       "Specify hello-interval for level-2 IIHs\n")
 
 DEFUN (isis_hello_multiplier,
        isis_hello_multiplier_cmd,
@@ -884,6 +904,15 @@ DEFUN (isis_hello_multiplier,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis hello-multiplier <2-100>",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set multiplier for Hello holding time\n"
+ *     "Hello multiplier value\n"
+ *
+ */
 DEFUN (no_isis_hello_multiplier,
        no_isis_hello_multiplier_cmd,
        "no isis hello-multiplier",
@@ -901,13 +930,6 @@ DEFUN (no_isis_hello_multiplier,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_hello_multiplier,
-       no_isis_hello_multiplier_arg_cmd,
-       "no isis hello-multiplier <2-100>",
-       NO_STR
-       "IS-IS commands\n"
-       "Set multiplier for Hello holding time\n"
-       "Hello multiplier value\n")
 
 DEFUN (isis_hello_multiplier_l1,
        isis_hello_multiplier_l1_cmd,
@@ -935,6 +957,16 @@ DEFUN (isis_hello_multiplier_l1,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis hello-multiplier <2-100> level-1",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set multiplier for Hello holding time\n"
+ *     "Hello multiplier value\n"
+ *     "Specify hello multiplier for level-1 IIHs\n"
+ *
+ */
 DEFUN (no_isis_hello_multiplier_l1,
        no_isis_hello_multiplier_l1_cmd,
        "no isis hello-multiplier level-1",
@@ -952,14 +984,6 @@ DEFUN (no_isis_hello_multiplier_l1,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_hello_multiplier_l1,
-       no_isis_hello_multiplier_l1_arg_cmd,
-       "no isis hello-multiplier <2-100> level-1",
-       NO_STR
-       "IS-IS commands\n"
-       "Set multiplier for Hello holding time\n"
-       "Hello multiplier value\n"
-       "Specify hello multiplier for level-1 IIHs\n")
 
 DEFUN (isis_hello_multiplier_l2,
        isis_hello_multiplier_l2_cmd,
@@ -987,6 +1011,16 @@ DEFUN (isis_hello_multiplier_l2,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis hello-multiplier <2-100> level-2",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set multiplier for Hello holding time\n"
+ *     "Hello multiplier value\n"
+ *     "Specify hello multiplier for level-2 IIHs\n"
+ *
+ */
 DEFUN (no_isis_hello_multiplier_l2,
        no_isis_hello_multiplier_l2_cmd,
        "no isis hello-multiplier level-2",
@@ -1004,14 +1038,6 @@ DEFUN (no_isis_hello_multiplier_l2,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_hello_multiplier_l2,
-       no_isis_hello_multiplier_l2_arg_cmd,
-       "no isis hello-multiplier <2-100> level-2",
-       NO_STR
-       "IS-IS commands\n"
-       "Set multiplier for Hello holding time\n"
-       "Hello multiplier value\n"
-       "Specify hello multiplier for level-2 IIHs\n")
 
 DEFUN (isis_hello_padding,
        isis_hello_padding_cmd,
@@ -1074,6 +1100,15 @@ DEFUN (csnp_interval,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis csnp-interval <1-600>",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set CSNP interval in seconds\n"
+ *     "CSNP interval value\n"
+ *
+ */
 DEFUN (no_csnp_interval,
        no_csnp_interval_cmd,
        "no isis csnp-interval",
@@ -1091,13 +1126,6 @@ DEFUN (no_csnp_interval,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_csnp_interval,
-       no_csnp_interval_arg_cmd,
-       "no isis csnp-interval <1-600>",
-       NO_STR
-       "IS-IS commands\n"
-       "Set CSNP interval in seconds\n"
-       "CSNP interval value\n")
 
 DEFUN (csnp_interval_l1,
        csnp_interval_l1_cmd,
@@ -1125,6 +1153,16 @@ DEFUN (csnp_interval_l1,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis csnp-interval <1-600> level-1",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set CSNP interval in seconds\n"
+ *     "CSNP interval value\n"
+ *     "Specify interval for level-1 CSNPs\n"
+ *
+ */
 DEFUN (no_csnp_interval_l1,
        no_csnp_interval_l1_cmd,
        "no isis csnp-interval level-1",
@@ -1142,14 +1180,6 @@ DEFUN (no_csnp_interval_l1,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_csnp_interval_l1,
-       no_csnp_interval_l1_arg_cmd,
-       "no isis csnp-interval <1-600> level-1",
-       NO_STR
-       "IS-IS commands\n"
-       "Set CSNP interval in seconds\n"
-       "CSNP interval value\n"
-       "Specify interval for level-1 CSNPs\n")
 
 DEFUN (csnp_interval_l2,
        csnp_interval_l2_cmd,
@@ -1177,6 +1207,16 @@ DEFUN (csnp_interval_l2,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis csnp-interval <1-600> level-2",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set CSNP interval in seconds\n"
+ *     "CSNP interval value\n"
+ *     "Specify interval for level-2 CSNPs\n"
+ *
+ */
 DEFUN (no_csnp_interval_l2,
        no_csnp_interval_l2_cmd,
        "no isis csnp-interval level-2",
@@ -1194,14 +1234,6 @@ DEFUN (no_csnp_interval_l2,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_csnp_interval_l2,
-       no_csnp_interval_l2_arg_cmd,
-       "no isis csnp-interval <1-600> level-2",
-       NO_STR
-       "IS-IS commands\n"
-       "Set CSNP interval in seconds\n"
-       "CSNP interval value\n"
-       "Specify interval for level-2 CSNPs\n")
 
 DEFUN (psnp_interval,
        psnp_interval_cmd,
@@ -1229,6 +1261,15 @@ DEFUN (psnp_interval,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis psnp-interval <1-120>",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set PSNP interval in seconds\n"
+ *     "PSNP interval value\n"
+ *
+ */
 DEFUN (no_psnp_interval,
        no_psnp_interval_cmd,
        "no isis psnp-interval",
@@ -1246,13 +1287,6 @@ DEFUN (no_psnp_interval,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_psnp_interval,
-       no_psnp_interval_arg_cmd,
-       "no isis psnp-interval <1-120>",
-       NO_STR
-       "IS-IS commands\n"
-       "Set PSNP interval in seconds\n"
-       "PSNP interval value\n")
 
 DEFUN (psnp_interval_l1,
        psnp_interval_l1_cmd,
@@ -1280,6 +1314,16 @@ DEFUN (psnp_interval_l1,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis psnp-interval <1-120> level-1",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set PSNP interval in seconds\n"
+ *     "PSNP interval value\n"
+ *     "Specify interval for level-1 PSNPs\n"
+ *
+ */
 DEFUN (no_psnp_interval_l1,
        no_psnp_interval_l1_cmd,
        "no isis psnp-interval level-1",
@@ -1297,14 +1341,6 @@ DEFUN (no_psnp_interval_l1,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_psnp_interval_l1,
-       no_psnp_interval_l1_arg_cmd,
-       "no isis psnp-interval <1-120> level-1",
-       NO_STR
-       "IS-IS commands\n"
-       "Set PSNP interval in seconds\n"
-       "PSNP interval value\n"
-       "Specify interval for level-1 PSNPs\n")
 
 DEFUN (psnp_interval_l2,
        psnp_interval_l2_cmd,
@@ -1332,6 +1368,16 @@ DEFUN (psnp_interval_l2,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis psnp-interval <1-120> level-2",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set PSNP interval in seconds\n"
+ *     "PSNP interval value\n"
+ *     "Specify interval for level-2 PSNPs\n"
+ *
+ */
 DEFUN (no_psnp_interval_l2,
        no_psnp_interval_l2_cmd,
        "no isis psnp-interval level-2",
@@ -1349,14 +1395,6 @@ DEFUN (no_psnp_interval_l2,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_psnp_interval_l2,
-       no_psnp_interval_l2_arg_cmd,
-       "no isis psnp-interval <1-120> level-2",
-       NO_STR
-       "IS-IS commands\n"
-       "Set PSNP interval in seconds\n"
-       "PSNP interval value\n"
-       "Specify interval for level-2 PSNPs\n")
 
 static int
 validate_metric_style_narrow (struct vty *vty, struct isis_area *area)
@@ -1566,6 +1604,14 @@ DEFUN (area_lsp_mtu,
   return area_lsp_mtu_set(vty, lsp_mtu);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no lsp-mtu <128-4352>",
+ *     NO_STR
+ *     "Configure the maximum size of generated LSPs\n"
+ *     "Maximum size of generated LSPs\n"
+ *
+ */
 DEFUN (no_area_lsp_mtu,
        no_area_lsp_mtu_cmd,
        "no lsp-mtu",
@@ -1575,12 +1621,6 @@ DEFUN (no_area_lsp_mtu,
   return area_lsp_mtu_set(vty, DEFAULT_LSP_MTU);
 }
 
-ALIAS (no_area_lsp_mtu,
-       no_area_lsp_mtu_arg_cmd,
-       "no lsp-mtu <128-4352>",
-       NO_STR
-       "Configure the maximum size of generated LSPs\n"
-       "Maximum size of generated LSPs\n");
 
 DEFUN (is_type,
        is_type_cmd,
@@ -1689,6 +1729,14 @@ DEFUN (lsp_gen_interval,
   return set_lsp_gen_interval (vty, area, interval, level);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no lsp-gen-interval <1-120>",
+ *     NO_STR
+ *     "Minimum interval between regenerating same LSP\n"
+ *     "Minimum interval in seconds\n"
+ *
+ */
 DEFUN (no_lsp_gen_interval,
        no_lsp_gen_interval_cmd,
        "no lsp-gen-interval",
@@ -1705,12 +1753,6 @@ DEFUN (no_lsp_gen_interval,
   return set_lsp_gen_interval (vty, area, interval, level);
 }
 
-ALIAS (no_lsp_gen_interval,
-       no_lsp_gen_interval_arg_cmd,
-       "no lsp-gen-interval <1-120>",
-       NO_STR
-       "Minimum interval between regenerating same LSP\n"
-       "Minimum interval in seconds\n")
 
 DEFUN (lsp_gen_interval_l1,
        lsp_gen_interval_l1_cmd,
@@ -1729,6 +1771,15 @@ DEFUN (lsp_gen_interval_l1,
   return set_lsp_gen_interval (vty, area, interval, level);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no lsp-gen-interval level-1 <1-120>",
+ *     NO_STR
+ *     "Minimum interval between regenerating same LSP\n"
+ *     "Set interval for level 1 only\n"
+ *     "Minimum interval in seconds\n"
+ *
+ */
 DEFUN (no_lsp_gen_interval_l1,
        no_lsp_gen_interval_l1_cmd,
        "no lsp-gen-interval level-1",
@@ -1746,13 +1797,6 @@ DEFUN (no_lsp_gen_interval_l1,
   return set_lsp_gen_interval (vty, area, interval, level);
 }
 
-ALIAS (no_lsp_gen_interval_l1,
-       no_lsp_gen_interval_l1_arg_cmd,
-       "no lsp-gen-interval level-1 <1-120>",
-       NO_STR
-       "Minimum interval between regenerating same LSP\n"
-       "Set interval for level 1 only\n"
-       "Minimum interval in seconds\n")
 
 DEFUN (lsp_gen_interval_l2,
        lsp_gen_interval_l2_cmd,
@@ -1771,6 +1815,15 @@ DEFUN (lsp_gen_interval_l2,
   return set_lsp_gen_interval (vty, area, interval, level);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no lsp-gen-interval level-2 <1-120>",
+ *     NO_STR
+ *     "Minimum interval between regenerating same LSP\n"
+ *     "Set interval for level 2 only\n"
+ *     "Minimum interval in seconds\n"
+ *
+ */
 DEFUN (no_lsp_gen_interval_l2,
        no_lsp_gen_interval_l2_cmd,
        "no lsp-gen-interval level-2",
@@ -1788,13 +1841,6 @@ DEFUN (no_lsp_gen_interval_l2,
   return set_lsp_gen_interval (vty, area, interval, level);
 }
 
-ALIAS (no_lsp_gen_interval_l2,
-       no_lsp_gen_interval_l2_arg_cmd,
-       "no lsp-gen-interval level-2 <1-120>",
-       NO_STR
-       "Minimum interval between regenerating same LSP\n"
-       "Set interval for level 2 only\n"
-       "Minimum interval in seconds\n")
 
 DEFUN (spf_interval,
        spf_interval_cmd,
@@ -1813,6 +1859,26 @@ DEFUN (spf_interval,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no spf-interval level-2 <1-120>",
+ *     NO_STR
+ *     "Minimum interval between SPF calculations\n"
+ *     "Set interval for level 2 only\n"
+ *     "Minimum interval between consecutive SPFs in seconds\n"
+ *
+ * "no spf-interval <1-120>",
+ *     NO_STR
+ *     "Minimum interval between SPF calculations\n"
+ *     "Minimum interval between consecutive SPFs in seconds\n"
+ *
+ * "no spf-interval level-1 <1-120>",
+ *     NO_STR
+ *     "Minimum interval between SPF calculations\n"
+ *     "Set interval for level 1 only\n"
+ *     "Minimum interval between consecutive SPFs in seconds\n"
+ *
+ */
 DEFUN (no_spf_interval,
        no_spf_interval_cmd,
        "no spf-interval",
@@ -1829,12 +1895,6 @@ DEFUN (no_spf_interval,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_spf_interval,
-       no_spf_interval_arg_cmd,
-       "no spf-interval <1-120>",
-       NO_STR
-       "Minimum interval between SPF calculations\n"
-       "Minimum interval between consecutive SPFs in seconds\n")
 
 DEFUN (spf_interval_l1,
        spf_interval_l1_cmd,
@@ -1869,13 +1929,6 @@ DEFUN (no_spf_interval_l1,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_spf_interval,
-       no_spf_interval_l1_arg_cmd,
-       "no spf-interval level-1 <1-120>",
-       NO_STR
-       "Minimum interval between SPF calculations\n"
-       "Set interval for level 1 only\n"
-       "Minimum interval between consecutive SPFs in seconds\n")
 
 DEFUN (spf_interval_l2,
        spf_interval_l2_cmd,
@@ -1910,13 +1963,6 @@ DEFUN (no_spf_interval_l2,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_spf_interval,
-       no_spf_interval_l2_arg_cmd,
-       "no spf-interval level-2 <1-120>",
-       NO_STR
-       "Minimum interval between SPF calculations\n"
-       "Set interval for level 2 only\n"
-       "Minimum interval between consecutive SPFs in seconds\n")
 
 static int
 area_max_lsp_lifetime_set(struct vty *vty, int level,
@@ -1979,6 +2025,14 @@ DEFUN (max_lsp_lifetime,
   return area_max_lsp_lifetime_set(vty, IS_LEVEL_1_AND_2, atoi(argv[1]->arg));
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no max-lsp-lifetime <350-65535>",
+ *     NO_STR
+ *     "Maximum LSP lifetime\n"
+ *     "LSP lifetime in seconds\n"
+ *
+ */
 DEFUN (no_max_lsp_lifetime,
        no_max_lsp_lifetime_cmd,
        "no max-lsp-lifetime",
@@ -1989,12 +2043,6 @@ DEFUN (no_max_lsp_lifetime,
 				   DEFAULT_LSP_LIFETIME);
 }
 
-ALIAS (no_max_lsp_lifetime,
-       no_max_lsp_lifetime_arg_cmd,
-       "no max-lsp-lifetime <350-65535>",
-       NO_STR
-       "Maximum LSP lifetime\n"
-       "LSP lifetime in seconds\n")
 
 DEFUN (max_lsp_lifetime_l1,
        max_lsp_lifetime_l1_cmd,
@@ -2005,6 +2053,14 @@ DEFUN (max_lsp_lifetime_l1,
   return area_max_lsp_lifetime_set(vty, IS_LEVEL_1, atoi(argv[2]->arg));
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no max-lsp-lifetime level-1 <350-65535>",
+ *     NO_STR
+ *     "Maximum LSP lifetime for Level 1 only\n"
+ *     "LSP lifetime for Level 1 only in seconds\n"
+ *
+ */
 DEFUN (no_max_lsp_lifetime_l1,
        no_max_lsp_lifetime_l1_cmd,
        "no max-lsp-lifetime level-1",
@@ -2014,12 +2070,6 @@ DEFUN (no_max_lsp_lifetime_l1,
   return area_max_lsp_lifetime_set(vty, IS_LEVEL_1, DEFAULT_LSP_LIFETIME);
 }
 
-ALIAS (no_max_lsp_lifetime_l1,
-       no_max_lsp_lifetime_l1_arg_cmd,
-       "no max-lsp-lifetime level-1 <350-65535>",
-       NO_STR
-       "Maximum LSP lifetime for Level 1 only\n"
-       "LSP lifetime for Level 1 only in seconds\n")
 
 DEFUN (max_lsp_lifetime_l2,
        max_lsp_lifetime_l2_cmd,
@@ -2030,6 +2080,14 @@ DEFUN (max_lsp_lifetime_l2,
   return area_max_lsp_lifetime_set(vty, IS_LEVEL_2, atoi(argv[2]->arg));
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no max-lsp-lifetime level-2 <350-65535>",
+ *     NO_STR
+ *     "Maximum LSP lifetime for Level 2 only\n"
+ *     "LSP lifetime for Level 2 only in seconds\n"
+ *
+ */
 DEFUN (no_max_lsp_lifetime_l2,
        no_max_lsp_lifetime_l2_cmd,
        "no max-lsp-lifetime level-2",
@@ -2039,12 +2097,6 @@ DEFUN (no_max_lsp_lifetime_l2,
   return area_max_lsp_lifetime_set(vty, IS_LEVEL_2, DEFAULT_LSP_LIFETIME);
 }
 
-ALIAS (no_max_lsp_lifetime_l2,
-       no_max_lsp_lifetime_l2_arg_cmd,
-       "no max-lsp-lifetime level-2 <350-65535>",
-       NO_STR
-       "Maximum LSP lifetime for Level 2 only\n"
-       "LSP lifetime for Level 2 only in seconds\n")
 
 static int
 area_lsp_refresh_interval_set(struct vty *vty, int level, uint16_t interval)
@@ -2099,6 +2151,14 @@ DEFUN (lsp_refresh_interval,
   return area_lsp_refresh_interval_set(vty, IS_LEVEL_1_AND_2, atoi(argv[1]->arg));
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no lsp-refresh-interval <1-65235>",
+ *     NO_STR
+ *     "LSP refresh interval\n"
+ *     "LSP refresh interval in seconds\n"
+ *
+ */
 DEFUN (no_lsp_refresh_interval,
        no_lsp_refresh_interval_cmd,
        "no lsp-refresh-interval",
@@ -2109,12 +2169,6 @@ DEFUN (no_lsp_refresh_interval,
 				       DEFAULT_MAX_LSP_GEN_INTERVAL);
 }
 
-ALIAS (no_lsp_refresh_interval,
-       no_lsp_refresh_interval_arg_cmd,
-       "no lsp-refresh-interval <1-65235>",
-       NO_STR
-       "LSP refresh interval\n"
-       "LSP refresh interval in seconds\n")
 
 DEFUN (lsp_refresh_interval_l1,
        lsp_refresh_interval_l1_cmd,
@@ -2125,6 +2179,14 @@ DEFUN (lsp_refresh_interval_l1,
   return area_lsp_refresh_interval_set(vty, IS_LEVEL_1, atoi(argv[2]->arg));
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no lsp-refresh-interval level-1 <1-65235>",
+ *     NO_STR
+ *     "LSP refresh interval for Level 1 only\n"
+ *     "LSP refresh interval for Level 1 only in seconds\n"
+ *
+ */
 DEFUN (no_lsp_refresh_interval_l1,
        no_lsp_refresh_interval_l1_cmd,
        "no lsp-refresh-interval level-1",
@@ -2135,12 +2197,6 @@ DEFUN (no_lsp_refresh_interval_l1,
 				       DEFAULT_MAX_LSP_GEN_INTERVAL);
 }
 
-ALIAS (no_lsp_refresh_interval_l1,
-       no_lsp_refresh_interval_l1_arg_cmd,
-       "no lsp-refresh-interval level-1 <1-65235>",
-       NO_STR
-       "LSP refresh interval for Level 1 only\n"
-       "LSP refresh interval for Level 1 only in seconds\n")
 
 DEFUN (lsp_refresh_interval_l2,
        lsp_refresh_interval_l2_cmd,
@@ -2151,6 +2207,14 @@ DEFUN (lsp_refresh_interval_l2,
   return area_lsp_refresh_interval_set(vty, IS_LEVEL_2, atoi(argv[2]->arg));
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no lsp-refresh-interval level-2 <1-65235>",
+ *     NO_STR
+ *     "LSP refresh interval for Level 2 only\n"
+ *     "LSP refresh interval for Level 2 only in seconds\n"
+ *
+ */
 DEFUN (no_lsp_refresh_interval_l2,
        no_lsp_refresh_interval_l2_cmd,
        "no lsp-refresh-interval level-2",
@@ -2161,12 +2225,6 @@ DEFUN (no_lsp_refresh_interval_l2,
 				       DEFAULT_MAX_LSP_GEN_INTERVAL);
 }
 
-ALIAS (no_lsp_refresh_interval_l2,
-       no_lsp_refresh_interval_l2_arg_cmd,
-       "no lsp-refresh-interval level-2 <1-65235>",
-       NO_STR
-       "LSP refresh interval for Level 2 only\n"
-       "LSP refresh interval for Level 2 only in seconds\n")
 
 static int
 area_passwd_set(struct vty *vty, int level,
@@ -2192,6 +2250,19 @@ area_passwd_set(struct vty *vty, int level,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "(area-password|domain-password) md5 WORD authenticate snp (send-only|validate)",
+ *     "Configure the authentication password for an area\n"
+ *     "Set the authentication password for a routing domain\n"
+ *     "Authentication type\n"
+ *     "Level-wide password\n"
+ *     "Authentication\n"
+ *     "SNP PDUs\n"
+ *     "Send but do not check PDUs on receiving\n"
+ *     "Send and check PDUs on receiving\n"
+ *
+ */
 DEFUN (area_passwd_md5,
        area_passwd_md5_cmd,
        "(area-password|domain-password) md5 WORD",
@@ -2214,18 +2285,20 @@ DEFUN (area_passwd_md5,
                          argv[2]->arg, snp_auth);
 }
 
-ALIAS (area_passwd_md5,
-       area_passwd_md5_snpauth_cmd,
-       "(area-password|domain-password) md5 WORD authenticate snp (send-only|validate)",
-       "Configure the authentication password for an area\n"
-       "Set the authentication password for a routing domain\n"
-       "Authentication type\n"
-       "Level-wide password\n"
-       "Authentication\n"
-       "SNP PDUs\n"
-       "Send but do not check PDUs on receiving\n"
-       "Send and check PDUs on receiving\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "(area-password|domain-password) clear WORD authenticate snp (send-only|validate)",
+ *     "Configure the authentication password for an area\n"
+ *     "Set the authentication password for a routing domain\n"
+ *     "Authentication type\n"
+ *     "Area password\n"
+ *     "Authentication\n"
+ *     "SNP PDUs\n"
+ *     "Send but do not check PDUs on receiving\n"
+ *     "Send and check PDUs on receiving\n"
+ *
+ */
 DEFUN (area_passwd_clear,
        area_passwd_clear_cmd,
        "(area-password|domain-password) clear WORD",
@@ -2248,17 +2321,6 @@ DEFUN (area_passwd_clear,
                          argv[2]->arg, snp_auth);
 }
 
-ALIAS (area_passwd_clear,
-       area_passwd_clear_snpauth_cmd,
-       "(area-password|domain-password) clear WORD authenticate snp (send-only|validate)",
-       "Configure the authentication password for an area\n"
-       "Set the authentication password for a routing domain\n"
-       "Authentication type\n"
-       "Area password\n"
-       "Authentication\n"
-       "SNP PDUs\n"
-       "Send but do not check PDUs on receiving\n"
-       "Send and check PDUs on receiving\n")
 
 DEFUN (no_area_passwd,
        no_area_passwd_cmd,
@@ -2296,70 +2358,51 @@ isis_vty_init (void)
 
   install_element (INTERFACE_NODE, &isis_passwd_cmd);
   install_element (INTERFACE_NODE, &no_isis_passwd_cmd);
-  install_element (INTERFACE_NODE, &no_isis_passwd_arg_cmd);
 
   install_element (INTERFACE_NODE, &isis_priority_cmd);
   install_element (INTERFACE_NODE, &no_isis_priority_cmd);
-  install_element (INTERFACE_NODE, &no_isis_priority_arg_cmd);
   install_element (INTERFACE_NODE, &isis_priority_l1_cmd);
   install_element (INTERFACE_NODE, &no_isis_priority_l1_cmd);
-  install_element (INTERFACE_NODE, &no_isis_priority_l1_arg_cmd);
   install_element (INTERFACE_NODE, &isis_priority_l2_cmd);
   install_element (INTERFACE_NODE, &no_isis_priority_l2_cmd);
-  install_element (INTERFACE_NODE, &no_isis_priority_l2_arg_cmd);
 
   install_element (INTERFACE_NODE, &isis_metric_cmd);
   install_element (INTERFACE_NODE, &no_isis_metric_cmd);
-  install_element (INTERFACE_NODE, &no_isis_metric_arg_cmd);
   install_element (INTERFACE_NODE, &isis_metric_l1_cmd);
   install_element (INTERFACE_NODE, &no_isis_metric_l1_cmd);
-  install_element (INTERFACE_NODE, &no_isis_metric_l1_arg_cmd);
   install_element (INTERFACE_NODE, &isis_metric_l2_cmd);
   install_element (INTERFACE_NODE, &no_isis_metric_l2_cmd);
-  install_element (INTERFACE_NODE, &no_isis_metric_l2_arg_cmd);
 
   install_element (INTERFACE_NODE, &isis_hello_interval_cmd);
   install_element (INTERFACE_NODE, &no_isis_hello_interval_cmd);
-  install_element (INTERFACE_NODE, &no_isis_hello_interval_arg_cmd);
   install_element (INTERFACE_NODE, &isis_hello_interval_l1_cmd);
   install_element (INTERFACE_NODE, &no_isis_hello_interval_l1_cmd);
-  install_element (INTERFACE_NODE, &no_isis_hello_interval_l1_arg_cmd);
   install_element (INTERFACE_NODE, &isis_hello_interval_l2_cmd);
   install_element (INTERFACE_NODE, &no_isis_hello_interval_l2_cmd);
-  install_element (INTERFACE_NODE, &no_isis_hello_interval_l2_arg_cmd);
 
   install_element (INTERFACE_NODE, &isis_hello_multiplier_cmd);
   install_element (INTERFACE_NODE, &no_isis_hello_multiplier_cmd);
-  install_element (INTERFACE_NODE, &no_isis_hello_multiplier_arg_cmd);
   install_element (INTERFACE_NODE, &isis_hello_multiplier_l1_cmd);
   install_element (INTERFACE_NODE, &no_isis_hello_multiplier_l1_cmd);
-  install_element (INTERFACE_NODE, &no_isis_hello_multiplier_l1_arg_cmd);
   install_element (INTERFACE_NODE, &isis_hello_multiplier_l2_cmd);
   install_element (INTERFACE_NODE, &no_isis_hello_multiplier_l2_cmd);
-  install_element (INTERFACE_NODE, &no_isis_hello_multiplier_l2_arg_cmd);
 
   install_element (INTERFACE_NODE, &isis_hello_padding_cmd);
   install_element (INTERFACE_NODE, &no_isis_hello_padding_cmd);
 
   install_element (INTERFACE_NODE, &csnp_interval_cmd);
   install_element (INTERFACE_NODE, &no_csnp_interval_cmd);
-  install_element (INTERFACE_NODE, &no_csnp_interval_arg_cmd);
   install_element (INTERFACE_NODE, &csnp_interval_l1_cmd);
   install_element (INTERFACE_NODE, &no_csnp_interval_l1_cmd);
-  install_element (INTERFACE_NODE, &no_csnp_interval_l1_arg_cmd);
   install_element (INTERFACE_NODE, &csnp_interval_l2_cmd);
   install_element (INTERFACE_NODE, &no_csnp_interval_l2_cmd);
-  install_element (INTERFACE_NODE, &no_csnp_interval_l2_arg_cmd);
 
   install_element (INTERFACE_NODE, &psnp_interval_cmd);
   install_element (INTERFACE_NODE, &no_psnp_interval_cmd);
-  install_element (INTERFACE_NODE, &no_psnp_interval_arg_cmd);
   install_element (INTERFACE_NODE, &psnp_interval_l1_cmd);
   install_element (INTERFACE_NODE, &no_psnp_interval_l1_cmd);
-  install_element (INTERFACE_NODE, &no_psnp_interval_l1_arg_cmd);
   install_element (INTERFACE_NODE, &psnp_interval_l2_cmd);
   install_element (INTERFACE_NODE, &no_psnp_interval_l2_cmd);
-  install_element (INTERFACE_NODE, &no_psnp_interval_l2_arg_cmd);
 
   install_element (ISIS_NODE, &metric_style_cmd);
   install_element (ISIS_NODE, &no_metric_style_cmd);
@@ -2375,54 +2418,39 @@ isis_vty_init (void)
 
   install_element (ISIS_NODE, &area_lsp_mtu_cmd);
   install_element (ISIS_NODE, &no_area_lsp_mtu_cmd);
-  install_element (ISIS_NODE, &no_area_lsp_mtu_arg_cmd);
 
   install_element (ISIS_NODE, &is_type_cmd);
   install_element (ISIS_NODE, &no_is_type_cmd);
 
   install_element (ISIS_NODE, &lsp_gen_interval_cmd);
   install_element (ISIS_NODE, &no_lsp_gen_interval_cmd);
-  install_element (ISIS_NODE, &no_lsp_gen_interval_arg_cmd);
   install_element (ISIS_NODE, &lsp_gen_interval_l1_cmd);
   install_element (ISIS_NODE, &no_lsp_gen_interval_l1_cmd);
-  install_element (ISIS_NODE, &no_lsp_gen_interval_l1_arg_cmd);
   install_element (ISIS_NODE, &lsp_gen_interval_l2_cmd);
   install_element (ISIS_NODE, &no_lsp_gen_interval_l2_cmd);
-  install_element (ISIS_NODE, &no_lsp_gen_interval_l2_arg_cmd);
 
   install_element (ISIS_NODE, &spf_interval_cmd);
   install_element (ISIS_NODE, &no_spf_interval_cmd);
-  install_element (ISIS_NODE, &no_spf_interval_arg_cmd);
   install_element (ISIS_NODE, &spf_interval_l1_cmd);
   install_element (ISIS_NODE, &no_spf_interval_l1_cmd);
-  install_element (ISIS_NODE, &no_spf_interval_l1_arg_cmd);
   install_element (ISIS_NODE, &spf_interval_l2_cmd);
   install_element (ISIS_NODE, &no_spf_interval_l2_cmd);
-  install_element (ISIS_NODE, &no_spf_interval_l2_arg_cmd);
 
   install_element (ISIS_NODE, &max_lsp_lifetime_cmd);
   install_element (ISIS_NODE, &no_max_lsp_lifetime_cmd);
-  install_element (ISIS_NODE, &no_max_lsp_lifetime_arg_cmd);
   install_element (ISIS_NODE, &max_lsp_lifetime_l1_cmd);
   install_element (ISIS_NODE, &no_max_lsp_lifetime_l1_cmd);
-  install_element (ISIS_NODE, &no_max_lsp_lifetime_l1_arg_cmd);
   install_element (ISIS_NODE, &max_lsp_lifetime_l2_cmd);
   install_element (ISIS_NODE, &no_max_lsp_lifetime_l2_cmd);
-  install_element (ISIS_NODE, &no_max_lsp_lifetime_l2_arg_cmd);
 
   install_element (ISIS_NODE, &lsp_refresh_interval_cmd);
   install_element (ISIS_NODE, &no_lsp_refresh_interval_cmd);
-  install_element (ISIS_NODE, &no_lsp_refresh_interval_arg_cmd);
   install_element (ISIS_NODE, &lsp_refresh_interval_l1_cmd);
   install_element (ISIS_NODE, &no_lsp_refresh_interval_l1_cmd);
-  install_element (ISIS_NODE, &no_lsp_refresh_interval_l1_arg_cmd);
   install_element (ISIS_NODE, &lsp_refresh_interval_l2_cmd);
   install_element (ISIS_NODE, &no_lsp_refresh_interval_l2_cmd);
-  install_element (ISIS_NODE, &no_lsp_refresh_interval_l2_arg_cmd);
 
   install_element (ISIS_NODE, &area_passwd_md5_cmd);
-  install_element (ISIS_NODE, &area_passwd_md5_snpauth_cmd);
   install_element (ISIS_NODE, &area_passwd_clear_cmd);
-  install_element (ISIS_NODE, &area_passwd_clear_snpauth_cmd);
   install_element (ISIS_NODE, &no_area_passwd_cmd);
 }