Fixing doc template for empty vlans column

aristanetworks · Aug 22, 2024 · af33193 · af33193
1 parent 6e4b393
commit af33193
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 33 deletions.
diff --git a/...ta/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md b/...ta/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md
@@ -89,13 +89,13 @@ sFlow is disabled.
 | --------- | ----------- | ---- | ----- | ----------- | ----------- | ------------- |
 | Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet1 | dot1q-tunnel | 110-111,200,210-211 | tag | g1, g2 | - |
 | Ethernet2 | SRV-POD02_Eth1 | trunk | 110-111,210-211 | - | - | - |
-| Ethernet3 | P2P_LINK_TO_DC1-SPINE2_Ethernet2 | trunk |  | 5 | - | - |
+| Ethernet3 | P2P_LINK_TO_DC1-SPINE2_Ethernet2 | trunk | - | 5 | - | - |
 | Ethernet5 | Molecule Routing | - | 220 | - | - | - |
 | Ethernet6 | SRV-POD02_Eth1 | trunk | 110-111,210-211 | - | - | - |
 | Ethernet7 | Molecule L2 | - | - | - | - | - |
 | Ethernet11 | interface_in_mode_access_accepting_tagged_LACP | access | 200 | - | - | - |
 | Ethernet12 | interface_with_dot1q_tunnel | dot1q-tunnel | 300 | - | - | - |
-| Ethernet13 | interface_in_mode_access_with_voice | trunk phone |  | 100 | - | - |
+| Ethernet13 | interface_in_mode_access_with_voice | trunk phone | - | 100 | - | - |
 | Ethernet14 | SRV-POD02_Eth1 | trunk | 110-111,210-211 | - | - | - |
 | Ethernet15 | PVLAN Promiscuous Access - only one secondary | access | 110 | - | - | - |
 | Ethernet16 | PVLAN Promiscuous Trunk - vlan translation out | trunk | 110-112 | - | - | - |
@@ -125,7 +125,7 @@ sFlow is disabled.
 | Ethernet43 | DOT1X Testing - timeout values | - | - | - | - | - |
 | Ethernet44 | DOT1X Testing - reauthorization_request_limit | - | - | - | - | - |
 | Ethernet45 | DOT1X Testing - all features | - | - | - | - | - |
-| Ethernet46 | native-vlan-tag-precedence | trunk |  | tag | - | - |
+| Ethernet46 | native-vlan-tag-precedence | trunk | - | tag | - | - |
 | Ethernet48 | Load Interval | - | - | - | - | - |
 | Ethernet50 | SFlow Interface Testing - SFlow ingress enabled | - | - | - | - | - |
 | Ethernet51 | SFlow Interface Testing - SFlow egress enabled | - | - | - | - | - |
@@ -136,8 +136,8 @@ sFlow is disabled.
 | Ethernet57 | Interface with poe commands and limit in watts | - | - | - | - | - |
 | Ethernet58 | Interface with poe disabled and no other poe keys | - | - | - | - | - |
 | Ethernet60 | IP NAT Testing | - | - | - | - | - |
-| Ethernet61 | interface_in_mode_access_with_voice | trunk phone |  | 100 | - | - |
-| Ethernet62 | interface_in_mode_access_with_voice | trunk phone |  | 100 | - | - |
+| Ethernet61 | interface_in_mode_access_with_voice | trunk phone | - | 100 | - | - |
+| Ethernet62 | interface_in_mode_access_with_voice | trunk phone | - | 100 | - | - |
 | Ethernet67 | Custom_Transceiver_Frequency | - | - | - | - | - |
 | Ethernet68 | Custom_Transceiver_Frequency | - | - | - | - | - |
 | Ethernet69 | IP NAT service-profile | - | - | - | - | - |

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
@@ -220,7 +220,7 @@ interface Ethernet50
 | Port-Channel3 | MLAG_PEER_DC1-LEAF1B_Po3 | trunk | 2-4094 | - | LEAF_PEER_L3, MLAG | - | - | - | - |
 | Port-Channel5 | DC1_L2LEAF1_Po1 | trunk | 110,201 | - | - | - | - | 5 | - |
 | Port-Channel10 | SRV01_bond0 | trunk | 2-3000 | - | - | - | - | - | 0000:0000:0404:0404:0303 |
-| Port-Channel12 | interface_in_mode_access_with_voice | trunk phone |  | 100 | - | - | - | - | - |
+| Port-Channel12 | interface_in_mode_access_with_voice | trunk phone | - | 100 | - | - | - | - | - |
 | Port-Channel14 | EVPN-MPLS multihoming | - | - | - | - | - | - | - | 0000:0000:0000:0102:0305 |
 | Port-Channel15 | DC1_L2LEAF3_Po1 | trunk | 110,201 | - | - | - | - | 15 | - |
 | Port-Channel16 | DC1_L2LEAF4_Po1 | trunk | 110,201 | 10 | - | - | - | 16 | - |
