Fix(eos_cli_config_gen): Render access vlan on port-channel interface…

…s if mode is dot1q-tunnel
aristanetworks · Apr 29, 2024 · fb300f8 · fb300f8
1 parent 3d1a6fc
commit fb300f8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
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
@@ -235,7 +235,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 | - | - | - | - | - | - | - |
+| Port-Channel131 | dot1q-tunnel mode | switched | dot1q-tunnel | 115 | - | - | - | - | - | - |
 
 ##### Encapsulation Dot1q
 
@@ -707,6 +707,7 @@ interface Port-Channel130
 interface Port-Channel131
    description dot1q-tunnel mode
    switchport
+   switchport access vlan 115
    switchport mode dot1q-tunnel
 ```
 

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
@@ -367,6 +367,7 @@ interface Port-Channel130
 interface Port-Channel131
    description dot1q-tunnel mode
    switchport
+   switchport access vlan 115
    switchport mode dot1q-tunnel
 !
 interface Ethernet3

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
@@ -451,6 +451,7 @@ port_channel_interfaces:
     description: dot1q-tunnel mode
     type: switched
     mode: dot1q-tunnel
+    vlans: 115
 
 
 # Children interfaces

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
@@ -64,7 +64,7 @@ interface {{ port_channel_interface.name }}
 {%     elif port_channel_interface.type | arista.avd.default("switched") == 'switched' %}
    switchport
 {%     endif %}
-{%     if port_channel_interface.vlans is arista.avd.defined and port_channel_interface.mode is arista.avd.defined("access") %}
+{%     if port_channel_interface.vlans is arista.avd.defined and port_channel_interface.mode in ["access", "dot1q-tunnel"] %}
    switchport access vlan {{ port_channel_interface.vlans }}
 {%     endif %}
 {%     if port_channel_interface.vlans is arista.avd.defined and port_channel_interface.mode is arista.avd.defined("trunk") %}