Add a test that tests the frr.conf.local merging. This should ensure we do not run into further regressions. The test also "succeeds" with the pre-templates version, there are just some whitespace and "!" issues. Also the route-maps are merged instead of pushed with higher sequence number. This shouldn't change anything.
Signed-off-by: Gabriel Goller <[email protected]> --- src/test/run_test_zones.pl | 16 ++++- .../expected_controller_config | 61 +++++++++++++++++++ .../frr_local_merge/expected_sdn_interfaces | 42 +++++++++++++ .../zones/evpn/frr_local_merge/frr.conf.local | 30 +++++++++ .../zones/evpn/frr_local_merge/interfaces | 7 +++ .../zones/evpn/frr_local_merge/sdn_config | 24 ++++++++ 6 files changed, 177 insertions(+), 3 deletions(-) create mode 100644 src/test/zones/evpn/frr_local_merge/expected_controller_config create mode 100644 src/test/zones/evpn/frr_local_merge/expected_sdn_interfaces create mode 100644 src/test/zones/evpn/frr_local_merge/frr.conf.local create mode 100644 src/test/zones/evpn/frr_local_merge/interfaces create mode 100644 src/test/zones/evpn/frr_local_merge/sdn_config diff --git a/src/test/run_test_zones.pl b/src/test/run_test_zones.pl index 905b2f42e1dc..806225735e6b 100755 --- a/src/test/run_test_zones.pl +++ b/src/test/run_test_zones.pl @@ -126,12 +126,22 @@ foreach my $test (@tests) { reload_controller => sub { return; }, - read_local_frr_config => sub { - return; - }, ); } + # Mock read_local_frr_config in PVE::Network::SDN::Frr to support testing frr.conf.local merging + my $frr_local_config; + my $frr_local_path = "./$test/frr.conf.local"; + if (-e $frr_local_path) { + $frr_local_config = read_file($frr_local_path); + } + my $mocked_frr = Test::MockModule->new('PVE::Network::SDN::Frr'); + $mocked_frr->mock( + read_local_frr_config => sub { + return $frr_local_config; + }, + ); + my $name = $test; my $expected = read_file("./$test/expected_sdn_interfaces"); diff --git a/src/test/zones/evpn/frr_local_merge/expected_controller_config b/src/test/zones/evpn/frr_local_merge/expected_controller_config new file mode 100644 index 000000000000..9d47e080bf7a --- /dev/null +++ b/src/test/zones/evpn/frr_local_merge/expected_controller_config @@ -0,0 +1,61 @@ +frr version 10.4.1 +frr defaults datacenter +hostname localhost +log syslog informational +service integrated-vtysh-config +! +vrf vrf_myzone + vni 1000 +exit-vrf +! +router bgp 65000 + bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp default ipv4-unicast + coalesce-time 1000 + no bgp graceful-restart notification + 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 + neighbor 192.168.1.1 remote-as 65001 + neighbor 192.168.1.1 description "External Peer" + address-family ipv4 unicast + neighbor VTEP activate + exit-address-family + ! + address-family l2vpn evpn + neighbor VTEP activate + neighbor VTEP route-map MAP_VTEP_IN in + neighbor VTEP route-map MAP_VTEP_OUT out + advertise-svi-ip + advertise-all-vni + exit-address-family +exit +! +router bgp 65000 vrf vrf_myzone + bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification +exit +! +route-map MAP_VTEP_IN permit 1 +exit +! +route-map MAP_VTEP_OUT permit 1 + set community 65000:100 +exit +route-map MAP_VTEP_IN permit 2 + set community 65000:200 +exit +! +ip prefix-list PL_ALLOW seq 10 permit 10.0.0.0/8 le 24 +route-map CUSTOM_MAP permit 10 + match ip address prefix-list PL_ALLOW +exit +! +bgp community-list standard CL_LOCAL permit 65000:200 +! +line vty +! diff --git a/src/test/zones/evpn/frr_local_merge/expected_sdn_interfaces b/src/test/zones/evpn/frr_local_merge/expected_sdn_interfaces new file mode 100644 index 000000000000..9d1c64c0f3fa --- /dev/null +++ b/src/test/zones/evpn/frr_local_merge/expected_sdn_interfaces @@ -0,0 +1,42 @@ +#version:1 + +auto myvnet +iface myvnet + address 10.0.0.1/24 + hwaddress A2:1D:CB:1A:C0:8B + bridge_ports vxlan_myvnet + bridge_stp off + bridge_fd 0 + mtu 1450 + ip-forward on + arp-accept on + vrf vrf_myzone + +auto vrf_myzone +iface vrf_myzone + vrf-table auto + post-up ip route add vrf vrf_myzone unreachable default metric 4278198272 + +auto vrfbr_myzone +iface vrfbr_myzone + bridge-ports vrfvx_myzone + bridge_stp off + bridge_fd 0 + mtu 1450 + vrf vrf_myzone + +auto vrfvx_myzone +iface vrfvx_myzone + vxlan-id 1000 + vxlan-local-tunnelip 192.168.0.1 + bridge-learning off + bridge-arp-nd-suppress on + mtu 1450 + +auto vxlan_myvnet +iface vxlan_myvnet + vxlan-id 100 + vxlan-local-tunnelip 192.168.0.1 + bridge-learning off + bridge-arp-nd-suppress on + mtu 1450 diff --git a/src/test/zones/evpn/frr_local_merge/frr.conf.local b/src/test/zones/evpn/frr_local_merge/frr.conf.local new file mode 100644 index 000000000000..a08f805cdabc --- /dev/null +++ b/src/test/zones/evpn/frr_local_merge/frr.conf.local @@ -0,0 +1,30 @@ +! +! Custom FRR configuration to be merged +! +router bgp 65000 + neighbor 192.168.1.1 remote-as 65001 + neighbor 192.168.1.1 description "External Peer" + address-family l2vpn evpn + advertise-svi-ip + exit-address-family + address-family ipv4 unicast + neighbor VTEP activate + exit-address-family +exit +! +route-map MAP_VTEP_OUT permit 1 + set community 65000:100 +exit +! +route-map MAP_VTEP_IN permit 2 + set community 65000:200 +exit +! +ip prefix-list PL_ALLOW seq 10 permit 10.0.0.0/8 le 24 +! +route-map CUSTOM_MAP permit 10 + match ip address prefix-list PL_ALLOW +exit +! +bgp community-list standard CL_LOCAL permit 65000:200 +! diff --git a/src/test/zones/evpn/frr_local_merge/interfaces b/src/test/zones/evpn/frr_local_merge/interfaces new file mode 100644 index 000000000000..66bb826a44b3 --- /dev/null +++ b/src/test/zones/evpn/frr_local_merge/interfaces @@ -0,0 +1,7 @@ +auto vmbr0 +iface vmbr0 inet static + address 192.168.0.1/24 + gateway 192.168.0.254 + bridge-ports eth0 + bridge-stp off + bridge-fd 0 diff --git a/src/test/zones/evpn/frr_local_merge/sdn_config b/src/test/zones/evpn/frr_local_merge/sdn_config new file mode 100644 index 000000000000..d6e44b7593c2 --- /dev/null +++ b/src/test/zones/evpn/frr_local_merge/sdn_config @@ -0,0 +1,24 @@ +{ + version => 1, + vnets => { + ids => { + myvnet => { tag => "100", type => "vnet", zone => "myzone" }, + }, + }, + + zones => { + ids => { myzone => { ipam => "pve", type => "evpn", controller => "evpnctl", 'vrf-vxlan' => 1000, 'mac' => 'A2:1D:CB:1A:C0:8B' } }, + }, + controllers => { + ids => { evpnctl => { type => "evpn", 'peers' => '192.168.0.1,192.168.0.2,192.168.0.3', asn => "65000" } }, + }, + + subnets => { + ids => { 'myzone-10.0.0.0-24' => { + 'type' => 'subnet', + 'vnet' => 'myvnet', + 'gateway' => '10.0.0.1', + } + } + } +} -- 2.47.3
