From: Renato Westphal <renato@opensourcerouting.org>
Date: Mon, 10 Aug 2020 14:42:31 +0000 (-0300)
Subject: isisd: normalize CLI help strings to always use IS-IS
X-Git-Tag: base_7.5~82^2~6
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6aa15aebc3d472985f6cf51c91069130710061b3;p=matthieu%2Ffrr.git

isisd: normalize CLI help strings to always use IS-IS

Some commands were using IS-IS while others were using ISIS. Fix
this inconsistency (prefer the former option for obvious reasons).

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---

diff --git a/isisd/isis_cli.c b/isisd/isis_cli.c
index cd75116c50..4c2bcc774e 100644
--- a/isisd/isis_cli.c
+++ b/isisd/isis_cli.c
@@ -1154,7 +1154,7 @@ DEFPY_YANG(isis_default_originate, isis_default_originate_cmd,
       "Distribute default route into level-2\n"
       "Always advertise default route\n"
       "Metric for default route\n"
-      "ISIS default metric\n"
+      "IS-IS default metric\n"
       "Route map reference\n"
       "Pointer to route-map entries\n")
 {
@@ -1228,7 +1228,7 @@ DEFPY_YANG(isis_redistribute, isis_redistribute_cmd,
       "Redistribute into level-1\n"
       "Redistribute into level-2\n"
       "Metric for redistributed routes\n"
-      "ISIS default metric\n"
+      "IS-IS default metric\n"
       "Route map reference\n"
       "Pointer to route-map entries\n")
 {
diff --git a/isisd/isisd.c b/isisd/isisd.c
index 156a32b1be..0c8640f241 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -526,7 +526,7 @@ DEFUN (show_isis_interface,
        "show " PROTO_NAME " interface",
        SHOW_STR
        PROTO_HELP
-       "ISIS interface\n")
+       "IS-IS interface\n")
 {
 	return show_isis_interface_common(vty, NULL, ISIS_UI_LEVEL_BRIEF);
 }
@@ -536,7 +536,7 @@ DEFUN (show_isis_interface_detail,
        "show " PROTO_NAME " interface detail",
        SHOW_STR
        PROTO_HELP
-       "ISIS interface\n"
+       "IS-IS interface\n"
        "show detailed information\n")
 {
 	return show_isis_interface_common(vty, NULL, ISIS_UI_LEVEL_DETAIL);
@@ -547,8 +547,8 @@ DEFUN (show_isis_interface_arg,
        "show " PROTO_NAME " interface WORD",
        SHOW_STR
        PROTO_HELP
-       "ISIS interface\n"
-       "ISIS interface name\n")
+       "IS-IS interface\n"
+       "IS-IS interface name\n")
 {
 	int idx_word = 3;
 	return show_isis_interface_common(vty, argv[idx_word]->arg,
@@ -697,7 +697,7 @@ DEFUN (show_isis_neighbor,
        "show " PROTO_NAME " neighbor",
        SHOW_STR
        PROTO_HELP
-       "ISIS neighbor adjacencies\n")
+       "IS-IS neighbor adjacencies\n")
 {
 	return show_isis_neighbor_common(vty, NULL, ISIS_UI_LEVEL_BRIEF);
 }
@@ -707,7 +707,7 @@ DEFUN (show_isis_neighbor_detail,
        "show " PROTO_NAME " neighbor detail",
        SHOW_STR
        PROTO_HELP
-       "ISIS neighbor adjacencies\n"
+       "IS-IS neighbor adjacencies\n"
        "show detailed information\n")
 {
 	return show_isis_neighbor_common(vty, NULL, ISIS_UI_LEVEL_DETAIL);
@@ -718,7 +718,7 @@ DEFUN (show_isis_neighbor_arg,
        "show " PROTO_NAME " neighbor WORD",
        SHOW_STR
        PROTO_HELP
-       "ISIS neighbor adjacencies\n"
+       "IS-IS neighbor adjacencies\n"
        "System id\n")
 {
 	int idx_word = 3;
@@ -731,7 +731,7 @@ DEFUN (clear_isis_neighbor,
        "clear " PROTO_NAME " neighbor",
        CLEAR_STR
        PROTO_HELP
-       "ISIS neighbor adjacencies\n")
+       "IS-IS neighbor adjacencies\n")
 {
 	return clear_isis_neighbor_common(vty, NULL);
 }
@@ -741,7 +741,7 @@ DEFUN (clear_isis_neighbor_arg,
        "clear " PROTO_NAME " neighbor WORD",
        CLEAR_STR
        PROTO_HELP
-       "ISIS neighbor adjacencies\n"
+       "IS-IS neighbor adjacencies\n"
        "System id\n")
 {
 	int idx_word = 3;