Merge pull request #4621 from ServerForge/current

T7175: Added VPP option

Author: sever-sever

data/templates/sflow/hsflowd.conf.j2

@@ -32,4 +32,7 @@ sflow {
   dropmon { limit={{ drop_monitor_limit }} start=on sw=on hw=off }
 {% endif %}
   dbus { }
+{% if vpp is vyos_defined %}
+  vpp { }
+{% endif %}
 }

interface-definitions/system_sflow.xml.in

@@ -106,6 +106,12 @@
               </leafNode>
             </children>
           </tagNode>
+          <leafNode name="vpp">
+            <properties>
+              <help>Enable VPP sampling</help>
+              <valueless/>
+            </properties>
+          </leafNode>
           <leafNode name="enable-egress">
             <properties>
               <help>Enable egress sampling</help>

src/conf_mode/system_sflow.py

@@ -60,7 +60,8 @@ def verify(sflow):
             )
 
     # Check if at least one interface is configured
-    if 'interface' not in sflow:
+    # Skip this check if VPP is enabled
+    if 'interface' not in sflow and 'vpp' not in sflow:
         raise ConfigError(
             'sFlow requires at least one interface to be configured!')