Merge branch 'devel' into rsvp

aristanetworks · Nov 13, 2024 · 861efe4 · 861efe4
2 parents 5d94392 + 241b400
commit 861efe4
Show file tree

Hide file tree

Showing 21 changed files with 142 additions and 133 deletions.
diff --git a/.github/requirements-ci.txt b/.github/requirements-ci.txt
@@ -1,7 +1,3 @@
 # Installing PyAVD from source.
 # The package path below is relative to the repo root and will only work if the pip install is executed from there.
-./python-avd
-# The -r path is relative to this file.
--r ../ansible_collections/arista/avd/requirements.txt
-# Needed for molecule
-jsonschema-rs>=0.24
+./python-avd[ansible-collection]
diff --git a/.github/workflows/new-cvp-integration.yml b/.github/workflows/new-cvp-integration.yml
@@ -6,6 +6,13 @@ on: workflow_dispatch
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref }}
+
+env:
+  # Set -vvv is ACTIONS_STEP_DEBUG is set
+  # Apparently it is set in secrets when running with debug
+  ANSIBLE_VERBOSITY: ${{ secrets.ACTIONS_STEP_DEBUG && 3 || 0 }}
+  AVD_NEVER_RUN_FROM_SOURCE: 1
+
 jobs:
   # ----------------------------------------------- #
   # CV INTEGRATION MOLECULE TEST FOR CV_WORKFLOW    #

diff --git a/.github/workflows/pull-request-management.yml b/.github/workflows/pull-request-management.yml
@@ -11,6 +11,7 @@ env:
   # Set -vvv is ACTIONS_STEP_DEBUG is set
   # Apparently it is set in secrets when running with debug
   ANSIBLE_VERBOSITY: ${{ secrets.ACTIONS_STEP_DEBUG && 3 || 0 }}
+  AVD_NEVER_RUN_FROM_SOURCE: 1
 
 jobs:
   file-changes:
@@ -111,7 +112,7 @@ jobs:
           python-version: ${{ matrix.python_version }}
       - name: 'Install Python requirements'
         run: |
-          pip install -r ansible_collections/arista/avd/requirements-dev.txt  -r ansible_collections/arista/avd/requirements.txt --upgrade
+          pip install -r .github/requirements-ci.txt -r ansible_collections/arista/avd/requirements-dev.txt --upgrade
 
   # ----------------------------------- #
   # EOS CLI CONFIG GEN MOLECULE
@@ -432,7 +433,7 @@ jobs:
             3.13
       - name: 'Install Python & Ansible requirements'
         run: |
-          pip install -r ansible_collections/arista/avd/requirements-dev.txt -r ansible_collections/arista/avd/requirements.txt --upgrade
+          pip install -r .github/requirements-ci.txt -r ansible_collections/arista/avd/requirements-dev.txt --upgrade
           ansible-galaxy collection install -r ansible_collections/arista/avd/collections.yml
       - name: 'Run ansible-test integration test cases'
         run: |

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

diff --git a/ansible_collections/arista/avd/docs/contribution/development-tooling.md b/ansible_collections/arista/avd/docs/contribution/development-tooling.md
@@ -56,7 +56,7 @@ Developing with your local Python environment requires you to configure and inst
 Recommended steps with Python virtual environment:
 
 1. Create and activate a Python virtual environment.
