From 43fcc0db006a12024df1b49d6f3c9e99ce165226 Mon Sep 17 00:00:00 2001
From: Lulu Cathrinus Grimalkin <e.altunbas@vyos.io>
Date: Sun, 15 Aug 2021 13:10:20 +0300
Subject: conntrack: T3275: migrate 'disable' syntax to 'enable' syntax for the
 new default behavior

---
 .../include/conntrack-module-disable.xml.i         |  8 ----
 interface-definitions/system-conntrack.xml.in      | 44 ++++++++--------------
 2 files changed, 15 insertions(+), 37 deletions(-)
 delete mode 100644 interface-definitions/include/conntrack-module-disable.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/conntrack-module-disable.xml.i b/interface-definitions/include/conntrack-module-disable.xml.i
deleted file mode 100644
index f891225e0..000000000
--- a/interface-definitions/include/conntrack-module-disable.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from conntrack-module-disable.xml.i -->
-<leafNode name="disable">
-  <properties>
-    <help>Disable connection tracking helper</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/system-conntrack.xml.in b/interface-definitions/system-conntrack.xml.in
index fa73df3db..c408e9bdd 100644
--- a/interface-definitions/system-conntrack.xml.in
+++ b/interface-definitions/system-conntrack.xml.in
@@ -37,64 +37,50 @@
           </leafNode>
           <node name="modules">
             <properties>
-              <help>Connection tracking modules settings</help>
+              <help>Connection tracking modules</help>
             </properties>
             <children>
               <node name="ftp">
                 <properties>
-                  <help>FTP connection tracking settings</help>
+                  <help>FTP connection tracking</help>
+                  <valueless/>
                 </properties>
-                <children>
-                  #include <include/conntrack-module-disable.xml.i>
-                </children>
               </node>
               <node name="h323">
                 <properties>
-                  <help>H.323 connection tracking settings</help>
+                  <help>H.323 connection tracking</help>
+                  <valueless/>
                 </properties>
-                <children>
-                  #include <include/conntrack-module-disable.xml.i>
-                </children>
               </node>
               <node name="nfs">
                 <properties>
-                  <help>NFS connection tracking settings</help>
+                  <help>NFS connection tracking</help>
+                  <valueless/>
                 </properties>
-                <children>
-                  #include <include/conntrack-module-disable.xml.i>
-                </children>
               </node>
               <node name="pptp">
                 <properties>
-                  <help>PPTP connection tracking settings</help>
+                  <help>PPTP connection tracking</help>
+                  <valueless/>
                 </properties>
-                <children>
-                  #include <include/conntrack-module-disable.xml.i>
-                </children>
               </node>
               <node name="sip">
                 <properties>
-                  <help>SIP connection tracking settings</help>
+                  <help>SIP connection tracking</help>
+                  <valueless/>
                 </properties>
-                <children>
-                  #include <include/conntrack-module-disable.xml.i>
-                </children>
               </node>
               <node name="sqlnet">
                 <properties>
-                  <help>SQLnet connection tracking settings</help>
+                  <help>SQLnet connection tracking</help>
+                  <valueless/>
                 </properties>
-                <children>
-                  #include <include/conntrack-module-disable.xml.i>
-                </children>
               </node>
               <node name="tftp">
                 <properties>
-                  <help>TFTP connection tracking settings</help>
+                  <help>TFTP connection tracking</help>
+                  <valueless/>
                 </properties>
-                <children>
-                  #include <include/conntrack-module-disable.xml.i>
-                </children>
               </node>
             </children>
           </node>
-- 
cgit v1.2.3