summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Bays <rbays@moresby.vyatta.com>2008-03-07 00:06:08 -0800
committerRobert Bays <rbays@moresby.vyatta.com>2008-03-07 00:06:08 -0800
commitf38f4f89c5dc66d021938b7a63051c5e601f6eb3 (patch)
treea0971cf824be8b0c8069e99f381c5dd8705f6eb5
parentae70ac4ecc2910e8a3d5bd70d6e3a1cb47f51ccb (diff)
downloadvyatta-cfg-quagga-f38f4f89c5dc66d021938b7a63051c5e601f6eb3.tar.gz
vyatta-cfg-quagga-f38f4f89c5dc66d021938b7a63051c5e601f6eb3.zip
bug 2753
-rw-r--r--templates/protocols/bgp/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def (renamed from templates/protocols/bgp/node.tag/parameters/network/import-check/node.def)8
-rw-r--r--templates/protocols/bgp/node.tag/parameters/network/node.def1
3 files changed, 7 insertions, 6 deletions
diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def
index 5e89d91a..c1b84c57 100644
--- a/templates/protocols/bgp/node.def
+++ b/templates/protocols/bgp/node.def
@@ -1,7 +1,9 @@
tag:
type: u32
help: Configure a BGP Autonomous System on this router
-# TODO: non-multinode parent
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "AS number must be between 1 and 4294967294"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $VAR(@)\" "
+# we need to set default parameters in BGP here since we can't do it in
+# startup scripts because we don't know the AS number
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $VAR(@)\" -c \"bgp network import-check\" "
delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no router bgp $VAR(@)\" "
diff --git a/templates/protocols/bgp/node.tag/parameters/network/import-check/node.def b/templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def
index 887eceaf..19ccdec2 100644
--- a/templates/protocols/bgp/node.tag/parameters/network/import-check/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def
@@ -1,5 +1,5 @@
-help: Check BGP network route exists in IGP
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $VAR(../../../@)\" \
- -c \"bgp network import-check \" "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $VAR(../../../@)\" \
+help: Disable checks to verify a route exists in IGP before importing with a network statement
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $VAR(../../@)\" \
-c \"no bgp network import-check \" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $VAR(../../@)\" \
+ -c \"bgp network import-check \" "
diff --git a/templates/protocols/bgp/node.tag/parameters/network/node.def b/templates/protocols/bgp/node.tag/parameters/network/node.def
deleted file mode 100644
index afc062e7..00000000
--- a/templates/protocols/bgp/node.tag/parameters/network/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Network parameter options