vtysh: return non-zero for configuration failures

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

This allows frr-reload.py (or anything else that scripts via vtysh)
to know if the vtysh command worked or hit an error.

3 files changed, 16 insertions, 16 deletions

diff --git a/isisd/isis_redist.c b/isisd/isis_redist.c
index 25fdf717b0..a646933bb6 100644
--- a/isisd/isis_redist.c
+++ b/isisd/isis_redist.c
@@ -581,27 +581,27 @@ DEFUN (isis_redistribute,
 
   family = str2family(argv[idx_afi]->text);
   if (family < 0)
-    return CMD_WARNING;
+    return CMD_WARNING_CONFIG_FAILED;
 
   afi = family2afi(family);
   if (!afi)
-    return CMD_WARNING;
+    return CMD_WARNING_CONFIG_FAILED;
 
   type = proto_redistnum(afi, argv[idx_protocol]->text);
   if (type < 0)
-    return CMD_WARNING;
+    return CMD_WARNING_CONFIG_FAILED;
 
   if (!strcmp("level-1", argv[idx_level]->arg))
     level = 1;
   else if (!strcmp("level-2", argv[idx_level]->arg))
     level = 2;
   else
-    return CMD_WARNING;
+    return CMD_WARNING_CONFIG_FAILED;
 
   if ((area->is_type & level) != level)
     {
       vty_outln (vty, "Node is not a level-%d IS", level);
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   metric = 0xffffffff;
@@ -610,7 +610,7 @@ DEFUN (isis_redistribute,
   if (argc > idx_metric_rmap + 1)
     {
       if (argv[idx_metric_rmap + 1]->arg[0] == '\0')
-        return CMD_WARNING;
+        return CMD_WARNING_CONFIG_FAILED;
 
       if (strmatch(argv[idx_metric_rmap]->text, "metric"))
         {
@@ -618,7 +618,7 @@ DEFUN (isis_redistribute,
           metric = strtoul(argv[idx_metric_rmap + 1]->arg, &endp, 10);
 
           if (*endp != '\0')
-            return CMD_WARNING;
+            return CMD_WARNING_CONFIG_FAILED;
         }
       else
         {
@@ -652,15 +652,15 @@ DEFUN (no_isis_redistribute,
 
   family = str2family(argv[idx_afi]->arg);
   if (family < 0)
-    return CMD_WARNING;
+    return CMD_WARNING_CONFIG_FAILED;
 
   afi = family2afi(family);
   if (!afi)
-    return CMD_WARNING;
+    return CMD_WARNING_CONFIG_FAILED;
 
   type = proto_redistnum(afi, argv[idx_protocol]->text);
   if (type < 0)
-    return CMD_WARNING;
+    return CMD_WARNING_CONFIG_FAILED;
 
   level = strmatch ("level-1", argv[idx_level]->text) ? 1 : 2;
 
@@ -696,14 +696,14 @@ DEFUN (isis_default_originate,
 
   family = str2family(argv[idx_afi]->text);
   if (family < 0)
-    return CMD_WARNING;
+    return CMD_WARNING_CONFIG_FAILED;
 
   level = strmatch ("level-1", argv[idx_level]->text) ? 1 : 2;
 
   if ((area->is_type & level) != level)
     {
       vty_outln (vty, "Node is not a level-%d IS", level);
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   if (argc > idx_always && strmatch (argv[idx_always]->text, "always"))
@@ -750,14 +750,14 @@ DEFUN (no_isis_default_originate,
 
   family = str2family(argv[idx_afi]->text);
   if (family < 0)
-    return CMD_WARNING;
+    return CMD_WARNING_CONFIG_FAILED;
 
   if (strmatch ("level-1", argv[idx_level]->text))
     level = 1;
   else if (strmatch ("level-2", argv[idx_level]->text))
     level = 2;
   else
-    return CMD_WARNING;
+    return CMD_WARNING_CONFIG_FAILED;
 
   isis_redist_unset(area, level, family, DEFAULT_ROUTE);
   return 0;
diff --git a/isisd/isis_te.c b/isisd/isis_te.c
index c4a0b9230b..53b56186f4 100644
--- a/isisd/isis_te.c
+++ b/isisd/isis_te.c
@@ -1174,7 +1174,7 @@ DEFUN (isis_mpls_te_router_addr,
   if (! inet_aton (argv[idx_ipv4]->arg, &value))
     {
       vty_outln (vty, "Please specify Router-Addr by A.B.C.D");
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   isisMplsTE.router_id.s_addr = value.s_addr;
diff --git a/isisd/isis_vty.c b/isisd/isis_vty.c
index f0e2831bff..9fc1cb110d 100644
--- a/isisd/isis_vty.c
+++ b/isisd/isis_vty.c
@@ -93,7 +93,7 @@ DEFUN (ip_router_isis,
     if (circuit->state != C_STATE_CONF && circuit->state != C_STATE_UP)
       {
         vty_outln (vty, "Couldn't bring up interface, please check log.");
-        return CMD_WARNING;
+        return CMD_WARNING_CONFIG_FAILED;
       }
   }