From 1262519c3de7ca0dabbdc9a988e61b76328862fa Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Fri, 11 Feb 2022 10:33:24 +0100 Subject: [PATCH] controllers: bgp: add bgp-multipath-as-path-relax option Some users need it to do ecmp when peering with 2 differents asn Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/Controllers/BgpPlugin.pm | 9 ++++ .../expected_controller_config | 43 ++++++++++++++++ .../multipath_relax/expected_sdn_interfaces | 41 ++++++++++++++++ test/zones/evpn/multipath_relax/interfaces | 7 +++ test/zones/evpn/multipath_relax/sdn_config | 49 +++++++++++++++++++ 5 files changed, 149 insertions(+) create mode 100644 test/zones/evpn/multipath_relax/expected_controller_config create mode 100644 test/zones/evpn/multipath_relax/expected_sdn_interfaces create mode 100644 test/zones/evpn/multipath_relax/interfaces create mode 100644 test/zones/evpn/multipath_relax/sdn_config diff --git a/PVE/Network/SDN/Controllers/BgpPlugin.pm b/PVE/Network/SDN/Controllers/BgpPlugin.pm index 075ca90..1e4e708 100644 --- a/PVE/Network/SDN/Controllers/BgpPlugin.pm +++ b/PVE/Network/SDN/Controllers/BgpPlugin.pm @@ -19,6 +19,10 @@ sub type { sub properties { return { + 'bgp-multipath-as-path-relax' => { + type => 'boolean', + optional => 1, + }, ebgp => { type => 'boolean', optional => 1, @@ -41,6 +45,7 @@ sub options { 'node' => { optional => 0 }, 'asn' => { optional => 0 }, 'peers' => { optional => 0 }, + 'bgp-multipath-as-path-relax' => { optional => 1 }, 'ebgp' => { optional => 1 }, 'ebgp-multihop' => { optional => 1 }, 'loopback' => { optional => 1 }, @@ -58,6 +63,8 @@ sub generate_controller_config { my $ebgp = $plugin_config->{ebgp}; my $ebgp_multihop = $plugin_config->{'ebgp-multihop'}; my $loopback = $plugin_config->{loopback}; + my $multipath_relax = $plugin_config->{'bgp-multipath-as-path-relax'}; + my $local_node = PVE::INotify::nodename(); @@ -86,6 +93,8 @@ sub generate_controller_config { push @controller_config, "bgp disable-ebgp-connected-route-check" if $loopback; } + push @controller_config, "bgp bestpath as-path multipath-relax" if $multipath_relax; + #BGP neighbors if(@peers) { push @controller_config, "neighbor BGP peer-group"; diff --git a/test/zones/evpn/multipath_relax/expected_controller_config b/test/zones/evpn/multipath_relax/expected_controller_config new file mode 100644 index 0000000..38cc836 --- /dev/null +++ b/test/zones/evpn/multipath_relax/expected_controller_config @@ -0,0 +1,43 @@ +log syslog informational +ip forwarding +ipv6 forwarding +frr defaults datacenter +service integrated-vtysh-config +hostname localhost +! +! +vrf vrf_myzone + vni 1000 +exit-vrf +! +router bgp 65000 + bgp router-id 192.168.0.1 + no bgp default ipv4-unicast + coalesce-time 1000 + 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 + bgp bestpath as-path multipath-relax + neighbor BGP peer-group + neighbor BGP remote-as 65000 + neighbor BGP bfd + neighbor 192.168.0.1 peer-group BGP + neighbor 192.168.0.2 peer-group BGP + neighbor 192.168.0.3 peer-group BGP + ! + address-family ipv4 unicast + neighbor BGP activate + neighbor BGP soft-reconfiguration inbound + exit-address-family + ! + address-family l2vpn evpn + neighbor VTEP activate + advertise-all-vni + exit-address-family +! +router bgp 65000 vrf vrf_myzone +! +line vty +! \ No newline at end of file diff --git a/test/zones/evpn/multipath_relax/expected_sdn_interfaces b/test/zones/evpn/multipath_relax/expected_sdn_interfaces new file mode 100644 index 0000000..4cf13e0 --- /dev/null +++ b/test/zones/evpn/multipath_relax/expected_sdn_interfaces @@ -0,0 +1,41 @@ +#version:1 + +auto myvnet +iface myvnet + address 10.0.0.1/24 + 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/test/zones/evpn/multipath_relax/interfaces b/test/zones/evpn/multipath_relax/interfaces new file mode 100644 index 0000000..66bb826 --- /dev/null +++ b/test/zones/evpn/multipath_relax/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/test/zones/evpn/multipath_relax/sdn_config b/test/zones/evpn/multipath_relax/sdn_config new file mode 100644 index 0000000..5a1d8a7 --- /dev/null +++ b/test/zones/evpn/multipath_relax/sdn_config @@ -0,0 +1,49 @@ +{ + version => 1, + vnets => { + ids => { + myvnet => { + tag => "100", + type => "vnet", + zone => "myzone", + }, + }, + }, + + zones => { + ids => { + myzone => { + ipam => "pve", + type => "evpn", + controller => "evpnctl", + 'vrf-vxlan' => 1000, + }, + }, + }, + controllers => { + ids => { + evpnctl => { + type => "evpn", + 'peers' => '192.168.0.1,192.168.0.2,192.168.0.3', + asn => "65000", + }, + localhost => { + type => "bgp", + 'peers' => '192.168.0.1,192.168.0.2,192.168.0.3', + 'bgp-multipath-as-path-relax' => "1", + asn => "65000", + node => "localhost", + }, + }, + }, + + subnets => { + ids => { + 'myzone-10.0.0.0-24' => { + 'type' => 'subnet', + 'vnet' => 'myvnet', + 'gateway' => '10.0.0.1', + }, + }, + }, +} -- 2.39.2