Merge pull request #1078 from dwalton76/ospfd-network-cmd-warning

*: return CMD_WARNING if command was already configured

diff --git a/babeld/babel_interface.c b/babeld/babel_interface.c
index 2895ac1e698289b3199eb82af9a691b0f84f28a9..4419160cd70bf567256d8fc35adf6d34dc1f6015 100644 (file)
--- a/babeld/babel_interface.c
+++ b/babeld/babel_interface.c
@@ -292,7 +292,7 @@ DEFUN (babel_network,
     if (ret < 0) {
         vty_out (vty, "There is same network configuration %s\n",
                    argv[1]->arg);
-        return CMD_WARNING_CONFIG_FAILED;
+        return CMD_WARNING;
     }
 
     return CMD_SUCCESS;

diff --git a/eigrpd/eigrp_vty.c b/eigrpd/eigrp_vty.c
index de21cb2e738f4733f863795b5201c14c1f04816c..d4d3bb36926cee0267bc8b5437e9bc1551a4a9cc 100644 (file)
--- a/eigrpd/eigrp_vty.c
+++ b/eigrpd/eigrp_vty.c
@@ -400,7 +400,7 @@ DEFUN (eigrp_network,
 
        if (ret == 0) {
                vty_out(vty, "There is already same network statement.\n");
-               return CMD_WARNING_CONFIG_FAILED;
+               return CMD_WARNING;
        }
 
        return CMD_SUCCESS;

diff --git a/lib/ns.c b/lib/ns.c
index 5e03a43e2ac0ba7f0d145da18b92c9f0fa7e538c..ba920e31b9078827eda1b8424f33ac9996689a8d 100644 (file)
--- a/lib/ns.c
+++ b/lib/ns.c
@@ -312,7 +312,7 @@ DEFUN_NOSH (ns_netns,
        if (ns->name && strcmp(ns->name, pathname) != 0) {
                vty_out(vty, "NS %u is already configured with NETNS %s\n",
                        ns->ns_id, ns->name);
-               return CMD_WARNING_CONFIG_FAILED;
+               return CMD_WARNING;
        }
 
        if (!ns->name)

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index c2a55d9b37528ff7ccdd46ef28792894ea293d99..4cbd4b4a9939f9d1256503616e5c6f342561fcff 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -507,7 +507,7 @@ DEFUN (ospf_network_area,
        ret = ospf_network_set(ospf, &p, area_id, format);
        if (ret == 0) {
                vty_out(vty, "There is already same network statement.\n");
-               return CMD_WARNING_CONFIG_FAILED;
+               return CMD_WARNING;
        }
 
        return CMD_SUCCESS;
@@ -847,7 +847,7 @@ static int ospf_vl_set_security(struct ospf_vl_data *vl_data,
                    != NULL) {
                        vty_out(vty, "OSPF: Key %d already exists\n",
                                vl_config->crypto_key_id);
-                       return CMD_WARNING_CONFIG_FAILED;
+                       return CMD_WARNING;
                }
                ck = ospf_crypt_key_new();
                ck->key_id = vl_config->crypto_key_id;
@@ -5966,7 +5966,7 @@ DEFUN (ip_ospf_message_digest_key,
        key_id = strtol(keyid, NULL, 10);
        if (ospf_crypt_key_lookup(params->auth_crypt, key_id) != NULL) {
                vty_out(vty, "OSPF: Key %d already exists\n", key_id);
-               return CMD_WARNING_CONFIG_FAILED;
+               return CMD_WARNING;
        }
 
        ck = ospf_crypt_key_new();

diff --git a/ripd/ripd.c b/ripd/ripd.c
index 36eceafd9b6f20e62edd89b9be9c92bed16f2961..6d6d0b92fd2e54f8f7943e7b370ea7739c183d4c 100644 (file)
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -2881,7 +2881,7 @@ DEFUN (rip_route,
        if (node->info) {
                vty_out(vty, "There is already same static route.\n");
                route_unlock_node(node);
-               return CMD_WARNING_CONFIG_FAILED;
+               return CMD_WARNING;
        }
 
        node->info = (void *)1;
@@ -3353,7 +3353,7 @@ DEFUN (rip_allow_ecmp,
 {
        if (rip->ecmp) {
                vty_out(vty, "ECMP is already enabled.\n");
-               return CMD_WARNING_CONFIG_FAILED;
+               return CMD_WARNING;
        }
 
        rip->ecmp = 1;
@@ -3369,7 +3369,7 @@ DEFUN (no_rip_allow_ecmp,
 {
        if (!rip->ecmp) {
                vty_out(vty, "ECMP is already disabled.\n");
-               return CMD_WARNING_CONFIG_FAILED;
+               return CMD_WARNING;
        }
 
        rip->ecmp = 0;

diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index d8017622d123a6283d65dd8ba6a06d6be70cddc6..e4368c9f9f51653bf95cf411e2a8603221637ffe 100644 (file)
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -2217,7 +2217,7 @@ DEFUN (ripng_route,
        if (rp->info) {
                vty_out(vty, "There is already same static route.\n");
                route_unlock_node(rp);
-               return CMD_WARNING_CONFIG_FAILED;
+               return CMD_WARNING;
        }
        rp->info = (void *)1;
 
@@ -2285,7 +2285,7 @@ DEFUN (ripng_aggregate_address,
        if (node->info) {
                vty_out(vty, "There is already same aggregate route.\n");
                route_unlock_node(node);
-               return CMD_WARNING_CONFIG_FAILED;
+               return CMD_WARNING;
        }
        node->info = (void *)1;
 
@@ -2621,7 +2621,7 @@ DEFUN (ripng_allow_ecmp,
 {
        if (ripng->ecmp) {
                vty_out(vty, "ECMP is already enabled.\n");
-               return CMD_WARNING_CONFIG_FAILED;
+               return CMD_WARNING;
        }
 
        ripng->ecmp = 1;
@@ -2637,7 +2637,7 @@ DEFUN (no_ripng_allow_ecmp,
 {
        if (!ripng->ecmp) {
                vty_out(vty, "ECMP is already disabled.\n");
-               return CMD_WARNING_CONFIG_FAILED;
+               return CMD_WARNING;
        }
 
        ripng->ecmp = 0;