Merge branch 'devel' into add_mpls_tunnel_termination

Author: gmuloc

Diff for: ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/network-ports-tests-2.cfg

@@ -597,6 +597,11 @@ interface Ethernet17
    no shutdown
    switchport
 !
+interface Ethernet24
+   description Matched on only 24 port platform
+   no shutdown
+   switchport
+!
 interface Ethernet51
    no shutdown
    channel-group 43 mode active

Diff for: ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/network-ports-tests.1.cfg

@@ -544,6 +544,11 @@ interface Ethernet14
    no shutdown
    switchport
 !
+interface Ethernet48
+   description Matched on all hostnames and 48 port platform
+   no shutdown
+   switchport
+!
 interface Ethernet51
    shutdown
    switchport

Diff for: ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/network-ports-tests-2.yml

@@ -727,6 +727,12 @@ ethernet_interfaces:
     id: 43
     mode: active
   peer_type: network_port
+- name: Ethernet24
+  description: Matched on only 24 port platform
+  shutdown: false
+  peer_type: network_port
+  switchport:
+    enabled: true
 hostname: network-ports-tests-2
 ip_igmp_snooping:
   globally_enabled: true
@@ -736,6 +742,7 @@ management_api_http:
   enable_vrfs:
   - name: MGMT
 metadata:
+  platform: 720XPM-24Y6
   fabric_name: EOS_DESIGNS_UNIT_TESTS
 mlag_configuration:
   domain_id: mlag

Diff for: ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/network-ports-tests.1.yml

@@ -697,6 +697,12 @@ ethernet_interfaces:
   peer_type: network_port
   switchport:
     enabled: true
+- name: Ethernet48
+  description: Matched on all hostnames and 48 port platform
+  shutdown: false
+  peer_type: network_port
+  switchport:
+    enabled: true
 hostname: network-ports-tests.1
 ip_igmp_snooping:
   globally_enabled: true
@@ -706,6 +712,7 @@ management_api_http:
   enable_vrfs:
   - name: MGMT
 metadata:
+  platform: 720XPM-48Y6
   fabric_name: EOS_DESIGNS_UNIT_TESTS
 mlag_configuration:
   domain_id: mlag

Diff for: ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/NETWORK_PORTS_TESTS.yml

@@ -141,6 +141,37 @@ network_ports:
       channel_id: 43
       mode: "active"
 
+  # Tests for issue #4786
+  # Test regex match all switches and specific platform match criteria.
+  - switches:
+      - network-ports-tests.*
+    platforms:
+      - 720XPM-48Y6
+    switch_ports:
+      - Ethernet48
+    description: Matched on all hostnames and 48 port platform
+
+  # Test only platform match.
+  - platforms:
+      - 720\w+-24Y6
+    switch_ports:
+      - Ethernet24
+    description: Matched on only 24 port platform
+
+  # Test criteria must match both hostname/platform.
+  - switches:
+      - network-ports-no-match
+    platforms:
+      - 720XPM-48Y6
+    switch_ports:
+      - Ethernet49
+    description: Should not match hostname and platform
+
+  # Test no match criteria
+  - switch_ports:
+      - Ethernet25
+    description: No criteria, no config
+
 servers:
   - name: CONNECTED_ENDPOINT_OVERWRITING_NETWORK_PORT
     adapters:
@@ -171,7 +202,23 @@ l2leaf:
       nodes:
         - name: network-ports-tests.1
           id: 1
+          platform: 720XPM-48Y6
         - name: network-ports-tests-2
           filter:
             only_vlans_in_use: true
           id: 2
+          platform: 720XPM-24Y6
+
+# Used for platform filtering tests
+custom_platform_settings:
+  - platforms:
+      - 720XPM-48Y6
+      - 720XPM-24Y6
+    feature_support:
+      poe: true
+      queue_monitor_length_notify: false
+    reload_delay:
+      mlag: 300
+      non_mlag: 330
+    trident_forwarding_table_partition: flexible exact-match 16000 l2-shared 18000 l3-shared
+      22000

Diff for: ansible_collections/arista/avd/roles/eos_designs/docs/input-variables.md

@@ -1161,12 +1161,62 @@ roles/eos_designs/docs/tables/default-connected-endpoints-description.md
 The `network_ports` data model is intended to be used with `port_profiles` and `parent_profiles` to keep the configuration generic and compact,
 but all features and keys supported under `connected_endpoints.adapters` are also supported directly under `network_ports`.
 
