Feat(eos_designs): Add support for sflow in l3_interfaces under network services (#6705)

Co-authored-by: Guillaume Mulocher <gmulocher@arista.com>

Author: Vibhu-gslab

ansible_collections/arista/avd/extensions/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-leaf1.cfg

@@ -67,6 +67,30 @@ interface Ethernet14
    switchport
    sflow enable
 !
+interface Ethernet15
+   description l3_interface_sflow_true
+   no shutdown
+   no switchport
+   vrf VRF1
+   ip address 10.255.15.1/30
+   sflow enable
+!
+interface Ethernet16
+   description l3_interface_sflow_false
+   no shutdown
+   no switchport
+   vrf VRF1
+   ip address 10.255.16.1/30
+   no sflow enable
+!
+interface Ethernet17
+   description l3_interface_sflow_unset
+   no shutdown
+   no switchport
+   vrf VRF1
+   ip address 10.255.17.1/30
+   sflow enable
+!
 interface Loopback0
    description ROUTER_ID
    no shutdown

ansible_collections/arista/avd/extensions/molecule/eos_designs_unit_tests/intended/structured_configs/sflow-tests-leaf1.yml

@@ -30,6 +30,39 @@ ethernet_interfaces:
     enable: true
   switchport:
     enabled: false
+- name: Ethernet15
+  description: l3_interface_sflow_true
+  shutdown: false
+  vrf: VRF1
+  ip_address: 10.255.15.1/30
+  metadata:
+    peer_type: l3_interface
+  sflow:
+    enable: true
+  switchport:
+    enabled: false
+- name: Ethernet16
+  description: l3_interface_sflow_false
+  shutdown: false
+  vrf: VRF1
+  ip_address: 10.255.16.1/30
+  metadata:
+    peer_type: l3_interface
+  sflow:
+    enable: false
+  switchport:
+    enabled: false
+- name: Ethernet17
+  description: l3_interface_sflow_unset
+  shutdown: false
+  vrf: VRF1
+  ip_address: 10.255.17.1/30
+  metadata:
+    peer_type: l3_interface
+  sflow:
+    enable: true
+  switchport:
+    enabled: false
 - name: Ethernet10
   description: SERVER_single-interface-true_eth1
   shutdown: false

ansible_collections/arista/avd/extensions/molecule/eos_designs_unit_tests/inventory/group_vars/SFLOW_TESTS.yml

@@ -26,6 +26,7 @@ fabric_sflow:
   l3_edge: true
   core_interfaces: true
   mlag_interfaces: true
+  l3_interfaces: true
 
 # P2P links between spine switches.
 core_interfaces:
@@ -74,6 +75,24 @@ tenants:
                 ip_address: 172.16.11.1/24
               - node: sflow-tests-leaf2
                 ip_address: 172.17.11.1/24
+        l3_interfaces:
+          # Test: per-interface sflow: true overrides fabric_sflow.l3_interfaces: true
+          - interfaces: [Ethernet15]
+            ip_addresses: [10.255.15.1/30]
+            nodes: [sflow-tests-leaf1]
+            description: l3_interface_sflow_true
+            sflow: true
+          # Test: per-interface sflow: false overrides fabric_sflow.l3_interfaces: true
+          - interfaces: [Ethernet16]
+            ip_addresses: [10.255.16.1/30]
+            nodes: [sflow-tests-leaf1]
+            description: l3_interface_sflow_false
+            sflow: false
+          # Test: no sflow key falls back to fabric_sflow.l3_interfaces: true
+          - interfaces: [Ethernet17]
+            ip_addresses: [10.255.17.1/30]
+            nodes: [sflow-tests-leaf1]
+            description: l3_interface_sflow_unset
 
 servers:
   - name: single-interface-true

ansible_collections/arista/avd/roles/eos_designs/docs/tables/network-services-vrfs-l3-interfaces-settings.md

@@ -1030,6 +1030,10 @@ $defs:
                       $ref: "eos_designs#/$defs/flow_tracking_link"
                       description: |-
                         Configures flow-tracking on the interface. Overrides `fabric_flow_tracking.l3_interfaces` setting.
+                    sflow:
+                      type: bool
+                      description: |-
+                        Configures sFlow on the interface. Overrides `fabric_sflow.l3_interfaces` setting.
                     monitor_sessions:
                       type: list
                       $ref: "eos_designs#/$defs/monitor_sessions"

python-avd/pyavd/_eos_designs/schema/__init__.py

@@ -9,7 +9,7 @@
 from pyavd._eos_cli_config_gen.schema import EosCliConfigGen
 from pyavd._eos_designs.structured_config.structured_config_generator import structured_config_contributor
 from pyavd._errors import AristaAvdError, AristaAvdInvalidInputsError
-from pyavd._utils import get_ip_from_ip_prefix
+from pyavd._utils import default, get_ip_from_ip_prefix
 
 if TYPE_CHECKING:
     from pyavd._eos_designs.schema import EosDesigns
@@ -137,7 +137,9 @@ def _set_l3_interfaces(
                         l3_interface.structured_config, list_merge=self.custom_structured_configs.list_merge_strategy
                     )
 
-                interface.sflow.enable = self.shared_utils.get_interface_sflow(interface.name, self.inputs.fabric_sflow.l3_interfaces)
+                interface.sflow.enable = self.shared_utils.get_interface_sflow(
+                    interface.name, default(l3_interface.sflow, self.inputs.fabric_sflow.l3_interfaces)
+                )
 
                 if l3_interface.ipv4_acl_in:
                     acl = self.shared_utils.get_ipv4_acl(