From 110e1ad42a17d3229cc554060f20af0429c4c184 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Tue, 28 Apr 2026 13:40:45 -0500
Subject: xml: T8467: remove unnecessary include, obscuring value help

The include is unnecessary, as the element is fully defined in the
subsequent lines. As node.def files are only populated on the first
instance, this leads to loss of the proper value help entries hence
completions.

Without these changes, for example:
vyos@vyos# set system conntrack ignore ipv4 rule 137 protocol
will not list 'all', 'tcp_udp', etc. as intended.
---
 interface-definitions/system_conntrack.xml.in | 2 --
 1 file changed, 2 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/system_conntrack.xml.in b/interface-definitions/system_conntrack.xml.in
index 92c4d24cf..733a4a4b8 100644
--- a/interface-definitions/system_conntrack.xml.in
+++ b/interface-definitions/system_conntrack.xml.in
@@ -84,7 +84,6 @@
                           </completionHelp>
                         </properties>
                       </leafNode>
-                      #include <include/ip-protocol.xml.i>
                       <leafNode name="protocol">
                         <properties>
                           <help>Protocol to match (protocol name, number, or "all")</help>
@@ -170,7 +169,6 @@
                           </completionHelp>
                         </properties>
                       </leafNode>
-                      #include <include/ip-protocol.xml.i>
                       <leafNode name="protocol">
                         <properties>
                           <help>Protocol to match (protocol name, number, or "all")</help>
-- 
cgit v1.2.3


From 0e0ff0b044f8d0215e2a551aaf02dffaffa9dcce Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Tue, 28 Apr 2026 14:04:22 -0500
Subject: xml: T8467: remove duplicate line

This duplication did not cause any harm, but was found in the general
clean up related to element 'properties' collisions.
---
 interface-definitions/include/bgp/protocol-common-config.xml.i | 1 -
 1 file changed, 1 deletion(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index f2247f3f0..6e1b3f8c5 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -1719,7 +1719,6 @@
     #include <include/bgp/neighbor-disable-connected-check.xml.i>
     #include <include/bgp/neighbor-ebgp-multihop.xml.i>
     #include <include/bgp/neighbor-graceful-restart.xml.i>
-    #include <include/bgp/neighbor-graceful-restart.xml.i>
     #include <include/bgp/neighbor-local-as.xml.i>
     #include <include/bgp/neighbor-local-role.xml.i>
     #include <include/bgp/neighbor-override-capability.xml.i>
-- 
cgit v1.2.3