lib, ospf6d, ospfd, zebra: Add ZEBRA_STR

Allow us to use a ZEBRA_STR for commands

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/lib/command.h b/lib/command.h
index e2d31decd44f5e5bd213e5167b645e5ed07f0342..9e6c954f151f7edd64044de281955b2869e17928 100644 (file)
--- a/lib/command.h
+++ b/lib/command.h
@@ -358,6 +358,7 @@ struct cmd_node {
 #define PCE_STR "PCE Router Information specific commands\n"
 #define MPLS_STR "MPLS information\n"
 #define WATCHFRR_STR "watchfrr information\n"
+#define ZEBRA_STR "Zebra information\n"
 
 #define CONF_BACKUP_EXT ".sav"
 

diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c
index 022b913168b5b63f04bbebf8470a39226f208233..a900648236429cda8ee101575b2b77d7bae3a1a2 100644 (file)
--- a/ospf6d/ospf6_zebra.c
+++ b/ospf6d/ospf6_zebra.c
@@ -256,7 +256,7 @@ DEFUN (show_zebra,
        SHOW_STR
        IPV6_STR
        OSPF6_STR
-       "Zebra information\n")
+       ZEBRA_STR)
 {
        int i;
        if (zclient == NULL) {

diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c
index 5933f5abfe06e47cfd0dd59d429bccf2ffac9fb7..6876054a633ebc6f1d68d880df561a818cafdb48 100644 (file)
--- a/ospfd/ospf_dump.c
+++ b/ospfd/ospf_dump.c
@@ -1182,7 +1182,7 @@ DEFUN (debug_ospf_zebra,
        "debug ospf zebra [<interface|redistribute>]",
        DEBUG_STR
        OSPF_STR
-       "OSPF Zebra information\n"
+       ZEBRA_STR
        "Zebra interface\n"
        "Zebra redistribute\n")
 {
@@ -1195,7 +1195,7 @@ DEFUN (debug_ospf_instance_zebra,
        DEBUG_STR
        OSPF_STR
        "Instance ID\n"
-       "OSPF Zebra information\n"
+       ZEBRA_STR
        "Zebra interface\n"
        "Zebra redistribute\n")
 {
@@ -1245,7 +1245,7 @@ DEFUN (no_debug_ospf_zebra,
        NO_STR
        DEBUG_STR
        OSPF_STR
-       "OSPF Zebra information\n"
+       ZEBRA_STR
        "Zebra interface\n"
        "Zebra redistribute\n")
 {
@@ -1259,7 +1259,7 @@ DEFUN (no_debug_ospf_instance_zebra,
        DEBUG_STR
        OSPF_STR
        "Instance ID\n"
-       "OSPF Zebra information\n"
+       ZEBRA_STR
        "Zebra interface\n"
        "Zebra redistribute\n")
 {

diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
index a5d256b7aa76ccdc579e9bdb071f25b13559b13c..0ffa55f1e44ab66163a83013244bf53c286ce34f 100644 (file)
--- a/zebra/zebra_fpm.c
+++ b/zebra/zebra_fpm.c
@@ -1413,7 +1413,7 @@ DEFUN (show_zebra_fpm_stats,
        show_zebra_fpm_stats_cmd,
        "show zebra fpm stats",
        SHOW_STR
-       "Zebra information\n"
+       ZEBRA_STR
        "Forwarding Path Manager information\n"
        "Statistics\n")
 {
@@ -1428,7 +1428,7 @@ DEFUN (clear_zebra_fpm_stats,
        clear_zebra_fpm_stats_cmd,
        "clear zebra fpm stats",
        CLEAR_STR
-       "Zebra information\n"
+       ZEBRA_STR
        "Clear Forwarding Path Manager information\n"
        "Statistics\n")
 {

diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c
index dd0189666e8ae2d94de77bbfd93f29d993acbd3c..7bfaf8e2750af63a92a967452daf205be46062ae 100644 (file)
--- a/zebra/zebra_routemap.c
+++ b/zebra/zebra_routemap.c
@@ -392,7 +392,7 @@ DEFUN (no_set_src,
 DEFUN (zebra_route_map_timer,
        zebra_route_map_timer_cmd,
        "zebra route-map delay-timer (0-600)",
-       "Zebra information\n"
+       ZEBRA_STR
        "Set route-map parameters\n"
        "Time to wait before route-map updates are processed\n"
        "0 means event-driven updates are disabled\n")
@@ -410,7 +410,7 @@ DEFUN (no_zebra_route_map_timer,
        no_zebra_route_map_timer_cmd,
        "no zebra route-map delay-timer [(0-600)]",
        NO_STR
-       "Zebra information\n"
+       ZEBRA_STR
        "Set route-map parameters\n"
        "Reset delay-timer to default value, 30 secs\n"
        "0 means event-driven updates are disabled\n")

diff --git a/zebra/zserv.c b/zebra/zserv.c
index 15bfd37da8dfc83511d5229eccdd2647ac8c96cc..fe8213702bf89ffe052a5292b710b311970ec455 100644 (file)
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -2841,7 +2841,7 @@ DEFUN (show_zebra,
        show_zebra_cmd,
        "show zebra",
        SHOW_STR
-       "Zebra information\n")
+       ZEBRA_STR)
 {
        struct vrf *vrf;
 
@@ -2866,7 +2866,7 @@ DEFUN (show_zebra_client,
        show_zebra_client_cmd,
        "show zebra client",
        SHOW_STR
-       "Zebra information\n"
+       ZEBRA_STR
        "Client information\n")
 {
        struct listnode *node;
@@ -2883,7 +2883,7 @@ DEFUN (show_zebra_client_summary,
        show_zebra_client_summary_cmd,
        "show zebra client summary",
        SHOW_STR
-       "Zebra information brief\n"
+       ZEBRA_STR
        "Client information brief\n"
        "Brief Summary\n")
 {