Changed few keys in additional-paths

aristanetworks · Mar 14, 2024 · 035e27d · 035e27d
1 parent 1fc1c01
commit 035e27d
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 54 deletions.
diff --git a/...ollections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn.yml b/...ollections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn.yml
@@ -82,13 +82,11 @@ router_bgp:
       - name: ADDITIONAL-PATH-PG-4
         activate: true
         additional_paths:
-          send: ecmp
-          ecmp_limit: 42
+          send_ecmp_limit: 42
       - name: ADDITIONAL-PATH-PG-5
         activate: true
         additional_paths:
-          send: limit
-          limit: 42
+          send_limit: 42
       # Checking the `no neighbor <PG> additional-paths send any is rendered
       - name: ADDITIONAL-PATH-PG-6
         activate: true

diff --git a/...arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-path-selection.yaml b/...arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-path-selection.yaml
@@ -30,7 +30,7 @@ router_bgp:
       additional_paths:
         receive: true
         send: ecmp
-        ecmp_limit: 42
+        send_ecmp_limit: 42
     peer_groups:
       - name: PATH-SELECTION-PG-1
         activate: true
@@ -48,13 +48,11 @@ router_bgp:
       - name: PATH-SELECTION-PG-4
         activate: true
         additional_paths:
-          send: limit
-          ecmp_limit: 42
+          send_ecmp_limit: 42
       - name: PATH-SELECTION-PG-5
         activate: true
         additional_paths:
-          send: limit
-          limit: 42
+          send_limit: 42
     neighbors:
       - ip_address: 172.31.255.0
         activate: true
@@ -72,10 +70,8 @@ router_bgp:
       - ip_address: 172.31.255.3
         activate: true
         additional_paths:
-          send: ecmp
-          ecmp_limit: 42
+          send_ecmp_limit: 42
       - ip_address: 172.31.255.4
         activate: true
         additional_paths:
-          send: limit
-          limit: 42
+          send_limit: 42
diff --git a/...a/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-vrf-address-families.yml b/...a/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-vrf-address-families.yml
@@ -39,8 +39,7 @@ router_bgp:
           additional_paths:
             install_ecmp_primary: true
             receive: true
-            send: ecmp
-            ecmp_limit: 4
+            send_ecmp_limit: 4
         neighbors:
           - ip_address: 1.2.3.4
             activate: true
@@ -115,8 +114,7 @@ router_bgp:
       address_family_ipv6:
         bgp:
           additional_paths:
-            send: limit
-            limit: 3
+            send_limit: 3
 
     - name: VRF03
       address_family_ipv4:

diff --git a/...ble_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml b/...ble_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml
diff --git a/...ta/avd/roles/eos_cli_config_gen/schemas/schema_fragments/defs_additional_paths.schema.yml b/...ta/avd/roles/eos_cli_config_gen/schemas/schema_fragments/defs_additional_paths.schema.yml
@@ -17,14 +17,14 @@ $defs:
         ecmp: All paths in best path ECMP group.
         limit: Limit to n eligible paths
       valid_values: [ 'any', 'backup', 'ecmp', 'limit' ]
-    ecmp_limit:
+    send_ecmp_limit:
       type: int
       description: Amount of ECMP paths to send. If this key-value pair is not set, it will send all paths in best ECMP group.
       convert_types:
         - str
       min: 2
       max: 64
-    limit:
+    send_limit:
       type: int
       description: Number of paths to send through bgp updates(The value of 'send' key must be 'limit').
       convert_types:

diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/router-bgp.j2 b/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/router-bgp.j2
@@ -605,14 +605,12 @@ router bgp {{ router_bgp.as }}
 {%             if peer_group.additional_paths.receive is arista.avd.defined(true) %}
       neighbor {{ peer_group.name }} additional-paths receive
 {%             endif %}
