tests: fix ospf6_topo1_vrf

ospf6d (and all other daemons except zebra) doesn't correctly process
`interface X vrf Y`, because it doesn't know existing VRFs at the time
of configuration file reading. Therefore it doesn't apply configuration
provided in the interface node.

Fix the problem by removing `vrf Y` part, having just an interface name
is enough.

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

diff --git a/tests/topotests/ospf6_topo1_vrf/r1/ospf6d.conf b/tests/topotests/ospf6_topo1_vrf/r1/ospf6d.conf
index ed480354e4d35bac289d2667f509355ce3109b7f..76daac24e6f3c7125d3266ed0e6ed7d9a2eb6bee 100644 (file)
--- a/tests/topotests/ospf6_topo1_vrf/r1/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1_vrf/r1/ospf6d.conf
@@ -9,12 +9,12 @@ debug ospf6 neighbor
 debug ospf6 route table
 debug ospf6 flooding
 !
-interface r1-stubnet vrf r1-cust1
+interface r1-stubnet
  ipv6 ospf6 network broadcast
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !
-interface r1-sw5 vrf r1-cust1
+interface r1-sw5
  ipv6 ospf6 network broadcast
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10

diff --git a/tests/topotests/ospf6_topo1_vrf/r2/ospf6d.conf b/tests/topotests/ospf6_topo1_vrf/r2/ospf6d.conf
index 485771e7d54512ad9d3b14d5bf7480e452d3e8c5..213301891879e0f89cb99fa7763f6dcdea9e4d5b 100644 (file)
--- a/tests/topotests/ospf6_topo1_vrf/r2/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1_vrf/r2/ospf6d.conf
@@ -9,12 +9,12 @@ debug ospf6 neighbor
 debug ospf6 route table
 debug ospf6 flooding
 !
-interface r2-stubnet vrf r2-cust1
+interface r2-stubnet
  ipv6 ospf6 network broadcast
  ipv6 ospf6 dead-interval 10
  ipv6 ospf6 hello-interval 2
 !
-interface r2-sw5 vrf r2-cust1
+interface r2-sw5
  ipv6 ospf6 network broadcast
  ipv6 ospf6 dead-interval 10
  ipv6 ospf6 hello-interval 2

diff --git a/tests/topotests/ospf6_topo1_vrf/r3/ospf6d.conf b/tests/topotests/ospf6_topo1_vrf/r3/ospf6d.conf
index f5837bf6fd5d2fa98f8d0553cc7cc221aeed4965..5f3d37380116723ce8bd8069fbd5c7e9a4e4310f 100644 (file)
--- a/tests/topotests/ospf6_topo1_vrf/r3/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1_vrf/r3/ospf6d.conf
@@ -9,17 +9,17 @@ debug ospf6 neighbor
 debug ospf6 route table
 debug ospf6 flooding
 !
-interface r3-stubnet vrf r3-cust1 
+interface r3-stubnet
  ipv6 ospf6 network broadcast
  ipv6 ospf6 dead-interval 10
  ipv6 ospf6 hello-interval 2
 !
-interface r3-sw5 vrf r3-cust1
+interface r3-sw5
  ipv6 ospf6 network broadcast
  ipv6 ospf6 dead-interval 10
  ipv6 ospf6 hello-interval 2
 !
-interface r3-sw6 vrf r3-cust1
+interface r3-sw6
  ipv6 ospf6 network broadcast
  ipv6 ospf6 dead-interval 10
  ipv6 ospf6 hello-interval 2

diff --git a/tests/topotests/ospf6_topo1_vrf/r4/ospf6d.conf b/tests/topotests/ospf6_topo1_vrf/r4/ospf6d.conf
index ab67d06ff4aec7f37fa0cdfdc6b01d80a89443a7..2d53ea210f4098a0419391c88e9e8c473bc0f529 100644 (file)
--- a/tests/topotests/ospf6_topo1_vrf/r4/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1_vrf/r4/ospf6d.conf
@@ -9,12 +9,12 @@ debug ospf6 neighbor
 debug ospf6 route table
 debug ospf6 flooding
 !
-interface r4-stubnet vrf r4-cust1 
+interface r4-stubnet
  ipv6 ospf6 network broadcast
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10
 !
-interface r4-sw6 vrf r4-cust1
+interface r4-sw6
  ipv6 ospf6 network broadcast
  ipv6 ospf6 hello-interval 2
  ipv6 ospf6 dead-interval 10