topotests: remove obsolete OSPFv3 area config

Don't use 'interface WORD area A.B.C.D' for enabling OSPFv3 areas on
interfaces and instead use the standardized 'ipv6 ospf6 area A.B.C.D'.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>

diff --git a/tests/topotests/all_protocol_startup/r1/ospf6d.conf b/tests/topotests/all_protocol_startup/r1/ospf6d.conf
index 33c26501ba357c04002e845524b7005c258f4d11..31c904b41592b291f89e60ddb051c10f25717c31 100644 (file)
--- a/tests/topotests/all_protocol_startup/r1/ospf6d.conf
+++ b/tests/topotests/all_protocol_startup/r1/ospf6d.conf
@@ -6,12 +6,12 @@ log file ospf6d.log
 ! debug ospf6 neighbor
 !
 interface r1-eth4
-  ipv6 ospf6 hello-interval 1
+ ipv6 ospf6 area 0.0.0.0
+ ipv6 ospf6 hello-interval 1
 !
 router ospf6
  ospf6 router-id 192.168.0.1
  log-adjacency-changes
- interface r1-eth4 area 0.0.0.0
 !
 line vty
 !

diff --git a/tests/topotests/bfd_ospf_topo1/rt1/ospf6d.conf b/tests/topotests/bfd_ospf_topo1/rt1/ospf6d.conf
index 98da8c261920f3ec9c4a9729e6704174d2579f21..a8ce562da21e30f6c26a04cebf766e8e89172959 100644 (file)
--- a/tests/topotests/bfd_ospf_topo1/rt1/ospf6d.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt1/ospf6d.conf
@@ -6,12 +6,14 @@ hostname rt1
 password 1
 !
 interface eth-rt2
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 8
  ipv6 ospf6 network broadcast
  ipv6 ospf6 bfd
 !
 interface eth-rt3
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 8
  ipv6 ospf6 network broadcast
@@ -19,7 +21,5 @@ interface eth-rt3
 !
 router ospf6
  ospf6 router-id 1.1.1.1
- interface eth-rt2 area 0.0.0.0
- interface eth-rt3 area 0.0.0.0
  redistribute connected
 !

diff --git a/tests/topotests/bfd_ospf_topo1/rt2/ospf6d.conf b/tests/topotests/bfd_ospf_topo1/rt2/ospf6d.conf
index 34b09020949a377e00c37685cc4270d9c4af55ab..f04d017681278b424a9b85ef174086f8500f37f5 100644 (file)
--- a/tests/topotests/bfd_ospf_topo1/rt2/ospf6d.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt2/ospf6d.conf
@@ -5,19 +5,19 @@ hostname rt2
 password 1
 !
 interface eth-rt1
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 8
  ipv6 ospf6 network broadcast
  ipv6 ospf6 bfd
 !
 interface eth-rt5
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 8
  ipv6 ospf6 network broadcast
 !
 router ospf6
  ospf6 router-id 2.2.2.2
- interface eth-rt1 area 0.0.0.0
- interface eth-rt5 area 0.0.0.0
  redistribute connected
 !

diff --git a/tests/topotests/bfd_ospf_topo1/rt3/ospf6d.conf b/tests/topotests/bfd_ospf_topo1/rt3/ospf6d.conf
index 8ab4eee1d3c4369a766df6c47bb02d9760fe5538..faf975497d921cdb1de64c297c6f817af2a6f3a7 100644 (file)
--- a/tests/topotests/bfd_ospf_topo1/rt3/ospf6d.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt3/ospf6d.conf
@@ -5,19 +5,19 @@ hostname rt3
 password 1
 !
 interface eth-rt1
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 8
  ipv6 ospf6 network broadcast
  ipv6 ospf6 bfd
 !
 interface eth-rt4
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 8
  ipv6 ospf6 network broadcast
 !
 router ospf6
  ospf6 router-id 3.3.3.3
- interface eth-rt1 area 0.0.0.0
- interface eth-rt4 area 0.0.0.0
  redistribute connected
 !

diff --git a/tests/topotests/bfd_ospf_topo1/rt4/ospf6d.conf b/tests/topotests/bfd_ospf_topo1/rt4/ospf6d.conf
index 138b688140d9963345d60a41c7f97bd7e36e63a9..c96093b98a8860c03f54adbb2ec93d202db669fe 100644 (file)
--- a/tests/topotests/bfd_ospf_topo1/rt4/ospf6d.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt4/ospf6d.conf
@@ -5,18 +5,18 @@ hostname rt4
 password 1
 !
 interface eth-rt3
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 8
  ipv6 ospf6 network broadcast
 !
 interface eth-rt5
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 8
  ipv6 ospf6 network broadcast
 !
 router ospf6
  ospf6 router-id 4.4.4.4