-{%             if peer_group.additional_paths.send is arista.avd.defined %}
-{%                 if peer_group.additional_paths.ecmp_limit is arista.avd.defined %}
-      neighbor {{ peer_group.name }} additional-paths send ecmp limit {{ peer_group.additional_paths.ecmp_limit }}
-{%                 elif peer_group.additional_paths.limit is arista.avd.defined %}
-      neighbor {{ peer_group.name }} additional-paths send limit {{ peer_group.additional_paths.limit }}
-{%                 else %}
+{%             if peer_group.additional_paths.send_ecmp_limit is arista.avd.defined %}
+      neighbor {{ peer_group.name }} additional-paths send ecmp limit {{ peer_group.additional_paths.send_ecmp_limit }}
+{%             elif peer_group.additional_paths.send_limit is arista.avd.defined %}
+      neighbor {{ peer_group.name }} additional-paths send limit {{ peer_group.additional_paths.send_limit }}
+{%             elif peer_group.additional_paths.send is arista.avd.defined %}
       neighbor {{ peer_group.name }} additional-paths send {{ peer_group.additional_paths.send }}
-{%                 endif %}
 {%             endif %}
 {%             if peer_group.domain_remote is arista.avd.defined(true) %}
       neighbor {{ peer_group.name }} domain remote
@@ -1057,10 +1055,10 @@ router bgp {{ router_bgp.as }}
 {%         if router_bgp.address_family_path_selection.bgp.additional_paths.receive is arista.avd.defined(true) %}
       bgp additional-paths receive
 {%         endif %}
-{%         if router_bgp.address_family_path_selection.bgp.additional_paths.send is arista.avd.defined %}
-      bgp additional-paths send ecmp limit {{ router_bgp.address_family_path_selection.bgp.additional_paths.ecmp_limit }}
-{%         elif router_bgp.address_family_path_selection.bgp.additional_paths.limit is arista.avd.defined %}
-      bgp additional-paths send limit {{ router_bgp.address_family_path_selection.bgp.additional_paths.limit }}
+{%         if router_bgp.address_family_path_selection.bgp.additional_paths.send_ecmp_limit is arista.avd.defined %}
+      bgp additional-paths send ecmp limit {{ router_bgp.address_family_path_selection.bgp.additional_paths.send_ecmp_limit }}
+{%         elif router_bgp.address_family_path_selection.bgp.additional_paths.send_limit is arista.avd.defined %}
+      bgp additional-paths send limit {{ router_bgp.address_family_path_selection.bgp.additional_paths.send_limit }}
 {%         elif router_bgp.address_family_path_selection.bgp.additional_paths.send is arista.avd.defined %}
       bgp additional-paths send {{ router_bgp.address_family_path_selection.bgp.additional_paths.send }}
 {%         endif %}
@@ -1073,10 +1071,10 @@ router bgp {{ router_bgp.as }}
 {%             if peer_group.additional_paths.receive is arista.avd.defined(true) %}
       neighbor {{ peer_group.name }} additional-paths receive
 {%             endif %}
-{%             if peer_group.additional_paths.ecmp_limit is arista.avd.defined %}
-      neighbor {{ peer_group.name }} additional-paths send ecmp limit {{ peer_group.additional_paths.ecmp_limit }}
-{%             elif peer_group.additional_paths.limit is arista.avd.defined %}
-      neighbor {{ peer_group.name }} additional-paths send limit {{ peer_group.additional_paths.limit }}
+{%             if peer_group.additional_paths.send_ecmp_limit is arista.avd.defined %}
+      neighbor {{ peer_group.name }} additional-paths send ecmp limit {{ peer_group.additional_paths.send_ecmp_limit }}
+{%             elif peer_group.additional_paths.send_limit is arista.avd.defined %}
+      neighbor {{ peer_group.name }} additional-paths send limit {{ peer_group.additional_paths.send_limit }}
 {%             elif peer_group.additional_paths.send is arista.avd.defined %}
       neighbor {{ peer_group.name }} additional-paths send {{ peer_group.additional_paths.send }}
 {%             endif %}
@@ -1090,10 +1088,10 @@ router bgp {{ router_bgp.as }}
 {%             if neighbor.additional_paths.receive is arista.avd.defined(true) %}
       neighbor {{ neighbor.ip_address }} additional-paths receive
 {%             endif %}