+To filter what switches to configure, match on a switch full hostname or platform type using regex patterns. When both criteria are used together, the switch must match both in order to generate the assigned port configuration.
+
 All ranges defined under `switch_ports` will be expanded to individual port configuration which leads to a some behavioral differences to `connected_endpoints`:
 
 - By default each port will be configured in a port-channel with one member when leveraging automatic channel-id generation.
   To configure multiple ports as member of the same port-channel set the channel-id key (see the example below).
 - Inconsistent configurations when used with `short_esi: auto` or `designated_forwarder_algorithm: auto`, since those rely on information from multiple switches and interfaces.
 
+??? example "Example using match criteria"
+
+    ```yaml
+    # Port Profiles
+    # Common settings inherited to network_ports
+    port_profiles:
+      - profile: common
+        mode: access
+        vlans: "999"
+        spanning_tree_portfast: edge
+        spanning_tree_bpdufilter: enabled
+
+    # Network Ports
+    # Switches are matched with regex matching the full hostname and platform type.
+    network_ports:
+      - switches:
+          - network-ports-[est]{5}-.*
+        platforms:
+          - 720XPM-48Y6
+        switch_ports:
+          - Ethernet1-48
+        profile: common
+
+    # Switches are matched on platform type, regardless of hostname.
+      - platforms:
+          - 720XPM-24Y6
+        switch_ports:
+          - Ethernet1-24
+        profile: common
+
+    # Custom Platform Settings
+    # Copied default 720XP platform settings, adding more specific platform names for match.
+    # These platform types can be assigned to devices as part of nodes/node_group settings.
+    custom_platform_settings:
+      - platforms:
+          - 720XPM-48Y6
+          - 720XPM-24Y6
+        feature_support:
+          poe: true
+          queue_monitor_length_notify: false
+        reload_delay:
+          mlag: 300
+          non_mlag: 330
+        trident_forwarding_table_partition: flexible exact-match 16000 l2-shared 18000 l3-shared
+          22000
+
+    ```
+
 ??? example "Example using network ports and profiles"
 
     ```yaml

Diff for: ansible_collections/arista/avd/roles/eos_designs/docs/tables/network-ports.md

@@ -13,13 +13,29 @@ keys:
       $ref: "eos_designs#/$defs/adapter_config"
       # These keys will take precedence over $ref
       keys:
+        # TODO: AVD 6.0.0 add min_length: 1 for switches
         switches:
           type: list
           description: |
             Regex matching the full hostname of one or more switches.
             The regular expression must match the full hostname.
           items:
             type: str
+        platforms:
+          type: list
+          min_length: 1
+          description: |-
+            Regex matching the full platform name of one or more switches. If used in combination with switch hostname matching, both criteria must match for configuration.
+            If you need to add custom platforms to match specific port quantities, create them under `custom_platform_settings`. Entries under `custom_platform_settings` should
+            match the platform match criteria.
+
+            For example, `720XP-48Y6` would require a custom platform type:
+
+            platforms:
+              - 720XP
+              - 720XP-48Y6
+          items:
+            type: str
         switch_ports:
           type: list
           description: |

Diff for: python-avd/pyavd/_eos_designs/schema/__init__.py

@@ -72,7 +72,12 @@ def _filtered_network_ports(self: AvdStructuredConfigConnectedEndpoints) -> list
         for index, network_port in enumerate(self.inputs.network_ports):
             network_port._context = f"network_ports[{index}]"
             network_port_settings = self.shared_utils.get_merged_adapter_settings(network_port)
-            if not self._match_regexes(network_port_settings.switches, self.shared_utils.hostname):
+
+            if not network_port_settings.switches and not network_port_settings.platforms:
+                continue
+            if network_port_settings.switches and not self._match_regexes(network_port_settings.switches, self.shared_utils.hostname):
+                continue
+            if network_port_settings.platforms and not self._match_regexes(network_port_settings.platforms, self.shared_utils.platform):
                 continue
 
             filtered_network_ports.append(network_port_settings)
@@ -83,9 +88,9 @@ def _match_regexes(self: AvdStructuredConfigConnectedEndpoints, regexes: list, v
         """
         Match a list of regexes with the supplied value.
 
-        Regex must match the full value to pass, so regex is wrapped in ^$.
+        Regex must match the full value to pass.
         """
-        return any(re.match(rf"^{regex}$", value) for regex in regexes)
+        return any(re.fullmatch(regex, value) for regex in regexes)
 
     def _get_short_esi(
         self: AvdStructuredConfigConnectedEndpoints,