@@ -238,9 +238,9 @@ interface Ethernet50
 | Port-Channel108 | bpdu false | - | - | - | - | - | - | - | - |
 | Port-Channel109 | Molecule ACLs | access | 110 | - | - | - | - | - | - |
 | Port-Channel112 | LACP fallback individual | trunk | 112 | - | - | 5 | individual | - | - |
-| Port-Channel115 | native-vlan-tag-precedence | trunk |  | tag | - | - | - | - | - |
-| Port-Channel121 | access_port_with_no_vlans | access |  | - | - | - | - | - | - |
-| Port-Channel122 | trunk_port_with_no_vlans | trunk |  | - | - | - | - | - | - |
+| Port-Channel115 | native-vlan-tag-precedence | trunk | - | tag | - | - | - | - | - |
+| Port-Channel121 | access_port_with_no_vlans | access | - | - | - | - | - | - | - |
+| Port-Channel122 | trunk_port_with_no_vlans | trunk | - | - | - | - | - | - | - |
 | Port-Channel131 | dot1q-tunnel mode | dot1q-tunnel | 115 | - | - | - | - | - | - |
 
 ##### Encapsulation Dot1q

diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/ethernet-interfaces.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/ethernet-interfaces.j2
@@ -31,22 +31,25 @@
                 (port_channel_interface.type is not arista.avd.defined or (port_channel_interface.type is arista.avd.defined and port_channel_interface.type not in ["switched", "routed"])) %}
 {%                 set description = ethernet_interface.description | arista.avd.default("-") %}
 {%                 set mode = port_channel_interface.switchport.mode | arista.avd.default('-') %}
-{%                 set vlans = [] %}
-{%                 if port_channel_interface.switchport.access_vlan is arista.avd.defined %}
-{%                     do vlans.append(port_channel_interface.switchport.access_vlan) %}
-{%                 endif %}
-{%                 if port_channel_interface.switchport.trunk.allowed_vlan is arista.avd.defined %}
-{%                     do vlans.extend(port_channel_interface.switchport.trunk.allowed_vlan | arista.avd.range_expand | map('int')) %}
+{%                 if port_channel_interface.switchport.access_vlan is arista.avd.defined or
+                    port_channel_interface.switchport.trunk.allowed_vlan is arista.avd.defined %}
+{%                     set vlans = [] %}
+{%                     if port_channel_interface.switchport.access_vlan is arista.avd.defined %}
+{%                         do vlans.append(port_channel_interface.switchport.access_vlan) %}
+{%                     endif %}
+{%                     if port_channel_interface.switchport.trunk.allowed_vlan is arista.avd.defined %}
+{%                         do vlans.extend(port_channel_interface.switchport.trunk.allowed_vlan | arista.avd.range_expand | map('int')) %}
+{%                     endif %}
+{%                     set vlans = vlans | arista.avd.list_compress %}
 {%                 endif %}
-{%                 set vlans = vlans | arista.avd.list_compress | arista.avd.default('-') %}
 {%                 if port_channel_interface.switchport.trunk.native_vlan_tag is arista.avd.defined(true) %}
 {%                     set native_vlan = "tag" %}
 {%                 else %}
 {%                     set native_vlan = port_channel_interface.switchport.trunk.native_vlan | arista.avd.default('-') %}
 {%                 endif %}
 {%                 set channel_group = ethernet_interface.channel_group.id %}
 {%                 set trunk_groups = port_channel_interface.switchport.trunk.groups | arista.avd.default(['-']) | join(', ') %}
-| {{ ethernet_interface.name }} | {{ description }} | *{{ mode }} | *{{ vlans }} | *{{ native_vlan }} | *{{ trunk_groups }} | {{ channel_group }} |
+| {{ ethernet_interface.name }} | {{ description }} | *{{ mode }} | *{{ vlans | arista.avd.default('-') }} | *{{ native_vlan }} | *{{ trunk_groups }} | {{ channel_group }} |
 {# TODO: AVD6.0 Below elif block should be removed once the deprecated keys are removed in AVD6.0 #}
 {%             elif port_channel_interface.type is arista.avd.defined('switched') %}
 {%                 set description = ethernet_interface.description | arista.avd.default("-") %}
@@ -73,21 +76,24 @@
                 (ethernet_interface.type is not arista.avd.defined or (ethernet_interface.type is arista.avd.defined and ethernet_interface.type not in ["switched", "routed"])) %}
 {%                 set description = ethernet_interface.description | arista.avd.default("-") %}
 {%                 set mode = ethernet_interface.switchport.mode | arista.avd.default('-') %}
