controllers: evpn : remove "no bgp ebgp-requires-policy"

It's already disabled in the default datacenter profile since frr 7.4

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

diff --git a/PVE/Network/SDN/Controllers/BgpPlugin.pm b/PVE/Network/SDN/Controllers/BgpPlugin.pm
index 70c7264deadcbf64c7335371612254e0feab5dff..bfeda0cac908fa04ae414838b00d6dfab35e05ba 100644 (file)
--- a/PVE/Network/SDN/Controllers/BgpPlugin.pm
+++ b/PVE/Network/SDN/Controllers/BgpPlugin.pm
@@ -89,7 +89,6 @@ sub generate_controller_config {
 
     @controller_config = ();
     if($ebgp) {
 
     @controller_config = ();
     if($ebgp) {

-       push @controller_config, "no bgp ebgp-requires-policy";

        push @controller_config, "bgp disable-ebgp-connected-route-check" if $loopback;
     }
 
        push @controller_config, "bgp disable-ebgp-connected-route-check" if $loopback;
     }
 

diff --git a/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/PVE/Network/SDN/Controllers/EvpnPlugin.pm
index 6d9b059ebba24f9928b20652bf2d3fe3b9b8e263..c4aac91f6d950c79181ca9bdedb721129947ef67 100644 (file)
--- a/PVE/Network/SDN/Controllers/EvpnPlugin.pm
+++ b/PVE/Network/SDN/Controllers/EvpnPlugin.pm
@@ -148,7 +148,6 @@ sub generate_controller_zone_config {
     #main vrf router
     @controller_config = ();
     push @controller_config, "bgp router-id $ifaceip";
     #main vrf router
     @controller_config = ();
     push @controller_config, "bgp router-id $ifaceip";

-    push @controller_config, "no bgp ebgp-requires-policy" if $ebgp;

 #    push @controller_config, "!";
     push(@{$config->{frr}->{router}->{"bgp $asn vrf $vrf"}->{""}}, @controller_config);
 
 #    push @controller_config, "!";
     push(@{$config->{frr}->{router}->{"bgp $asn vrf $vrf"}->{""}}, @controller_config);
 

diff --git a/test/zones/evpn/ebgp/expected_controller_config b/test/zones/evpn/ebgp/expected_controller_config
index ae35a351b0d1a452a1fa1c4a95e81c5898014a65..50d01c15e496c1b9e65e221885cf63e86e891a9f 100644 (file)
--- a/test/zones/evpn/ebgp/expected_controller_config
+++ b/test/zones/evpn/ebgp/expected_controller_config
@@ -19,7 +19,6 @@ router bgp 65001
  neighbor VTEP bfd
  neighbor 192.168.0.2 peer-group VTEP
  neighbor 192.168.0.3 peer-group VTEP
  neighbor VTEP bfd
  neighbor 192.168.0.2 peer-group VTEP
  neighbor 192.168.0.3 peer-group VTEP

- no bgp ebgp-requires-policy

  neighbor BGP peer-group
  neighbor BGP remote-as external
  neighbor BGP bfd
  neighbor BGP peer-group
  neighbor BGP remote-as external
  neighbor BGP bfd


@@ -41,7 +40,6 @@ router bgp 65001
 !
 router bgp 65001 vrf vrf_myzone
  bgp router-id 192.168.0.1
 !
 router bgp 65001 vrf vrf_myzone
  bgp router-id 192.168.0.1

- no bgp ebgp-requires-policy

  !
  address-family l2vpn evpn
   route-target import 65000:1000
  !
  address-family l2vpn evpn
   route-target import 65000:1000

diff --git a/test/zones/evpn/ebgp_loopback/expected_controller_config b/test/zones/evpn/ebgp_loopback/expected_controller_config
index 55141b2bc6892e9e5dc3389a0b5536969f01220a..5b246c6057a52ff857ee5e06c4e86500ecf6d4c5 100644 (file)
--- a/test/zones/evpn/ebgp_loopback/expected_controller_config
+++ b/test/zones/evpn/ebgp_loopback/expected_controller_config
@@ -23,7 +23,6 @@ router bgp 65001
  neighbor VTEP update-source dummy1
  neighbor 192.168.0.2 peer-group VTEP
  neighbor 192.168.0.3 peer-group VTEP
  neighbor VTEP update-source dummy1
  neighbor 192.168.0.2 peer-group VTEP
  neighbor 192.168.0.3 peer-group VTEP

- no bgp ebgp-requires-policy

  bgp disable-ebgp-connected-route-check
  neighbor BGP peer-group
  neighbor BGP remote-as external
  bgp disable-ebgp-connected-route-check
  neighbor BGP peer-group
  neighbor BGP remote-as external


@@ -46,7 +45,6 @@ router bgp 65001
 !
 router bgp 65001 vrf vrf_myzone
  bgp router-id 192.168.0.1
 !
 router bgp 65001 vrf vrf_myzone
  bgp router-id 192.168.0.1

- no bgp ebgp-requires-policy

  !
  address-family l2vpn evpn
   route-target import 65000:1000
  !
  address-family l2vpn evpn
   route-target import 65000:1000