Merge branch 'aristanetworks:devel' into add_mpls_tunnel_termination

aristanetworks · Jan 21, 2025 · 363a696 · 363a696
2 parents 2a534aa + ae5d390
commit 363a696
Show file tree

Hide file tree

Showing 20 changed files with 137 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,9 +31,6 @@ __pycache__/
 # ansible_collections/arista/avd/tests ignores
 ansible_collections/arista/avd/tests/.mypy_cache/
 
-# ansible-lint ignores
-ansible_collections/arista/avd/.ansible
-
 # Development
 ## pyenv
 .python-version

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -75,7 +75,7 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.9.1
+    rev: v0.9.2
     hooks:
       # Run the linter.
       - id: ruff

diff --git a/ansible_collections/arista/avd/.ansible-lint b/ansible_collections/arista/avd/.ansible-lint
@@ -8,6 +8,3 @@ skip_list:
   - var-naming[no-role-prefix] # TODO: Fix internal variable names as a breaking change for AVD 5.0.0
 kinds:
   - yaml: "**/molecule/**/inventory/host_vars/host1/roles.yml"
-exclude_paths:
-  - .cache/
-  - .ansible/
diff --git a/...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md b/...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md
@@ -3834,6 +3834,8 @@ interface Dps1
 ```eos
 !
 interface Ethernet1
+   !! testing multi line comment with |-
+   !! connection to dc1-spine1
    traffic-policy input BLUE-C1-POLICY
    traffic-policy output BLUE-C2-POLICY
    description P2P_LINK_TO_DC1-SPINE1_Ethernet1
@@ -3913,6 +3915,8 @@ interface Ethernet1
 
 !
 interface Ethernet2
+   !! testing multi line comments with |
+   !! connection to server in pod02
    description SRV-POD02_Eth1
    switchport dot1q vlan tag disallowed
    switchport trunk allowed vlan 110-111,210-211
@@ -3939,6 +3943,7 @@ interface Ethernet2
    spanning-tree bpdufilter disable
 !
 interface Ethernet3
+   !! testing single line comment
    description P2P_LINK_TO_DC1-SPINE2_Ethernet2
    mtu 1500
    switchport trunk native vlan 5
@@ -5090,6 +5095,8 @@ interface Port-Channel3
    isis authentication key 0 <removed>
 !
 interface Port-Channel5
+   !! testing multi line comments with |-
+   !! applied to port-channel 5
    description DC1_L2LEAF1_Po1
    bgp session tracker ST2
    switchport trunk allowed vlan 110,201
@@ -5210,6 +5217,8 @@ interface Port-Channel14
       route-target import 00:00:01:02:03:05
 !
 interface Port-Channel15
+   !! testing multi line comments with |
+   !! applied to port-channel 15
    traffic-policy input BLUE-C1-POLICY
    traffic-policy output BLUE-C2-POLICY
    description DC1_L2LEAF3_Po1
@@ -5227,6 +5236,7 @@ interface Port-Channel15
    link tracking group EVPN_MH_ES2 upstream
 !
 interface Port-Channel16
+   !! testing single line comment
    description DC1_L2LEAF4_Po1
    switchport trunk native vlan 10
    switchport dot1q vlan tag disallowed
@@ -6534,12 +6544,14 @@ service routing protocols model multi-agent
 #### Virtual Router MAC Address Summary
 
 Virtual Router MAC Address: 00:1c:73:00:dc:01
+Virtual Router MAC Address Advertisement Interval: 40
 
 #### Virtual Router MAC Address Device Configuration
 
 ```eos
 !
 ip virtual-router mac-address 00:1c:73:00:dc:01
