From 1ae9686cdf1b3e514345a5c8ddfa060d9d0429eb Mon Sep 17 00:00:00 2001 From: Renato Westphal Date: Mon, 15 Apr 2019 19:03:15 -0300 Subject: [PATCH] lib: don't initialize the northbound database in the unit tests Move call to nb_db_init() from nb_init() to frr_init() so that only the FRR daemons will initialize the northbound database. This should fix a few warnings when running some unit tests. Signed-off-by: Renato Westphal --- lib/libfrr.c | 5 +++++ lib/northbound.c | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/libfrr.c b/lib/libfrr.c index 1afe30d61..0d4c8d6c0 100644 --- a/lib/libfrr.c +++ b/lib/libfrr.c @@ -38,6 +38,7 @@ #include "lib_errors.h" #include "db.h" #include "northbound_cli.h" +#include "northbound_db.h" DEFINE_HOOK(frr_late_init, (struct thread_master * tm), (tm)) DEFINE_KOOH(frr_early_fini, (), ()) @@ -654,6 +655,10 @@ struct thread_master *frr_init(void) yang_init(); nb_init(master, di->yang_modules, di->n_yang_modules); + if (nb_db_init() != NB_OK) + flog_warn(EC_LIB_NB_DATABASE, + "%s: failed to initialize northbound database", + __func__); return master; } diff --git a/lib/northbound.c b/lib/northbound.c index 9deb9c6cc..fd92aaa9d 100644 --- a/lib/northbound.c +++ b/lib/northbound.c @@ -1677,12 +1677,6 @@ void nb_init(struct thread_master *tm, exit(1); } - /* Initialize the northbound database (used for the rollback log). */ - if (nb_db_init() != NB_OK) - flog_warn(EC_LIB_NB_DATABASE, - "%s: failed to initialize northbound database", - __func__); - /* Create an empty running configuration. */ running_config = nb_config_new(NULL); -- 2.39.5