Merge branch 'devel' into rsvp

aristanetworks · Nov 21, 2024 · b1e8233 · b1e8233
2 parents b547bda + 71a101e
commit b1e8233
Show file tree

Hide file tree

Showing 46 changed files with 2,106 additions and 94 deletions.
diff --git a/.github/workflows/new-cvp-integration.yml b/.github/workflows/new-cvp-integration.yml
@@ -12,6 +12,8 @@ env:
   # Apparently it is set in secrets when running with debug
   ANSIBLE_VERBOSITY: ${{ secrets.ACTIONS_STEP_DEBUG && 3 || 0 }}
   AVD_NEVER_RUN_FROM_SOURCE: 1
+  PY_COLORS: 1 # allows molecule colors to be passed to GitHub Actions
+  ANSIBLE_FORCE_COLOR: 1 # allows ansible colors to be passed to GitHub Actions
 
 jobs:
   # ----------------------------------------------- #
@@ -26,12 +28,8 @@ jobs:
         avd_scenario:
           - 'cv_workflow'
         ansible_version:
-          - 'ansible-core<2.18.0 --upgrade'
+          - 'ansible-core<2.19.0 --upgrade'
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
-          echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Run molecule action
         env:
@@ -59,12 +57,8 @@ jobs:
         avd_scenario:
           - 'cv_deploy'
         ansible_version:
-          - 'ansible-core<2.18.0 --upgrade'
+          - 'ansible-core<2.19.0 --upgrade'
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
-          echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Run molecule action
         env:

diff --git a/.github/workflows/pull-request-management.yml b/.github/workflows/pull-request-management.yml
@@ -12,6 +12,8 @@ env:
   # Apparently it is set in secrets when running with debug
   ANSIBLE_VERBOSITY: ${{ secrets.ACTIONS_STEP_DEBUG && 3 || 0 }}
   AVD_NEVER_RUN_FROM_SOURCE: 1
+  PY_COLORS: 1 # allows molecule colors to be passed to GitHub Actions
+  ANSIBLE_FORCE_COLOR: 1 # allows ansible colors to be passed to GitHub Actions
 
 jobs:
   file-changes:
@@ -101,10 +103,6 @@ jobs:
           - "3.12"
           - "3.13"
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
-          echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Set up Python 3
         uses: actions/setup-python@v5
@@ -136,10 +134,6 @@ jobs:
     needs: [ file-changes ]
     if: needs.file-changes.outputs.config_gen == 'true'
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
-          echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Run molecule action
         uses: arista-netdevops-community/[email protected]
@@ -171,10 +165,6 @@ jobs:
     needs: [ file-changes ]
     if: needs.file-changes.outputs.dhcp == 'true'
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
-          echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Run molecule action
         uses: arista-netdevops-community/[email protected]
@@ -240,10 +230,6 @@ jobs:
     needs: [ file-changes ]
     if: needs.file-changes.outputs.eos_design == 'true' || needs.file-changes.outputs.config_gen == 'true'
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
-          echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Build minimum requirements
         run: |
@@ -285,10 +271,6 @@ jobs:
     needs: [ file-changes ]
     if: needs.file-changes.outputs.cloudvision == 'true'
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
-          echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Run molecule action
         uses: arista-netdevops-community/[email protected]
@@ -325,10 +307,6 @@ jobs:
     needs: [ file-changes ]
     if: needs.file-changes.outputs.eos_design == 'true' || needs.file-changes.outputs.validate_state == 'true'
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
-          echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Run molecule action
         uses: arista-netdevops-community/[email protected]
@@ -349,12 +327,7 @@ jobs:
     name: Run ansible-test sanity validation
     runs-on: ubuntu-latest
     needs: [ file-changes ]
-    # needs: [ molecule_eos_designs, molecule_cloudvision ]
-    # if: needs.cloudvision.status != 'failed' && needs.molecule_eos_designs.status != 'failed' && needs.file-changes.outputs.plugins == 'true'
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Set up Python 3
         uses: actions/setup-python@v5
@@ -363,7 +336,7 @@ jobs:
             3.10
             3.11
             3.12
-          # 3.13 - Still waiting for support in ansible-test
+            3.13
       - name: 'Install Python requirements'
         run: |
           pip install "ansible-core<2.19.0" -r .github/requirements-ci.txt --upgrade
@@ -377,9 +350,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ file-changes ]
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Set up Python 3
         uses: actions/setup-python@v5
@@ -399,16 +369,13 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ file-changes ]
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Set up Python 3
         uses: actions/setup-python@v5
         with:
           python-version: |
             3.12
-          # 3.13 - Still waiting for support in ansible-test
+            3.13
       - name: 'Install Python requirements'
         run: |
           pip install "ansible-core<2.19.0" -r .github/requirements-ci.txt --upgrade
@@ -422,9 +389,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ file-changes ]
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Set up Python 3
         uses: actions/setup-python@v5
@@ -449,8 +413,6 @@ jobs:
     name: Test galaxy-importer
     runs-on: ubuntu-20.04 # Older version to be compatible with old python
     env:
