matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[TSA]: Add community to the loopback prefix, when isolated (#3708)

Browse Source 
* Rename asn/deployment_id_asn_map.yaml to constants/constants.yaml

* Fix bgp templates

* Add community for loopback when bgpd is isolated

* Use correct community value
This commit is contained in:
pavel-shirshov 2019-11-06 16:07:28 -08:00 committed by GitHub
parent d346cb3898
commit d5af096f41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dockers/docker-fpm-frr/TSA
View File

@ -3,20 +3,20 @@
c=0 c=0
config=$(vtysh -c "show run") config=$(vtysh -c "show run")
echo "$config" | grep -q "route-map TO_BGP_PEER_V4 permit 2" echo "$config" | grep -q "route-map TO_BGP_PEER_V4 permit 2"
c=$(($c+$?)) c=$((c+$?))
echo "$config" | grep -q "route-map TO_BGP_PEER_V4 deny 3" echo "$config" | grep -q "route-map TO_BGP_PEER_V4 deny 3"
c=$(($c+$?)) c=$((c+$?))
echo "$config" | grep -q "route-map TO_BGP_PEER_V6 permit 2" echo "$config" | grep -q "route-map TO_BGP_PEER_V6 permit 2"
c=$(($c+$?)) c=$((c+$?))
echo "$config" | grep -q "route-map TO_BGP_PEER_V6 deny 3" echo "$config" | grep -q "route-map TO_BGP_PEER_V6 deny 3"
c=$(($c+$?)) c=$((c+$?))
if [[ $c -eq 4 ]]; if [[ $c -eq 4 ]];
then then
vtysh -c "configure terminal" -c "route-map TO_BGP_PEER_V4 permit 2" -c "match ip address prefix-list PL_LoopbackV4" TSA_FILE=$(mktemp)
vtysh -c "configure terminal" -c "route-map TO_BGP_PEER_V4 deny 3" sonic-cfggen -d -y /etc/sonic/constants.yml -t /usr/share/sonic/templates/bgpd.tsa.isolate.conf.j2 > "$TSA_FILE"
vtysh -c "configure terminal" -c "route-map TO_BGP_PEER_V6 permit 2" -c "match ipv6 address prefix-list PL_LoopbackV6" vtysh -f "$TSA_FILE"
vtysh -c "configure terminal" -c "route-map TO_BGP_PEER_V6 deny 3" rm -f "$TSA_FILE"
echo "System Mode: Normal -> Maintenance" echo "System Mode: Normal -> Maintenance"
else else
echo "System is already in Maintenance mode" echo "System is already in Maintenance mode"

17
dockers/docker-fpm-frr/TSB
View File

@ -3,21 +3,20 @@
c=0 c=0
config=$(vtysh -c "show run") config=$(vtysh -c "show run")
echo "$config" | grep -q "route-map TO_BGP_PEER_V4 permit 2" echo "$config" | grep -q "route-map TO_BGP_PEER_V4 permit 2"
c=$(($c+$?)) c=$((c+$?))
echo "$config" | grep -q "route-map TO_BGP_PEER_V4 deny 3" echo "$config" | grep -q "route-map TO_BGP_PEER_V4 deny 3"
c=$(($c+$?)) c=$((c+$?))
echo "$config" | grep -q "route-map TO_BGP_PEER_V6 permit 2" echo "$config" | grep -q "route-map TO_BGP_PEER_V6 permit 2"
c=$(($c+$?)) c=$((c+$?))
echo "$config" | grep -q "route-map TO_BGP_PEER_V6 deny 3" echo "$config" | grep -q "route-map TO_BGP_PEER_V6 deny 3"
c=$(($c+$?)) c=$((c+$?))
if [[ $c -eq 0 ]]; if [[ $c -eq 0 ]];
then then
vtysh -c "configure terminal" -c "no route-map TO_BGP_PEER_V4 deny 3" TSB_FILE=$(mktemp)
vtysh -c "configure terminal" -c "no route-map TO_BGP_PEER_V4 permit 2" sonic-cfggen -d -y /etc/sonic/constants.yml -t /usr/share/sonic/templates/bgpd.tsa.unisolate.conf.j2 > "$TSB_FILE"
vtysh -c "configure terminal" -c "no route-map TO_BGP_PEER_V6 deny 3" vtysh -f "$TSB_FILE"
vtysh -c "configure terminal" -c "no route-map TO_BGP_PEER_V6 permit 2" rm -f "$TSB_FILE"
echo "System Mode: Maintenance -> Normal" echo "System Mode: Maintenance -> Normal"
else else
echo "System is already in Normal mode" echo "System is already in Normal mode"

8
dockers/docker-fpm-frr/TSC
View File

@ -4,13 +4,13 @@ echo "Traffic Shift Check:"
c=0 c=0
config=$(vtysh -c "show run") config=$(vtysh -c "show run")
echo "$config" | grep -q "route-map TO_BGP_PEER_V4 permit 2" echo "$config" | grep -q "route-map TO_BGP_PEER_V4 permit 2"
c=$(($c+$?)) c=$((c+$?))
echo "$config" | grep -q "route-map TO_BGP_PEER_V4 deny 3" echo "$config" | grep -q "route-map TO_BGP_PEER_V4 deny 3"
c=$(($c+$?)) c=$((c+$?))
echo "$config" | grep -q "route-map TO_BGP_PEER_V6 permit 2" echo "$config" | grep -q "route-map TO_BGP_PEER_V6 permit 2"
c=$(($c+$?)) c=$((c+$?))
echo "$config" | grep -q "route-map TO_BGP_PEER_V6 deny 3" echo "$config" | grep -q "route-map TO_BGP_PEER_V6 deny 3"
c=$(($c+$?)) c=$((c+$?))
if [[ $c -eq 4 ]]; if [[ $c -eq 4 ]];
then then

2
dockers/docker-fpm-frr/bgpd.conf.default.j2
View File

@ -107,7 +107,7 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
{% if bgp_peer['peer_asn'] is defined %} {% if bgp_peer['peer_asn'] is defined %}
neighbor {{ bgp_peer['name'] }} remote-as {{ bgp_peer['peer_asn'] }} neighbor {{ bgp_peer['name'] }} remote-as {{ bgp_peer['peer_asn'] }}
{% else %} {% else %}
neighbor {{ bgp_peer['name'] }} remote-as {{ deployment_id_asn_map[DEVICE_METADATA['localhost']['deployment_id']] }} neighbor {{ bgp_peer['name'] }} remote-as {{ constants.deployment_id_asn_map[DEVICE_METADATA['localhost']['deployment_id']] }}
{% endif %} {% endif %}
neighbor {{ bgp_peer['name'] }} ebgp-multihop 255 neighbor {{ bgp_peer['name'] }} ebgp-multihop 255
neighbor {{ bgp_peer['name'] }} soft-reconfiguration inbound neighbor {{ bgp_peer['name'] }} soft-reconfiguration inbound

10
dockers/docker-fpm-frr/bgpd.tsa.isolate.conf.j2 Normal file
View File

@ -0,0 +1,10 @@
route-map TO_BGP_PEER_V4 permit 2
match ip address prefix-list PL_LoopbackV4
set community {{ constants.traffic_shift_community }}
route-map TO_BGP_PEER_V4 deny 3
!
route-map TO_BGP_PEER_V6 permit 2
match ipv6 address prefix-list PL_LoopbackV6
set community {{ constants.traffic_shift_community }}
route-map TO_BGP_PEER_V6 deny 3
!

6
dockers/docker-fpm-frr/bgpd.tsa.unisolate.conf.j2 Normal file
View File

@ -0,0 +1,6 @@
no route-map TO_BGP_PEER_V4 permit 2
no route-map TO_BGP_PEER_V4 deny 3
!
no route-map TO_BGP_PEER_V6 permit 2
no route-map TO_BGP_PEER_V6 deny 3
!

4
dockers/docker-fpm-frr/start.sh
View File

@ -5,13 +5,13 @@ mkdir -p /etc/frr
CONFIG_TYPE=`sonic-cfggen -d -v 'DEVICE_METADATA["localhost"]["docker_routing_config_mode"]'` CONFIG_TYPE=`sonic-cfggen -d -v 'DEVICE_METADATA["localhost"]["docker_routing_config_mode"]'`
if [ -z "$CONFIG_TYPE" ] || [ "$CONFIG_TYPE" == "separated" ]; then if [ -z "$CONFIG_TYPE" ] || [ "$CONFIG_TYPE" == "separated" ]; then
sonic-cfggen -d -y /etc/sonic/deployment_id_asn_map.yml -t /usr/share/sonic/templates/bgpd.conf.j2 > /etc/frr/bgpd.conf sonic-cfggen -d -y /etc/sonic/constants.yml -t /usr/share/sonic/templates/bgpd.conf.j2 > /etc/frr/bgpd.conf
sonic-cfggen -d -t /usr/share/sonic/templates/zebra.conf.j2 > /etc/frr/zebra.conf sonic-cfggen -d -t /usr/share/sonic/templates/zebra.conf.j2 > /etc/frr/zebra.conf
sonic-cfggen -d -t /usr/share/sonic/templates/staticd.conf.j2 > /etc/frr/staticd.conf sonic-cfggen -d -t /usr/share/sonic/templates/staticd.conf.j2 > /etc/frr/staticd.conf
echo "no service integrated-vtysh-config" > /etc/frr/vtysh.conf echo "no service integrated-vtysh-config" > /etc/frr/vtysh.conf
rm -f /etc/frr/frr.conf rm -f /etc/frr/frr.conf
elif [ "$CONFIG_TYPE" == "unified" ]; then elif [ "$CONFIG_TYPE" == "unified" ]; then
sonic-cfggen -d -y /etc/sonic/deployment_id_asn_map.yml -t /usr/share/sonic/templates/frr.conf.j2 >/etc/frr/frr.conf sonic-cfggen -d -y /etc/sonic/constants.yml -t /usr/share/sonic/templates/frr.conf.j2 >/etc/frr/frr.conf
echo "service integrated-vtysh-config" > /etc/frr/vtysh.conf echo "service integrated-vtysh-config" > /etc/frr/vtysh.conf
rm -f /etc/frr/bgpd.conf /etc/frr/zebra.conf /etc/frr/staticd.conf rm -f /etc/frr/bgpd.conf /etc/frr/zebra.conf /etc/frr/staticd.conf
fi fi

2
dockers/docker-fpm-quagga/bgpd.conf.j2
View File

@ -101,7 +101,7 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
{% if bgp_peer['peer_asn'] is defined %} {% if bgp_peer['peer_asn'] is defined %}
neighbor {{ bgp_peer['name'] }} remote-as {{ bgp_peer['peer_asn'] }} neighbor {{ bgp_peer['name'] }} remote-as {{ bgp_peer['peer_asn'] }}
{% else %} {% else %}
neighbor {{ bgp_peer['name'] }} remote-as {{ deployment_id_asn_map[DEVICE_METADATA['localhost']['deployment_id']] }} neighbor {{ bgp_peer['name'] }} remote-as {{ constants.deployment_id_asn_map[DEVICE_METADATA['localhost']['deployment_id']] }}
{% endif %} {% endif %}
neighbor {{ bgp_peer['name'] }} ebgp-multihop 255 neighbor {{ bgp_peer['name'] }} ebgp-multihop 255
neighbor {{ bgp_peer['name'] }} soft-reconfiguration inbound neighbor {{ bgp_peer['name'] }} soft-reconfiguration inbound

2
dockers/docker-fpm-quagga/start.sh
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
mkdir -p /etc/quagga mkdir -p /etc/quagga
sonic-cfggen -d -y /etc/sonic/deployment_id_asn_map.yml -t /usr/share/sonic/templates/bgpd.conf.j2 > /etc/quagga/bgpd.conf sonic-cfggen -d -y /etc/sonic/constants.yml -t /usr/share/sonic/templates/bgpd.conf.j2 > /etc/quagga/bgpd.conf
sonic-cfggen -d -t /usr/share/sonic/templates/zebra.conf.j2 > /etc/quagga/zebra.conf sonic-cfggen -d -t /usr/share/sonic/templates/zebra.conf.j2 > /etc/quagga/zebra.conf

2
files/build_templates/sonic_debian_extension.j2
View File

@ -235,7 +235,7 @@ sudo bash -c "echo '{ \"DEVICE_METADATA\": { \"localhost\": { \"default_bgp_stat
sudo cp $IMAGE_CONFIGS/snmp/snmp.yml $FILESYSTEM_ROOT/etc/sonic/ sudo cp $IMAGE_CONFIGS/snmp/snmp.yml $FILESYSTEM_ROOT/etc/sonic/
# Copy ASN configuration files # Copy ASN configuration files
sudo cp $IMAGE_CONFIGS/asn/deployment_id_asn_map.yml $FILESYSTEM_ROOT/etc/sonic/ sudo cp $IMAGE_CONFIGS/constants/constants.yml $FILESYSTEM_ROOT/etc/sonic/
# Copy sudoers configuration file # Copy sudoers configuration file
sudo cp $IMAGE_CONFIGS/sudoers/sudoers $FILESYSTEM_ROOT/etc/ sudo cp $IMAGE_CONFIGS/sudoers/sudoers $FILESYSTEM_ROOT/etc/

2
files/image_config/asn/deployment_id_asn_map.yml
View File

@ -1,2 +0,0 @@
deployment_id_asn_map:
"1" : 65432

4
files/image_config/constants/constants.yml Normal file
View File

@ -0,0 +1,4 @@
constants:
deployment_id_asn_map:
"1" : 65432
traffic_shift_community: 12345:12345