From 6869bb921e7b79aeb2b145ce0b98bec8af8cbc84 Mon Sep 17 00:00:00 2001 From: Igor Ryzhov Date: Mon, 7 Jun 2021 21:58:26 +0300 Subject: [PATCH] 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 --- tests/topotests/ospf6_topo1_vrf/r1/ospf6d.conf | 4 ++-- tests/topotests/ospf6_topo1_vrf/r2/ospf6d.conf | 4 ++-- tests/topotests/ospf6_topo1_vrf/r3/ospf6d.conf | 6 +++--- tests/topotests/ospf6_topo1_vrf/r4/ospf6d.conf | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/topotests/ospf6_topo1_vrf/r1/ospf6d.conf b/tests/topotests/ospf6_topo1_vrf/r1/ospf6d.conf index ed480354e4..76daac24e6 100644 --- 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 485771e7d5..2133018918 100644 --- 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 f5837bf6fd..5f3d373801 100644 --- 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 ab67d06ff4..2d53ea210f 100644 --- 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 -- 2.39.5