Feat(eos_designs): Add platform match criteria for network_ports

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

@@ -597,6 +597,24 @@ interface Ethernet17
    no shutdown
    switchport
 !
+interface Ethernet23
+   description PCs
+   no shutdown
+   switchport access vlan 100
+   switchport mode access
+   switchport
+   spanning-tree portfast
+   spanning-tree bpdufilter enable
+!
+interface Ethernet24
+   description PCs
+   no shutdown
+   switchport access vlan 100
+   switchport mode access
+   switchport
+   spanning-tree portfast
+   spanning-tree bpdufilter enable
+!
 interface Ethernet51
    no shutdown
    channel-group 43 mode active

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

@@ -544,6 +544,24 @@ interface Ethernet14
    no shutdown
    switchport
 !
+interface Ethernet47
+   description PCs
+   no shutdown
+   switchport access vlan 100
+   switchport mode access
+   switchport
+   spanning-tree portfast
+   spanning-tree bpdufilter enable
+!
+interface Ethernet48
+   description PCs
+   no shutdown
+   switchport access vlan 100
+   switchport mode access
+   switchport
+   spanning-tree portfast
+   spanning-tree bpdufilter enable
+!
 interface Ethernet51
    shutdown
    switchport

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

@@ -814,6 +814,30 @@ ethernet_interfaces:
   channel_group:
     id: 43
     mode: active
+- name: Ethernet23
+  peer: PCs
+  peer_type: network_port
+  port_profile: pc
+  description: PCs
+  shutdown: false
+  switchport:
+    enabled: true
+    mode: access
+    access_vlan: 100
+  spanning_tree_portfast: edge
+  spanning_tree_bpdufilter: enabled
+- name: Ethernet24
+  peer: PCs
+  peer_type: network_port
+  port_profile: pc
+  description: PCs
+  shutdown: false
+  switchport:
+    enabled: true
+    mode: access
+    access_vlan: 100
+  spanning_tree_portfast: edge
+  spanning_tree_bpdufilter: enabled
 mlag_configuration:
   domain_id: mlag
   local_interface: Vlan4094
@@ -833,3 +857,5 @@ monitor_sessions:
   destinations:
   - Ethernet17
   encapsulation_gre_metadata_tx: true
+metadata:
+  platform: 720XPM-24Y6

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

@@ -751,6 +751,30 @@ ethernet_interfaces:
   shutdown: true
   switchport:
     enabled: true
+- name: Ethernet47
+  peer: PCs
+  peer_type: network_port
+  port_profile: pc
+  description: PCs
+  shutdown: false
+  switchport:
+    enabled: true
+    mode: access
+    access_vlan: 100
+  spanning_tree_portfast: edge
+  spanning_tree_bpdufilter: enabled
+- name: Ethernet48
+  peer: PCs
+  peer_type: network_port
+  port_profile: pc
+  description: PCs
+  shutdown: false
+  switchport:
+    enabled: true
+    mode: access
+    access_vlan: 100
+  spanning_tree_portfast: edge
+  spanning_tree_bpdufilter: enabled
 mlag_configuration:
   domain_id: mlag
   local_interface: Vlan4094
@@ -760,3 +784,5 @@ mlag_configuration:
   reload_delay_non_mlag: '330'
 ip_igmp_snooping:
   globally_enabled: true
+metadata:
+  platform: 720XPM-48Y6

ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/NETWORK_PORTS_TESTS.yml

@@ -141,6 +141,25 @@ network_ports:
       channel_id: 43
       mode: "active"
 
+  # The next two switches are targeted using a like regex filtering on correct platform type
+  # Test regex and platform match criteria
+  - switches:
+      - network-ports-tests.*
+    switch_ports:
+      - Ethernet47-48
+    platforms:
+      - 720XPM-48Y6
+    profile: pc
+    endpoint: PCs
+
+  # Test only platform match
+  - switch_ports:
+      - Ethernet23-24
+    platforms:
+      - 720XPM-24Y6
+    profile: pc
+    endpoint: PCs
+
 servers:
   - name: CONNECTED_ENDPOINT_OVERWRITING_NETWORK_PORT
     adapters:
@@ -171,7 +190,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

python-avd/pyavd/_eos_designs/schema/schema_fragments/network_ports.schema.yml

@@ -20,6 +20,17 @@ keys:
             The regular expression must match the full hostname.
           items:
             type: str
+        platforms:
+          type: list
+          description: |
+            Matching the platform type of one or more switches, to match full platform names, create a custom platform in `platform_settings`.
+            For example, `720XP-48Y6` would require a custom platform type:
+
+            platforms:
+              - 720XP
+              - 720XP-48Y6
+          items:
+            type: str
         switch_ports:
           type: list
           description: |

python-avd/pyavd/_eos_designs/structured_config/connected_endpoints/utils.py

@@ -72,7 +72,9 @@ 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 network_port_settings.switches and not self._match_regexes(network_port_settings.switches, self.shared_utils.hostname):
+                continue
+            if network_port_settings.platforms and self.shared_utils.platform not in network_port_settings.platforms:
                 continue
 
             filtered_network_ports.append(network_port_settings)