smoketest: flow-accounting: add sflow and netflow testcases

1 files changed, 30 insertions, 26 deletions

diff --git a/interface-definitions/flow-accounting-conf.xml.in b/interface-definitions/flow-accounting-conf.xml.in
index b98794792..9f13c295b 100644
--- a/interface-definitions/flow-accounting-conf.xml.in
+++ b/interface-definitions/flow-accounting-conf.xml.in
@@ -17,20 +17,20 @@
                 <description>Buffer size in MiB</description>
               </valueHelp>
               <constraint>
-                <validator name="numeric" argument="--range 0-4294967295" />
+                <validator name="numeric" argument="--range 0-4294967295"/>
               </constraint>
             </properties>
           </leafNode>
           <leafNode name="enable-egress">
             <properties>
               <help>Enable egress flow accounting</help>
-              <valueless />
+              <valueless/>
             </properties>
           </leafNode>
           <leafNode name="disable-imt">
             <properties>
               <help>Disable in memory table plugin</help>
-              <valueless />
+              <valueless/>
             </properties>
           </leafNode>
           <leafNode name="syslog-facility">
@@ -166,7 +166,7 @@
                     <description>NetFlow maximum flows</description>
                   </valueHelp>
                   <constraint>
-                   <validator name="numeric" argument="--range 0-4294967295" />
+                   <validator name="numeric" argument="--range 0-4294967295"/>
                   </constraint>
                 </properties>
               </leafNode>
@@ -178,7 +178,7 @@
                     <description>Sampling rate (1 in N packets)</description>
                   </valueHelp>
                   <constraint>
-                   <validator name="numeric" argument="--range 0-4294967295" />
+                   <validator name="numeric" argument="--range 0-4294967295"/>
                   </constraint>
                 </properties>
               </leafNode>
@@ -241,10 +241,10 @@
                       <help>NetFlow port number</help>
                       <valueHelp>
                         <format>u32:1025-65535</format>
-                        <description>NetFlow port number (default 2055)</description>
+                        <description>NetFlow port number (default: 2055)</description>
                       </valueHelp>
                       <constraint>
-                       <validator name="numeric" argument="--range 1025-65535" />
+                       <validator name="numeric" argument="--range 1025-65535"/>
                       </constraint>
                     </properties>
                   </leafNode>
@@ -260,10 +260,10 @@
                       <help>Expiry scan interval</help>
                       <valueHelp>
                         <format>u32:0-2147483647</format>
-                        <description>Expiry scan interval (default 60)</description>
+                        <description>Expiry scan interval (default: 60)</description>
                       </valueHelp>
                       <constraint>
-                       <validator name="numeric" argument="--range 0-2147483647" />
+                        <validator name="numeric" argument="--range 0-2147483647"/>
                       </constraint>
                     </properties>
                   </leafNode>
@@ -272,10 +272,10 @@
                       <help>Generic flow timeout value</help>
                       <valueHelp>
                         <format>u32:0-2147483647</format>
-                        <description>Generic flow timeout in seconds (default 3600)</description>
+                        <description>Generic flow timeout in seconds (default: 3600)</description>
                       </valueHelp>
                       <constraint>
-                       <validator name="numeric" argument="--range 0-2147483647" />
+                       <validator name="numeric" argument="--range 0-2147483647"/>
                       </constraint>
                     </properties>
                   </leafNode>
@@ -284,10 +284,10 @@
                       <help>ICMP timeout value</help>
                       <valueHelp>
                         <format>u32:0-2147483647</format>
-                        <description>ICMP timeout in seconds (default 300)</description>
+                        <description>ICMP timeout in seconds (default: 300)</description>
                       </valueHelp>
                       <constraint>
-                       <validator name="numeric" argument="--range 0-2147483647" />
+                       <validator name="numeric" argument="--range 0-2147483647"/>
                       </constraint>
                     </properties>
                   </leafNode>
@@ -296,10 +296,10 @@
                       <help>Max active timeout value</help>
                       <valueHelp>
                         <format>u32:0-2147483647</format>
-                        <description>Max active timeout in seconds (default 604800)</description>
+                        <description>Max active timeout in seconds (default: 604800)</description>
                       </valueHelp>
                       <constraint>
-                       <validator name="numeric" argument="--range 0-2147483647" />
+                       <validator name="numeric" argument="--range 0-2147483647"/>
                       </constraint>
                     </properties>
                   </leafNode>
@@ -308,10 +308,10 @@
                       <help>TCP finish timeout value</help>
                       <valueHelp>
                         <format>u32:0-2147483647</format>
-                        <description>TCP FIN timeout in seconds (default 300)</description>
+                        <description>TCP FIN timeout in seconds (default: 300)</description>
                       </valueHelp>
                       <constraint>
-                       <validator name="numeric" argument="--range 0-2147483647" />
+                       <validator name="numeric" argument="--range 0-2147483647"/>
                       </constraint>
                     </properties>
                   </leafNode>
@@ -320,10 +320,10 @@
                       <help>TCP generic timeout value</help>
                       <valueHelp>
                         <format>u32:0-2147483647</format>
-                        <description>TCP generic timeout in seconds (default 3600)</description>
+                        <description>TCP generic timeout in seconds (default: 3600)</description>
                       </valueHelp>
                       <constraint>
-                       <validator name="numeric" argument="--range 0-2147483647" />
+                       <validator name="numeric" argument="--range 0-2147483647"/>
                       </constraint>
                     </properties>
                   </leafNode>
@@ -332,10 +332,10 @@
                       <help>TCP reset timeout value</help>
                       <valueHelp>
                         <format>u32:0-2147483647</format>
-                        <description>TCP RST timeout in seconds (default 120)</description>
+                        <description>TCP RST timeout in seconds (default: 120)</description>
                       </valueHelp>
                       <constraint>
-                       <validator name="numeric" argument="--range 0-2147483647" />
+                       <validator name="numeric" argument="--range 0-2147483647"/>
                       </constraint>
                     </properties>
                   </leafNode>
@@ -344,10 +344,10 @@
                       <help>UDP timeout value</help>
                       <valueHelp>
                         <format>u32:0-2147483647</format>
-                        <description>UDP timeout in seconds (default 300)</description>
+                        <description>UDP timeout in seconds (default: 300)</description>
                       </valueHelp>
                       <constraint>
-                       <validator name="numeric" argument="--range 0-2147483647" />
+                       <validator name="numeric" argument="--range 0-2147483647"/>
                       </constraint>
                     </properties>
                   </leafNode>
@@ -363,6 +363,10 @@
               <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>auto</format>
                     <description>auto select sFlow agent-address (default)</description>
@@ -385,7 +389,7 @@
                     <description>Sampling rate (1 in N packets)</description>
                   </valueHelp>
                   <constraint>
-                   <validator name="numeric" argument="--range 0-4294967295" />
+                   <validator name="numeric" argument="--range 0-4294967295"/>
                   </constraint>
                 </properties>
               </leafNode>
@@ -411,10 +415,10 @@
                       <help>sFlow port number</help>
                       <valueHelp>
                         <format>u32:1025-65535</format>
-                        <description>sFlow port number (default 6343)</description>
+                        <description>sFlow port number (default: 6343)</description>
                       </valueHelp>
                       <constraint>
-                       <validator name="numeric" argument="--range 1025-65535" />
+                       <validator name="numeric" argument="--range 1025-65535"/>
                       </constraint>
                     </properties>
                   </leafNode>