summaryrefslogtreecommitdiff
path: root/lib/ns.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/ns.c')
-rw-r--r--lib/ns.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/ns.c b/lib/ns.c
index 4d46ecd0af..583fe95b79 100644
--- a/lib/ns.c
+++ b/lib/ns.c
@@ -296,7 +296,7 @@ ns_netns_pathname (struct vty *vty, const char *name)
if (! result)
{
- vty_outln (vty, "Invalid pathname: %s",safe_strerror(errno));
+ vty_out (vty, "Invalid pathname: %s\n",safe_strerror(errno));
return NULL;
}
return pathname;
@@ -317,16 +317,16 @@ DEFUN_NOSH (ns_netns,
char *pathname = ns_netns_pathname (vty, argv[idx_name]->arg);
if (!pathname)
- return CMD_WARNING;
+ return CMD_WARNING_CONFIG_FAILED;
ns_id = strtoul (argv[idx_number]->arg, NULL, 10);
ns = ns_get (ns_id);
if (ns->name && strcmp (ns->name, pathname) != 0)
{
- vty_out (vty, "NS %u is already configured with NETNS %s%s",
- ns->ns_id, ns->name, VTYNL);
- return CMD_WARNING;
+ vty_out (vty, "NS %u is already configured with NETNS %s\n",
+ ns->ns_id, ns->name);
+ return CMD_WARNING_CONFIG_FAILED;
}
if (!ns->name)
@@ -334,9 +334,9 @@ DEFUN_NOSH (ns_netns,
if (!ns_enable (ns))
{
- vty_out (vty, "Can not associate NS %u with NETNS %s%s",
- ns->ns_id, ns->name, VTYNL);
- return CMD_WARNING;
+ vty_out (vty, "Can not associate NS %u with NETNS %s\n",
+ ns->ns_id, ns->name);
+ return CMD_WARNING_CONFIG_FAILED;
}
return CMD_SUCCESS;
@@ -358,21 +358,21 @@ DEFUN (no_ns_netns,
char *pathname = ns_netns_pathname (vty, argv[idx_name]->arg);
if (!pathname)
- return CMD_WARNING;
+ return CMD_WARNING_CONFIG_FAILED;
ns_id = strtoul(argv[idx_number]->arg, NULL, 10);
ns = ns_lookup (ns_id);
if (!ns)
{
- vty_outln (vty, "NS %u is not found", ns_id);
+ vty_out (vty, "NS %u is not found\n", ns_id);
return CMD_SUCCESS;
}
if (ns->name && strcmp (ns->name, pathname) != 0)
{
- vty_outln (vty, "Incorrect NETNS file name");
- return CMD_WARNING;
+ vty_out (vty, "Incorrect NETNS file name\n");
+ return CMD_WARNING_CONFIG_FAILED;
}
ns_disable (ns);
@@ -405,7 +405,7 @@ ns_config_write (struct vty *vty)
if (ns->ns_id == NS_DEFAULT || ns->name == NULL)
continue;
- vty_outln (vty, "logical-router %u netns %s", ns->ns_id,ns->name);
+ vty_out (vty, "logical-router %u netns %s\n", ns->ns_id,ns->name);
write = 1;
}