summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Derumier <aderumier@odiso.com>2023-04-20 23:36:17 +0200
committerThomas Lamprecht <t.lamprecht@proxmox.com>2023-06-06 10:23:57 +0200
commit5d5b4099d19c7c765c6cd6c321491325f41d587f (patch)
tree37c84d9bc849fc769afce66098afda440d0f2efa
parent2bff8ab75505a3c299741ca80a0d01216f91819c (diff)
fix #4657: evpn: fix exit-node with multiple vrf
Currently, if a node is primary exit-node for 1 vrf, and secondary exit-node for another vrf, The deny route-map is filtering routes imports for both vrf. This patch adds filtering only for the vrf's where the node is secondary. Signed-off-by: Alexandre Derumier <aderumier@odiso.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
-rw-r--r--src/PVE/Network/SDN/Controllers/EvpnPlugin.pm1
-rw-r--r--src/test/zones/evpn/exitnode/expected_controller_config1
-rw-r--r--src/test/zones/evpn/exitnode_local_routing/expected_controller_config1
-rw-r--r--src/test/zones/evpn/exitnode_snat/expected_controller_config1
4 files changed, 4 insertions, 0 deletions
diff --git a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
index 727aeaa..9d39b9b 100644
--- a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
+++ b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
@@ -168,6 +168,7 @@ sub generate_controller_zone_config {
if (!$exitnodes_primary || $exitnodes_primary eq $local_node) {
#filter default type5 route coming from other exit nodes on primary node or both nodes if no primary is defined.
my $routemap_config = ();
+ push @{$routemap_config}, "match evpn vni $vrfvxlan";
push @{$routemap_config}, "match evpn route-type prefix";
my $routemap = { rule => $routemap_config, action => "deny" };
unshift(@{$config->{frr_routemap}->{'MAP_VTEP_IN'}}, $routemap);
diff --git a/src/test/zones/evpn/exitnode/expected_controller_config b/src/test/zones/evpn/exitnode/expected_controller_config
index 48830a3..2c3f19e 100644
--- a/src/test/zones/evpn/exitnode/expected_controller_config
+++ b/src/test/zones/evpn/exitnode/expected_controller_config
@@ -53,6 +53,7 @@ router bgp 65000 vrf vrf_myzone
exit
!
route-map MAP_VTEP_IN deny 1
+ match evpn vni 1000
match evpn route-type prefix
exit
!
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 f671b63..c557a7e 100644
--- a/src/test/zones/evpn/exitnode_local_routing/expected_controller_config
+++ b/src/test/zones/evpn/exitnode_local_routing/expected_controller_config
@@ -38,6 +38,7 @@ router bgp 65000 vrf vrf_myzone
exit
!
route-map MAP_VTEP_IN deny 1
+ match evpn vni 1000
match evpn route-type prefix
exit
!
diff --git a/src/test/zones/evpn/exitnode_snat/expected_controller_config b/src/test/zones/evpn/exitnode_snat/expected_controller_config
index 48830a3..2c3f19e 100644
--- a/src/test/zones/evpn/exitnode_snat/expected_controller_config
+++ b/src/test/zones/evpn/exitnode_snat/expected_controller_config
@@ -53,6 +53,7 @@ router bgp 65000 vrf vrf_myzone
exit
!
route-map MAP_VTEP_IN deny 1
+ match evpn vni 1000
match evpn route-type prefix
exit
!