summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Bays <robert@vyatta.com>2010-07-14 23:40:42 -0700
committerRobert Bays <robert@vyatta.com>2010-07-14 23:40:42 -0700
commitbf5a6a95bbdcabc5a170e136091f97c3fff7fb76 (patch)
tree3da86aed56ac1eae0f2dfffad65977ff5f8e4849
parent2bc92eb0613a2950aa742e82329287522425b1c1 (diff)
downloadvyatta-cfg-quagga-bf5a6a95bbdcabc5a170e136091f97c3fff7fb76.tar.gz
vyatta-cfg-quagga-bf5a6a95bbdcabc5a170e136091f97c3fff7fb76.zip
update ttl-security for peer-group as well
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/ebgp-multihop/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/hops/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def8
3 files changed, 8 insertions, 8 deletions
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"