diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-06-16 15:50:45 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-06-16 15:50:45 +0200 |
| commit | 24971edeadf9874e9dfe93221a22f6f05d9048dc (patch) | |
| tree | ad741de36e727dcccb48aac30c5d9745ffa860ba | |
| parent | 8dc9ac88c2ab71a71ab6f532339cd4ab2b321a29 (diff) | |
| parent | 890c9e8984c6b4eeef7ee277c88777416e1fb340 (diff) | |
| download | vyatta-cfg-quagga-24971edeadf9874e9dfe93221a22f6f05d9048dc.tar.gz vyatta-cfg-quagga-24971edeadf9874e9dfe93221a22f6f05d9048dc.zip | |
Merge branch 'bgp-address-family' into current
* bgp-address-family:
T849: move BGP peer-group node to ipv4 address family
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | cfg-version/quagga@4 (renamed from cfg-version/quagga@3) | 0 | ||||
| -rwxr-xr-x | scripts/bgp/vyatta-bgp.pl | 12 | ||||
| -rw-r--r-- | templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/peer-group/node.def (renamed from templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def) | 0 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 434de372..cd4b1ba8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ share_perl5_DATA = lib/Vyatta/Quagga/Config.pm src_check_prefix_boundary = src/check_prefix_boundary.c -curver_DATA = cfg-version/quagga@3 +curver_DATA = cfg-version/quagga@4 cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \ cpio -0pd diff --git a/cfg-version/quagga@3 b/cfg-version/quagga@4 index e69de29b..e69de29b 100644 --- a/cfg-version/quagga@3 +++ b/cfg-version/quagga@4 diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl index 2a3ca514..331f41ed 100755 --- a/scripts/bgp/vyatta-bgp.pl +++ b/scripts/bgp/vyatta-bgp.pl @@ -575,11 +575,6 @@ my %qcom = ( set => 'router bgp #3 ; neighbor #5 password #7', del => 'router bgp #3 ; no neighbor #5 password', }, - 'protocols bgp var neighbor var peer-group' => { - set => 'router bgp #3 ; neighbor #5 peer-group #7', - del => 'router bgp #3 ; no neighbor #5 peer-group #7', - noerr => 'del', - }, 'protocols bgp var neighbor var port' => { set => 'router bgp #3 ; neighbor #5 port #7', del => 'router bgp #3 ; no neighbor #5 port', @@ -949,7 +944,7 @@ my %qcom = ( set => 'router bgp #3 ; address-family ipv4 unicast ; neighbor #5 capability orf prefix-list send', del => 'router bgp #3 ; address-family ipv4 unicast ; no neighbor #5 capability orf prefix-list send', }, - ## Note that the activate will need to be moved when we migrate to + ## Note that the activate will need to be moved when we migrate to ## supporting a single IP version in a peering session. 'protocols bgp var peer-group var address-family ipv4-unicast default-originate' => { set => 'router bgp #3 ; address-family ipv4 unicast ; neighbor #5 activate ; neighbor #5 default-originate', @@ -959,6 +954,11 @@ my %qcom = ( set => 'router bgp #3 ; address-family ipv4 unicast ; neighbor #5 activate ; neighbor #5 default-originate route-map #10', del => 'router bgp #3 ; address-family ipv4 unicast ; no neighbor #5 default-originate route-map #10', }, + 'protocols bgp var peer-group var address-family ipv4-unicast peer-group' => { + set => 'router bgp #3 ; address-family ipv4 unicast ; neighbor #5 peer-group #7', + del => 'router bgp #3 ; address-family ipv4 unicast ; no neighbor #5 peer-group #7', + noerr => 'del', + }, 'protocols bgp var peer-group var address-family ipv4-unicast disable-send-community' => { set => undef, del => undef, diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/peer-group/node.def index 5da142d6..5da142d6 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/peer-group/node.def |