From f8bb85f9be357d0788117368e44137fd570aa902 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 4 Dec 2020 12:03:17 +0100
Subject: vlan: xml: T2653: use common include file for ip and ipv6 options

---
 interface-definitions/include/vif-s.xml.i | 12 ++++--------
 interface-definitions/include/vif.xml.i   | 21 ++-------------------
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i
index ab556489f..6ba7e0b99 100644
--- a/interface-definitions/include/vif-s.xml.i
+++ b/interface-definitions/include/vif-s.xml.i
@@ -35,14 +35,8 @@
       </properties>
       <defaultValue>802.1ad</defaultValue>
     </leafNode>
-    <node name="ip">
-      <children>
-        #include <include/interface-disable-arp-filter.xml.i>
-        #include <include/interface-enable-arp-accept.xml.i>
-        #include <include/interface-enable-arp-announce.xml.i>
-        #include <include/interface-enable-arp-ignore.xml.i>
-      </children>
-    </node>
+    #include <include/interface-ipv4-options.xml.i>
+    #include <include/interface-ipv6-options.xml.i>
     #include <include/interface-mac.xml.i>
     #include <include/interface-mtu-68-16000.xml.i>
     <tagNode name="vif-c">
@@ -60,6 +54,8 @@
         #include <include/dhcpv6-options.xml.i>
         #include <include/interface-disable-link-detect.xml.i>
         #include <include/interface-disable.xml.i>
+        #include <include/interface-ipv4-options.xml.i>
+        #include <include/interface-ipv6-options.xml.i>
         #include <include/interface-mac.xml.i>
         #include <include/interface-mtu-68-16000.xml.i>
         #include <include/interface-vrf.xml.i>
diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i
index 3369d0d7c..bc60dd04d 100644
--- a/interface-definitions/include/vif.xml.i
+++ b/interface-definitions/include/vif.xml.i
@@ -43,25 +43,8 @@
         <constraintErrorMessage>QoS mapping should be in the format of '0:7 2:3' with numbers 0-9</constraintErrorMessage>
       </properties>
     </leafNode>
-    <node name="ip">
-      <children>
-        #include <include/interface-arp-cache-timeout.xml.i>
-        #include <include/interface-disable-arp-filter.xml.i>
-        #include <include/interface-disable-forwarding.xml.i>
-        #include <include/interface-enable-arp-accept.xml.i>
-        #include <include/interface-enable-arp-announce.xml.i>
-        #include <include/interface-enable-arp-ignore.xml.i>
-        #include <include/interface-enable-proxy-arp.xml.i>
-        #include <include/interface-proxy-arp-pvlan.xml.i>
-      </children>
-    </node>
-    <node name="ipv6">
-      <children>
-        #include <include/ipv6-address.xml.i>
-        #include <include/ipv6-disable-forwarding.xml.i>
-        #include <include/ipv6-dup-addr-detect-transmits.xml.i>
-      </children>
-    </node>
+    #include <include/interface-ipv4-options.xml.i>
+    #include <include/interface-ipv6-options.xml.i>
     #include <include/interface-mac.xml.i>
     #include <include/interface-mtu-68-16000.xml.i>
   </children>
-- 
cgit v1.2.3