summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-06-23 12:20:57 +0200
committerChristian Poessinger <christian@poessinger.com>2019-06-23 12:20:57 +0200
commit275b3aa2e9add3074db893a5e4a32f22c7af108c (patch)
treeb6ca8b1fa2e4d22d7f1cd8b951bfc9432c27e897
parentcfc5f4220407d6fd4f9b637850b5db39ce197be9 (diff)
parentc0293182e9fafbad28cc0a790f881c812f52406b (diff)
downloadvyatta-cfg-quagga-275b3aa2e9add3074db893a5e4a32f22c7af108c.tar.gz
vyatta-cfg-quagga-275b3aa2e9add3074db893a5e4a32f22c7af108c.zip
Merge branch 'bfd' into current
* bfd: bfd: T1183: adjust BGP/OSPF help text on BFD bfd: T1183: add BGP neighbor BFD support bfd: T1183: add OSPF BFD support on interface nodes
-rw-r--r--interface-templates/ip/ospf/bfd/node.def3
-rw-r--r--interface-templates/ipv6/ospfv3/bfd/node.def4
-rwxr-xr-xscripts/bgp/vyatta-bgp.pl8
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/bfd/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/bfd/node.def1
5 files changed, 17 insertions, 0 deletions
diff --git a/interface-templates/ip/ospf/bfd/node.def b/interface-templates/ip/ospf/bfd/node.def
new file mode 100644
index 00000000..619b7415
--- /dev/null
+++ b/interface-templates/ip/ospf/bfd/node.def
@@ -0,0 +1,3 @@
+help: Enable Bidirectional Forwarding Detection (BFD) support
+create:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf bfd"
+delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf bfd"
diff --git a/interface-templates/ipv6/ospfv3/bfd/node.def b/interface-templates/ipv6/ospfv3/bfd/node.def
new file mode 100644
index 00000000..7ef33bb7
--- /dev/null
+++ b/interface-templates/ipv6/ospfv3/bfd/node.def
@@ -0,0 +1,4 @@
+help: Enable Bidirectional Forwarding Detection (BFD) support
+create:vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "ipv6 ospf6 bfd"
+delete:vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "no ipv6 ospf6 bfd"
+
diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl
index 2a3ca514..fe62deb7 100755
--- a/scripts/bgp/vyatta-bgp.pl
+++ b/scripts/bgp/vyatta-bgp.pl
@@ -571,6 +571,10 @@ my %qcom = (
set => 'router bgp #3 ; neighbor #5 passive',
del => 'router bgp #3 ; no neighbor #5 passive',
},
+ 'protocols bgp var neighbor var bfd' => {
+ set => 'router bgp #3 ; neighbor #5 bfd',
+ del => 'router bgp #3 ; no neighbor #5 bfd',
+ },
'protocols bgp var neighbor var password' => {
set => 'router bgp #3 ; neighbor #5 password #7',
del => 'router bgp #3 ; no neighbor #5 password',
@@ -1104,6 +1108,10 @@ my %qcom = (
set => 'router bgp #3 ; neighbor #5 passive',
del => 'router bgp #3 ; no neighbor #5 passive',
},
+ 'protocols bgp var peer-group var bfd' => {
+ set => 'router bgp #3 ; neighbor #5 bfd',
+ del => 'router bgp #3 ; no neighbor #5 bfd',
+ },
'protocols bgp var peer-group var password' => {
set => 'router bgp #3 ; neighbor #5 password #7',
del => 'router bgp #3 ; no neighbor #5 password',
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/bfd/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/bfd/node.def
new file mode 100644
index 00000000..284ce4d8
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/bfd/node.def
@@ -0,0 +1 @@
+help: Enable Bidirectional Forwarding Detection (BFD) support
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/bfd/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/bfd/node.def
new file mode 100644
index 00000000..284ce4d8
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/bfd/node.def
@@ -0,0 +1 @@
+help: Enable Bidirectional Forwarding Detection (BFD) support