-2. Install Python requirements located in the AVD repository: [requirements-dev.txt](https://github.com/aristanetworks/avd/blob/devel/ansible_collections/arista/avd/requirements-dev.txt) and [requirements.txt](https://github.com/aristanetworks/avd/blob/devel/ansible_collections/arista/avd/requirements.txt).
+2. Install Python requirements located in the AVD repository: [requirements-dev.txt](https://github.com/aristanetworks/avd/blob/devel/ansible_collections/arista/avd/requirements-dev.txt).
 
 !!! note
     Ensure the virtual environment is located outside of the AVD project directory.
@@ -72,7 +72,7 @@ source avd-venv/bin/activate
 # The installation _must_ be performed from the root of the cloned avd repository.
 cd avd
 # Requirements files are located in `ansible_collections/arista/avd` of the avd repository.
-pip3 install -r ansible_collections/arista/avd/requirements-dev.txt -r ansible_collections/arista/avd/requirements.txt --upgrade
+pip3 install -r ansible_collections/arista/avd/requirements-dev.txt --upgrade
 ```
 
 !!! note

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
@@ -8,6 +8,7 @@
   - [IP Domain-list](#ip-domain-list)
   - [Clock Settings](#clock-settings)
   - [NTP](#ntp)
+  - [System Control-Plane](#system-control-plane)
   - [Management SSH](#management-ssh)
   - [Management Tech-Support](#management-tech-support)
 - [CVX](#cvx)
@@ -149,6 +150,9 @@
 - [VRF Instances](#vrf-instances)
   - [VRF Instances Summary](#vrf-instances-summary)
   - [VRF Instances Device Configuration](#vrf-instances-device-configuration)
+- [System L1](#system-l1)
+  - [Unsupported Interface Configurations](#unsupported-interface-configurations)
+  - [System L1 Device Configuration](#system-l1-device-configuration)
 - [Application Traffic Recognition](#application-traffic-recognition)
   - [Applications](#applications)
   - [Application Profiles](#application-profiles)
@@ -327,6 +331,48 @@ ntp server 20.20.20.1 key <removed>
 ntp server ie.pool.ntp.org iburst key <removed>
 ```
 
+### System Control-Plane
+
+#### TCP MSS Ceiling
+
+| Protocol | Segment Size |
+| -------- | -------------|
+| IPv4 | 1344 |
+| IPv6 | 1366 |
+
+#### Control-Plane Access-Groups
+
+| Protocol | VRF | Access-list |
+| -------- | --- | ------------|
+| IPv4 Ingress default | All | ingress_ipv4_acl |
+| IPv4 | default | acl4_1 |
+| IPv4 | red | acl4_2 |
+| IPv4 | red_1 | acl4_2 |
+| IPv4 | default | acl4_3 |
+| IPv6 Ingress default | All | ingress_ipv6_acl |
+| IPv6 | default | acl6_1 |
+| IPv6 | blue | acl6_2 |
+| IPv6 | blue_1 | acl6_2 |
+| IPv6 | default | acl6_3 |
+
+#### System Control-Plane Device Configuration
+
+```eos
+!
+system control-plane
+   tcp mss ceiling ipv4 1344 ipv6 1366
+   ip access-group ingress default ingress_ipv4_acl
+   ip access-group acl4_1 in
+   ip access-group acl4_3 vrf default in
+   ip access-group acl4_2 vrf red in
+   ip access-group acl4_2 vrf red_1 in
+   ipv6 access-group ingress default ingress_ipv6_acl
+   ipv6 access-group acl6_1 in
+   ipv6 access-group acl6_3 vrf default in
+   ipv6 access-group acl6_2 vrf blue in
+   ipv6 access-group acl6_2 vrf blue_1 in
+```
+
 ### Management SSH
 
 #### Authentication Settings
@@ -4948,6 +4994,24 @@ vrf instance TENANT_A_PROJECT01
 vrf instance TENANT_A_PROJECT02
 ```
 
+## System L1
+
+### Unsupported Interface Configurations
+
+| Unsupported Configuration | action |
+| ---------------- | -------|
+| Speed | warn |
+| Error correction | error |
+
+### System L1 Device Configuration
+
+```eos
+!
+system l1
+   unsupported speed action warn
+   unsupported error-correction action error
+```
+
 ## Application Traffic Recognition
 
 ### Applications

diff --git a/...lections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/system.md b/...lections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/system.md
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
@@ -500,6 +500,10 @@ no sflow hardware acceleration module Linecard3
 !
 service unsupported-transceiver test dsafDSFfvadskjh3424
 !
+system l1
+   unsupported speed action warn
+   unsupported error-correction action error
+!
 tap aggregation
    mode exclusive profile tap-aggregation-extended
    encapsulation dot1br strip
@@ -2164,6 +2168,19 @@ mac access-list TEST4
    permit any 02:00:00:12:34:56 00:00:00:00:00:00
    deny any 02:00:00:ab:cd:ef 00:00:00:00:00:00
 !
+system control-plane
+   tcp mss ceiling ipv4 1344 ipv6 1366
+   ip access-group ingress default ingress_ipv4_acl
+   ip access-group acl4_1 in
+   ip access-group acl4_3 vrf default in
+   ip access-group acl4_2 vrf red in
+   ip access-group acl4_2 vrf red_1 in
+   ipv6 access-group ingress default ingress_ipv6_acl
+   ipv6 access-group acl6_1 in
+   ipv6 access-group acl6_3 vrf default in
+   ipv6 access-group acl6_2 vrf blue in
+   ipv6 access-group acl6_2 vrf blue_1 in
+!
 mac address-table notification host-flap logging
 mac address-table notification host-flap detection window 10
 mac address-table notification host-flap detection moves 2

diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/system.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/system.cfg
diff --git a/...config_gen/inventory/host_vars/system.yml → ..._gen/inventory/host_vars/host1/system.yml b/...config_gen/inventory/host_vars/system.yml → ..._gen/inventory/host_vars/host1/system.yml
@@ -3,6 +3,7 @@ system:
     tcp_mss:
       ipv4: 1344
       ipv6: 1366
+    ipv4_access_group_ingress_default: ingress_ipv4_acl
     ipv4_access_groups:
       - acl_name: "acl4_1"
       - acl_name: "acl4_2"
@@ -11,6 +12,7 @@ system:
         vrf: red_1
       - acl_name: "acl4_3"
         vrf: default
+    ipv6_access_group_ingress_default: ingress_ipv6_acl
     ipv6_access_groups:
       - acl_name: "acl6_1"
       - acl_name: "acl6_2"

diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.yml
@@ -83,7 +83,6 @@ test_hosts:
     spanning-tree-rapid-pvst:
     sync-e:
     tcam-profile:
-    system:
     terminattr-cloud:
     terminattr-extra-flags:
     terminattr-multi-cluster-certs:

diff --git a/ansible_collections/arista/avd/plugins/__init__.py b/ansible_collections/arista/avd/plugins/__init__.py
@@ -4,11 +4,12 @@
 from __future__ import annotations
 
 from contextlib import suppress
+from os import environ
 from pathlib import Path
 
 PYTHON_AVD_PATH = Path(__file__).parents[4] / "python-avd"
 RUNNING_FROM_SOURCE_PATH = PYTHON_AVD_PATH / "pyavd/running_from_src.txt"
-RUNNING_FROM_SOURCE = RUNNING_FROM_SOURCE_PATH.exists()
+RUNNING_FROM_SOURCE = RUNNING_FROM_SOURCE_PATH.exists() and not environ.get("AVD_NEVER_RUN_FROM_SOURCE")
 
 if RUNNING_FROM_SOURCE:
     import sys

diff --git a/ansible_collections/arista/avd/requirements-dev.txt b/ansible_collections/arista/avd/requirements-dev.txt
@@ -22,7 +22,7 @@ pylint>=3.2.6
 pre-commit>=3.2.0
 pre-commit-hooks>=3.3.0
 referencing>=0.35.0
-ruff==0.5.6
+ruff==0.7.3
 tox
 treelib>=1.5.5
 twine

diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/system.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/system.md
diff --git a/...le_collections/arista/avd/roles/eos_validate_state/python_modules/tests/avdtestrouting.py b/...le_collections/arista/avd/roles/eos_validate_state/python_modules/tests/avdtestrouting.py
@@ -9,7 +9,7 @@
 from ansible_collections.arista.avd.plugins.plugin_utils.eos_validate_state_utils.avdtestbase import AvdTestBase
 from ansible_collections.arista.avd.plugins.plugin_utils.utils import default, get
 
-from ..bgp_constants import BGP_ADDRESS_FAMILIES  # noqa: TID252 Will be fixed when moving to pyavd
+from ..bgp_constants import BGP_ADDRESS_FAMILIES  # noqa: TID252 will be fixed when moving to pyavd
 
 LOGGER = logging.getLogger(__name__)