From 63cadf52a4b8d8aa31a868c4b19e44a9eff12d37 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 4 Dec 2021 07:23:14 +0100
Subject: bfd: T4044: add VRF support for peers

---
 interface-definitions/protocols-bfd.xml.in | 1 +
 1 file changed, 1 insertion(+)

(limited to 'interface-definitions/protocols-bfd.xml.in')

diff --git a/interface-definitions/protocols-bfd.xml.in b/interface-definitions/protocols-bfd.xml.in
index 7b22b8125..d5a968001 100644
--- a/interface-definitions/protocols-bfd.xml.in
+++ b/interface-definitions/protocols-bfd.xml.in
@@ -73,6 +73,7 @@
                   <valueless/>
                 </properties>
               </leafNode>
+              #include <include/interface/vrf.xml.i>
             </children>
           </tagNode>
           <tagNode name="profile">
-- 
cgit v1.2.3


From 0ec938326ffd63ad5eab5f3be3038e13fe3118ec Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 9 Dec 2021 23:17:47 +0100
Subject: xml: include: create dedicated bfd subfolder

---
 interface-definitions/include/bfd-common.xml.i     | 78 ----------------------
 interface-definitions/include/bfd.xml.i            |  8 ---
 interface-definitions/include/bfd/bfd.xml.i        | 10 +++
 interface-definitions/include/bfd/common.xml.i     | 78 ++++++++++++++++++++++
 .../include/isis/protocol-common-config.xml.i      |  2 +-
 .../include/ospf/interface-common.xml.i            |  2 +-
 interface-definitions/protocols-bfd.xml.in         |  4 +-
 7 files changed, 92 insertions(+), 90 deletions(-)
 delete mode 100644 interface-definitions/include/bfd-common.xml.i
 delete mode 100644 interface-definitions/include/bfd.xml.i
 create mode 100644 interface-definitions/include/bfd/bfd.xml.i
 create mode 100644 interface-definitions/include/bfd/common.xml.i

(limited to 'interface-definitions/protocols-bfd.xml.in')

diff --git a/interface-definitions/include/bfd-common.xml.i b/interface-definitions/include/bfd-common.xml.i
deleted file mode 100644
index 8379784f7..000000000
--- a/interface-definitions/include/bfd-common.xml.i
+++ /dev/null
@@ -1,78 +0,0 @@
-<!-- include start from bfd-common.xml.i -->
-<leafNode name="echo-mode">
-  <properties>
-    <help>Enables the echo transmission mode</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<node name="interval">
-  <properties>
-    <help>Configure timer intervals</help>
-  </properties>
-  <children>
-    <leafNode name="receive">
-      <properties>
-        <help>Minimum interval of receiving control packets</help>
-        <valueHelp>
-          <format>u32:10-60000</format>
-          <description>Interval in milliseconds (default: 300)</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 10-60000"/>
-        </constraint>
-      </properties>
-      <defaultValue>300</defaultValue>
-    </leafNode>
-    <leafNode name="transmit">
-      <properties>
-        <help>Minimum interval of transmitting control packets</help>
-        <valueHelp>
-          <format>u32:10-60000</format>
-          <description>Interval in milliseconds (default: 300)</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 10-60000"/>
-        </constraint>
-      </properties>
-      <defaultValue>300</defaultValue>
-    </leafNode>
-    <leafNode name="multiplier">
-      <properties>
-        <help>Multiplier to determine packet loss</help>
-        <valueHelp>
-          <format>u32:2-255</format>
-          <description>Remote transmission interval will be multiplied by this value (default: 3)</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 2-255"/>
-        </constraint>
-      </properties>
-      <defaultValue>3</defaultValue>
-    </leafNode>
-    <leafNode name="echo-interval">
-      <properties>
-        <help>Echo receive transmission interval</help>
-        <valueHelp>
-          <format>u32:10-60000</format>
-          <description>The minimal echo receive transmission interval that this system is capable of handling</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 10-60000"/>
-        </constraint>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<leafNode name="passive">
-  <properties>
-    <help>Do not attempt to start sessions</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<leafNode name="shutdown">
-  <properties>
-    <help>Disable this peer</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/bfd.xml.i b/interface-definitions/include/bfd.xml.i
deleted file mode 100644
index 2bc3664e1..000000000
--- a/interface-definitions/include/bfd.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from bfd.xml.i -->
-<leafNode name="bfd">
-  <properties>
-    <help>Enable Bidirectional Forwarding Detection (BFD)</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/bfd/bfd.xml.i b/interface-definitions/include/bfd/bfd.xml.i
new file mode 100644
index 000000000..022956d98
--- /dev/null
+++ b/interface-definitions/include/bfd/bfd.xml.i
@@ -0,0 +1,10 @@
+<!-- include start from bfd/bfd.xml.i -->
+<node name="bfd">
+  <properties>
+    <help>Enable Bidirectional Forwarding Detection (BFD)</help>
+  </properties>
+  <children>
+    #include <include/bfd/profile.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/bfd/common.xml.i b/interface-definitions/include/bfd/common.xml.i
new file mode 100644
index 000000000..e52221441
--- /dev/null
+++ b/interface-definitions/include/bfd/common.xml.i
@@ -0,0 +1,78 @@
+<!-- include start from bfd/common.xml.i -->
+<leafNode name="echo-mode">
+  <properties>
+    <help>Enables the echo transmission mode</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<node name="interval">
+  <properties>
+    <help>Configure timer intervals</help>
+  </properties>
+  <children>
+    <leafNode name="receive">
+      <properties>
+        <help>Minimum interval of receiving control packets</help>
+        <valueHelp>
+          <format>u32:10-60000</format>
+          <description>Interval in milliseconds (default: 300)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 10-60000"/>
+        </constraint>
+      </properties>
+      <defaultValue>300</defaultValue>
+    </leafNode>
+    <leafNode name="transmit">
+      <properties>
+        <help>Minimum interval of transmitting control packets</help>
+        <valueHelp>
+          <format>u32:10-60000</format>
+          <description>Interval in milliseconds (default: 300)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 10-60000"/>
+        </constraint>
+      </properties>
+      <defaultValue>300</defaultValue>
+    </leafNode>
+    <leafNode name="multiplier">
+      <properties>
+        <help>Multiplier to determine packet loss</help>
+        <valueHelp>
+          <format>u32:2-255</format>
+          <description>Remote transmission interval will be multiplied by this value (default: 3)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 2-255"/>
+        </constraint>
+      </properties>
+      <defaultValue>3</defaultValue>
+    </leafNode>
+    <leafNode name="echo-interval">
+      <properties>
+        <help>Echo receive transmission interval</help>
+        <valueHelp>
+          <format>u32:10-60000</format>
+          <description>The minimal echo receive transmission interval that this system is capable of handling</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 10-60000"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<leafNode name="passive">
+  <properties>
+    <help>Do not attempt to start sessions</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="shutdown">
+  <properties>
+    <help>Disable this peer</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i
index 84e2f7bb2..8ffa14a19 100644
--- a/interface-definitions/include/isis/protocol-common-config.xml.i
+++ b/interface-definitions/include/isis/protocol-common-config.xml.i
@@ -648,7 +648,7 @@
     </completionHelp>
   </properties>
   <children>
