From c2a8c1a22f432265c73606106046c02e995eb630 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 22 Jun 2019 14:44:45 +0200
Subject: bfd: T1183: adjust CLI syntax for source address/interface

Place address/interface under new source node.

vyis@vyos# show protocols bfd
 peer 1.1.1.1 {
     source {
         address 1.2.3.4
         interface eth0.201
     }
 }
---
 interface-definitions/protocols-bfd.xml | 45 +++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 19 deletions(-)

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

diff --git a/interface-definitions/protocols-bfd.xml b/interface-definitions/protocols-bfd.xml
index 91f0665f9..ab8c9e233 100644
--- a/interface-definitions/protocols-bfd.xml
+++ b/interface-definitions/protocols-bfd.xml
@@ -22,27 +22,34 @@
               </valueHelp>
             </properties>
             <children>
-              <leafNode name="local-interface">
+              <node name="source">
                 <properties>
-                  <help>Local interface to bind our peer listener to</help>
-                  <completionHelp>
-                    <script>${vyos_completion_dir}/list_interfaces.py</script>
-                  </completionHelp>
+                  <help>Bind listener to specifid interface/address, mandatory for IPv6</help>
                 </properties>
-              </leafNode>
-              <leafNode name="local-address">
-                <properties>
-                  <help>Local address to bind our peer listener to</help>
-                  <valueHelp>
-                    <format>ipv4</format>
-                    <description>Local IPv4 address used to connect to the peer</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>ipv6</format>
-                    <description>Local IPv6 address used to connect to the peer</description>
-                  </valueHelp>
-                </properties>
-              </leafNode>
+                <children>
+                  <leafNode name="interface">
+                    <properties>
+                      <help>Local interface to bind our peer listener to</help>
+                      <completionHelp>
+                        <script>${vyos_completion_dir}/list_interfaces.py</script>
+                      </completionHelp>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="address">
+                    <properties>
+                      <help>Local address to bind our peer listener to</help>
+                      <valueHelp>
+                        <format>ipv4</format>
+                        <description>Local IPv4 address used to connect to the peer</description>
+                      </valueHelp>
+                      <valueHelp>
+                        <format>ipv6</format>
+                        <description>Local IPv6 address used to connect to the peer</description>
+                      </valueHelp>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
               <leafNode name="shutdown">
                 <properties>
                   <help>Disable this peer</help>
-- 
cgit v1.2.3