tests: replace "interface IFNAME area" with "ipv6 ospf6 area"

Only one test is modified yet, to have both new and deprecated commands
tested by the CI.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

diff --git a/tests/topotests/ospf6_topo1_vrf/README.md b/tests/topotests/ospf6_topo1_vrf/README.md
index 3ed0b8fbe2bdc590a27da9cde005d354fe3eb213..18bca5c54f6bfd1bfe066854e00566f2ec18d4b1 100644 (file)
--- a/tests/topotests/ospf6_topo1_vrf/README.md
+++ b/tests/topotests/ospf6_topo1_vrf/README.md
@@ -54,10 +54,12 @@ Simplified `R1` config (R1 is similar)
        hostname r1
        !
        interface r1-stubnet vrf r1-cust1
+        ipv6 ospf6 area 0.0.0.0
         ipv6 address fc00:1:1:1::1/64
         ipv6 ospf6 network broadcast
        !
        interface r1-sw5 vrf r1-cust1
+        ipv6 ospf6 area 0.0.0.0
         ipv6 address fc00:a:a:a::1/64
         ipv6 ospf6 network broadcast
        !
@@ -65,8 +67,6 @@ Simplified `R1` config (R1 is similar)
         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
        !
        ipv6 route fc00:1111:1111:1111::/64 fc00:1:1:1::1234 vrf r1-cust1
 
@@ -75,14 +75,17 @@ Simplified `R3` config
        hostname r3
        !
        interface r3-stubnet vrf r3-cust1
+        ipv6 ospf6 area 0.0.0.0
         ipv6 address fc00:3:3:3::3/64
         ipv6 ospf6 network broadcast
        !
        interface r3-sw5 vrf r3-cust1
+        ipv6 ospf6 area 0.0.0.0
         ipv6 address fc00:a:a:a::3/64
         ipv6 ospf6 network broadcast
        !
        interface r3-sw6 vrf r3-cust1
+        ipv6 ospf6 area 0.0.0.1
         ipv6 address fc00:b:b:b::3/64
         ipv6 ospf6 network broadcast
        !
@@ -90,9 +93,6 @@ Simplified `R3` config
         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
        !
        ipv6 route fc00:3333:3333:3333::/64 fc00:3:3:3::1234 vrf r3-cust1
 

diff --git a/tests/topotests/ospf6_topo1_vrf/r1/ospf6d.conf b/tests/topotests/ospf6_topo1_vrf/r1/ospf6d.conf
index 76daac24e6f3c7125d3266ed0e6ed7d9a2eb6bee..83bdfb7c81f538d85e140fb1cd450ed7dcababa2 100644 (file)
--- a/tests/topotests/ospf6_topo1_vrf/r1/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1_vrf/r1/ospf6d.conf
@@ -10,11 +10,13 @@ debug ospf6 route table
 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 vrf r1-cust1
  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_vrf/r2/ospf6d.conf b/tests/topotests/ospf6_topo1_vrf/r2/ospf6d.conf
index 213301891879e0f89cb99fa7763f6dcdea9e4d5b..7fd01aa0ccf33b6f45b89f7cf6d34c0e4e5558c5 100644 (file)
--- a/tests/topotests/ospf6_topo1_vrf/r2/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1_vrf/r2/ospf6d.conf
@@ -10,11 +10,13 @@ debug ospf6 route table
 debug ospf6 flooding
 !
 interface r2-stubnet
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 network broadcast
  ipv6 ospf6 dead-interval 10
  ipv6 ospf6 hello-interval 2
 !
 interface r2-sw5
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 network broadcast
  ipv6 ospf6 dead-interval 10
  ipv6 ospf6 hello-interval 2
@@ -23,8 +25,6 @@ router ospf6 vrf r2-cust1
  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_vrf/r3/ospf6d.conf b/tests/topotests/ospf6_topo1_vrf/r3/ospf6d.conf
index 5f3d37380116723ce8bd8069fbd5c7e9a4e4310f..df5aed3a6a4357e2d0fa3372dde015aee6281853 100644 (file)
--- a/tests/topotests/ospf6_topo1_vrf/r3/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1_vrf/r3/ospf6d.conf
@@ -10,16 +10,19 @@ debug ospf6 route table
 debug ospf6 flooding
 !
 interface r3-stubnet
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 network broadcast
  ipv6 ospf6 dead-interval 10
  ipv6 ospf6 hello-interval 2
 !
 interface r3-sw5
+ ipv6 ospf6 area 0.0.0.0
  ipv6 ospf6 network broadcast
  ipv6 ospf6 dead-interval 10
  ipv6 ospf6 hello-interval 2
 !
 interface r3-sw6
+ ipv6 ospf6 area 0.0.0.1
  ipv6 ospf6 network broadcast
  ipv6 ospf6 dead-interval 10
  ipv6 ospf6 hello-interval 2
@@ -28,9 +31,6 @@ router ospf6 vrf r3-cust1
  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_vrf/r4/ospf6d.conf b/tests/topotests/ospf6_topo1_vrf/r4/ospf6d.conf
index 2d53ea210f4098a0419391c88e9e8c473bc0f529..465defb40fd746f3a96811998f5488fa646588e0 100644 (file)
--- a/tests/topotests/ospf6_topo1_vrf/r4/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1_vrf/r4/ospf6d.conf
@@ -10,11 +10,13 @@ debug ospf6 route table
 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 vrf r4-cust1
  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