Feat(eos_cli_config_gen): Added Support for Spanning Tree Port ID Allocation (#5286)

Co-authored-by: Guillaume Mulocher <[email protected]>
Co-authored-by: Claus Holbech <[email protected]>

Author: 3 people

ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md

@@ -3357,6 +3357,7 @@ STP mode: **rapid-pvst**
 - Spanning Tree disabled for VLANs: **105,202,505-506**
 - Global BPDU Guard for Edge ports is disabled.
 - Global BPDU Filter for Edge ports is disabled.
+- Range of port-ids reserved for port-channels: 201-2001.
 
 ### Spanning Tree Device Configuration
 
@@ -3368,6 +3369,7 @@ no spanning-tree edge-port bpduguard default
 no spanning-tree edge-port bpdufilter default
 spanning-tree bpduguard rate-limit default
 spanning-tree bpduguard rate-limit count 100
+spanning-tree port-id allocation port-channel range 201 2001
 spanning-tree vlan-id 1,2,3,4,5,10-15 priority 4096
 spanning-tree vlan-id 3 priority 8192
 spanning-tree vlan-id 100-500 priority 16384

ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg

@@ -1129,6 +1129,7 @@ no spanning-tree edge-port bpduguard default
 no spanning-tree edge-port bpdufilter default
 spanning-tree bpduguard rate-limit default
 spanning-tree bpduguard rate-limit count 100
+spanning-tree port-id allocation port-channel range 201 2001
 spanning-tree vlan-id 1,2,3,4,5,10-15 priority 4096
 spanning-tree vlan-id 3 priority 8192
 spanning-tree vlan-id 100-500 priority 16384

ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/spanning-tree.yml

@@ -17,3 +17,6 @@ spanning_tree:
     - id: "100-500"
       priority: 16384
   no_spanning_tree_vlan: 105,202,505-506
+  port_id_allocation_port_channel_range:
+    minimum: 201
+    maximum: 2001

ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/spanning-tree.md

@@ -81,6 +81,11 @@ STP Root Super: **{{ spanning_tree.root_super }}**
 {%             endif %}
 {%         endif %}
 {%     endif %}
+{%     if spanning_tree.port_id_allocation_port_channel_range is arista.avd.defined %}
+{%         set min_range = spanning_tree.port_id_allocation_port_channel_range.minimum %}
+{%         set max_range = spanning_tree.port_id_allocation_port_channel_range.maximum %}
+{%         do global_settings.append("- Range of port-ids reserved for port-channels: " ~ min_range ~ "-" ~ max_range ~ ".") %}
+{%     endif %}
 {%     if global_settings | length > 0 %}
 
 #### Global Spanning-Tree Settings

python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/spanning-tree.j2

@@ -38,6 +38,11 @@ spanning-tree bpduguard rate-limit count {{ spanning_tree.bpduguard_rate_limit.c
 {%     if spanning_tree.root_super is arista.avd.defined(true) %}
 spanning-tree root super
 {%     endif %}
+{%     if spanning_tree.port_id_allocation_port_channel_range is arista.avd.defined %}
+{%         set min_range = spanning_tree.port_id_allocation_port_channel_range.minimum %}
+{%         set max_range = spanning_tree.port_id_allocation_port_channel_range.maximum %}
+spanning-tree port-id allocation port-channel range {{ min_range }} {{ max_range }}
+{%     endif %}
 {%     if spanning_tree.mode is arista.avd.defined('mstp') %}
 {%         for mst_instance in spanning_tree.mst_instances | arista.avd.natural_sort('id') %}
 {%             if mst_instance.priority is arista.avd.defined %}

python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/spanning-tree.j2

@@ -107,3 +107,23 @@ keys:
               type: int
               convert_types:
                 - str
+      port_id_allocation_port_channel_range:
+        description: Specify range of port-ids to reserve for port-channels.
+        type: dict
+        keys:
+          minimum:
+            description: Specify minimum value for reserved range.
+            type: int
+            min: 1
+            max: 2048
+            required: true
+            convert_types:
+              - str
+          maximum:
+            description: Specify maximum value for reserved range.
+            type: int
+            min: 1
+            max: 2048
+            required: true
+            convert_types:
+              - str