Move some stuff up and down, this makes it easier to generate the config using templates.
Signed-off-by: Gabriel Goller <[email protected]> --- .../evpn/ebgp_loopback/expected_controller_config | 2 +- .../zones/evpn/isis/expected_controller_config | 14 ++++++++------ .../evpn/isis_loopback/expected_controller_config | 14 ++++++++------ .../isis_standalone/expected_controller_config | 14 ++++++++------ .../multipath_relax/expected_controller_config | 2 +- .../openfabric_fabric/expected_controller_config | 12 ++++++------ .../evpn/ospf_fabric/expected_controller_config | 12 ++++++------ 7 files changed, 38 insertions(+), 32 deletions(-) diff --git a/src/test/zones/evpn/ebgp_loopback/expected_controller_config b/src/test/zones/evpn/ebgp_loopback/expected_controller_config index 38f62d06540c..aedb2daef418 100644 --- a/src/test/zones/evpn/ebgp_loopback/expected_controller_config +++ b/src/test/zones/evpn/ebgp_loopback/expected_controller_config @@ -14,6 +14,7 @@ router bgp 65001 no bgp default ipv4-unicast coalesce-time 1000 no bgp graceful-restart notification + bgp disable-ebgp-connected-route-check neighbor VTEP peer-group neighbor VTEP remote-as external neighbor VTEP bfd @@ -21,7 +22,6 @@ router bgp 65001 neighbor VTEP update-source dummy1 neighbor 192.168.0.2 peer-group VTEP neighbor 192.168.0.3 peer-group VTEP - bgp disable-ebgp-connected-route-check neighbor BGP peer-group neighbor BGP remote-as external neighbor BGP bfd diff --git a/src/test/zones/evpn/isis/expected_controller_config b/src/test/zones/evpn/isis/expected_controller_config index 2361879e0cc2..af9ba30ac97e 100644 --- a/src/test/zones/evpn/isis/expected_controller_config +++ b/src/test/zones/evpn/isis/expected_controller_config @@ -8,12 +8,6 @@ vrf vrf_myzone vni 1000 exit-vrf ! -interface eth0 - ip router isis isis1 -! -interface eth1 - ip router isis isis1 -! router bgp 65000 bgp router-id 192.168.0.1 no bgp hard-administrative-reset @@ -47,6 +41,14 @@ router isis isis1 log-adjacency-changes exit ! +interface eth0 + ip router isis isis1 +exit +! +interface eth1 + ip router isis isis1 +exit +! route-map MAP_VTEP_IN permit 1 exit ! diff --git a/src/test/zones/evpn/isis_loopback/expected_controller_config b/src/test/zones/evpn/isis_loopback/expected_controller_config index f4a6e353377b..0eed628286af 100644 --- a/src/test/zones/evpn/isis_loopback/expected_controller_config +++ b/src/test/zones/evpn/isis_loopback/expected_controller_config @@ -8,12 +8,6 @@ vrf vrf_myzone vni 1000 exit-vrf ! -interface eth0 - ip router isis isis1 -! -interface eth1 - ip router isis isis1 -! router bgp 65000 bgp router-id 10.0.0.1 no bgp hard-administrative-reset @@ -48,6 +42,14 @@ router isis isis1 log-adjacency-changes exit ! +interface eth0 + ip router isis isis1 +exit +! +interface eth1 + ip router isis isis1 +exit +! route-map MAP_VTEP_IN permit 1 exit ! diff --git a/src/test/zones/evpn/isis_standalone/expected_controller_config b/src/test/zones/evpn/isis_standalone/expected_controller_config index 2cf4dcbf359a..149e4e1f8b79 100644 --- a/src/test/zones/evpn/isis_standalone/expected_controller_config +++ b/src/test/zones/evpn/isis_standalone/expected_controller_config @@ -4,12 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -interface eth0 - ip router isis isis1 -! -interface eth1 - ip router isis isis1 -! router isis isis1 net 47.0023.0000.0000.0000.0000.0000.0000.1900.0004.00 redistribute ipv4 connected level-1 @@ -17,5 +11,13 @@ router isis isis1 log-adjacency-changes exit ! +interface eth0 + ip router isis isis1 +exit +! +interface eth1 + ip router isis isis1 +exit +! line vty ! diff --git a/src/test/zones/evpn/multipath_relax/expected_controller_config b/src/test/zones/evpn/multipath_relax/expected_controller_config index 783d05cf24d5..26b70b767782 100644 --- a/src/test/zones/evpn/multipath_relax/expected_controller_config +++ b/src/test/zones/evpn/multipath_relax/expected_controller_config @@ -14,12 +14,12 @@ router bgp 65000 no bgp default ipv4-unicast coalesce-time 1000 no bgp graceful-restart notification + bgp bestpath as-path multipath-relax neighbor VTEP peer-group neighbor VTEP remote-as 65000 neighbor VTEP bfd neighbor 192.168.0.2 peer-group VTEP neighbor 192.168.0.3 peer-group VTEP - bgp bestpath as-path multipath-relax neighbor BGP peer-group neighbor BGP remote-as 65000 neighbor BGP bfd diff --git a/src/test/zones/evpn/openfabric_fabric/expected_controller_config b/src/test/zones/evpn/openfabric_fabric/expected_controller_config index f3d82ef242be..e749e279769e 100644 --- a/src/test/zones/evpn/openfabric_fabric/expected_controller_config +++ b/src/test/zones/evpn/openfabric_fabric/expected_controller_config @@ -35,12 +35,6 @@ router bgp 65000 vrf vrf_evpn no bgp graceful-restart notification exit ! -route-map MAP_VTEP_IN permit 1 -exit -! -route-map MAP_VTEP_OUT permit 1 -exit -! router openfabric test net 49.0001.1720.2000.3001.00 exit @@ -62,6 +56,12 @@ exit ! access-list pve_openfabric_test_ips permit 172.20.3.0/24 ! +route-map MAP_VTEP_IN permit 1 +exit +! +route-map MAP_VTEP_OUT permit 1 +exit +! route-map pve_openfabric permit 100 match ip address pve_openfabric_test_ips set src 172.20.3.1 diff --git a/src/test/zones/evpn/ospf_fabric/expected_controller_config b/src/test/zones/evpn/ospf_fabric/expected_controller_config index 3e41a56eeb9d..b5a1b925213c 100644 --- a/src/test/zones/evpn/ospf_fabric/expected_controller_config +++ b/src/test/zones/evpn/ospf_fabric/expected_controller_config @@ -35,12 +35,6 @@ router bgp 65000 vrf vrf_evpn no bgp graceful-restart notification exit ! -route-map MAP_VTEP_IN permit 1 -exit -! -route-map MAP_VTEP_OUT permit 1 -exit -! router ospf ospf router-id 172.20.30.1 exit @@ -56,6 +50,12 @@ exit ! access-list pve_ospf_test_ips permit 172.20.30.0/24 ! +route-map MAP_VTEP_IN permit 1 +exit +! +route-map MAP_VTEP_OUT permit 1 +exit +! route-map pve_ospf permit 100 match ip address pve_ospf_test_ips set src 172.20.30.1 -- 2.47.3
