Fix(eos_cli_config_gen): Render switchport mode for all modes for Por…

…t-channels (#3429)
aristanetworks · Dec 15, 2023 · c44d663 · c44d663
1 parent 68b33d0
commit c44d663
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 1 deletion.
diff --git a/...vd/molecule/eos_cli_config_gen/documentation/devices/port-channel-interfaces.md b/...vd/molecule/eos_cli_config_gen/documentation/devices/port-channel-interfaces.md
@@ -233,6 +233,7 @@ interface Ethernet50
 | Port-Channel121 | access_port_with_no_vlans | switched | access | - | - | - | - | - | - | - |
 | Port-Channel122 | trunk_port_with_no_vlans | switched | trunk | - | - | - | - | - | - | - |
 | Port-Channel130 | IP NAT Testing | switched | access | - | - | - | - | - | - | - |
+| Port-Channel131 | dot1q-tunnel mode | switched | dot1q-tunnel | - | - | - | - | - | - | - |
 
 ##### Encapsulation Dot1q
 
@@ -404,6 +405,7 @@ interface Port-Channel12
    switchport trunk native vlan 100
    switchport phone vlan 70
    switchport phone trunk untagged
+   switchport mode trunk phone
 !
 interface Port-Channel13
    description EVPN-Vxlan single-active redundancy
@@ -679,6 +681,11 @@ interface Port-Channel130
    ip nat source dynamic access-list ACL2 pool POOL2
    ip nat destination static 1.0.0.1 2.0.0.1
    ip nat destination dynamic access-list ACL1 pool POOL1
+!
+interface Port-Channel131
+   description dot1q-tunnel mode
+   switchport
+   switchport mode dot1q-tunnel
 ```
 
 ## BFD

diff --git a/...tions/arista/avd/molecule/eos_cli_config_gen/intended/configs/port-channel-interfaces.cfg b/...tions/arista/avd/molecule/eos_cli_config_gen/intended/configs/port-channel-interfaces.cfg
@@ -67,6 +67,7 @@ interface Port-Channel12
    switchport trunk native vlan 100
    switchport phone vlan 70
    switchport phone trunk untagged
+   switchport mode trunk phone
 !
 interface Port-Channel13
    description EVPN-Vxlan single-active redundancy
@@ -343,6 +344,11 @@ interface Port-Channel130
    ip nat destination static 1.0.0.1 2.0.0.1
    ip nat destination dynamic access-list ACL1 pool POOL1
 !
+interface Port-Channel131
+   description dot1q-tunnel mode
+   switchport
+   switchport mode dot1q-tunnel
+!
 interface Ethernet3
    description MLAG_PEER_DC1-LEAF1B_Ethernet3
    channel-group 3 mode active

diff --git a/...ns/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/port-channel-interfaces.yml b/...ns/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/port-channel-interfaces.yml
@@ -415,6 +415,12 @@ port_channel_interfaces:
           - original_ip: 3.0.0.1
             translated_ip: 4.0.0.1
 
+  - name: Port-Channel131
+    description: dot1q-tunnel mode
+    type: switched
+    mode: dot1q-tunnel
+
+
 # Children interfaces
 ethernet_interfaces:
   - name: Ethernet5

diff --git a/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2A.cfg b/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2A.cfg
@@ -192,6 +192,7 @@ interface Port-Channel26
    switchport trunk native vlan 210
    switchport phone vlan 211
    switchport phone trunk untagged
+   switchport mode trunk phone
 !
 interface Port-Channel141
    description DC1_L2LEAF5_Po1

diff --git a/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2B.cfg b/...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2B.cfg
@@ -192,6 +192,7 @@ interface Port-Channel26
    switchport trunk native vlan 210
    switchport phone vlan 211
    switchport phone trunk untagged
+   switchport mode trunk phone
 !
 interface Port-Channel141
    description DC1_L2LEAF5_Po1

diff --git a/..._collections/arista/avd/roles/eos_cli_config_gen/templates/eos/port-channel-interfaces.j2 b/..._collections/arista/avd/roles/eos_cli_config_gen/templates/eos/port-channel-interfaces.j2
@@ -78,7 +78,7 @@ interface {{ port_channel_interface.name }}
 {%     if port_channel_interface.phone.trunk is arista.avd.defined %}
    switchport phone trunk {{ port_channel_interface.phone.trunk }}
 {%     endif %}
-{%     if port_channel_interface.mode is arista.avd.defined("trunk") %}
+{%     if port_channel_interface.mode is arista.avd.defined and port_channel_interface.mode != "access" %}
    switchport mode {{ port_channel_interface.mode }}
 {%     endif %}
 {%     for  trunk_group in port_channel_interface.trunk_groups | arista.avd.natural_sort %}