summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsdc <taras@sentrium.io>2019-10-08 19:44:59 +0300
committerzsdc <taras@sentrium.io>2019-10-08 19:44:59 +0300
commit455389f6becbbec93f16bc31289c0ae46d278e08 (patch)
tree805b7d6d41aef412f869a3d6913c698da14a8813
parent0f8641babb207e36c2b1637aea7cc2761c54f31b (diff)
downloadvyatta-cfg-quagga-455389f6becbbec93f16bc31289c0ae46d278e08.tar.gz
vyatta-cfg-quagga-455389f6becbbec93f16bc31289c0ae46d278e08.zip
[BGP] T1490: Deleted bgp scan-time parameter
Deleted obsoleted BGP scan-time parameter, as it never existed in FRRouting as unneeded - there is used more modern next-hop tracking instead.
-rw-r--r--Makefile.am2
-rw-r--r--cfg-version/quagga@4 (renamed from cfg-version/quagga@3)0
-rwxr-xr-xscripts/bgp/vyatta-bgp.pl4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/scan-time/node.def4
4 files changed, 1 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 434de372..cd4b1ba8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@ share_perl5_DATA = lib/Vyatta/Quagga/Config.pm
src_check_prefix_boundary = src/check_prefix_boundary.c
-curver_DATA = cfg-version/quagga@3
+curver_DATA = cfg-version/quagga@4
cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \
cpio -0pd
diff --git a/cfg-version/quagga@3 b/cfg-version/quagga@4
index e69de29b..e69de29b 100644
--- a/cfg-version/quagga@3
+++ b/cfg-version/quagga@4
diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl
index 9a816344..a99b7897 100755
--- a/scripts/bgp/vyatta-bgp.pl
+++ b/scripts/bgp/vyatta-bgp.pl
@@ -764,10 +764,6 @@ my %qcom = (
set => 'router bgp #3 ; bgp router-id #6',
del => 'router bgp #3 ; no bgp router-id #6',
},
- 'protocols bgp var parameters scan-time' => {
- set => 'router bgp #3 ; bgp scan-time #6',
- del => 'router bgp #3 ; no bgp scan-time #6',
- },
'protocols bgp var peer-group' => {
set => undef,
del => undef,
diff --git a/templates/protocols/bgp/node.tag/parameters/scan-time/node.def b/templates/protocols/bgp/node.tag/parameters/scan-time/node.def
deleted file mode 100644
index 5a009f86..00000000
--- a/templates/protocols/bgp/node.tag/parameters/scan-time/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: BGP route scanner interval
-val_help: u32:5-60; Scan interval in seconds
-syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 60; "scan-time must be between 5 and 60 seconds"