-    #include <include/bfd.xml.i>
+    #include <include/bfd/bfd.xml.i>
     <leafNode name="circuit-type">
       <properties>
         <help>Configure circuit type for interface</help>
diff --git a/interface-definitions/include/ospf/interface-common.xml.i b/interface-definitions/include/ospf/interface-common.xml.i
index 4b0aef380..738651594 100644
--- a/interface-definitions/include/ospf/interface-common.xml.i
+++ b/interface-definitions/include/ospf/interface-common.xml.i
@@ -1,5 +1,5 @@
 <!-- include start from ospf/interface-common.xml.i -->
-#include <include/bfd.xml.i>
+#include <include/bfd/bfd.xml.i>
 <leafNode name="cost">
   <properties>
     <help>Interface cost</help>
diff --git a/interface-definitions/protocols-bfd.xml.in b/interface-definitions/protocols-bfd.xml.in
index d5a968001..265c9603a 100644
--- a/interface-definitions/protocols-bfd.xml.in
+++ b/interface-definitions/protocols-bfd.xml.in
@@ -66,7 +66,7 @@
                   </leafNode>
                 </children>
               </node>
-              #include <include/bfd-common.xml.i>
+              #include <include/bfd/common.xml.i>
               <leafNode name="multihop">
                 <properties>
                   <help>Allow this BFD peer to not be directly connected</help>
@@ -88,7 +88,7 @@
               </constraint>
             </properties>
             <children>
-              #include <include/bfd-common.xml.i>
+              #include <include/bfd/common.xml.i>
             </children>
           </tagNode>
         </children>
-- 
cgit v1.2.3


From e639b84e56a131e6391aa94adb1c1937f3c8dc60 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 9 Dec 2021 23:19:19 +0100
Subject: xml: T4058: provide building block for BFD profiles

---
 interface-definitions/include/bfd/profile.xml.i | 14 ++++++++++++++
 interface-definitions/protocols-bfd.xml.in      | 13 +------------
 2 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 interface-definitions/include/bfd/profile.xml.i

(limited to 'interface-definitions/protocols-bfd.xml.in')

diff --git a/interface-definitions/include/bfd/profile.xml.i b/interface-definitions/include/bfd/profile.xml.i
new file mode 100644
index 000000000..5ff057286
--- /dev/null
+++ b/interface-definitions/include/bfd/profile.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from bfd/profile.xml.i -->
+<leafNode name="profile">
+  <properties>
+    <help>Use settings from BFD profile</help>
+    <completionHelp>
+      <path>protocols bfd profile</path>
+    </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>BFD profile name</description>
+    </valueHelp>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/protocols-bfd.xml.in b/interface-definitions/protocols-bfd.xml.in
index 265c9603a..a9957d884 100644
--- a/interface-definitions/protocols-bfd.xml.in
+++ b/interface-definitions/protocols-bfd.xml.in
@@ -26,18 +26,7 @@
               </constraint>
             </properties>
             <children>
-              <leafNode name="profile">
-                <properties>
-                  <help>Use settings from BFD profile</help>
-                  <completionHelp>
-                    <path>protocols bfd profile</path>
-                  </completionHelp>
-                  <valueHelp>
-                    <format>txt</format>
-                    <description>BFD profile name</description>
-                  </valueHelp>
-                </properties>
-              </leafNode>
+              #include <include/bfd/profile.xml.i>
               <node name="source">
                 <properties>
                   <help>Bind listener to specified interface/address, mandatory for IPv6</help>
-- 
cgit v1.2.3