-      PY_COLORS: 1 # allows molecule colors to be passed to GitHub Actions
-      ANSIBLE_FORCE_COLOR: 1 # allows ansible colors to be passed to GitHub Actions
       GALAXY_IMPORTER_CONFIG: galaxy-importer/galaxy-importer.cfg
     steps:
       - uses: actions/setup-python@v5
@@ -492,9 +454,6 @@ jobs:
       matrix:
         python: ["3.10", "3.11", "3.12", "3.13"]
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Set up Python 3
         uses: actions/setup-python@v5

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.7.3
+    rev: v0.7.4
     hooks:
       # Run the linter.
       - id: ruff

diff --git a/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG-ISIS-L3LEAF1A.cfg b/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG-ISIS-L3LEAF1A.cfg
@@ -0,0 +1,141 @@
+!
+no enable password
+no aaa root
+!
+vlan internal order ascending range 1006 1199
+!
+transceiver qsfp default-mode 4x10G
+!
+service routing protocols model multi-agent
+!
+hostname MLAG-ISIS-L3LEAF1A
+!
+no spanning-tree vlan-id 4094
+!
+vlan 4094
+   name MLAG
+   trunk group MLAG
+!
+vrf instance MGMT
+!
+management api http-commands
+   protocol https
+   no shutdown
+   !
+   vrf MGMT
+      no shutdown
+!
+interface Port-Channel5
+   description MLAG_MLAG-ISIS-L3LEAF1B_Port-Channel5
+   no shutdown
+   switchport mode trunk
+   switchport trunk group MLAG
+   switchport
+!
+interface Ethernet1
+   description P2P_MLAG-ISIS-SPINE_Ethernet30
+   no shutdown
+   mtu 9214
+   no switchport
+   ip address 10.10.101.7/31
+   isis enable EVPN_UNDERLAY
+   isis circuit-type level-2
+   isis metric 50
+   isis network point-to-point
+   isis authentication mode md5
+   isis authentication key 7 $1c$sTNAlR6rKSw=
+!
+interface Ethernet5
+   description MLAG_MLAG-ISIS-L3LEAF1B_Ethernet5
+   no shutdown
+   channel-group 5 mode active
+!
+interface Ethernet6
+   description MLAG_MLAG-ISIS-L3LEAF1B_Ethernet6
+   no shutdown
+   channel-group 5 mode active
+!
+interface Loopback0
+   description ROUTER_ID
+   no shutdown
+   ip address 192.168.255.36/32
+   isis enable EVPN_UNDERLAY
+   isis passive
+!
+interface Loopback1
+   description VXLAN_TUNNEL_SOURCE
+   no shutdown
+   ip address 192.168.254.36/32
+   isis enable EVPN_UNDERLAY
+   isis passive
+!
+interface Management1
+   description OOB_MANAGEMENT
+   no shutdown
+   vrf MGMT
+   ip address 192.168.201.116/24
+!
+interface Vlan4094
+   description MLAG
+   no shutdown
+   mtu 9214
+   no autostate
+   ip address 10.10.255.6/31
+   isis enable EVPN_UNDERLAY
+   isis metric 50
+   isis network point-to-point
+   isis authentication mode md5
+   isis authentication key 7 $1c$sTNAlR6rKSw=
+!
+interface Vxlan1
+   description MLAG-ISIS-L3LEAF1A_VTEP
+   vxlan source-interface Loopback1
+   vxlan virtual-router encapsulation mac-address mlag-system-id
+   vxlan udp-port 4789
+!
+ip routing
+no ip routing vrf MGMT
+!
+mlag configuration
+   domain-id MLAG_ISIS_L3LEAF1
+   local-interface Vlan4094
+   peer-address 10.10.255.7
+   peer-link Port-Channel5
+   reload-delay mlag 300
+   reload-delay non-mlag 330
+!
+router bfd
+   multihop interval 300 min-rx 300 multiplier 3
+!
+router bgp 65161
+   router-id 192.168.255.36
+   update wait-install
+   no bgp default ipv4-unicast
+   maximum-paths 4 ecmp 4
+   neighbor EVPN-OVERLAY-PEERS peer group
+   neighbor EVPN-OVERLAY-PEERS update-source Loopback0
+   neighbor EVPN-OVERLAY-PEERS bfd
+   neighbor EVPN-OVERLAY-PEERS ebgp-multihop 3
+   neighbor EVPN-OVERLAY-PEERS send-community
+   neighbor EVPN-OVERLAY-PEERS maximum-routes 0
+   neighbor 10.10.10.1 peer group EVPN-OVERLAY-PEERS
+   neighbor 10.10.10.1 remote-as 65000
+   neighbor 10.10.10.1 description MLAG-ISIS-SPINE_Loopback0
+   !
+   address-family evpn
+      neighbor EVPN-OVERLAY-PEERS activate
+   !
+   address-family ipv4
+      no neighbor EVPN-OVERLAY-PEERS activate
+!
+router isis EVPN_UNDERLAY
+   net 49.0001.1921.6825.5036.00
+   router-id ipv4 192.168.255.36
+   is-type level-2
+   log-adjacency-changes
+   !
+   address-family ipv4 unicast
+      maximum-paths 4
+   !
+!
+end