fix #5361: evpn: fix ipv6 route-map

Signed-off-by: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
index 3c7782afbd406b16e3b21bbcd18ea1ee4db1c2d4..2b62276942f5569ae820e0cd813b81fc24e87002 100644 (file)
--- 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 50b702b475a14434d885d7165a30ccf5600497ce..99e933a8c4dc16bb8d45cc377301330255dbdafc 100644 (file)
--- 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 456574d3f0e7a0d22a38e72607b8cc8cde779335..2bc55727fb588bae253dd79732b586693e848cbf 100644 (file)
--- 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 50b702b475a14434d885d7165a30ccf5600497ce..99e933a8c4dc16bb8d45cc377301330255dbdafc 100644 (file)
--- 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 a6403c093b5d09542997e5dc8f789c21604cc44e..fc8ae67b2a355aaffc58d4f835647cacd4ebeccf 100644 (file)
--- 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