- interface eth-rt3 area 0.0.0.0
- interface eth-rt5 area 0.0.0.0
  redistribute connected
 !

diff --git a/tests/topotests/bfd_ospf_topo1/rt5/ospf6d.conf b/tests/topotests/bfd_ospf_topo1/rt5/ospf6d.conf
index 6eb4fe59a8875ab200d5f7fb0625f8dabe7b25d4..6d40d17d503f3687844089b8069dad8b3e6837bb 100644 (file)
--- a/tests/topotests/bfd_ospf_topo1/rt5/ospf6d.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt5/ospf6d.conf
@@ -5,18 +5,18 @@ hostname rt5
 password 1
 !
 interface eth-rt2
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 network broadcast
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 8
 !
 interface eth-rt4
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 network broadcast
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 8
 !
 router ospf6
  ospf6 router-id 5.5.5.5
- interface eth-rt2 area 0.0.0.0
- interface eth-rt4 area 0.0.0.0
  redistribute connected
 !

diff --git a/tests/topotests/bfd_profiles_topo1/r4/ospf6d.conf b/tests/topotests/bfd_profiles_topo1/r4/ospf6d.conf
index 4ef28c39caa8be508cab3292d38fce2e7bf4eab7..948874c0e55bbbc65a12d9fd2c78d39614e21b8e 100644 (file)
--- a/tests/topotests/bfd_profiles_topo1/r4/ospf6d.conf
+++ b/tests/topotests/bfd_profiles_topo1/r4/ospf6d.conf
@@ -1,4 +1,5 @@
 interface r4-eth1
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 bfd profile fast-tx
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
@@ -6,5 +7,4 @@ interface r4-eth1
 router ospf6
  ospf6 router-id 10.254.254.4
  redistribute connected
- interface r4-eth1 area 0.0.0.0
 !

diff --git a/tests/topotests/bfd_profiles_topo1/r5/ospf6d.conf b/tests/topotests/bfd_profiles_topo1/r5/ospf6d.conf
index 20b53cfc555596e779abd7869b013e083a0431df..f6e8dc3b670aa5dd0de3e59f00bd5c9c2131a4f6 100644 (file)
--- a/tests/topotests/bfd_profiles_topo1/r5/ospf6d.conf
+++ b/tests/topotests/bfd_profiles_topo1/r5/ospf6d.conf
@@ -1,4 +1,5 @@
 interface r5-eth0
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 bfd
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
@@ -6,5 +7,4 @@ interface r5-eth0
 router ospf6
  ospf6 router-id 10.254.254.5
  redistribute connected
- interface r5-eth0 area 0.0.0.0
 !

diff --git a/tests/topotests/bgp_features/r1/ospf6d.conf b/tests/topotests/bgp_features/r1/ospf6d.conf
index 9afc6f491923ad4b6e82353eae3551897a6e8dde..3e6196ecafddedd2f0d72f55e87719d71d3dcc51 100644 (file)
--- a/tests/topotests/bgp_features/r1/ospf6d.conf
+++ b/tests/topotests/bgp_features/r1/ospf6d.conf
@@ -3,19 +3,19 @@ log file ospf6d.log
 ! debug ospf6 neighbor
 !
 interface r1-lo
+ ipv6 ospf6 area 0.0.0.0
 !
 interface r1-eth1
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 priority 10
 !
 interface r1-eth2
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 priority 10
 !
 router ospf6
  ospf6 router-id 192.168.0.1
  log-adjacency-changes
- interface r1-lo area 0.0.0.0
- interface r1-eth1 area 0.0.0.0
- interface r1-eth2 area 0.0.0.0
 !
 line vty
 !

diff --git a/tests/topotests/bgp_features/r2/ospf6d.conf b/tests/topotests/bgp_features/r2/ospf6d.conf
index 7fe535651e508273f9cb295224014ef86dcb3e8e..56aecd006c542427da4e4e3b96346f498f154b46 100644 (file)
--- a/tests/topotests/bgp_features/r2/ospf6d.conf
+++ b/tests/topotests/bgp_features/r2/ospf6d.conf
@@ -3,19 +3,19 @@ log file ospf6d.log
 ! debug ospf6 neighbor
 !
 interface r2-lo
