From 73c013bab12402f2c40f35fbffc8b0178482df18 Mon Sep 17 00:00:00 2001 From: Viacheslav Date: Thu, 5 Aug 2021 16:50:08 +0000 Subject: bgp: T548: Add ipv6 maximum-path and migrate to proper afi --- cfg-version/quagga@7 | 0 cfg-version/quagga@8 | 0 scripts/bgp/vyatta-bgp.pl | 36 ++++++++++++++-------- .../ipv4-unicast/maximum-paths/ebgp/node.def | 4 +++ .../ipv4-unicast/maximum-paths/ibgp/node.def | 4 +++ .../ipv4-unicast/maximum-paths/node.def | 1 + .../ipv6-unicast/maximum-paths/ebgp/node.def | 4 +++ .../ipv6-unicast/maximum-paths/ibgp/node.def | 4 +++ .../ipv6-unicast/maximum-paths/node.def | 1 + .../bgp/node.tag/maximum-paths/ebgp/node.def | 4 --- .../bgp/node.tag/maximum-paths/ibgp/node.def | 4 --- .../protocols/bgp/node.tag/maximum-paths/node.def | 1 - 12 files changed, 42 insertions(+), 21 deletions(-) delete mode 100644 cfg-version/quagga@7 create mode 100644 cfg-version/quagga@8 create mode 100644 templates/protocols/bgp/node.tag/address-family/ipv4-unicast/maximum-paths/ebgp/node.def create mode 100644 templates/protocols/bgp/node.tag/address-family/ipv4-unicast/maximum-paths/ibgp/node.def create mode 100644 templates/protocols/bgp/node.tag/address-family/ipv4-unicast/maximum-paths/node.def create mode 100644 templates/protocols/bgp/node.tag/address-family/ipv6-unicast/maximum-paths/ebgp/node.def create mode 100644 templates/protocols/bgp/node.tag/address-family/ipv6-unicast/maximum-paths/ibgp/node.def create mode 100644 templates/protocols/bgp/node.tag/address-family/ipv6-unicast/maximum-paths/node.def delete mode 100644 templates/protocols/bgp/node.tag/maximum-paths/ebgp/node.def delete mode 100644 templates/protocols/bgp/node.tag/maximum-paths/ibgp/node.def delete mode 100644 templates/protocols/bgp/node.tag/maximum-paths/node.def diff --git a/cfg-version/quagga@7 b/cfg-version/quagga@7 deleted file mode 100644 index e69de29b..00000000 diff --git a/cfg-version/quagga@8 b/cfg-version/quagga@8 new file mode 100644 index 00000000..e69de29b diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl index 9496621e..b0e0af25 100755 --- a/scripts/bgp/vyatta-bgp.pl +++ b/scripts/bgp/vyatta-bgp.pl @@ -83,6 +83,18 @@ my %qcom = ( set => 'router bgp #3 ; address-family ipv6 ; network #7 pathlimit #9', del => 'router bgp #3 ; address-family ipv6 ; no network #7 pathlimit #9', }, + 'protocols bgp var address-family ipv6-unicast maximum-paths' => { + set => undef, + del => undef, + }, + 'protocols bgp var address-family ipv6-unicast maximum-paths ebgp' => { + set => 'router bgp #3 ; address-family ipv6 ; maximum-paths #8', + del => 'router bgp #3 ; address-family ipv6 ; no maximum-paths #8', + }, + 'protocols bgp var address-family ipv6-unicast maximum-paths ibgp' => { + set => 'router bgp #3 ; address-family ipv6 ; maximum-paths ibgp #8', + del => 'router bgp #3 ; address-family ipv6 ; no maximum-paths ibgp #8', + }, 'protocols bgp var address-family ipv6-unicast redistribute' => { set => undef, del => undef, @@ -146,6 +158,18 @@ my %qcom = ( set => 'router bgp #3 ; network #7 route-map #9', del => 'router bgp #3 ; no network #7 route-map #9 ; network #7', }, + 'protocols bgp var address-family ipv4-unicast maximum-paths' => { + set => undef, + del => undef, + }, + 'protocols bgp var address-family ipv4-unicast maximum-paths ebgp' => { + set => 'router bgp #3 ; address-family ipv4 ; maximum-paths #8', + del => 'router bgp #3 ; address-family ipv4 ; no maximum-paths #8', + }, + 'protocols bgp var address-family ipv4-unicast maximum-paths ibgp' => { + set => 'router bgp #3 ; address-family ipv4 ; maximum-paths ibgp #8', + del => 'router bgp #3 ; address-family ipv4 ; no maximum-paths ibgp #8', + }, 'protocols bgp var address-family ipv4-unicast redistribute' => { set => undef, del => undef, @@ -200,18 +224,6 @@ my %qcom = ( del => 'router bgp #3 ; address-family ipv4 unicast ; no redistribute static', noerr => 'set', }, - 'protocols bgp var maximum-paths' => { - set => undef, - del => undef, - }, - 'protocols bgp var maximum-paths ebgp' => { - set => 'router bgp #3 ; maximum-paths #6', - del => 'router bgp #3 ; no maximum-paths #6', - }, - 'protocols bgp var maximum-paths ibgp' => { - set => 'router bgp #3 ; maximum-paths ibgp #6', - del => 'router bgp #3 ; no maximum-paths ibgp #6', - }, 'protocols bgp var neighbor' => { set => undef, del => undef, diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/maximum-paths/ebgp/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/maximum-paths/ebgp/node.def new file mode 100644 index 00000000..c01ec064 --- /dev/null +++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/maximum-paths/ebgp/node.def @@ -0,0 +1,4 @@ +type: u32 +help: Maximum ebgp multipaths +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)" +val_help: u32:1-255; EBGP multipaths diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/maximum-paths/ibgp/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/maximum-paths/ibgp/node.def new file mode 100644 index 00000000..b437ec0b --- /dev/null +++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/maximum-paths/ibgp/node.def @@ -0,0 +1,4 @@ +type: u32 +help: Maximum ibgp multipaths +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)" +val_help: u32:1-255; IBGP multipaths diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/maximum-paths/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/maximum-paths/node.def new file mode 100644 index 00000000..17c33530 --- /dev/null +++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/maximum-paths/node.def @@ -0,0 +1 @@ +help: BGP multipaths diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/maximum-paths/ebgp/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/maximum-paths/ebgp/node.def new file mode 100644 index 00000000..c01ec064 --- /dev/null +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/maximum-paths/ebgp/node.def @@ -0,0 +1,4 @@ +type: u32 +help: Maximum ebgp multipaths +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)" +val_help: u32:1-255; EBGP multipaths diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/maximum-paths/ibgp/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/maximum-paths/ibgp/node.def new file mode 100644 index 00000000..b437ec0b --- /dev/null +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/maximum-paths/ibgp/node.def @@ -0,0 +1,4 @@ +type: u32 +help: Maximum ibgp multipaths +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)" +val_help: u32:1-255; IBGP multipaths diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/maximum-paths/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/maximum-paths/node.def new file mode 100644 index 00000000..17c33530 --- /dev/null +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/maximum-paths/node.def @@ -0,0 +1 @@ +help: BGP multipaths diff --git a/templates/protocols/bgp/node.tag/maximum-paths/ebgp/node.def b/templates/protocols/bgp/node.tag/maximum-paths/ebgp/node.def deleted file mode 100644 index c01ec064..00000000 --- a/templates/protocols/bgp/node.tag/maximum-paths/ebgp/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -help: Maximum ebgp multipaths -syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)" -val_help: u32:1-255; EBGP multipaths diff --git a/templates/protocols/bgp/node.tag/maximum-paths/ibgp/node.def b/templates/protocols/bgp/node.tag/maximum-paths/ibgp/node.def deleted file mode 100644 index b437ec0b..00000000 --- a/templates/protocols/bgp/node.tag/maximum-paths/ibgp/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -help: Maximum ibgp multipaths -syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)" -val_help: u32:1-255; IBGP multipaths diff --git a/templates/protocols/bgp/node.tag/maximum-paths/node.def b/templates/protocols/bgp/node.tag/maximum-paths/node.def deleted file mode 100644 index 17c33530..00000000 --- a/templates/protocols/bgp/node.tag/maximum-paths/node.def +++ /dev/null @@ -1 +0,0 @@ -help: BGP multipaths -- cgit v1.2.3