From f38f4f89c5dc66d021938b7a63051c5e601f6eb3 Mon Sep 17 00:00:00 2001
From: Robert Bays <rbays@moresby.vyatta.com>
Date: Fri, 7 Mar 2008 00:06:08 -0800
Subject: bug 2753

---
 templates/protocols/bgp/node.def                                     | 4 +++-
 .../bgp/node.tag/parameters/disable-network-import-check/node.def    | 5 +++++
 .../protocols/bgp/node.tag/parameters/network/import-check/node.def  | 5 -----
 templates/protocols/bgp/node.tag/parameters/network/node.def         | 1 -
 4 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def
 delete mode 100644 templates/protocols/bgp/node.tag/parameters/network/import-check/node.def
 delete mode 100644 templates/protocols/bgp/node.tag/parameters/network/node.def

(limited to 'templates/protocols')

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/disable-network-import-check/node.def b/templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def
new file mode 100644
index 00000000..19ccdec2
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def
@@ -0,0 +1,5 @@
+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/import-check/node.def b/templates/protocols/bgp/node.tag/parameters/network/import-check/node.def
deleted file mode 100644
index 887eceaf..00000000
--- a/templates/protocols/bgp/node.tag/parameters/network/import-check/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-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(../../../@)\" \
-           -c \"no 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
-- 
cgit v1.2.3