4 files changed, 22 insertions, 10 deletions
diff --git a/tests/topotests/ospf6_topo2/r1/ospf6d.conf b/tests/topotests/ospf6_topo2/r1/ospf6d.conf
index 2e465e6d1..1bf6550d9 100644
--- a/tests/topotests/ospf6_topo2/r1/ospf6d.conf
+++ b/tests/topotests/ospf6_topo2/r1/ospf6d.conf
@@ -2,6 +2,10 @@ debug ospf6 lsa router
 debug ospf6 lsa router originate
 debug ospf6 lsa router examine
 debug ospf6 lsa router flooding
+debug ospf6 lsa nssa
+debug ospf6 lsa nssa originate
+debug ospf6 lsa nssa examine
+debug ospf6 lsa nssa flooding
 debug ospf6 lsa as-external
 debug ospf6 lsa as-external originate
 debug ospf6 lsa as-external examine
@@ -15,7 +19,6 @@ debug ospf6 zebra
 debug ospf6 interface
 debug ospf6 neighbor
 debug ospf6 flooding
-debug ospf6 gr helper
 debug ospf6 spf process
 debug ospf6 route intra-area
 debug ospf6 route inter-area
@@ -24,11 +27,11 @@ debug ospf6 asbr
 debug ospf6 nssa
 !
 interface r1-eth0
+ ipv6 ospf6 area 0.0.0.1
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !
 router ospf6
  ospf6 router-id 10.254.254.1
  area 0.0.0.1 stub
- interface r1-eth0 area 0.0.0.1
 !
diff --git a/tests/topotests/ospf6_topo2/r2/ospf6d.conf b/tests/topotests/ospf6_topo2/r2/ospf6d.conf
index 4a1d10693..7567c9cd6 100644
--- a/tests/topotests/ospf6_topo2/r2/ospf6d.conf
+++ b/tests/topotests/ospf6_topo2/r2/ospf6d.conf
@@ -2,6 +2,10 @@ debug ospf6 lsa router
 debug ospf6 lsa router originate
 debug ospf6 lsa router examine
 debug ospf6 lsa router flooding
+debug ospf6 lsa nssa
+debug ospf6 lsa nssa originate
+debug ospf6 lsa nssa examine
+debug ospf6 lsa nssa flooding
 debug ospf6 lsa as-external
 debug ospf6 lsa as-external originate
 debug ospf6 lsa as-external examine
@@ -15,7 +19,6 @@ debug ospf6 zebra
 debug ospf6 interface
 debug ospf6 neighbor
 debug ospf6 flooding
-debug ospf6 gr helper
 debug ospf6 spf process
 debug ospf6 route intra-area
 debug ospf6 route inter-area
@@ -24,14 +27,17 @@ debug ospf6 asbr
 debug ospf6 nssa
 !
 interface r2-eth0
+ ipv6 ospf6 area 0.0.0.1
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !
 interface r2-eth1
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !
 interface r2-eth2
+ ipv6 ospf6 area 0.0.0.2
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !
@@ -42,7 +48,4 @@ router ospf6
  default-information originate always metric 123
  area 0.0.0.1 stub
  area 0.0.0.2 nssa
- interface r2-eth0 area 0.0.0.1
- interface r2-eth1 area 0.0.0.0
- interface r2-eth2 area 0.0.0.2
 !
diff --git a/tests/topotests/ospf6_topo2/r3/ospf6d.conf b/tests/topotests/ospf6_topo2/r3/ospf6d.conf
index 5faeb70e5..0fb4e7e36 100644
--- a/tests/topotests/ospf6_topo2/r3/ospf6d.conf
+++ b/tests/topotests/ospf6_topo2/r3/ospf6d.conf
@@ -2,6 +2,10 @@ debug ospf6 lsa router
 debug ospf6 lsa router originate
 debug ospf6 lsa router examine
 debug ospf6 lsa router flooding
+debug ospf6 lsa nssa
+debug ospf6 lsa nssa originate
+debug ospf6 lsa nssa examine
+debug ospf6 lsa nssa flooding
 debug ospf6 lsa as-external
 debug ospf6 lsa as-external originate
 debug ospf6 lsa as-external examine
@@ -15,7 +19,6 @@ debug ospf6 zebra
 debug ospf6 interface
 debug ospf6 neighbor
 debug ospf6 flooding
-debug ospf6 gr helper
 debug ospf6 spf process
 debug ospf6 route intra-area
 debug ospf6 route inter-area
@@ -24,6 +27,7 @@ debug ospf6 asbr
 debug ospf6 nssa
 !
 interface r3-eth0
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !
@@ -31,5 +35,4 @@ router ospf6
  ospf6 router-id 10.254.254.3
  redistribute connected
  redistribute static
- interface r3-eth0 area 0.0.0.0
 !
diff --git a/tests/topotests/ospf6_topo2/r4/ospf6d.conf b/tests/topotests/ospf6_topo2/r4/ospf6d.conf
index 04d763f6a..91f8df440 100644
--- a/tests/topotests/ospf6_topo2/r4/ospf6d.conf
+++ b/tests/topotests/ospf6_topo2/r4/ospf6d.conf
@@ -2,6 +2,10 @@ debug ospf6 lsa router
 debug ospf6 lsa router originate
 debug ospf6 lsa router examine
 debug ospf6 lsa router flooding
+debug ospf6 lsa nssa
+debug ospf6 lsa nssa originate
+debug ospf6 lsa nssa examine
+debug ospf6 lsa nssa flooding
 debug ospf6 lsa as-external
 debug ospf6 lsa as-external originate
 debug ospf6 lsa as-external examine
@@ -15,7 +19,6 @@ debug ospf6 zebra
 debug ospf6 interface
 debug ospf6 neighbor
 debug ospf6 flooding
-debug ospf6 gr helper
 debug ospf6 spf process
 debug ospf6 route intra-area
 debug ospf6 route inter-area
@@ -24,11 +27,11 @@ debug ospf6 asbr
 debug ospf6 nssa
 !
 interface r4-eth0
+ ipv6 ospf6 area 0.0.0.2
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !
 router ospf6
  ospf6 router-id 10.254.254.4
  area 0.0.0.2 nssa
- interface r4-eth0 area 0.0.0.2
 !