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 <mjs@voltanet.io>

diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py
index b19c9063e33a6e55e9fe06c98e6170d4bc1c543c..b65acad23e2b762b010e2cf7e2268c057876da85 100644 (file)
--- 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 8723bd8d3086c488f6e8b044ea8103789ea3ec9e..02ba69bd4d1f7a97564740d135ef3026e8199f39 100644 (file)
--- 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)