diff options
| author | Robert Bays <robert@vyatta.com> | 2010-07-23 13:07:44 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-28 09:51:03 -0700 |
| commit | 3dd5183a3c52ca16bc7b7461b2a2820fe87ff49d (patch) | |
| tree | cf2bff1146a85f4ce9214689c902a66d93283792 /templates | |
| parent | 04909ae8013ce8ccd0032f2615c0eef9ad4ceffe (diff) | |
| download | vyatta-cfg-quagga-3dd5183a3c52ca16bc7b7461b2a2820fe87ff49d.tar.gz vyatta-cfg-quagga-3dd5183a3c52ca16bc7b7461b2a2820fe87ff49d.zip | |
fix for bug 5892
(cherry picked from commit 5ae305002d35de573a34974104f13ebede556715)
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def | 4 | ||||
| -rw-r--r-- | templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def index a60b9bb1..42fd3cec 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def @@ -4,6 +4,4 @@ help: Local AS number [REQUIRED] val_help: u32:1-4294967294; Local AS number syntax:expression: $VAR(@) >=1 && $VAR(@) <= 4294967294; "local-as must be between 1 and 4294967294" commit:expression: $VAR(@) != $VAR(../../@); "you can't set local-as the same as the router AS" -commit:expression: $VAR(../remote-as/@) != $VAR(../../@); "local-as can't be set on iBGP peers" -commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-local-as --neighbor $VAR(../@) --as $VAR(../../@)" - +commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --is-iBGP --neighbor $VAR(../@) --as $VAR(../../@)"; "local-as can't be set on iBGP peers" diff --git a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def index 71c6b0a8..a5d5b671 100644 --- a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def +++ b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def @@ -3,3 +3,4 @@ type: u32 help: Peer ASs in the BGP confederation val_help: u32:1-4294967294; Peer AS number numbers (ex: "435 234") syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "confederation AS id must be between 1 and 4294967294" +commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-for-iBGP-ASN $VAR(@) --as $VAR(../../../@)"; "can't set confederation ASN to $VAR(@). Delete neighbors with remote-as $VAR(@) first." |