Merge pull request #732 from c-po/t3310-bfd

bfd: T3310: migrate to get_config_dict() and FRR reload

2 files changed, 104 insertions, 68 deletions

diff --git a/interface-definitions/include/bfd-common.xml.i b/interface-definitions/include/bfd-common.xml.i
new file mode 100644
index 000000000..ff73e4b20
--- /dev/null
+++ b/interface-definitions/include/bfd-common.xml.i
@@ -0,0 +1,72 @@
+<!-- included 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>10-60000</format>
+          <description>Interval in milliseconds</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>10-60000</format>
+          <description>Interval in milliseconds</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>2-255</format>
+          <description>Remote transmission interval will be multiplied by this value</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>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="shutdown">
+  <properties>
+    <help>Disable this peer</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/protocols-bfd.xml.in b/interface-definitions/protocols-bfd.xml.in
index 8900e7955..cc3c3bf12 100644
--- a/interface-definitions/protocols-bfd.xml.in
+++ b/interface-definitions/protocols-bfd.xml.in
@@ -11,7 +11,7 @@
         <children>
           <tagNode name="peer">
             <properties>
-              <help>Configures a new BFD peer to listen and talk to</help>
+              <help>Configures BFD peer to listen and talk to</help>
               <valueHelp>
                 <format>ipv4</format>
                 <description>BFD peer IPv4 address</description>
@@ -26,6 +26,18 @@
               </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>
               <node name="source">
                 <properties>
                   <help>Bind listener to specified interface/address, mandatory for IPv6</help>
@@ -42,6 +54,9 @@
                   <leafNode name="address">
                     <properties>
                       <help>Local address to bind our peer listener to</help>
+                      <completionHelp>
+                        <script>${vyos_completion_dir}/list_local_ips.sh --both</script>
+                      </completionHelp>
                       <valueHelp>
                         <format>ipv4</format>
                         <description>Local IPv4 address used to connect to the peer</description>
@@ -58,79 +73,28 @@
                   </leafNode>
                 </children>
               </node>
-              <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>10-60000</format>
-                        <description>Interval in milliseconds</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 10-60000"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="transmit">
-                    <properties>
-                      <help>Minimum interval of transmitting control packets</help>
-                      <valueHelp>
-                        <format>10-60000</format>
-                        <description>Interval in milliseconds</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 10-60000"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="multiplier">
-                    <properties>
-                      <help>Multiplier to determine packet loss</help>
-                      <valueHelp>
-                        <format>2-255</format>
-                        <description>Remote transmission interval will be multiplied by this value</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 2-255"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="echo-interval">
-                    <properties>
-                      <help>Echo receive transmission interval</help>
-                      <valueHelp>
-                        <format>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="shutdown">
-                <properties>
-                  <help>Disable this peer</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
+              #include <include/bfd-common.xml.i>
               <leafNode name="multihop">
                 <properties>
                   <help>Allow this BFD peer to not be directly connected</help>
                   <valueless/>
                 </properties>
               </leafNode>
-              <leafNode name="echo-mode">
-                <properties>
-                  <help>Enables the echo transmission mode</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
+            </children>
+          </tagNode>
+          <tagNode name="profile">
+            <properties>
+              <help>Configure BFD profile used by individual peer</help>
+              <valueHelp>
+                <format>txt</format>
+                <description>Name of BFD profile</description>
+              </valueHelp>
+              <constraint>
+                <regex>^[-_a-zA-Z0-9]{1,32}$</regex>
+              </constraint>
+            </properties>
+            <children>
+              #include <include/bfd-common.xml.i>
             </children>
           </tagNode>
         </children>