diff options
author | Robert Bays <robert@vyatta.com> | 2011-09-11 16:31:14 -0700 |
---|---|---|
committer | Robert Bays <robert@vyatta.com> | 2011-09-11 16:31:14 -0700 |
commit | 5b2d4955d09efb2fb29899d693749e53c60a4e86 (patch) | |
tree | a18baae7b14251354d6ac3d25f701374351c3339 | |
parent | b84a03d4e11af3b87907e60dea1fd0d3de2b585e (diff) | |
download | vyatta-cfg-quagga-5b2d4955d09efb2fb29899d693749e53c60a4e86.tar.gz vyatta-cfg-quagga-5b2d4955d09efb2fb29899d693749e53c60a4e86.zip |
Bug 6030: bgp redistribution doesn't work well when it's set for ipv4 and ipv6
Second part of the fix for this bug.
-rwxr-xr-x | scripts/bgp/vyatta-bgp.pl | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl index 0a182a5c..56bfe978 100755 --- a/scripts/bgp/vyatta-bgp.pl +++ b/scripts/bgp/vyatta-bgp.pl @@ -88,10 +88,20 @@ my %qcom = ( del => undef, }, 'protocols bgp var address-family ipv6-unicast redistribute connected' => { - set => 'router bgp #3 ; address-family ipv6 ; no redistribute connected ; redistribute connected ?route-map ?metric', + set => 'router bgp #3 ; address-family ipv6 ; redistribute connected', del => 'router bgp #3 ; address-family ipv6 ; no redistribute connected', noerr => 'set', }, + 'protocols bgp var address-family ipv6-unicast redistribute connected metric' => { + set => 'router bgp #3 ; address-family ipv6 ; redistribute connected metric #9', + del => 'router bgp #3 ; address-family ipv6 ; no redistribute connected metric #9', + noerr => 'set', + }, + 'protocols bgp var address-family ipv6-unicast redistribute connected route-map' => { + set => 'router bgp #3 ; address-family ipv6 ; redistribute connected route-map #9', + del => 'router bgp #3 ; address-family ipv6 ; no redistribute connected route-map #9', + noerr => 'set', + }, 'protocols bgp var address-family ipv6-unicast redistribute kernel' => { set => 'router bgp #3 ; address-family ipv6 ; no redistribute kernel ; redistribute kernel ?route-map ?metric', del => 'router bgp #3 ; address-family ipv6 ; no redistribute kernel', @@ -1017,10 +1027,20 @@ my %qcom = ( del => undef, }, 'protocols bgp var redistribute connected' => { - set => 'router bgp #3 ; no redistribute connected ; redistribute connected ?route-map ?metric', + set => 'router bgp #3 ; redistribute connected ?route-map ?metric', del => 'router bgp #3 ; no redistribute connected', noerr => 'set', }, + 'protocols bgp var redistribute connected metric' => { + set => 'router bgp #3 ; redistribute connected metric #7', + del => 'router bgp #3 ; no redistribute connected metric #7', + noerr => 'set', + }, + 'protocols bgp var redistribute connected route-map' => { + set => 'router bgp #3 ; redistribute connected route-map #7', + del => 'router bgp #3 ; no redistribute connected route-map #7', + noerr => 'set', + }, 'protocols bgp var redistribute kernel' => { set => 'router bgp #3 ; no redistribute kernel ; redistribute kernel ?route-map ?metric', del => 'router bgp #3 ; no redistribute kernel', |