Feat(eos_cli_config_gen): Redo the model for additional-paths in BGP

ansible_collections/arista/avd/docs/porting-guides/5.x.x.md

@@ -1284,6 +1284,51 @@ port_channel_interfaces:
 +       encapsulation: unmatched
 ```
 
+### Data model for BGP additional-paths in `router_bgp.address_family_evpn/_vrfs[].ipv4/_vrfs[].ipv6/_path_selection` has been changed
+
+In AVD 5.0.0, the data models for `router_bgp.vrfs[].address_family_ipv4.bgp.additional_paths`, `router_bgp.vrf[].address_family_ipv6.bgp.additional_paths`, `router_bgp.address_family_evpn.bgp.peer_groups[].additional_paths`, `router_bgp.address_family_evpn.bgp_additional_paths`, `router_bgp.address_family_path_selection.bgp.additional_paths`, `router_bgp.address_family_path_selection.neighbors[].additional_paths` have been changed. The key `additional_paths.send` is a string instead of dictionary.
+
+The difference shown below keeps the previous configurations.
+
+```diff
+router_bgp:
+  address_family_path_selection:
+    bgp:
+      additional_paths:
+-        send:
+-          any: true
++        send: any
+  <...>
+  vrfs:
+    address_family_ipv4:
+      bgp:
+        additional_paths:
+-          send:
+-            ecmp_limit: 100
++          send: ecmp
++          send_ecmp_limit: 100
+  <...>
+    address_family_ipv6:
+      bgp:
+        additional_paths:
+-         send:
+-           limit: 100
++         send: limit
++         send_limit: 100
+  <...>
+    address_family_evpn:
+      bgp_additional_paths:
+        receive: true
+-       send:
+-         ecmp
++       send: ecmp
+      peer_groups:
+        additional_paths:
+-         send:
+-           any: false
++         send: disabled
+```
+
 ### Fix issues with flags, source/destination ports, and field set for TCP/UDP protocol under traffic-policies
 
 The change has been incorporated into `traffic-policies.j2` eos template.

ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-base.md

@@ -237,13 +237,20 @@ router bgp 65101
    redistribute static rcf Router_BGP_Static()
    !
    address-family ipv4
+      bgp additional-paths install
+      bgp additional-paths receive
+      bgp additional-paths send ecmp limit 20
+      neighbor foo additional-paths receive
       neighbor foo prefix-list PL-BAR-v4-IN in
       neighbor foo prefix-list PL-BAR-v4-OUT out
       neighbor foo default-originate route-map RM-FOO-MATCH always
+      neighbor foo additional-paths send ecmp limit 20 prefix-list PL1
       neighbor 10.2.3.8 rcf in Address_Family_IPV4_In()
       neighbor 10.2.3.9 rcf out Address_Family_IPV4_Out()
+      neighbor 192.0.2.1 additional-paths receive
       neighbor 192.0.2.1 prefix-list PL-FOO-v4-IN in
       neighbor 192.0.2.1 prefix-list PL-FOO-v4-OUT out
+      neighbor 192.0.2.1 additional-paths send limit 20 prefix-list PL1
       network 10.0.0.0/8
       network 172.16.0.0/12
       network 192.168.0.0/16 route-map RM-FOO-MATCH
@@ -257,10 +264,17 @@ router bgp 65101
       redistribute static rcf Address_Family_IPV4_Static()
    !
    address-family ipv6
+      bgp additional-paths install ecmp-primary
+      bgp additional-paths receive
+      bgp additional-paths send any
+      neighbor baz additional-paths receive
       neighbor baz prefix-list PL-BAR-v6-IN in
       neighbor baz prefix-list PL-BAR-v6-OUT out
+      neighbor baz additional-paths send ecmp limit 20
+      neighbor 2001:db8::1 additional-paths receive
       neighbor 2001:db8::1 prefix-list PL-FOO-v6-IN in
       neighbor 2001:db8::1 prefix-list PL-FOO-v6-OUT out
+      neighbor 2001:db8::1 additional-paths send ecmp limit 20
       neighbor 2001:db8::2 rcf in Address_Family_IPV6_In()
       neighbor 2001:db8::2 rcf out Address_Family_IPV6_Out()
       network 2001:db8:100::/40

ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn.md

@@ -299,7 +299,9 @@ router bgp 65101
       neighbor TEST-ENCAPSULATION-2 activate
       neighbor TEST-ENCAPSULATION-2 encapsulation path-selection
       neighbor 10.100.100.1 activate
+      neighbor 10.100.100.1 additional-paths receive
       neighbor 10.100.100.1 default-route
+      neighbor 10.100.100.1 additional-paths send any
       neighbor 10.100.100.2 activate
       neighbor 10.100.100.2 default-route route-map RM_DEFAULT_ROUTE
       neighbor 10.100.100.3 activate

ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-vrf-address-families.md

@@ -47,6 +47,12 @@ ASN Notation: asplain
 | ------ | --------- |
 | 65001 | 1.0.1.1 |
 
+#### BGP Neighbors
+
+| Neighbor | Remote AS | VRF | Shutdown | Send-community | Maximum-routes | Allowas-in | BFD | RIB Pre-Policy Retain | Route-Reflector Client | Passive | TTL Max Hops |
+| -------- | --------- | --- | -------- | -------------- | -------------- | ---------- | --- | --------------------- | ---------------------- | ------- | ------------ |
+| 1.1.1.1 | - | VRF02 | - | - | - | - | - | - | - | - | - |
+
 #### Router BGP VRFs
 
 | VRF | Route-Distinguisher | Redistribute |
@@ -73,19 +79,29 @@ router bgp 65001
       neighbor FOOBAR activate
    !
    address-family ipv4 multicast
+      bgp additional-paths receive
       neighbor FOOBAR activate
+      neighbor FOOBAR additional-paths receive
+      neighbor 10.1.1.1 activate
+      neighbor 10.1.1.1 additional-paths receive
    !
    address-family ipv6
       no neighbor FOOBAR activate
    !
    address-family ipv6 multicast
+      bgp additional-paths receive
       no neighbor FOOBAR activate
+      neighbor FOOBAR additional-paths receive
+      neighbor aa::1 additional-paths receive
       redistribute isis rcf Router_BGP_Isis()
       redistribute ospf match internal
       redistribute ospfv3 match external
       redistribute ospfv3 match nssa-external 2
    !
    vrf VRF01
+      bgp additional-paths install
+      bgp additional-paths receive
+      bgp additional-paths send any
       no bgp redistribute-internal
       !
       address-family flow-spec ipv4
@@ -105,8 +121,10 @@ router bgp 65001
          bgp additional-paths receive
          bgp additional-paths send ecmp limit 4
          neighbor 1.2.3.4 activate
+         neighbor 1.2.3.4 additional-paths receive
          neighbor 1.2.3.4 route-map FOO in
          neighbor 1.2.3.4 route-map BAR out
+         neighbor 1.2.3.4 additional-paths send any
          network 2.3.4.0/24 route-map BARFOO
          no bgp redistribute-internal
          redistribute connected rcf VRF_AFIPV4_RCF_CONNECTED_1()
@@ -121,6 +139,7 @@ router bgp 65001
          bgp additional-paths receive
          neighbor 1.2.3.4 route-map FOO in
          neighbor 1.2.3.4 route-map BAR out
+         neighbor 1.2.3.4 additional-paths receive
          network 239.0.0.0/24 route-map BARFOO
          redistribute connected
          redistribute ospf match internal
@@ -135,8 +154,10 @@ router bgp 65001
          bgp additional-paths receive
          bgp additional-paths send any
          neighbor aa::1 activate
+         neighbor aa::1 additional-paths receive
          neighbor aa::1 route-map FOO in
          neighbor aa::1 route-map BAR out
+         neighbor aa::1 additional-paths send any
          neighbor aa::2 activate
          neighbor aa::2 rcf in VRF_AFIPV6_RCF_IN()
          neighbor aa::2 rcf out VRF_AFIPV6_RCF_OUT()
@@ -152,6 +173,8 @@ router bgp 65001
       address-family ipv6 multicast
          bgp missing-policy direction in action deny
          bgp missing-policy direction out action deny
+         bgp additional-paths receive
+         neighbor aa::1 additional-paths receive
          network ff08:1::/64
          redistribute connected
          redistribute ospf match external
@@ -160,6 +183,8 @@ router bgp 65001
          redistribute static route-map VRF_AFIPV6MULTI_RM_STATIC
    !
    vrf VRF02
+      neighbor 1.1.1.1 additional-paths receive
+      neighbor 1.1.1.1 additional-paths send ecmp limit 24
       !
       address-family ipv4
          bgp additional-paths send backup

ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-base.cfg

@@ -97,13 +97,20 @@ router bgp 65101
    redistribute static rcf Router_BGP_Static()
    !
    address-family ipv4
+      bgp additional-paths install
+      bgp additional-paths receive
+      bgp additional-paths send ecmp limit 20
+      neighbor foo additional-paths receive
       neighbor foo prefix-list PL-BAR-v4-IN in
       neighbor foo prefix-list PL-BAR-v4-OUT out
       neighbor foo default-originate route-map RM-FOO-MATCH always
+      neighbor foo additional-paths send ecmp limit 20 prefix-list PL1
       neighbor 10.2.3.8 rcf in Address_Family_IPV4_In()
       neighbor 10.2.3.9 rcf out Address_Family_IPV4_Out()
+      neighbor 192.0.2.1 additional-paths receive
       neighbor 192.0.2.1 prefix-list PL-FOO-v4-IN in
       neighbor 192.0.2.1 prefix-list PL-FOO-v4-OUT out
+      neighbor 192.0.2.1 additional-paths send limit 20 prefix-list PL1
       network 10.0.0.0/8
       network 172.16.0.0/12
       network 192.168.0.0/16 route-map RM-FOO-MATCH
@@ -117,10 +124,17 @@ router bgp 65101
       redistribute static rcf Address_Family_IPV4_Static()
    !
    address-family ipv6
+      bgp additional-paths install ecmp-primary
+      bgp additional-paths receive
+      bgp additional-paths send any
+      neighbor baz additional-paths receive
       neighbor baz prefix-list PL-BAR-v6-IN in
       neighbor baz prefix-list PL-BAR-v6-OUT out
+      neighbor baz additional-paths send ecmp limit 20
+      neighbor 2001:db8::1 additional-paths receive
       neighbor 2001:db8::1 prefix-list PL-FOO-v6-IN in
       neighbor 2001:db8::1 prefix-list PL-FOO-v6-OUT out
+      neighbor 2001:db8::1 additional-paths send ecmp limit 20
       neighbor 2001:db8::2 rcf in Address_Family_IPV6_In()
       neighbor 2001:db8::2 rcf out Address_Family_IPV6_Out()
       network 2001:db8:100::/40

ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn.cfg

@@ -122,7 +122,9 @@ router bgp 65101
       neighbor TEST-ENCAPSULATION-2 activate
       neighbor TEST-ENCAPSULATION-2 encapsulation path-selection
       neighbor 10.100.100.1 activate
+      neighbor 10.100.100.1 additional-paths receive
       neighbor 10.100.100.1 default-route
+      neighbor 10.100.100.1 additional-paths send any
       neighbor 10.100.100.2 activate
       neighbor 10.100.100.2 default-route route-map RM_DEFAULT_ROUTE
       neighbor 10.100.100.3 activate

ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-vrf-address-families.cfg

@@ -18,19 +18,29 @@ router bgp 65001
       neighbor FOOBAR activate
    !
    address-family ipv4 multicast
+      bgp additional-paths receive
       neighbor FOOBAR activate
+      neighbor FOOBAR additional-paths receive
+      neighbor 10.1.1.1 activate
+      neighbor 10.1.1.1 additional-paths receive
    !
    address-family ipv6
       no neighbor FOOBAR activate
    !
    address-family ipv6 multicast
+      bgp additional-paths receive
       no neighbor FOOBAR activate
+      neighbor FOOBAR additional-paths receive
+      neighbor aa::1 additional-paths receive
       redistribute isis rcf Router_BGP_Isis()
       redistribute ospf match internal
       redistribute ospfv3 match external
       redistribute ospfv3 match nssa-external 2
    !
    vrf VRF01
+      bgp additional-paths install
+      bgp additional-paths receive
+      bgp additional-paths send any
       no bgp redistribute-internal
       !
       address-family flow-spec ipv4
@@ -50,8 +60,10 @@ router bgp 65001
          bgp additional-paths receive
          bgp additional-paths send ecmp limit 4
          neighbor 1.2.3.4 activate
+         neighbor 1.2.3.4 additional-paths receive
          neighbor 1.2.3.4 route-map FOO in
          neighbor 1.2.3.4 route-map BAR out
+         neighbor 1.2.3.4 additional-paths send any
          network 2.3.4.0/24 route-map BARFOO
          no bgp redistribute-internal
          redistribute connected rcf VRF_AFIPV4_RCF_CONNECTED_1()
@@ -66,6 +78,7 @@ router bgp 65001
          bgp additional-paths receive
          neighbor 1.2.3.4 route-map FOO in
          neighbor 1.2.3.4 route-map BAR out
+         neighbor 1.2.3.4 additional-paths receive
          network 239.0.0.0/24 route-map BARFOO
          redistribute connected
          redistribute ospf match internal
@@ -80,8 +93,10 @@ router bgp 65001
          bgp additional-paths receive
          bgp additional-paths send any
          neighbor aa::1 activate
+         neighbor aa::1 additional-paths receive
          neighbor aa::1 route-map FOO in
          neighbor aa::1 route-map BAR out
+         neighbor aa::1 additional-paths send any
          neighbor aa::2 activate
          neighbor aa::2 rcf in VRF_AFIPV6_RCF_IN()
          neighbor aa::2 rcf out VRF_AFIPV6_RCF_OUT()
@@ -97,6 +112,8 @@ router bgp 65001
       address-family ipv6 multicast
          bgp missing-policy direction in action deny
          bgp missing-policy direction out action deny
+         bgp additional-paths receive
+         neighbor aa::1 additional-paths receive
          network ff08:1::/64
          redistribute connected
          redistribute ospf match external
@@ -105,6 +122,8 @@ router bgp 65001
          redistribute static route-map VRF_AFIPV6MULTI_RM_STATIC
    !
    vrf VRF02
+      neighbor 1.1.1.1 additional-paths receive
+      neighbor 1.1.1.1 additional-paths send ecmp limit 24
       !
       address-family ipv4
          bgp additional-paths send backup

ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-base.yml

@@ -107,17 +107,32 @@ router_bgp:
         route_map: RM-FOO-MATCH
     bgp:
       redistribute_internal: false
+      additional_paths:
+        receive: true
+        install: true
+        send: ecmp
+        send_ecmp_limit: 20
     peer_groups:
       - name: foo
         prefix_list_in: PL-BAR-v4-IN
         prefix_list_out: PL-BAR-v4-OUT
         default_originate:
           always: true
           route_map: RM-FOO-MATCH
+        additional_paths:
+          receive: true
+          send: ecmp
+          send_ecmp_limit: 20
+          prefix_list: PL1
     neighbors:
       - ip_address: 192.0.2.1
         prefix_list_in: PL-FOO-v4-IN
         prefix_list_out: PL-FOO-v4-OUT
+        additional_paths:
+          receive: true
+          send: limit
+          send_limit: 20
+          prefix_list: PL1
       - ip_address: 10.2.3.8
         rcf_in: Address_Family_IPV4_In()
       - ip_address: 10.2.3.9
@@ -147,14 +162,28 @@ router_bgp:
         route_map: RM-BAR-MATCH
     bgp:
       redistribute_internal: true
+      additional_paths:
+        receive: true
+        install_ecmp_primary: true
+        send: any
     peer_groups:
       - name: baz
         prefix_list_in: PL-BAR-v6-IN
         prefix_list_out: PL-BAR-v6-OUT
+        additional_paths:
+          receive: true
+          send: ecmp
+          send_ecmp_limit: 20
+          prefix_list: PL2
     neighbors:
       - ip_address: 2001:db8::1
         prefix_list_in: PL-FOO-v6-IN
         prefix_list_out: PL-FOO-v6-OUT
+        additional_paths:
+          receive: true
+          send: ecmp
+          send_ecmp_limit: 20
+          prefix_list: PL2
       - ip_address: 2001:db8::2
         rcf_in: Address_Family_IPV6_In()
         rcf_out: Address_Family_IPV6_Out()

ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn-mpls.yml

@@ -37,9 +37,10 @@ router_bgp:
     - ip_address: 192.168.255.2
       peer_group: EVPN-OVERLAY-PEERS
   address_family_evpn:
-    bgp_additional_paths:
-      send:
-        limit: 10
+    bgp:
+      additional_paths:
+        send: limit
+        send_limit: 10
     next_hop_mpls_resolution_ribs:
       - rib_type: "tunnel-rib-colored"
       - rib_type: "tunnel-rib"