From 0351a28f2a14f542cf20088f2794d0c4144a3cc3 Mon Sep 17 00:00:00 2001
From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 20 Aug 2018 10:39:44 -0400
Subject: [PATCH] lib: Convert vrf.c to use new error-code subsystem

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---
 lib/lib_errors.c |  6 ++++++
 lib/lib_errors.h |  1 +
 lib/vrf.c        | 15 ++++++++-------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/lib_errors.c b/lib/lib_errors.c
index 3ab8ac80f3..b27f9391ad 100644
--- a/lib/lib_errors.c
+++ b/lib/lib_errors.c
@@ -58,6 +58,12 @@ static struct log_ref ferr_lib_warn[] = {
 		.description = "The config subsystem attempted to read in it's configuration file which failed, so we are falling back to the backup config file to see if it is available",
 		.suggestion = "Create configuration file",
 	},
+	{
+		.code = LIB_WARN_VRF_LENGTH,
+		.title = "The VRF subsystem has encountered a parsing error",
+		.description = "The VRF subsystem, during initialization, has found a parsing error with input it has received",
+		.suggestion = "Check the length of the vrf name and adjust accordingly",
+	},
 	{
 		.code = END_FERR,
 	},
diff --git a/lib/lib_errors.h b/lib/lib_errors.h
index a157cc731b..dcaf888e1b 100644
--- a/lib/lib_errors.h
+++ b/lib/lib_errors.h
@@ -44,6 +44,7 @@ enum lib_log_refs {
 	LIB_WARN_SLOW_THREAD,
 	LIB_WARN_RMAP_RECURSION_LIMIT,
 	LIB_WARN_BACKUP_CONFIG,
+	LIB_WARN_VRF_LENGTH,
 };
 
 extern void lib_error_init(void);
diff --git a/lib/vrf.c b/lib/vrf.c
index 1fb1b786c7..18314b4f32 100644
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -624,7 +624,8 @@ int vrf_handler_create(struct vty *vty, const char *vrfname,
 				"%% VRF name %s invalid: length exceeds %d bytes\n",
 				vrfname, VRF_NAMSIZ);
 		else
-			zlog_warn(
+			flog_warn(
+				LIB_WARN_VRF_LENGTH,
 				"%% VRF name %s invalid: length exceeds %d bytes\n",
 				vrfname, VRF_NAMSIZ);
 		return CMD_WARNING_CONFIG_FAILED;
@@ -653,7 +654,7 @@ int vrf_netns_handler_create(struct vty *vty, struct vrf *vrf, char *pathname,
 				"VRF %u is already configured with VRF %s\n",
 				vrf->vrf_id, vrf->name);
 		else
-			zlog_warn("VRF %u is already configured with VRF %s\n",
+			zlog_info("VRF %u is already configured with VRF %s\n",
 				  vrf->vrf_id, vrf->name);
 		return CMD_WARNING_CONFIG_FAILED;
 	}
@@ -665,9 +666,9 @@ int vrf_netns_handler_create(struct vty *vty, struct vrf *vrf, char *pathname,
 					"VRF %u already configured with NETNS %s\n",
 					vrf->vrf_id, ns->name);
 			else
-				zlog_warn(
-					"VRF %u already configured with NETNS %s",
-					vrf->vrf_id, ns->name);
+				zlog_info(
+					  "VRF %u already configured with NETNS %s",
+					  vrf->vrf_id, ns->name);
 			return CMD_WARNING_CONFIG_FAILED;
 		}
 	}
@@ -683,7 +684,7 @@ int vrf_netns_handler_create(struct vty *vty, struct vrf *vrf, char *pathname,
 				" with VRF %u(%s)\n",
 				ns->name, vrf2->vrf_id, vrf2->name);
 		else
-			zlog_warn("NS %s is already configured with VRF %u(%s)",
+			zlog_info("NS %s is already configured with VRF %u(%s)",
 				  ns->name, vrf2->vrf_id, vrf2->name);
 		return CMD_WARNING_CONFIG_FAILED;
 	}
@@ -699,7 +700,7 @@ int vrf_netns_handler_create(struct vty *vty, struct vrf *vrf, char *pathname,
 			vty_out(vty, "Can not associate NS %u with NETNS %s\n",
 				ns->ns_id, ns->name);
 		else
-			zlog_warn("Can not associate NS %u with NETNS %s",
+			zlog_info("Can not associate NS %u with NETNS %s",
 				  ns->ns_id, ns->name);
 		return CMD_WARNING_CONFIG_FAILED;
 	}
-- 
2.39.5