From 1733ebf10aedafefbc17bd0660f6d43098b08d8a Mon Sep 17 00:00:00 2001 From: Cheeze-It <16260577+Cheeze-It@users.noreply.github.com> Date: Thu, 15 Apr 2021 05:18:22 -0600 Subject: bgp: T2771: add vpn, multicast, flowspec address families In this commit we add more address families within BGP. This should bring VyOS the ability to enable the rest of the capabilities within FRR. Co-authored-by: Cheeze_It --- data/templates/frr/bgp.frr.tmpl | 55 +- .../include/bgp/bgp-afi-common-flowspec.xml.i | 29 + .../include/bgp/bgp-afi-common-vpn.xml.i | 144 +++++ .../include/bgp/bgp-common-config.xml.i | 604 ++++++++++++++++++++- .../bgp/bgp-neighbor-afi-ipv4-flowspec.xml.i | 11 + .../bgp-neighbor-afi-ipv4-labeled-unicast.xml.i | 19 + .../bgp/bgp-neighbor-afi-ipv4-multicast.xml.i | 19 + .../include/bgp/bgp-neighbor-afi-ipv4-vpn.xml.i | 11 + .../bgp/bgp-neighbor-afi-ipv6-flowspec.xml.i | 11 + .../bgp-neighbor-afi-ipv6-labeled-unicast.xml.i | 20 + .../bgp/bgp-neighbor-afi-ipv6-multicast.xml.i | 12 + .../include/bgp/bgp-neighbor-afi-ipv6-vpn.xml.i | 12 + smoketest/scripts/cli/test_protocols_bgp.py | 95 +++- src/conf_mode/protocols_bgp.py | 40 +- 14 files changed, 1049 insertions(+), 33 deletions(-) create mode 100644 interface-definitions/include/bgp/bgp-afi-common-flowspec.xml.i create mode 100644 interface-definitions/include/bgp/bgp-afi-common-vpn.xml.i create mode 100644 interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-flowspec.xml.i create mode 100644 interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-labeled-unicast.xml.i create mode 100644 interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-multicast.xml.i create mode 100644 interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-vpn.xml.i create mode 100644 interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-flowspec.xml.i create mode 100644 interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-labeled-unicast.xml.i create mode 100644 interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-multicast.xml.i create mode 100644 interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-vpn.xml.i diff --git a/data/templates/frr/bgp.frr.tmpl b/data/templates/frr/bgp.frr.tmpl index 9b910a69f..dafe45f59 100644 --- a/data/templates/frr/bgp.frr.tmpl +++ b/data/templates/frr/bgp.frr.tmpl @@ -90,8 +90,24 @@ {% for afi, afi_config in config.address_family.items() %} {% if afi == 'ipv4_unicast' %} address-family ipv4 unicast +{% elif afi == 'ipv4_multicast' %} + address-family ipv4 multicast +{% elif afi == 'ipv4_labeled_unicast' %} + address-family ipv4 labeled-unicast +{% elif afi == 'ipv4_vpn' %} + address-family ipv4 vpn +{% elif afi == 'ipv4_flowspec' %} + address-family ipv4 flowspec {% elif afi == 'ipv6_unicast' %} address-family ipv6 unicast +{% elif afi == 'ipv6_multicast' %} + address-family ipv6 multicast +{% elif afi == 'ipv6_labeled_unicast' %} + address-family ipv6 labeled-unicast +{% elif afi == 'ipv6_vpn' %} + address-family ipv6 vpn +{% elif afi == 'ipv6_flowspec' %} + address-family ipv6 flowspec {% elif afi == 'l2vpn_evpn' %} address-family l2vpn evpn {% endif %} @@ -205,8 +221,24 @@ router bgp {{ local_as }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none ! {% if afi == 'ipv4_unicast' %} address-family ipv4 unicast +{% elif afi == 'ipv4_multicast' %} + address-family ipv4 multicast +{% elif afi == 'ipv4_labeled_unicast' %} + address-family ipv4 labeled-unicast +{% elif afi == 'ipv4_vpn' %} + address-family ipv4 vpn +{% elif afi == 'ipv4_flowspec' %} + address-family ipv4 flowspec {% elif afi == 'ipv6_unicast' %} address-family ipv6 unicast +{% elif afi == 'ipv6_multicast' %} + address-family ipv6 multicast +{% elif afi == 'ipv6_labeled_unicast' %} + address-family ipv6 labeled-unicast +{% elif afi == 'ipv6_vpn' %} + address-family ipv6 vpn +{% elif afi == 'ipv6_flowspec' %} + address-family ipv6 flowspec {% elif afi == 'l2vpn_evpn' %} address-family l2vpn evpn {% endif %} @@ -238,7 +270,7 @@ router bgp {{ local_as }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none {% endif %} {% if afi_config.network is defined and afi_config.network is not none %} {% for network in afi_config.network %} - network {{ network }}{% if afi_config.network[network].route_map is defined %} route-map {{ afi_config.network[network].route_map }}{% endif %}{% if afi_config.network[network].backdoor is defined %} backdoor{% endif %} + network {{ network }}{% if afi_config.network[network].route_map is defined %} route-map {{ afi_config.network[network].route_map }}{% endif %}{% if afi_config.network[network].backdoor is defined %} backdoor{% endif %}{% if afi_config.network[network].rd is defined and afi_config.network[network].label is defined%} rd {{ afi_config.network[network].rd }} label {{ afi_config.network[network].label }}{% endif %} {####### we need this blank line!! #######} {% endfor %} @@ -247,7 +279,22 @@ router bgp {{ local_as }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none {% for adv_afi, adv_afi_config in afi_config.advertise.items() %} {% if adv_afi_config.unicast is defined and adv_afi_config.unicast is not none %} advertise {{ adv_afi }} unicast {{ 'route-map ' + adv_afi_config.unicast.route_map if adv_afi_config.unicast.route_map is defined }} +{% endif %} +{% endfor %} +{% endif %} +{% if afi_config.distance is defined and afi_config.distance is not none %} +{% if afi_config.distance is defined and afi_config.distance.external is defined and afi_config.distance.internal is defined and afi_config.distance.local is defined %} + distance bgp {{ afi_config.distance.external }} {{ afi_config.distance.internal }} {{ afi_config.distance.local }} +{% endif %} +{% if afi_config.distance.prefix is defined and afi_config.distance.prefix is not none %} +{% for prefix in afi_config.distance.prefix %} + distance {{ afi_config.distance.prefix[prefix].distance }} {{ prefix }} +{% endfor %} +{% endif %} {% endif %} +{% if afi_config.local_install is defined and afi_config.local_install is not none %} +{% for interface in afi_config.local_install.interface %} + local-install {{ interface }} {% endfor %} {% endif %} {% if afi_config.advertise_all_vni is defined %} @@ -378,8 +425,6 @@ router bgp {{ local_as }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none bgp deterministic-med {% endif %} {% if parameters.distance is defined and parameters.distance is not none %} - ! - address-family ipv4 unicast {% if parameters.distance.global is defined and parameters.distance.global.external is defined and parameters.distance.global.internal is defined and parameters.distance.global.local is defined %} distance bgp {{ parameters.distance.global.external }} {{ parameters.distance.global.internal }} {{ parameters.distance.global.local }} {% endif %} @@ -388,8 +433,6 @@ router bgp {{ local_as }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none distance {{ parameters.distance.prefix[prefix].distance }} {{ prefix }} {% endfor %} {% endif %} - exit-address-family - ! {% endif %} {% if parameters.graceful_restart is defined %} bgp graceful-restart {{ 'stalepath-time ' + parameters.graceful_restart.stalepath_time if parameters.graceful_restart.stalepath_time is defined }} @@ -420,4 +463,4 @@ router bgp {{ local_as }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none {% if route_map is defined and route_map is not none %} ip protocol bgp route-map {{ route_map }} {% endif %} -! +! \ No newline at end of file diff --git a/interface-definitions/include/bgp/bgp-afi-common-flowspec.xml.i b/interface-definitions/include/bgp/bgp-afi-common-flowspec.xml.i new file mode 100644 index 000000000..bb9b0a966 --- /dev/null +++ b/interface-definitions/include/bgp/bgp-afi-common-flowspec.xml.i @@ -0,0 +1,29 @@ + + + + as-path-list to filter route updates to/from this peer + + + + + As-path-list to filter outgoing route updates to this peer + + policy as-path-list + + + + + + As-path-list to filter incoming route updates from this peer + + policy as-path-list + + + + + +#include +#include +#include +#include + diff --git a/interface-definitions/include/bgp/bgp-afi-common-vpn.xml.i b/interface-definitions/include/bgp/bgp-afi-common-vpn.xml.i new file mode 100644 index 000000000..162a2c805 --- /dev/null +++ b/interface-definitions/include/bgp/bgp-afi-common-vpn.xml.i @@ -0,0 +1,144 @@ + + + + Use addpath to advertise all paths to a neighbor + + + + + + Use addpath to advertise the bestpath per each neighboring AS + + + +#include + + + AS for routes sent to this peer to be the local AS + + + +#include + + + Disable sending community attributes to this peer + + + + + Disable sending extended community attributes to this peer + + + + + + Disable sending standard community attributes to this peer + + + + + + + + Access-list to filter route updates to/from this peer-group + + + + + Access-list to filter outgoing route updates to this peer-group + + policy access-list + + + u32:1-65535 + Access-list to filter outgoing route updates to this peer-group + + + + + + + + + Access-list to filter incoming route updates from this peer-group + + policy access-list + + + u32:1-65535 + Access-list to filter incoming route updates from this peer-group + + + + + + + + + + + as-path-list to filter route updates to/from this peer + + + + + As-path-list to filter outgoing route updates to this peer + + policy as-path-list + + + + + + As-path-list to filter incoming route updates from this peer + + policy as-path-list + + + + + + + + Maximum number of prefixes to accept from this peer + + u32:1-4294967295 + Prefix limit + + + + + + +#include + + + Remove private AS numbers from AS path in outbound route updates + + + +#include +#include +#include +#include + + + Route-map to selectively unsuppress suppressed routes + + policy route-map + + + + + + Default weight for routes from this peer + + u32:1-65535 + Default weight + + + + + + + diff --git a/interface-definitions/include/bgp/bgp-common-config.xml.i b/interface-definitions/include/bgp/bgp-common-config.xml.i index 813da097c..66843a55f 100644 --- a/interface-definitions/include/bgp/bgp-common-config.xml.i +++ b/interface-definitions/include/bgp/bgp-common-config.xml.i @@ -24,6 +24,75 @@ #include + + + Administrative distances for BGP routes + + + + + eBGP routes administrative distance + + u32:1-255 + eBGP routes administrative distance + + + + + + + + + iBGP routes administrative distance + + u32:1-255 + iBGP routes administrative distance + + + + + + + + + Locally originated BGP routes administrative distance + + u32:1-255 + Locally originated BGP routes administrative distance + + + + + + + + + Administrative distance for a specific BGP prefix + + ipv4net + Administrative distance for a specific BGP prefix + + + + + + + + + Administrative distance for prefix + + u32:1-255 + Administrative distance for external BGP routes + + + + + + + + + + BGP network @@ -108,6 +177,229 @@ + + + Multicast IPv4 BGP settings + + + + + BGP aggregate network/prefix + + ipv4net + BGP aggregate network/prefix + + + + + + + #include + + + + + Administrative distances for BGP routes + + + + + eBGP routes administrative distance + + u32:1-255 + eBGP routes administrative distance + + + + + + + + + iBGP routes administrative distance + + u32:1-255 + iBGP routes administrative distance + + + + + + + + + Locally originated BGP routes administrative distance + + u32:1-255 + Locally originated BGP routes administrative distance + + + + + + + + + Administrative distance for a specific BGP prefix + + ipv4net + Administrative distance for a specific BGP prefix + + + + + + + + + Administrative distance for prefix + + u32:1-255 + Administrative distance for external BGP routes + + + + + + + + + + + + + Import BGP network/prefix into multicast IPv4 RIB + + ipv4net + Multicast IPv4 BGP network/prefix + + + + + + + + + Use BGP network/prefix as a backdoor route + + + + #include + + + + + + + Labeled Unicast IPv4 BGP settings + + + + + BGP aggregate network/prefix + + ipv4net + BGP aggregate network/prefix + + + + + + + #include + + + + + Import BGP network/prefix into labeled unicast IPv4 RIB + + ipv4net + Labeled Unicast IPv4 BGP network/prefix + + + + + + + + + Use BGP network/prefix as a backdoor route + + + + #include + + + + + + + Flowspec IPv4 BGP settings + + + + + Apply local policy routing to interface + + + + + Interface + + + + + + + + + + + + + Unicast VPN IPv4 BGP settings + + + + + Import BGP network/prefix into unicast VPN IPv4 RIB + + ipv4net + Unicast VPN IPv4 BGP network/prefix + + + + + + + + + Route Distinguisher + + txt + Route Distinguisher, asn:xxx + + + ^[0-9]{1,10}:[0-9]{1,5}$ + + + + + + MPLS label value assigned to route + + u32:0-1048575 + MPLS label value + + + + + + + + + + IPv6 BGP settings @@ -128,6 +420,75 @@ #include + + + Administrative distances for BGP routes + + + + + eBGP routes administrative distance + + u32:1-255 + eBGP routes administrative distance + + + + + + + + + iBGP routes administrative distance + + u32:1-255 + iBGP routes administrative distance + + + + + + + + + Locally originated BGP routes administrative distance + + u32:1-255 + Locally originated BGP routes administrative distance + + + + + + + + + Administrative distance for a specific BGP prefix + + ipv6net + Administrative distance for a specific BGP prefix + + + + + + + + + Administrative distance for prefix + + u32:1-255 + Administrative distance for external BGP routes + + + + + + + + + + BGP network @@ -210,6 +571,235 @@ + + + Multicast IPv6 BGP settings + + + + + BGP aggregate network/prefix + + ipv6net + BGP aggregate network/prefix + + + + + + + #include + + + + + Administrative distances for BGP routes + + + + + eBGP routes administrative distance + + u32:1-255 + eBGP routes administrative distance + + + + + + + + + iBGP routes administrative distance + + u32:1-255 + iBGP routes administrative distance + + + + + + + + + Locally originated BGP routes administrative distance + + u32:1-255 + Locally originated BGP routes administrative distance + + + + + + + + + Administrative distance for a specific BGP prefix + + ipv6net + Administrative distance for a specific BGP prefix + + + + + + + + + Administrative distance for prefix + + u32:1-255 + Administrative distance for external BGP routes + + + + + + + + + + + + + Import BGP network/prefix into multicast IPv6 RIB + + ipv6net + Multicast IPv6 BGP network/prefix + + + + + + + + + AS-path hopcount limit + + u32:0-255 + AS path hop count limit + + + + + + + #include + + + + + + + Labeled Unicast IPv6 BGP settings + + + + + BGP aggregate network/prefix + + ipv6net + BGP aggregate network/prefix + + + + + + + #include + + + + + Import BGP network/prefix into labeled unicast IPv6 RIB + + ipv6net + Labeled Unicast IPv6 BGP network/prefix + + + + + + + + + Use BGP network/prefix as a backdoor route + + + + #include + + + + + + + Flowspec IPv6 BGP settings + + + + + Apply local policy routing to interface + + + + + Interface + + + + + + + + + + + + + Unicast VPN IPv6 BGP settings + + + + + Import BGP network/prefix into unicast VPN IPv6 RIB + + ipv6net + Unicast VPN IPv6 BGP network/prefix + + + + + + + + + Route Distinguisher + + txt + Route Distinguisher, asn:xxx + + + ^[0-9]{1,10}:[0-9]{1,5}$ + + + + + + MPLS label value assigned to route + + u32:0-1048575 + MPLS label value + + + + + + + + + + L2VPN EVPN BGP settings @@ -303,7 +893,7 @@ - BGP dynamic neighbors listen commands + Listen for and accept BGP dynamic neighbors from range @@ -320,7 +910,7 @@ - Dynamic neighbors listen range + BGP dynamic neighbors listen range ipv4net IPv4 dynamic neighbors listen range @@ -381,6 +971,14 @@ #include #include + #include + #include + #include + #include + #include + #include + #include + #include #include @@ -856,4 +1454,4 @@ #include - + \ No newline at end of file diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-flowspec.xml.i b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-flowspec.xml.i new file mode 100644 index 000000000..732ff1773 --- /dev/null +++ b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-flowspec.xml.i @@ -0,0 +1,11 @@ + + + + IPv4 Flow Specification BGP neighbor parameters + + + #include + #include + + + diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-labeled-unicast.xml.i b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-labeled-unicast.xml.i new file mode 100644 index 000000000..9baf5380d --- /dev/null +++ b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-labeled-unicast.xml.i @@ -0,0 +1,19 @@ + + + + IPv4 Labeled Unicast BGP neighbor parameters + + + + + Advertise capabilities to this neighbor (IPv4) + + + #include + + + #include + #include + + + diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-multicast.xml.i b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-multicast.xml.i new file mode 100644 index 000000000..073e5a868 --- /dev/null +++ b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-multicast.xml.i @@ -0,0 +1,19 @@ + + + + IPv4 Multicast BGP neighbor parameters + + + + + Advertise capabilities to this neighbor (IPv4) + + + #include + + + #include + #include + + + diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-vpn.xml.i b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-vpn.xml.i new file mode 100644 index 000000000..1ce7028b8 --- /dev/null +++ b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-vpn.xml.i @@ -0,0 +1,11 @@ + + + + IPv4 VPN BGP neighbor parameters + + + #include + #include + + + diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-flowspec.xml.i b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-flowspec.xml.i new file mode 100644 index 000000000..3fbf785ce --- /dev/null +++ b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-flowspec.xml.i @@ -0,0 +1,11 @@ + + + + IPv6 Flow Specification BGP neighbor parameters + + + #include + #include + + + diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-labeled-unicast.xml.i b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-labeled-unicast.xml.i new file mode 100644 index 000000000..1f84e7afb --- /dev/null +++ b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-labeled-unicast.xml.i @@ -0,0 +1,20 @@ + + + + IPv6 Labeled Unicast BGP neighbor parameters + + + + + Advertise capabilities to this neighbor (IPv6) + + + #include + + + #include + #include + #include + + + diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-multicast.xml.i b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-multicast.xml.i new file mode 100644 index 000000000..e49465ed2 --- /dev/null +++ b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-multicast.xml.i @@ -0,0 +1,12 @@ + + + + IPv6 Multicast BGP neighbor parameters + + + #include + #include + #include + + + diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-vpn.xml.i b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-vpn.xml.i new file mode 100644 index 000000000..9a7a22418 --- /dev/null +++ b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-vpn.xml.i @@ -0,0 +1,12 @@ + + + + IPv6 VPN BGP neighbor parameters + + + #include + #include + #include + + + diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py index bce74a7b2..8ed0f7228 100755 --- a/smoketest/scripts/cli/test_protocols_bgp.py +++ b/smoketest/scripts/cli/test_protocols_bgp.py @@ -547,7 +547,76 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase): self.assertIn(f' advertise-default-gw', vniconfig) self.assertIn(f' advertise-svi-ip', vniconfig) - def test_bgp_08_vrf_simple(self): + def test_bgp_08_zebra_route_map(self): + # Implemented because of T3328 + self.cli_set(base_path + ['route-map', route_map_in]) + # commit changes + self.cli_commit() + + # Verify FRR configuration + zebra_route_map = f'ip protocol bgp route-map {route_map_in}' + frrconfig = self.getFRRconfig(zebra_route_map) + self.assertIn(zebra_route_map, frrconfig) + + # Remove the route-map again + self.cli_delete(base_path + ['route-map']) + # commit changes + self.cli_commit() + + # Verify FRR configuration + frrconfig = self.getFRRconfig(zebra_route_map) + self.assertNotIn(zebra_route_map, frrconfig) + + def test_bgp_09_distance_and_flowspec(self): + distance_external = '25' + distance_internal = '30' + distance_local = '35' + distance_v4_prefix = '169.254.0.0/32' + distance_v6_prefix = '2001::/128' + distance_prefix_value = '110' + distance_families = ['ipv4-unicast', 'ipv6-unicast','ipv4-multicast', 'ipv6-multicast'] + verify_families = ['ipv4 unicast', 'ipv6 unicast','ipv4 multicast', 'ipv6 multicast'] + flowspec_families = ['address-family ipv4 flowspec', 'address-family ipv6 flowspec'] + flowspec_int = 'lo' + + # Per family distance support + for family in distance_families: + self.cli_set(base_path + ['address-family', family, 'distance', 'external', distance_external]) + self.cli_set(base_path + ['address-family', family, 'distance', 'internal', distance_internal]) + self.cli_set(base_path + ['address-family', family, 'distance', 'local', distance_local]) + if 'ipv4' in family: + self.cli_set(base_path + ['address-family', family, 'distance', + 'prefix', distance_v4_prefix, 'distance', distance_prefix_value]) + if 'ipv6' in family: + self.cli_set(base_path + ['address-family', family, 'distance', + 'prefix', distance_v6_prefix, 'distance', distance_prefix_value]) + + # IPv4 flowspec interface check + self.cli_set(base_path + ['address-family', 'ipv4-flowspec', 'local-install', 'interface', flowspec_int]) + + # IPv6 flowspec interface check + self.cli_set(base_path + ['address-family', 'ipv6-flowspec', 'local-install', 'interface', flowspec_int]) + + # Commit changes + self.cli_commit() + + # Verify FRR distances configuration + frrconfig = self.getFRRconfig(f'router bgp {ASN}') + self.assertIn(f'router bgp {ASN}', frrconfig) + for family in verify_families: + self.assertIn(f'address-family {family}', frrconfig) + self.assertIn(f'distance bgp {distance_external} {distance_internal} {distance_local}', frrconfig) + if 'ipv4' in family: + self.assertIn(f'distance {distance_prefix_value} {distance_v4_prefix}', frrconfig) + if 'ipv6' in family: + self.assertIn(f'distance {distance_prefix_value} {distance_v6_prefix}', frrconfig) + + # Verify FRR flowspec configuration + for family in flowspec_families: + self.assertIn(f'{family}', frrconfig) + self.assertIn(f'local-install {flowspec_int}', frrconfig) + + def test_bgp_10_vrf_simple(self): router_id = '127.0.0.3' vrfs = ['red', 'green', 'blue'] @@ -571,26 +640,6 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase): self.assertIn(f'router bgp {ASN} vrf {vrf}', frrconfig) self.assertIn(f' bgp router-id {router_id}', frrconfig) - - def test_bgp_09_zebra_route_map(self): - # Implemented because of T3328 - self.cli_set(base_path + ['route-map', route_map_in]) - # commit changes - self.cli_commit() - - # Verify FRR configuration - zebra_route_map = f'ip protocol bgp route-map {route_map_in}' - frrconfig = self.getFRRconfig(zebra_route_map) - self.assertIn(zebra_route_map, frrconfig) - - # Remove the route-map again - self.cli_delete(base_path + ['route-map']) - # commit changes - self.cli_commit() - - # Verify FRR configuration - frrconfig = self.getFRRconfig(zebra_route_map) - self.assertNotIn(zebra_route_map, frrconfig) - + if __name__ == '__main__': - unittest.main(verbosity=2) + unittest.main(verbosity=2) \ No newline at end of file diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py index 6b83087bf..001108ede 100755 --- a/src/conf_mode/protocols_bgp.py +++ b/src/conf_mode/protocols_bgp.py @@ -127,6 +127,10 @@ def verify(bgp): if 'ebgp_multihop' in peer_config and 'ttl_security' in peer_config: raise ConfigError('You can\'t set both ebgp-multihop and ttl-security hops') + # Check if neighbor has both override capability and strict capability match configured at the same time. + if 'override_capability' in peer_config and 'strict_capability_match' in peer_config: + raise ConfigError(f'Neighbor "{peer}" cannot have both override-capability and strict-capability-match configured at the same time!') + # Check spaces in the password if 'password' in peer_config and ' ' in peer_config['password']: raise ConfigError('You can\'t use spaces in the password') @@ -148,11 +152,21 @@ def verify(bgp): if 'remote_as' in peer_config: raise ConfigError(f'remote-as must be set under the interface node of "{peer}"') - for afi in ['ipv4_unicast', 'ipv6_unicast', 'l2vpn_evpn']: + for afi in ['ipv4_unicast', 'ipv4_multicast', 'ipv4_labeled_unicast', 'ipv4_flowspec', + 'ipv6_unicast', 'ipv6_multicast', 'ipv6_labeled_unicast', 'ipv6_flowspec', + 'l2vpn_evpn']: # Bail out early if address family is not configured if 'address_family' not in peer_config or afi not in peer_config['address_family']: continue + # Check if neighbor has both ipv4 unicast and ipv4 labeled unicast configured at the same time. + if 'ipv4_unicast' in peer_config['address_family'] and 'ipv4_labeled_unicast' in peer_config['address_family']: + raise ConfigError(f'Neighbor "{peer}" cannot have both ipv4-unicast and ipv4-labeled-unicast configured at the same time!') + + # Check if neighbor has both ipv6 unicast and ipv6 labeled unicast configured at the same time. + if 'ipv6_unicast' in peer_config['address_family'] and 'ipv6_labeled_unicast' in peer_config['address_family']: + raise ConfigError(f'Neighbor "{peer}" cannot have both ipv6-unicast and ipv6-labeled-unicast configured at the same time!') + afi_config = peer_config['address_family'][afi] # Validate if configured Prefix list exists if 'prefix_list' in afi_config: @@ -192,6 +206,30 @@ def verify(bgp): if not verify_remote_as(bgp['listen']['range'][prefix], bgp): raise ConfigError(f'Peer-group "{peer_group}" requires remote-as to be set!') + # Throw an error if the global administrative distance parameters aren't all filled out. + if dict_search('parameters.distance', bgp) == None: + pass + else: + if dict_search('parameters.distance.global', bgp): + for key in ['external', 'internal', 'local']: + if dict_search(f'parameters.distance.global.{key}', bgp) == None: + raise ConfigError('Missing mandatory configuration option for '\ + f'global administrative distance {key}!') + + # Throw an error if the address family specific administrative distance parameters aren't all filled out. + if dict_search('address_family', bgp) == None: + pass + else: + for address_family_name in dict_search('address_family', bgp): + if dict_search(f'address_family.{address_family_name}.distance', bgp) == None: + pass + else: + for key in ['external', 'internal', 'local']: + if dict_search(f'address_family.{address_family_name}.distance.{key}', bgp) == None: + address_family_name = address_family_name.replace('_', '-') + raise ConfigError('Missing mandatory configuration option for '\ + f'{address_family_name} administrative distance {key}!') + return None def generate(bgp): -- cgit v1.2.3