proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 03:41:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests,zebra: fix more startup topotest issues

Browse Source 
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 <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2020-07-04 12:25:10 -04:00
parent 807c31d582
commit cb3e512d97
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/topotests/lib/topotest.py
View File

@ -1242,7 +1242,7 @@ class Router(Node):
) )
# Now start all the other daemons # Now start all the other daemons
for daemon in self.daemons: for daemon in daemons_list:
# Skip disabled daemons and zebra # Skip disabled daemons and zebra
if self.daemons[daemon] == 0: if self.daemons[daemon] == 0:
continue continue

8
zebra/zebra_nhg.c
View File

@ -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_UNHASHABLE);
SET_FLAG(nhe->flags, NEXTHOP_GROUP_INSTALLED); SET_FLAG(nhe->flags, NEXTHOP_GROUP_INSTALLED);
flog_warn( flog(LOG_INFO,
EC_ZEBRA_DUPLICATE_NHG_MESSAGE, EC_ZEBRA_DUPLICATE_NHG_MESSAGE,
"Nexthop Group with ID (%d) is a duplicate, therefore unhashable, ignoring", "Nexthop Group with ID (%d) is a duplicate, therefore unhashable, ignoring",
nhe->id); nhe->id);
} }
static void zebra_nhg_set_valid(struct nhg_hash_entry *nhe) static void zebra_nhg_set_valid(struct nhg_hash_entry *nhe)