From c508ffa2de63d1b35a2447a2b89315061f0ff7e3 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier via pve-devel Date: Fri, 12 Apr 2024 12:22:53 +0200 Subject: [PATCH] fix #5361: evpn: fix ipv6 route-map Signed-off-by: Alexandre Derumier Signed-off-by: Thomas Lamprecht --- src/PVE/Network/SDN/Controllers/EvpnPlugin.pm | 2 +- src/test/zones/evpn/exitnode/expected_controller_config | 2 +- .../evpn/exitnode_local_routing/expected_controller_config | 2 +- src/test/zones/evpn/exitnode_snat/expected_controller_config | 2 +- .../zones/evpn/exitnodenullroute/expected_controller_config | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm index 3c7782a..2b62276 100644 --- a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm +++ b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm @@ -208,7 +208,7 @@ sub generate_controller_zone_config { if (!$exitnodes_primary || $exitnodes_primary eq $local_node) { #filter default route coming from other exit nodes on primary node or both nodes if no primary is defined. my $routemap_config_v6 = (); - push @{$routemap_config_v6}, "match ip address prefix-list only_default_v6"; + push @{$routemap_config_v6}, "match ipv6 address prefix-list only_default_v6"; my $routemap_v6 = { rule => $routemap_config_v6, action => "deny" }; unshift(@{$config->{frr_routemap}->{'MAP_VTEP_IN'}}, $routemap_v6); diff --git a/src/test/zones/evpn/exitnode/expected_controller_config b/src/test/zones/evpn/exitnode/expected_controller_config index 50b702b..99e933a 100644 --- a/src/test/zones/evpn/exitnode/expected_controller_config +++ b/src/test/zones/evpn/exitnode/expected_controller_config @@ -65,7 +65,7 @@ route-map MAP_VTEP_IN deny 1 exit ! route-map MAP_VTEP_IN deny 2 - match ip address prefix-list only_default_v6 + match ipv6 address prefix-list only_default_v6 exit ! route-map MAP_VTEP_IN permit 3 diff --git a/src/test/zones/evpn/exitnode_local_routing/expected_controller_config b/src/test/zones/evpn/exitnode_local_routing/expected_controller_config index 456574d..2bc5572 100644 --- a/src/test/zones/evpn/exitnode_local_routing/expected_controller_config +++ b/src/test/zones/evpn/exitnode_local_routing/expected_controller_config @@ -49,7 +49,7 @@ route-map MAP_VTEP_IN deny 1 exit ! route-map MAP_VTEP_IN deny 2 - match ip address prefix-list only_default_v6 + match ipv6 address prefix-list only_default_v6 exit ! route-map MAP_VTEP_IN permit 3 diff --git a/src/test/zones/evpn/exitnode_snat/expected_controller_config b/src/test/zones/evpn/exitnode_snat/expected_controller_config index 50b702b..99e933a 100644 --- a/src/test/zones/evpn/exitnode_snat/expected_controller_config +++ b/src/test/zones/evpn/exitnode_snat/expected_controller_config @@ -65,7 +65,7 @@ route-map MAP_VTEP_IN deny 1 exit ! route-map MAP_VTEP_IN deny 2 - match ip address prefix-list only_default_v6 + match ipv6 address prefix-list only_default_v6 exit ! route-map MAP_VTEP_IN permit 3 diff --git a/src/test/zones/evpn/exitnodenullroute/expected_controller_config b/src/test/zones/evpn/exitnodenullroute/expected_controller_config index a6403c0..fc8ae67 100644 --- a/src/test/zones/evpn/exitnodenullroute/expected_controller_config +++ b/src/test/zones/evpn/exitnodenullroute/expected_controller_config @@ -100,7 +100,7 @@ route-map MAP_VTEP_IN deny 1 exit ! route-map MAP_VTEP_IN deny 2 - match ip address prefix-list only_default_v6 + match ipv6 address prefix-list only_default_v6 exit ! route-map MAP_VTEP_IN deny 3 @@ -108,7 +108,7 @@ route-map MAP_VTEP_IN deny 3 exit ! route-map MAP_VTEP_IN deny 4 - match ip address prefix-list only_default_v6 + match ipv6 address prefix-list only_default_v6 exit ! route-map MAP_VTEP_IN permit 5 -- 2.39.5