Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bgp]: Update TSA functionality #5906

Merged
merged 7 commits into from
Nov 14, 2020
Merged

[bgp]: Update TSA functionality #5906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b78fc66
Fix protocol for ipv6 TSA route-map
pavel-shirshov Nov 11, 2020
d062c61
Skip route-maps, which doesn't have V4, or V6 in their names
pavel-shirshov Nov 11, 2020
544f1ea
Add total_portstat.py which will output total traffic thoough the dev…
pavel-shirshov Nov 11, 2020
a601c93
Fix the test
Nov 12, 2020
39ba9c9
Move the file to the correct place
pavel-shirshov Nov 12, 2020
82fcc12
Revert "Move the file to the correct place"
pavel-shirshov Nov 13, 2020
f58df62
Revert "Add total_portstat.py which will output total traffic thoough…
pavel-shirshov Nov 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion dockers/docker-fpm-frr/TSA
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,17 @@ then
case "$route_map_name" in
*V4*)
ip_version=V4
ip_protocol=ip
;;
*V6*)
ip_version=V6
ip_protocol=ipv6
;;
*)
continue
;;
esac
sonic-cfggen -d -a "{\"route_map_name\":\"$route_map_name\", \"ip_version\": \"$ip_version\"}" -y /etc/sonic/constants.yml -t /usr/share/sonic/templates/bgpd/tsa/bgpd.tsa.isolate.conf.j2 > "$TSA_FILE"
sonic-cfggen -d -a "{\"route_map_name\":\"$route_map_name\", \"ip_version\": \"$ip_version\", \"ip_protocol\": \"$ip_protocol\"}" -y /etc/sonic/constants.yml -t /usr/share/sonic/templates/bgpd/tsa/bgpd.tsa.isolate.conf.j2 > "$TSA_FILE"
vtysh -f "$TSA_FILE"
rm -f "$TSA_FILE"
done
Expand Down
9 changes: 9 additions & 0 deletions dockers/docker-fpm-frr/TSB
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@ then
TSB_FILE=$(mktemp)
for route_map_name in $(echo "$config" | sed -ne 's/ neighbor \S* route-map \(\S*\) out/\1/p');
do
case "$route_map_name" in
*V4*)
;;
*V6*)
;;
*)
continue
;;
esac
sonic-cfggen -d -a "{\"route_map_name\":\"$route_map_name\"}" -t /usr/share/sonic/templates/bgpd/tsa/bgpd.tsa.unisolate.conf.j2 > "$TSB_FILE"
vtysh -f "$TSB_FILE"
rm -f "$TSB_FILE"
Expand Down
2 changes: 1 addition & 1 deletion dockers/docker-fpm-frr/frr/bgpd/tsa/bgpd.tsa.isolate.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
route-map {{ route_map_name }} permit 2
match ip address prefix-list PL_Loopback{{ ip_version }}
match {{ ip_protocol }} address prefix-list PL_Loopback{{ ip_version }}
set community {{ constants.bgp.traffic_shift_community }}
route-map {{ route_map_name }} deny 3
!
3 changes: 2 additions & 1 deletion src/sonic-bgpcfgd/tests/data/sonic-cfggen/tsa/isolate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
}
},
"route_map_name": "test_rm_name",
"ip_version": "V4"
"ip_version": "V4",
"ip_protocol": "ip"
}