ospf6d: remove incorrect debug guard

Also, update the ospf6_topo2 topotest since the expected output
was wrong. With this fix, NSSA routes will be created on r2
("redistribute connected"), and NSSA routes appear in the routing
table as regular external routes.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c
index 4e7a7146eb4c131553177d4d89df79c323df21a4..14122988025e369619bfecf0c54f880379b1023a 100644 (file)
--- a/ospf6d/ospf6_spf.c
+++ b/ospf6d/ospf6_spf.c
@@ -1250,12 +1250,9 @@ static int ospf6_ase_calculate_timer(struct thread *t)
                                zlog_debug("%s : looking at area %s", __func__,
                                           area->name);
 
-                       if (IS_OSPF6_DEBUG_SPF(PROCESS)) {
-                               type = htons(OSPF6_LSTYPE_TYPE_7);
-                               for (ALL_LSDB_TYPED(area->lsdb, type, lsa))
-                                       ospf6_ase_calculate_route(ospf6, lsa,
-                                                                 area);
-                       }
+                       type = htons(OSPF6_LSTYPE_TYPE_7);
+                       for (ALL_LSDB_TYPED(area->lsdb, type, lsa))
+                               ospf6_ase_calculate_route(ospf6, lsa, area);
                }
        }
        return 0;

diff --git a/tests/topotests/ospf6_topo2/test_ospf6_topo2.py b/tests/topotests/ospf6_topo2/test_ospf6_topo2.py
index 0fe5228ce63acf5b7d0fcecb4f97053cc0590d0b..b6c8cf3e750a024fc3eb044693423021ac955b4a 100644 (file)
--- a/tests/topotests/ospf6_topo2/test_ospf6_topo2.py
+++ b/tests/topotests/ospf6_topo2/test_ospf6_topo2.py
@@ -199,7 +199,7 @@ def test_ospfv3_expected_route_types():
         {
             "numberOfIntraAreaRoutes": 1,
             "numberOfInterAreaRoutes": 2,
-            "numberOfExternal1Routes": 0,
+            "numberOfExternal1Routes": 4,
             "numberOfExternal2Routes": 0,
         },
     )