+ ipv6 ospf6 area 0.0.0.0
 !
 interface r2-eth1
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 priority 5
 !
 interface r2-eth2
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 priority 10
 !
 router ospf6
  ospf6 router-id 192.168.0.2
  log-adjacency-changes
- interface r2-lo area 0.0.0.0
- interface r2-eth1 area 0.0.0.0
- interface r2-eth2 area 0.0.0.0
 !
 line vty
 !

diff --git a/tests/topotests/bgp_features/r3/ospf6d.conf b/tests/topotests/bgp_features/r3/ospf6d.conf
index 07325b69b0d519a004cb81da4a61f4bbf896a1ee..f15b9d9ea524753abbbba7b8d69efa6d31a0c743 100644 (file)
--- a/tests/topotests/bgp_features/r3/ospf6d.conf
+++ b/tests/topotests/bgp_features/r3/ospf6d.conf
@@ -3,19 +3,19 @@ log file ospf6d.log
 ! debug ospf6 neighbor
 !
 interface r3-lo
+ ipv6 ospf6 area 0.0.0.0
 !
 interface r3-eth1
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 priority 5
 !
 interface r3-eth2
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 priority 5
 !
 router ospf6
  ospf6 router-id 192.168.0.3
  log-adjacency-changes
- interface r3-lo area 0.0.0.0
- interface r3-eth1 area 0.0.0.0
- interface r3-eth2 area 0.0.0.0
 !
 line vty
 !

diff --git a/tests/topotests/ospf6_topo1/r1/ospf6d.conf b/tests/topotests/ospf6_topo1/r1/ospf6d.conf
index 5f1ceee964bcc9c8890c9ea1cc28e8263766347d..d2693ec07d1c1c6f760356964f0aa58ba9cafd90 100644 (file)
--- a/tests/topotests/ospf6_topo1/r1/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1/r1/ospf6d.conf
@@ -10,11 +10,13 @@ log file ospf6d.log
 ! debug ospf6 flooding
 !
 interface r1-stubnet
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 network broadcast
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !
 interface r1-sw5
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 network broadcast
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
@@ -23,8 +25,6 @@ router ospf6
  ospf6 router-id 10.0.0.1
  log-adjacency-changes detail
  redistribute static
- interface r1-stubnet area 0.0.0.0
- interface r1-sw5 area 0.0.0.0
 !
 line vty
  exec-timeout 0 0

diff --git a/tests/topotests/ospf6_topo1/r2/ospf6d.conf b/tests/topotests/ospf6_topo1/r2/ospf6d.conf
index d51b41e1e5833634ff7e181cfe8bec83ad55220e..c9e88f1545ea8368d4c0ff5b1d0c86aa2a25387d 100644 (file)
--- a/tests/topotests/ospf6_topo1/r2/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1/r2/ospf6d.conf
@@ -10,11 +10,13 @@ log file ospf6d.log
 ! debug ospf6 flooding
 !
 interface r2-stubnet
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 network broadcast
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !
 interface r2-sw5
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 network broadcast
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
@@ -23,8 +25,6 @@ router ospf6
  ospf6 router-id 10.0.0.2
  log-adjacency-changes detail
  redistribute static
- interface r2-stubnet area 0.0.0.0
- interface r2-sw5 area 0.0.0.0
 !
 line vty
  exec-timeout 0 0

diff --git a/tests/topotests/ospf6_topo1/r3/ospf6d.conf b/tests/topotests/ospf6_topo1/r3/ospf6d.conf
index cad71ac067b3993da9b9a30623d74ff7f398674f..e1c3e44d0e20096afc09a131e1476d0aa25cae2f 100644 (file)
--- a/tests/topotests/ospf6_topo1/r3/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1/r3/ospf6d.conf
@@ -10,16 +10,19 @@ log file ospf6d.log
 ! debug ospf6 flooding
 !
 interface r3-stubnet
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 network broadcast
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !
 interface r3-sw5
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 network broadcast
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !
 interface r3-sw6
+ ipv6 ospf6 area 0.0.0.1
  ipv6 ospf6 network broadcast
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
@@ -28,9 +31,6 @@ router ospf6
  ospf6 router-id 10.0.0.3
  log-adjacency-changes detail
  redistribute static
- interface r3-stubnet area 0.0.0.0
- interface r3-sw5 area 0.0.0.0
- interface r3-sw6 area 0.0.0.1
 !
 line vty
  exec-timeout 0 0