-{%                 set vlans = [] %}
-{%                 if ethernet_interface.switchport.access_vlan is arista.avd.defined %}
-{%                     do vlans.append(ethernet_interface.switchport.access_vlan) %}
-{%                 endif %}
-{%                 if ethernet_interface.switchport.trunk.allowed_vlan is arista.avd.defined %}
-{%                     do vlans.extend(ethernet_interface.switchport.trunk.allowed_vlan | arista.avd.range_expand | map('int')) %}
+{%                 if ethernet_interface.switchport.access_vlan is arista.avd.defined or
+                    ethernet_interface.switchport.trunk.allowed_vlan is arista.avd.defined %}
+{%                     set vlans = [] %}
+{%                     if ethernet_interface.switchport.access_vlan is arista.avd.defined %}
+{%                         do vlans.append(ethernet_interface.switchport.access_vlan) %}
+{%                     endif %}
+{%                     if ethernet_interface.switchport.trunk.allowed_vlan is arista.avd.defined %}
+{%                         do vlans.extend(ethernet_interface.switchport.trunk.allowed_vlan | arista.avd.range_expand | map('int')) %}
+{%                     endif %}
+{%                     set vlans = vlans | arista.avd.list_compress %}
 {%                 endif %}
-{%                 set vlans = vlans | arista.avd.list_compress | arista.avd.default('-') %}
 {%                 if ethernet_interface.switchport.trunk.native_vlan_tag is arista.avd.defined(true) %}
 {%                     set native_vlan = "tag" %}
 {%                 else %}
 {%                     set native_vlan = ethernet_interface.switchport.trunk.native_vlan | arista.avd.default('-') %}
 {%                 endif %}
 {%                 set trunk_groups = ethernet_interface.switchport.trunk.groups | arista.avd.default(['-']) | join(', ') %}
-| {{ ethernet_interface.name }} | {{ description }} | {{ mode }} | {{ vlans }} | {{ native_vlan }} | {{ trunk_groups }} | - |
+| {{ ethernet_interface.name }} | {{ description }} | {{ mode }} | {{ vlans | arista.avd.default('-') }} | {{ native_vlan }} | {{ trunk_groups }} | - |
 {# TODO: AVD6.0 Below elif block should be removed once the deprecated keys are removed in AVD6.0 #}
 {%             elif ethernet_interface.type is arista.avd.defined('switched') %}
 {%                 set description = ethernet_interface.description | arista.avd.default("-") %}

diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/port-channel-interfaces.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/port-channel-interfaces.j2
@@ -26,14 +26,17 @@
             (port_channel_interface.type is not arista.avd.defined or (port_channel_interface.type is arista.avd.defined and port_channel_interface.type not in ["switched", "routed"])) %}
 {%             set description = port_channel_interface.description | arista.avd.default("-") %}
 {%             set mode = port_channel_interface.switchport.mode | arista.avd.default('-') %}
-{%             set vlans = [] %}
-{%             if port_channel_interface.switchport.access_vlan is arista.avd.defined %}
-{%                 do vlans.append(port_channel_interface.switchport.access_vlan) %}
-{%             endif %}
-{%             if port_channel_interface.switchport.trunk.allowed_vlan is arista.avd.defined %}
-{%                 do vlans.extend(port_channel_interface.switchport.trunk.allowed_vlan | arista.avd.range_expand | map('int')) %}
+{%             if port_channel_interface.switchport.access_vlan is arista.avd.defined or
+                port_channel_interface.switchport.trunk.allowed_vlan is arista.avd.defined %}
+{%                 set vlans = [] %}
+{%                 if port_channel_interface.switchport.access_vlan is arista.avd.defined %}
+{%                     do vlans.append(port_channel_interface.switchport.access_vlan) %}
+{%                 endif %}
+{%                 if port_channel_interface.switchport.trunk.allowed_vlan is arista.avd.defined %}
+{%                     do vlans.extend(port_channel_interface.switchport.trunk.allowed_vlan | arista.avd.range_expand | map('int')) %}
+{%                 endif %}
+{%                 set vlans = vlans | arista.avd.list_compress %}
 {%             endif %}
-{%             set vlans = vlans | arista.avd.list_compress %}
 {%             if port_channel_interface.switchport.trunk.native_vlan_tag is arista.avd.defined(true) %}
 {%                 set native_vlan = "tag" %}
 {%             else %}
@@ -44,7 +47,7 @@
 {%             set lacp_fallback_mode = port_channel_interface.lacp_fallback_mode | arista.avd.default("-") %}
 {%             set mlag = port_channel_interface.mlag | arista.avd.default("-") %}
 {%             set esi = port_channel_interface.evpn_ethernet_segment.identifier | arista.avd.default("-") %}
-| {{ port_channel_interface.name }} | {{ description }} | {{ mode }} | {{ vlans }} | {{ native_vlan }} | {{ trunk_groups }} | {{ lacp_fallback_timeout }} | {{ lacp_fallback_mode }} | {{ mlag }} | {{ esi }} |
+| {{ port_channel_interface.name }} | {{ description }} | {{ mode }} | {{ vlans | arista.avd.default('-') }} | {{ native_vlan }} | {{ trunk_groups }} | {{ lacp_fallback_timeout }} | {{ lacp_fallback_mode }} | {{ mlag }} | {{ esi }} |
 {# TODO: AVD6.0 Below elif block should be removed once the deprecated keys are removed in AVD6.0 #}
 {%         elif port_channel_interface.type is arista.avd.defined("switched") %}
 {%             set description = port_channel_interface.description | arista.avd.default("-") %}