From cb3e512d97080d54b616842c7c9a7dcbaf82555a Mon Sep 17 00:00:00 2001 From: Mark Stapp Date: Sat, 4 Jul 2020 12:25:10 -0400 Subject: [PATCH] tests,zebra: fix more startup topotest issues Use the right list of daemons to avoid trying to start zebra twice. Change a zebra log message to INFO level to avoid stderr check failure. Signed-off-by: Mark Stapp --- tests/topotests/lib/topotest.py | 2 +- zebra/zebra_nhg.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py index b19c9063e3..b65acad23e 100644 --- a/tests/topotests/lib/topotest.py +++ b/tests/topotests/lib/topotest.py @@ -1242,7 +1242,7 @@ class Router(Node): ) # Now start all the other daemons - for daemon in self.daemons: + for daemon in daemons_list: # Skip disabled daemons and zebra if self.daemons[daemon] == 0: continue diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c index 8723bd8d30..02ba69bd4d 100644 --- a/zebra/zebra_nhg.c +++ b/zebra/zebra_nhg.c @@ -976,10 +976,10 @@ static void zebra_nhg_set_unhashable(struct nhg_hash_entry *nhe) SET_FLAG(nhe->flags, NEXTHOP_GROUP_UNHASHABLE); SET_FLAG(nhe->flags, NEXTHOP_GROUP_INSTALLED); - flog_warn( - EC_ZEBRA_DUPLICATE_NHG_MESSAGE, - "Nexthop Group with ID (%d) is a duplicate, therefore unhashable, ignoring", - nhe->id); + flog(LOG_INFO, + EC_ZEBRA_DUPLICATE_NHG_MESSAGE, + "Nexthop Group with ID (%d) is a duplicate, therefore unhashable, ignoring", + nhe->id); } static void zebra_nhg_set_valid(struct nhg_hash_entry *nhe)