From bf5a6a95bbdcabc5a170e136091f97c3fff7fb76 Mon Sep 17 00:00:00 2001
From: Robert Bays <robert@vyatta.com>
Date: Wed, 14 Jul 2010 23:40:42 -0700
Subject: update ttl-security for peer-group as well

---
 .../bgp/node.tag/peer-group/node.tag/ebgp-multihop/node.def       | 2 +-
 .../bgp/node.tag/peer-group/node.tag/ttl-security/hops/node.def   | 6 ++++++
 .../bgp/node.tag/peer-group/node.tag/ttl-security/node.def        | 8 +-------
 3 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/hops/node.def

(limited to 'templates/protocols/bgp')

diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/ebgp-multihop/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/ebgp-multihop/node.def
index f3606389..b4432261 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/ebgp-multihop/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/ebgp-multihop/node.def
@@ -3,4 +3,4 @@ help: Allow this EBGP peer-group to not be on a directly connected network
 comp_help: possible completions:
   <1-255>    number of hops 
 syntax:expression: $VAR(@) >=1 && $VAR(@) <= 255; "ebgp-multihop must be between 1 and 255"
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --not-exists \"protocols bgp $VAR(../../@) neighbor $VAR(../@) ttl-security\" "; "protocols bgp $VAR(../../@) neighbor $VAR(../@) ebgp-multihop: you can't set both ebgp-multihop and ttl-security"
+commit:expression: $VAR(../ttl-security/hops/) == ""; "protocols bgp $VAR(../../@) peer-group $VAR(../@) ebgp-multihop: you can't set both ebgp-multihop and ttl-security hops"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/hops/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/hops/node.def
new file mode 100644
index 00000000..76d801a0
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/hops/node.def
@@ -0,0 +1,6 @@
+type: u32
+help: Set number of the maximum number of hops to the BGP peer
+comp_help: possible completions:
+  <1-254>    number of hops 
+syntax:expression: $VAR(@) >=1 && $VAR(@) <= 254; "ttl-security hops must be between 1 and 254"
+commit:expression: $VAR(../../ebgp-multihop/) == ""; "protocols bgp $VAR(../../../@) peer-group $VAR(../../@) ttl-security hops: you can't set both ebgp-multihop and ttl-security hops"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def
index bf7c0f39..4ac20c35 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def
@@ -1,8 +1,2 @@
-type: u32
-help: Set ttl security mechanism for this peer-group
-comp_help: possible completions:
-  <1-254>   maximum number of hops that separate two peers
-syntax:expression: $VAR(@) >=1 && $VAR(@) <= 254 ; \
-    "ttl-security must be between 1 and 254"
+help: Set ttl security mechanism for this BGP peer
 
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --not-exists \"protocols bgp $VAR(../../@) neighbor $VAR(../@) ebgp-multihop\" "; "protocols bgp $VAR(../../@) neighbor $VAR(../@) ttl-security: you can't set both ebgp-multihop and ttl-security"
-- 
cgit v1.2.3