From d8c27642a3753513ae1d3c433fa46858a5ee946c Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 1 Apr 2021 12:30:48 +0000
Subject: static: route: arp: T3170: prevent empty node.def from beeing
 generated

Currently if there are XML nodes defined in multiple places it can and will
happen that one overrides the other. In this case, the "protocols static arp"
definition file overwrites the node.def file in the "protocols static" folder
that had a priority - the priority is essential for l2tpv3 to work.
---
 interface-definitions/protocols-static-arp.xml.in | 37 -----------
 interface-definitions/protocols-static.xml.in     | 78 +++++++++++++++--------
 2 files changed, 52 insertions(+), 63 deletions(-)
 delete mode 100644 interface-definitions/protocols-static-arp.xml.in

(limited to 'interface-definitions')

diff --git a/interface-definitions/protocols-static-arp.xml.in b/interface-definitions/protocols-static-arp.xml.in
deleted file mode 100644
index e5e8a9ad9..000000000
--- a/interface-definitions/protocols-static-arp.xml.in
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="protocols">
-    <children>
-      <node name="static">
-        <children>
-          <tagNode name="arp" owner="${vyos_conf_scripts_dir}/arp.py">
-            <properties>
-              <help>Static ARP translation</help>
-              <valueHelp>
-                <format>ipv4</format>
-                <description>IPv4 destination address</description>
-              </valueHelp>
-              <constraint>
-                <validator name="ipv4-address"/>
-              </constraint>
-            </properties>
-            <children>
-              <leafNode name="hwaddr">
-                <properties>
-                  <help>Translation MAC address</help>
-                  <valueHelp>
-                    <format>macaddr</format>
-                    <description>Hardware (MAC) address</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="mac-address"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-            </children>
-          </tagNode>
-        </children>
-      </node>
-    </children>
-  </node>
-</interfaceDefinition>
diff --git a/interface-definitions/protocols-static.xml.in b/interface-definitions/protocols-static.xml.in
index ab60649a0..2b1b0082a 100644
--- a/interface-definitions/protocols-static.xml.in
+++ b/interface-definitions/protocols-static.xml.in
@@ -2,32 +2,58 @@
 <interfaceDefinition>
   <node name="protocols">
     <children>
-       <node name="static" owner="${vyos_conf_scripts_dir}/protocols_static.py">
-        <properties>
-          <help>Static route parameters</help>
-          <priority>480</priority>
-        </properties>
-        <children>
-          #include <include/static/static-route-map.xml.i>
-          #include <include/static/static-route.xml.i>
-          #include <include/static/static-route6.xml.i>
-          <tagNode name="table">
-            <properties>
-              <help>Policy route table number</help>
-              <valueHelp>
-                <format>u32:1-200</format>
-                <description>Policy route table number</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 1-200"/>
-              </constraint>
-            </properties>
-            <children>
-              #include <include/static/static-route.xml.i>
-              #include <include/static/static-route6.xml.i>
-            </children>
-          </tagNode>
-        </children>
+      <node name="static" owner="${vyos_conf_scripts_dir}/protocols_static.py">
+       <properties>
+         <help>Static route parameters</help>
+         <priority>480</priority>
+       </properties>
+       <children>
+         <tagNode name="arp" owner="${vyos_conf_scripts_dir}/arp.py">
+           <properties>
+             <help>Static ARP translation</help>
+             <valueHelp>
+               <format>ipv4</format>
+               <description>IPv4 destination address</description>
+             </valueHelp>
+             <constraint>
+               <validator name="ipv4-address"/>
+             </constraint>
+           </properties>
+           <children>
+             <leafNode name="hwaddr">
+               <properties>
+                 <help>Translation MAC address</help>
+                 <valueHelp>
+                   <format>macaddr</format>
+                   <description>Hardware (MAC) address</description>
+                 </valueHelp>
+                 <constraint>
+                   <validator name="mac-address"/>
+                 </constraint>
+               </properties>
+             </leafNode>
+           </children>
+         </tagNode>
+         #include <include/static/static-route-map.xml.i>
+         #include <include/static/static-route.xml.i>
+         #include <include/static/static-route6.xml.i>
+         <tagNode name="table">
+           <properties>
+             <help>Policy route table number</help>
+             <valueHelp>
+               <format>u32:1-200</format>
+               <description>Policy route table number</description>
+             </valueHelp>
+             <constraint>
+               <validator name="numeric" argument="--range 1-200"/>
+             </constraint>
+           </properties>
+           <children>
+             #include <include/static/static-route.xml.i>
+             #include <include/static/static-route6.xml.i>
+           </children>
+         </tagNode>
+       </children>
       </node>
     </children>
   </node>
-- 
cgit v1.2.3