From 832ed9122a0a602cadabe24457e9d64272a3d861 Mon Sep 17 00:00:00 2001
From: "Nataliia S." <81954790+natali-rs1985@users.noreply.github.com>
Date: Tue, 21 Jan 2025 11:19:27 +0200
Subject: T6895: Merge the hsflowd-based sFlow and uacctd-based sFlow (#4310)

---
 .../include/version/flow-accounting-version.xml.i  |  2 +-
 .../system_flow-accounting.xml.in                  | 67 ----------------------
 interface-definitions/system_sflow.xml.in          |  6 ++
 3 files changed, 7 insertions(+), 68 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/version/flow-accounting-version.xml.i b/interface-definitions/include/version/flow-accounting-version.xml.i
index 5b01fe4b5..95d1e20db 100644
--- a/interface-definitions/include/version/flow-accounting-version.xml.i
+++ b/interface-definitions/include/version/flow-accounting-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/flow-accounting-version.xml.i -->
-<syntaxVersion component='flow-accounting' version='1'></syntaxVersion>
+<syntaxVersion component='flow-accounting' version='2'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/system_flow-accounting.xml.in b/interface-definitions/system_flow-accounting.xml.in
index 83a2480a3..4799205ad 100644
--- a/interface-definitions/system_flow-accounting.xml.in
+++ b/interface-definitions/system_flow-accounting.xml.in
@@ -362,73 +362,6 @@
               </node>
             </children>
           </node>
-          <node name="sflow">
-            <properties>
-              <help>sFlow settings</help>
-            </properties>
-            <children>
-              <leafNode name="agent-address">
-                <properties>
-                  <help>sFlow agent IPv4 address</help>
-                  <completionHelp>
-                    <list>auto</list>
-                    <script>${vyos_completion_dir}/list_local_ips.sh --ipv4</script>
-                  </completionHelp>
-                  <valueHelp>
-                    <format>ipv4</format>
-                    <description>sFlow IPv4 agent address</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ipv4-address"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="sampling-rate">
-                <properties>
-                  <help>sFlow sampling-rate</help>
-                  <valueHelp>
-                    <format>u32</format>
-                    <description>Sampling rate (1 in N packets)</description>
-                  </valueHelp>
-                  <constraint>
-                   <validator name="numeric" argument="--range 0-4294967295"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <tagNode name="server">
-                <properties>
-                  <help>sFlow destination server</help>
-                  <valueHelp>
-                    <format>ipv4</format>
-                    <description>IPv4 server to export sFlow</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>ipv6</format>
-                    <description>IPv6 server to export sFlow</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ip-address"/>
-                  </constraint>
-                </properties>
-                <children>
-                  <leafNode name="port">
-                    <properties>
-                      <help>sFlow port number</help>
-                      <valueHelp>
-                        <format>u32:1025-65535</format>
-                        <description>sFlow port number</description>
-                      </valueHelp>
-                      <constraint>
-                       <validator name="numeric" argument="--range 1025-65535"/>
-                      </constraint>
-                    </properties>
-                    <defaultValue>6343</defaultValue>
-                  </leafNode>
-                </children>
-              </tagNode>
-              #include <include/source-address-ipv4-ipv6.xml.i>
-            </children>
-          </node>
           #include <include/interface/vrf.xml.i>
         </children>
       </node>
diff --git a/interface-definitions/system_sflow.xml.in b/interface-definitions/system_sflow.xml.in
index aaf4033d8..2cd7a5d12 100644
--- a/interface-definitions/system_sflow.xml.in
+++ b/interface-definitions/system_sflow.xml.in
@@ -106,6 +106,12 @@
               </leafNode>
             </children>
           </tagNode>
+          <leafNode name="enable-egress">
+            <properties>
+              <help>Enable egress sampling</help>
+              <valueless/>
+            </properties>
+          </leafNode>
           #include <include/interface/vrf.xml.i>
         </children>
       </node>
-- 
cgit v1.2.3