-{%             if neighbor.additional_paths.ecmp_limit is arista.avd.defined %}
-      neighbor {{ neighbor.ip_address }} additional-paths send ecmp limit {{ neighbor.additional_paths.ecmp_limit }}
-{%             elif neighbor.additional_paths.limit is arista.avd.defined %}
-      neighbor {{ neighbor.ip_address }} additional-paths send limit {{ neighbor.additional_paths.limit }}
+{%             if neighbor.additional_paths.send_ecmp_limit is arista.avd.defined %}
+      neighbor {{ neighbor.ip_address }} additional-paths send ecmp limit {{ neighbor.additional_paths.send_ecmp_limit }}
+{%             elif neighbor.additional_paths.send_limit is arista.avd.defined %}
+      neighbor {{ neighbor.ip_address }} additional-paths send limit {{ neighbor.additional_paths.send_limit }}
 {%             elif neighbor.additional_paths.send is arista.avd.defined  %}
       neighbor {{ neighbor.ip_address }} additional-paths send {{ neighbor.additional_paths.send }}
 {%             endif %}
@@ -1493,14 +1491,12 @@ router bgp {{ router_bgp.as }}
 {%             if vrf.address_family_ipv4.bgp.additional_paths.receive is arista.avd.defined(true) %}
          bgp additional-paths receive
 {%             endif %}
-{%             if vrf.address_family_ipv4.bgp.additional_paths.send is arista.avd.defined %}
-{%                 if vrf.address_family_ipv4.bgp.additional_paths.ecmp_limit is arista.avd.defined %}
-         bgp additional-paths send ecmp limit {{ vrf.address_family_ipv4.bgp.additional_paths.ecmp_limit }}
-{%                 elif vrf.address_family_ipv4.bgp.additional_paths.limit is arista.avd.defined %}
-         bgp additional-paths send limit {{ vrf.address_family_ipv4.bgp.additional_paths.limit }}
-{%                 else %}
+{%             if vrf.address_family_ipv4.bgp.additional_paths.send_ecmp_limit is arista.avd.defined %}
+         bgp additional-paths send ecmp limit {{ vrf.address_family_ipv4.bgp.additional_paths.send_ecmp_limit }}
+{%             elif vrf.address_family_ipv4.bgp.additional_paths.send_limit is arista.avd.defined %}
+         bgp additional-paths send limit {{ vrf.address_family_ipv4.bgp.additional_paths.send_limit }}
+{%             elif vrf.address_family_ipv4.bgp.additional_paths.send is arista.avd.defined %}
          bgp additional-paths send {{ vrf.address_family_ipv4.bgp.additional_paths.send }}
-{%                 endif %}
 {%             endif %}
 {%             for neighbor in vrf.address_family_ipv4.neighbors | arista.avd.natural_sort('ip_address') %}
 {%                 if neighbor.activate is arista.avd.defined(true) %}
@@ -1604,14 +1600,12 @@ router bgp {{ router_bgp.as }}
 {%             if vrf.address_family_ipv6.bgp.additional_paths.receive is arista.avd.defined(true) %}
          bgp additional-paths receive
 {%             endif %}
-{%             if vrf.address_family_ipv6.bgp.additional_paths.send is arista.avd.defined %}
-{%                 if vrf.address_family_ipv6.bgp.additional_paths.ecmp_limit is arista.avd.defined %}
-         bgp additional-paths send ecmp limit {{ vrf.address_family_ipv6.bgp.additional_paths.ecmp_limit }}
-{%                 elif vrf.address_family_ipv6.bgp.additional_paths.limit is arista.avd.defined %}
-         bgp additional-paths send limit {{ vrf.address_family_ipv6.bgp.additional_paths.limit }}
-{%                 else %}
+{%             if vrf.address_family_ipv6.bgp.additional_paths.send_ecmp_limit is arista.avd.defined %}
+         bgp additional-paths send ecmp limit {{ vrf.address_family_ipv6.bgp.additional_paths.send_ecmp_limit }}
+{%             elif vrf.address_family_ipv6.bgp.additional_paths.send_limit is arista.avd.defined %}
+         bgp additional-paths send limit {{ vrf.address_family_ipv6.bgp.additional_paths.send_limit }}
+{%             elif vrf.address_family_ipv6.bgp.additional_paths.send is arista.avd.defined %}
          bgp additional-paths send {{ vrf.address_family_ipv6.bgp.additional_paths.send }}
-{%                 endif %}
 {%             endif %}
 {%             for neighbor in vrf.address_family_ipv6.neighbors | arista.avd.natural_sort('ip_address') %}
 {%                 if neighbor.activate is arista.avd.defined(true) %}