+ip virtual-router mac-address advertisement-interval 40
 ```
 
 ### IP Routing

diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg
@@ -1654,6 +1654,8 @@ interface Port-Channel3
    isis authentication key 0 password
 !
 interface Port-Channel5
+   !! testing multi line comments with |-
+   !! applied to port-channel 5
    description DC1_L2LEAF1_Po1
    bgp session tracker ST2
    switchport trunk allowed vlan 110,201
@@ -1774,6 +1776,8 @@ interface Port-Channel14
       route-target import 00:00:01:02:03:05
 !
 interface Port-Channel15
+   !! testing multi line comments with |
+   !! applied to port-channel 15
    traffic-policy input BLUE-C1-POLICY
    traffic-policy output BLUE-C2-POLICY
    description DC1_L2LEAF3_Po1
@@ -1791,6 +1795,7 @@ interface Port-Channel15
    link tracking group EVPN_MH_ES2 upstream
 !
 interface Port-Channel16
+   !! testing single line comment
    description DC1_L2LEAF4_Po1
    switchport trunk native vlan 10
    switchport dot1q vlan tag disallowed
@@ -2269,6 +2274,8 @@ interface Dps1
    load-interval 42
 !
 interface Ethernet1
+   !! testing multi line comment with |-
+   !! connection to dc1-spine1
    traffic-policy input BLUE-C1-POLICY
    traffic-policy output BLUE-C2-POLICY
    description P2P_LINK_TO_DC1-SPINE1_Ethernet1
@@ -2348,6 +2355,8 @@ interface Ethernet1
 
 !
 interface Ethernet2
+   !! testing multi line comments with |
+   !! connection to server in pod02
    description SRV-POD02_Eth1
    switchport dot1q vlan tag disallowed
    switchport trunk allowed vlan 110-111,210-211
@@ -2374,6 +2383,7 @@ interface Ethernet2
    spanning-tree bpdufilter disable
 !
 interface Ethernet3
+   !! testing single line comment
    description P2P_LINK_TO_DC1-SPINE2_Ethernet2
    mtu 1500
    switchport trunk native vlan 5
@@ -4151,6 +4161,7 @@ interface profile TEST-PROFILE-2
    command ptp enable
 !
 ip virtual-router mac-address 00:1c:73:00:dc:01
+ip virtual-router mac-address advertisement-interval 40
 !
 ip address virtual source-nat vrf TEST_01 address 1.1.1.1
 ip address virtual source-nat vrf TEST_02 address 1.1.1.2

diff --git a/.../arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/ethernet-interfaces.yml b/.../arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/ethernet-interfaces.yml
@@ -6,6 +6,9 @@ ethernet_interfaces:
     peer_interface: Ethernet1
     peer_type: spine
     description: P2P_LINK_TO_DC1-SPINE1_Ethernet1
+    comment: |-
+      testing multi line comment with |-
+      connection to dc1-spine1
     speed: forced 100gfull
     mtu: 1500
     l2_mtu: 8000
@@ -161,6 +164,9 @@ ethernet_interfaces:
     peer_interface: Eth1
     peer_type: server
     description: SRV-POD02_Eth1
+    comment: |
+      testing multi line comments with |
+      connection to server in pod02
     tcp_mss_ceiling:
       ipv4_segment_size: 70
       direction: ingress
@@ -217,6 +223,7 @@ ethernet_interfaces:
     peer_interface: Ethernet2
     peer_type: spine
     description: P2P_LINK_TO_DC1-SPINE2_Ethernet2
+    comment: testing single line comment
     mtu: 1500
     ip_address: 172.31.128.1/31
     snmp_trap_link_change: false

diff --git a/...ig_gen/inventory/host_vars/host1/ip-virtual-router-mac-address-advertisement-interval.yml b/...ig_gen/inventory/host_vars/host1/ip-virtual-router-mac-address-advertisement-interval.yml
@@ -0,0 +1,3 @@
+---
+### IP Virtual Router MAC Address Advertisement Interval ###
+ip_virtual_router_mac_address_advertisement_interval: 40
diff --git a/...sta/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/port-channel-interfaces.yml b/...sta/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/port-channel-interfaces.yml
@@ -3,6 +3,9 @@
 port_channel_interfaces:
   - name: Port-Channel5
     description: DC1_L2LEAF1_Po1
+    comment: |-
+      testing multi line comments with |-
+      applied to port-channel 5
     link_tracking_groups:
       - name: EVPN_MH_ES1
         direction: downstream
@@ -70,6 +73,9 @@ port_channel_interfaces:
           destination_mac_address: forwardable
 
   - name: Port-Channel15
+    comment: |
+      testing multi line comments with |
+      applied to port-channel 15
     description: DC1_L2LEAF3_Po1
     link_tracking_groups:
       - name: EVPN_MH_ES2
@@ -111,6 +117,7 @@ port_channel_interfaces:
       output: BLUE-C2-POLICY
 
   - name: Port-Channel16
+    comment: testing single line comment
     description: DC1_L2LEAF4_Po1
     snmp_trap_link_change: true
     mlag: 16

diff --git a/...lections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md b/...lections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md
diff --git a/..._config_gen/docs/tables/ip-virtual-router-mac-address-advertisement-interval.md b/..._config_gen/docs/tables/ip-virtual-router-mac-address-advertisement-interval.md
diff --git a/...ions/arista/avd/roles/eos_cli_config_gen/docs/tables/port-channel-interfaces.md b/...ions/arista/avd/roles/eos_cli_config_gen/docs/tables/port-channel-interfaces.md
diff --git a/...-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/ip-virtual-router-mac-address.j2 b/...-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/ip-virtual-router-mac-address.j2
@@ -4,13 +4,18 @@
  that can be found in the LICENSE file.
 #}
 {# doc - ip virtual router mac address #}
-{% if ip_virtual_router_mac_address is arista.avd.defined %}
+{% if ip_virtual_router_mac_address is arista.avd.defined or ip_virtual_router_mac_address_advertisement_interval is arista.avd.defined %}
 
 ### Virtual Router MAC Address
 
 #### Virtual Router MAC Address Summary
 
+{%     if ip_virtual_router_mac_address is arista.avd.defined %}
 Virtual Router MAC Address: {{ ip_virtual_router_mac_address }}
+{%     endif %}
+{%     if ip_virtual_router_mac_address_advertisement_interval is arista.avd.defined %}
+Virtual Router MAC Address Advertisement Interval: {{ ip_virtual_router_mac_address_advertisement_interval }}
+{%     endif %}
 
 #### Virtual Router MAC Address Device Configuration
 

diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ethernet-interfaces.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ethernet-interfaces.j2
@@ -8,6 +8,11 @@
 {% for ethernet_interface in ethernet_interfaces | arista.avd.natural_sort('name') %}
 !
 interface {{ ethernet_interface.name }}
+{%     if ethernet_interface.comment is arista.avd.defined %}
+{%         for comment_line in ethernet_interface.comment.splitlines() | arista.avd.default([]) %}
+   !! {{ comment_line }}
+{%         endfor %}
+{%     endif %}
 {%     if ethernet_interface.profile is arista.avd.defined %}
    profile {{ ethernet_interface.profile }}
 {%     endif %}

diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ip-virtual-router-mac-address.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ip-virtual-router-mac-address.j2
@@ -4,7 +4,12 @@
  that can be found in the LICENSE file.
 #}
 {# eos - ip virtual router mac address #}
-{% if ip_virtual_router_mac_address is arista.avd.defined %}
+{% if ip_virtual_router_mac_address is arista.avd.defined or ip_virtual_router_mac_address_advertisement_interval is arista.avd.defined %}
 !
+{%     if ip_virtual_router_mac_address is arista.avd.defined %}
 ip virtual-router mac-address {{ ip_virtual_router_mac_address }}
+{%     endif %}
+{%     if ip_virtual_router_mac_address_advertisement_interval is arista.avd.defined %}
+ip virtual-router mac-address advertisement-interval {{ ip_virtual_router_mac_address_advertisement_interval }}
+{%     endif %}
 {% endif %}
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/port-channel-interfaces.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/port-channel-interfaces.j2
@@ -7,6 +7,11 @@
 {% for port_channel_interface in port_channel_interfaces | arista.avd.natural_sort('name') %}
 !
 interface {{ port_channel_interface.name }}
+{%     if port_channel_interface.comment is arista.avd.defined %}
+{%         for comment_line in port_channel_interface.comment.splitlines() | arista.avd.default([]) %}
+   !! {{ comment_line }}
+{%         endfor %}
+{%     endif %}
 {%     if port_channel_interface.profile is arista.avd.defined %}
    profile {{ port_channel_interface.profile }}
 {%     endif %}