matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

lib: don't initialize the northbound database in the unit tests

Browse source 
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 <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2019-04-15 19:03:15 -03:00
parent de4eaa3c55
commit 1ae9686cdf
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/libfrr.c
View file

@ -38,6 +38,7 @@
#include "lib_errors.h" #include "lib_errors.h"
#include "db.h" #include "db.h"
#include "northbound_cli.h" #include "northbound_cli.h"
#include "northbound_db.h"
DEFINE_HOOK(frr_late_init, (struct thread_master * tm), (tm)) DEFINE_HOOK(frr_late_init, (struct thread_master * tm), (tm))
DEFINE_KOOH(frr_early_fini, (), ()) DEFINE_KOOH(frr_early_fini, (), ())
@ -654,6 +655,10 @@ struct thread_master *frr_init(void)
yang_init(); yang_init();
nb_init(master, di->yang_modules, di->n_yang_modules); 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; return master;
} }

6
lib/northbound.c
View file

@ -1677,12 +1677,6 @@ void nb_init(struct thread_master *tm,
exit(1); 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. */ /* Create an empty running configuration. */
running_config = nb_config_new(NULL); running_config = nb_config_new(NULL);