This should not contain any functional change, just moving around some
stuff.

Signed-off-by: Gabriel Goller <[email protected]>
---
 .../expected_controller_config                | 72 ++++++++++---------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/src/test/zones/evpn/frr_local_merge/expected_controller_config 
b/src/test/zones/evpn/frr_local_merge/expected_controller_config
index 82f36c9e37ec..a501791d1b2f 100644
--- a/src/test/zones/evpn/frr_local_merge/expected_controller_config
+++ b/src/test/zones/evpn/frr_local_merge/expected_controller_config
@@ -4,24 +4,10 @@ hostname localhost
 log syslog informational
 service integrated-vtysh-config
 !
-!
 vrf vrf_myzone
  vni 1000
 exit-vrf
 !
-interface ens19
- no ip ospf passive
-!
-interface eth0
- ip router isis isis1
-!
-interface eth1
- ip router isis isis1
- isis circuit-type level-2-only
-!
-interface iface2
- ip ospf area 0
-!
 router bgp 65000
  bgp router-id 192.168.0.1
  no bgp default ipv4-unicast
@@ -69,10 +55,6 @@ router bgp 65000 vrf vrf_myzone
  no bgp graceful-restart notification
 exit
 !
-router eigrp 1
- network 10.0.0.0/8
-exit
-!
 router isis isis1
  net 47.0023.0000.0000.0000.0000.0000.0000.1900.0004.00
  redistribute ipv4 connected level-1
@@ -80,27 +62,40 @@ router isis isis1
  log-adjacency-changes
 exit
 !
-router ospf
- passive-interface default
+interface eth0
+ ip router isis isis1
 exit
 !
-ip prefix-list PL_ALLOW seq 10 permit 10.0.0.0/8 le 24
-ip prefix-list loopbacks_ips seq 10 permit 0.0.0.0/0 le 32
+interface eth1
+ ip router isis isis1
+ isis circuit-type level-2-only
+exit
 !
+ip prefix-list loopbacks_ips seq 10 permit 0.0.0.0/0 le 32
+ip prefix-list PL_ALLOW seq 10 permit 10.0.0.0/8 le 24
 bgp community-list standard CL_LOCAL permit 65000:200
+interface iface2
+ ip ospf area 0
+exit
 !
-route-map CUSTOM_MAP permit 1
- match ip address prefix-list PL_ALLOW
+interface ens19
+ no ip ospf passive
 exit
 !
-route-map MAP_VTEP_IN permit 1
+router ospf
+ passive-interface default
 exit
 !
-route-map MAP_VTEP_IN permit 2
- set community 65000:200
+router eigrp 1
+ network 10.0.0.0/8
 exit
 !
-route-map MAP_VTEP_OUT permit 1
+route-map CUSTOM_MAP permit 1
+ match ip address prefix-list PL_ALLOW
+exit
+!
+route-map MAP_VTEP_IN permit 2
+ set community 65000:200
 exit
 !
 route-map MAP_VTEP_OUT permit 2
@@ -111,16 +106,11 @@ route-map MAP_VTEP_OUT permit 3
  match ip next-hop LOCAL
 exit
 !
-route-map correct_src permit 1
- match ip address prefix-list loopbacks_ips
- set src 192.168.0.1
-exit
-!
 route-map correct_src deny 2
  match ip next-hop NOT_LOCAL
 exit
 !
-ip protocol bgp route-map correct_src
+!
 router ospf
  ospf router-id 172.20.30.1
 exit
@@ -136,13 +126,25 @@ 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 correct_src permit 1
+ match ip address prefix-list loopbacks_ips
+ set src 192.168.0.1
+exit
+!
 route-map pve_ospf permit 100
  match ip address pve_ospf_test_ips
  set src 172.20.30.1
 exit
 !
-ip protocol ospf route-map pve_ospf
+ip protocol bgp route-map correct_src
 !
+ip protocol ospf route-map pve_ospf
 !
 line vty
 !
-- 
2.47.3




Reply via email to