diff options
| author | Robert Bays <robert@vyatta.com> | 2010-08-06 15:40:27 -0700 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2010-08-10 10:32:09 -0700 |
| commit | 23adebecd0c65e465cc6fbde3a676376e28fef81 (patch) | |
| tree | 98ebb4211ca865c0a41a57dd68e5329054a4e527 | |
| parent | d0ce0f3fdc14cc9559c8835f00a9dccace4ba9fe (diff) | |
| download | vyatta-cfg-quagga-23adebecd0c65e465cc6fbde3a676376e28fef81.tar.gz vyatta-cfg-quagga-23adebecd0c65e465cc6fbde3a676376e28fef81.zip | |
fix for bug 5925
(cherry picked from commit 0773ce1032d07f7f74e2b41c0f160570a8ed66a1)
| -rwxr-xr-x | scripts/bgp/vyatta-bgp.pl | 3 | ||||
| -rw-r--r-- | templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl index d97a3e69..a91d16e5 100755 --- a/scripts/bgp/vyatta-bgp.pl +++ b/scripts/bgp/vyatta-bgp.pl @@ -1304,7 +1304,8 @@ sub check_for_iBGP_ASN { my $config = new Vyatta::Config; $config->setLevel("protocols bgp $as"); - my @neighbors = $config->listNodes('neighbor'); + #my @neighbors = $config->listNodes('neighbor'); + my @neighbors = $config->listOrigNodes('neighbor'); foreach $neighbor (@neighbors) { my $remoteas = $config->returnValue("neighbor $neighbor remote-as"); if ("$testas" eq "$remoteas") { 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 a5d5b671..52823424 100644 --- a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def +++ b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def @@ -3,4 +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." +commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-for-iBGP-ASN $VAR(@) --as $VAR(../../../@)"; "Can't set confederation peers ASN to $VAR(@). Delete any neighbors with remote-as $VAR(@) and/or change the local ASN first." |