From 890c9e8984c6b4eeef7ee277c88777416e1fb340 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 16 Jun 2019 15:13:21 +0200 Subject: T849: move BGP peer-group node to ipv4 address family To have a consitent IPv4/IPv6 CLI a lot of BGP neighbor nodes have been migrated. The IPv4 peer-group has been forgotten, leaving a non consistent CLI. Previously: ----------- neighbor 2001:DB8:FFFF::1 { address-family { ipv6-unicast { peer-group iBGP } } peer-group iBGP } Now: ---- neighbor 2001:DB8:FFFF::1 { address-family { ipv6-unicast { peer-group iBGP } } address-family { ipv4-unicast { peer-group iBGP } } } --- scripts/bgp/vyatta-bgp.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'scripts') 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, -- cgit v1.2.3 From cfc5f4220407d6fd4f9b637850b5db39ce197be9 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 16 Jun 2019 17:02:52 +0200 Subject: Revert "T849: move BGP peer-group node to ipv4 address family" This reverts commit 890c9e8984c6b4eeef7ee277c88777416e1fb340. --- Makefile.am | 2 +- cfg-version/quagga@3 | 0 cfg-version/quagga@4 | 0 scripts/bgp/vyatta-bgp.pl | 12 ++++++------ .../node.tag/address-family/ipv4-unicast/peer-group/node.def | 6 ------ .../bgp/node.tag/neighbor/node.tag/peer-group/node.def | 6 ++++++ 6 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 cfg-version/quagga@3 delete mode 100644 cfg-version/quagga@4 delete mode 100644 templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/peer-group/node.def create mode 100644 templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def (limited to 'scripts') diff --git a/Makefile.am b/Makefile.am index cd4b1ba8..434de372 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@4 +curver_DATA = cfg-version/quagga@3 cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \ cpio -0pd diff --git a/cfg-version/quagga@3 b/cfg-version/quagga@3 new file mode 100644 index 00000000..e69de29b diff --git a/cfg-version/quagga@4 b/cfg-version/quagga@4 deleted file mode 100644 index e69de29b..00000000 diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl index 331f41ed..2a3ca514 100755 --- a/scripts/bgp/vyatta-bgp.pl +++ b/scripts/bgp/vyatta-bgp.pl @@ -575,6 +575,11 @@ 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', @@ -944,7 +949,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', @@ -954,11 +959,6 @@ 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/address-family/ipv4-unicast/peer-group/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/peer-group/node.def deleted file mode 100644 index 5da142d6..00000000 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/peer-group/node.def +++ /dev/null @@ -1,6 +0,0 @@ -type: txt -help: IPv4 peer group for this peer -allowed: local -a params - params=$( /opt/vyatta/sbin/vyatta-bgp.pl --list-peer-groups --as $VAR(../../@) ) - echo -n ${params[@]##*/} -commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"protocols bgp $VAR(../../@) peer-group $VAR(@)\" "; "protocols bgp $VAR(../../@) peer-group $VAR(@) doesn't exist" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def new file mode 100644 index 00000000..5da142d6 --- /dev/null +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def @@ -0,0 +1,6 @@ +type: txt +help: IPv4 peer group for this peer +allowed: local -a params + params=$( /opt/vyatta/sbin/vyatta-bgp.pl --list-peer-groups --as $VAR(../../@) ) + echo -n ${params[@]##*/} +commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"protocols bgp $VAR(../../@) peer-group $VAR(@)\" "; "protocols bgp $VAR(../../@) peer-group $VAR(@) doesn't exist" -- cgit v1.2.3 From ed6f25d767383d5d6f3e57584f218545baf10af6 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 22 Jun 2019 19:03:21 +0200 Subject: bfd: T1183: add BGP neighbor BFD support set protocols bgp neighbor bfd set protocols bgp peer-group bfd --- scripts/bgp/vyatta-bgp.pl | 8 ++++++++ templates/protocols/bgp/node.tag/neighbor/node.tag/bfd/node.def | 1 + templates/protocols/bgp/node.tag/peer-group/node.tag/bfd/node.def | 1 + 3 files changed, 10 insertions(+) create mode 100644 templates/protocols/bgp/node.tag/neighbor/node.tag/bfd/node.def create mode 100644 templates/protocols/bgp/node.tag/peer-group/node.tag/bfd/node.def (limited to 'scripts') diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl index 2a3ca514..fe62deb7 100755 --- a/scripts/bgp/vyatta-bgp.pl +++ b/scripts/bgp/vyatta-bgp.pl @@ -571,6 +571,10 @@ my %qcom = ( set => 'router bgp #3 ; neighbor #5 passive', del => 'router bgp #3 ; no neighbor #5 passive', }, + 'protocols bgp var neighbor var bfd' => { + set => 'router bgp #3 ; neighbor #5 bfd', + del => 'router bgp #3 ; no neighbor #5 bfd', + }, 'protocols bgp var neighbor var password' => { set => 'router bgp #3 ; neighbor #5 password #7', del => 'router bgp #3 ; no neighbor #5 password', @@ -1104,6 +1108,10 @@ my %qcom = ( set => 'router bgp #3 ; neighbor #5 passive', del => 'router bgp #3 ; no neighbor #5 passive', }, + 'protocols bgp var peer-group var bfd' => { + set => 'router bgp #3 ; neighbor #5 bfd', + del => 'router bgp #3 ; no neighbor #5 bfd', + }, 'protocols bgp var peer-group var password' => { set => 'router bgp #3 ; neighbor #5 password #7', del => 'router bgp #3 ; no neighbor #5 password', diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/bfd/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/bfd/node.def new file mode 100644 index 00000000..b5b6a244 --- /dev/null +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/bfd/node.def @@ -0,0 +1 @@ +help: Enable Bidirectional Forwarding Detection (BFD) with this neighbor diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/bfd/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/bfd/node.def new file mode 100644 index 00000000..b5b6a244 --- /dev/null +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/bfd/node.def @@ -0,0 +1 @@ +help: Enable Bidirectional Forwarding Detection (BFD) with this neighbor -- cgit v1.2.3 From d52b304f973397cf983b00e95b9d35a12bc8e2d9 Mon Sep 17 00:00:00 2001 From: Wouter van Os Date: Mon, 8 Jul 2019 09:52:17 +0200 Subject: [bgp] T1509: add support for replace-as in local-as BGP neighbor --- scripts/bgp/vyatta-bgp.pl | 4 ++++ .../node.tag/local-as/node.tag/no-prepend/replace-as/node.def | 1 + 2 files changed, 5 insertions(+) create mode 100644 templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.tag/no-prepend/replace-as/node.def (limited to 'scripts') diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl index fe62deb7..93fb601f 100755 --- a/scripts/bgp/vyatta-bgp.pl +++ b/scripts/bgp/vyatta-bgp.pl @@ -563,6 +563,10 @@ my %qcom = ( set => 'router bgp #3 ; no neighbor #5 local-as #7 ; neighbor #5 local-as #7 no-prepend', del => 'router bgp #3 ; no neighbor #5 local-as #7 no-prepend ; neighbor #5 local-as #7', }, + 'protocols bgp var neighbor var local-as var no-prepend replace-as' => { + set => 'router bgp #3 ; no neighbor #5 local-as #7 ; neighbor #5 local-as #7 no-prepend replace-as', + del => 'router bgp #3 ; neighbor #5 local-as #7 no-prepend', + }, 'protocols bgp var neighbor var override-capability' => { set => 'router bgp #3 ; neighbor #5 override-capability', del => 'router bgp #3 ; no neighbor #5 override-capability', diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.tag/no-prepend/replace-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.tag/no-prepend/replace-as/node.def new file mode 100644 index 00000000..52fbc0b0 --- /dev/null +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.tag/no-prepend/replace-as/node.def @@ -0,0 +1 @@ +help: Only prepend local-as when transmitting local-route updates to this peer. -- cgit v1.2.3