diff --git a/tests/topotests/ospf6_topo1/r4/ospf6d.conf b/tests/topotests/ospf6_topo1/r4/ospf6d.conf
index f0b166bc4bce2a2054eff266483e44fafcbe4a1c..230ec7aad4574418b32f6f4659a4986736535f98 100644 (file)
--- a/tests/topotests/ospf6_topo1/r4/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1/r4/ospf6d.conf
@@ -10,11 +10,13 @@ log file ospf6d.log
 ! debug ospf6 flooding
 !
 interface r4-stubnet
+ ipv6 ospf6 area 0.0.0.1
  ipv6 ospf6 network broadcast
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !
 interface r4-sw6
+ ipv6 ospf6 area 0.0.0.1
  ipv6 ospf6 network broadcast
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
@@ -23,8 +25,6 @@ router ospf6
  ospf6 router-id 10.0.0.4
  log-adjacency-changes detail
  redistribute static
- interface r4-stubnet area 0.0.0.1
- interface r4-sw6 area 0.0.0.1
 !
 line vty
  exec-timeout 0 0

diff --git a/tests/topotests/ospf_topo1/r1/ospf6d.conf b/tests/topotests/ospf_topo1/r1/ospf6d.conf
index ca3497b4a58d26c82abf9912b87848b0d8a3ba0a..0e6c7dadfb5e52429e44df1089e5f78d75d7f9c4 100644 (file)
--- a/tests/topotests/ospf_topo1/r1/ospf6d.conf
+++ b/tests/topotests/ospf_topo1/r1/ospf6d.conf
@@ -4,10 +4,12 @@ router ospf6
  redistribute kernel
  redistribute connected
  redistribute static
- interface r1-eth0 area 0.0.0.0
- interface r1-eth1 area 0.0.0.0
+!
+interface r1-eth0
+ ipv6 ospf6 area 0.0.0.0
 !
 int r1-eth1
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 dead-interval 10
  ipv6 ospf6 hello-interval 2
 !

diff --git a/tests/topotests/ospf_topo1/r2/ospf6d.conf b/tests/topotests/ospf_topo1/r2/ospf6d.conf
index 44047e1a4eeb1804733c0d5ee98e70fd8cff3000..f6a1f505304f97c643c7782d16761e84841ca632 100644 (file)
--- a/tests/topotests/ospf_topo1/r2/ospf6d.conf
+++ b/tests/topotests/ospf_topo1/r2/ospf6d.conf
@@ -4,14 +4,14 @@ router ospf6
  redistribute kernel
  redistribute connected
  redistribute static
- interface r2-eth0 area 0.0.0.0
- interface r2-eth1 area 0.0.0.0
 !
 int r2-eth0
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !
 int r2-eth1
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !

diff --git a/tests/topotests/ospf_topo1/r3/ospf6d.conf b/tests/topotests/ospf_topo1/r3/ospf6d.conf
index 13ad9a7356a730c7a19aec1acbca9f08fa8d091b..278a01696858505bdb9d2806623227589091c5ae 100644 (file)
--- a/tests/topotests/ospf_topo1/r3/ospf6d.conf
+++ b/tests/topotests/ospf_topo1/r3/ospf6d.conf
@@ -4,19 +4,19 @@ router ospf6
  redistribute kernel
  redistribute connected
  redistribute static
- interface r3-eth0 area 0.0.0.0
- interface r3-eth1 area 0.0.0.0
- interface r3-eth2 area 0.0.0.1
 !
 int r3-eth0
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !
 int r3-eth1
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !
 int r3-eth2
+ ipv6 ospf6 area 0.0.0.1
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !

diff --git a/tests/topotests/ospf_topo1/r4/ospf6d.conf b/tests/topotests/ospf_topo1/r4/ospf6d.conf
index f9bde0e83c0eacc248853c4fb52d3b21c41203dd..777dd0b7b7f0b75eaedf1f131dffd72326b469b6 100644 (file)
--- a/tests/topotests/ospf_topo1/r4/ospf6d.conf
+++ b/tests/topotests/ospf_topo1/r4/ospf6d.conf
@@ -4,14 +4,14 @@ router ospf6
  redistribute kernel
  redistribute connected
  redistribute static
- interface r4-eth0 area 0.0.0.1
- interface r4-eth1 area 0.0.0.1
 !
 int r4-eth0
+ ipv6 ospf6 area 0.0.0.1
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !
 int r4-eth1
+ ipv6 ospf6 area 0.0.0.1
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !