Skip to content

Commit 7c81400

Browse files
Bojun-FengBojun-Feng
committed
[interfaces.j2]: Remove syslog policy routing rules from interfaces template
* Remove SYSLOG_SERVER ip rule block added by PR #20340 and VRF gate added by PR #27068 * Remove hardcoded 10.20.6.16 fallback rule and associated test expectations Signed-off-by: Bojun-Feng <bojundf@gmail.com>
1 parent 56b949e commit 7c81400

15 files changed

Lines changed: 0 additions & 182 deletions

‎files/image_config/interfaces/interfaces.j2‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -106,22 +106,6 @@ iface {{ name }} {{ 'inet' if prefix | ipv4 else 'inet6' }} static
106106
{% for route in MGMT_INTERFACE[(name, prefix)]['forced_mgmt_routes'] %}
107107
up ip {{ '-4' if prefix | ipv4 else '-6' }} rule add pref {{ force_mgmt_route_priority }} to {{ route }} table {{ vrf_table }}
108108
{% endfor %}
109-
{% if SYSLOG_SERVER is defined and SYSLOG_SERVER %}
110-
{% for server in SYSLOG_SERVER %}
111-
{% set server_vrf = SYSLOG_SERVER[server].get('vrf', '') if SYSLOG_SERVER[server] is mapping else '' %}
112-
{% if server_vrf == '' or server_vrf == 'mgmt' %}
113-
{% if server | ipv4 and prefix | ipv4 %}
114-
up ip rule add pref {{ force_mgmt_route_priority }} to {{ server }}/32 table {{ vrf_table }}
115-
{% elif server | ipv6 and prefix | ipv6 %}
116-
up ip -6 rule add pref {{ force_mgmt_route_priority }} to {{ server }}/128 table {{ vrf_table }}
117-
{% endif %}
118-
{% endif %}
119-
{% endfor %}
120-
{% else %}
121-
{% if prefix | ipv4 %}
122-
up ip rule add pref {{ force_mgmt_route_priority }} to 10.20.6.16/32 table {{ vrf_table }}
123-
{% endif %}
124-
{% endif %}
125109
{% if prefix | ipv6 and vrf_table == 'default'%}
126110
# IPV6 default table not add to lookup by default, management server need this to access IPV6 address when BGP shutdown
127111
up ip -6 rule add pref {{ force_mgmt_route_priority + 3 }} lookup {{ vrf_table }}
@@ -133,22 +117,6 @@ iface {{ name }} {{ 'inet' if prefix | ipv4 else 'inet6' }} static
133117
{% for route in MGMT_INTERFACE[(name, prefix)]['forced_mgmt_routes'] %}
134118
pre-down ip {{ '-4' if route | ipv4 else '-6' }} rule delete pref {{ force_mgmt_route_priority }} to {{ route }} table {{ vrf_table }}
135119
{% endfor %}
136-
{% if SYSLOG_SERVER is defined and SYSLOG_SERVER %}
137-
{% for server in SYSLOG_SERVER %}
138-
{% set server_vrf = SYSLOG_SERVER[server].get('vrf', '') if SYSLOG_SERVER[server] is mapping else '' %}
139-
{% if server_vrf == '' or server_vrf == 'mgmt' %}
140-
{% if server | ipv4 and prefix | ipv4 %}
141-
down ip rule delete pref {{ force_mgmt_route_priority }} to {{ server }}/32 table {{ vrf_table }}
142-
{% elif server | ipv6 and prefix | ipv6 %}
143-
down ip -6 rule delete pref {{ force_mgmt_route_priority }} to {{ server }}/128 table {{ vrf_table }}
144-
{% endif %}
145-
{% endif %}
146-
{% endfor %}
147-
{% else %}
148-
{% if prefix | ipv4 %}
149-
down ip rule delete pref {{ force_mgmt_route_priority }} to 10.20.6.16/32 table {{ vrf_table }}
150-
{% endif %}
151-
{% endif %}
152120
{% if prefix | ipv6 and vrf_table == 'default'%}
153121
pre-down ip -6 rule delete pref {{ force_mgmt_route_priority + 3 }} lookup {{ vrf_table }}
154122
{% endif %}

‎src/sonic-config-engine/tests/sample_output/py2/interfaces‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@ iface eth0 inet static
2424
up ip -4 route add 10.0.0.0/24 dev eth0 table default
2525
up ip -4 route add default via 10.0.0.1 dev eth0 table default metric 201
2626
up ip -4 rule add pref 32765 from 10.0.0.100/32 table default
27-
up ip rule add pref 32764 to 10.20.6.16/32 table default
2827
# management port down rules
2928
pre-down ip -4 route delete default via 10.0.0.1 dev eth0 table default
3029
pre-down ip -4 route delete 10.0.0.0/24 dev eth0 table default
3130
pre-down ip -4 rule delete pref 32765 from 10.0.0.100/32 table default
32-
down ip rule delete pref 32764 to 10.20.6.16/32 table default
3331
iface eth0 inet6 static
3432
address 2603:10e2:0:2902::8
3533
netmask 64

‎src/sonic-config-engine/tests/sample_output/py2/interfaces_mgmt31‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@ iface eth0 inet static
2323
up ip -4 route add 10.10.4.12/31 dev eth0 table default
2424
up ip -4 route add default via 10.10.4.12 dev eth0 table default metric 201
2525
up ip -4 rule add pref 32765 from 10.10.4.13/32 table default
26-
up ip rule add pref 32764 to 10.20.6.16/32 table default
2726
# management port down rules
2827
pre-down ip -4 route delete default via 10.10.4.12 dev eth0 table default
2928
pre-down ip -4 route delete 10.10.4.12/31 dev eth0 table default
3029
pre-down ip -4 rule delete pref 32765 from 10.10.4.13/32 table default
31-
down ip rule delete pref 32764 to 10.20.6.16/32 table default
3230
iface eth0 inet6 static
3331
address 2603:10e2:0:2902::8
3432
netmask 64

‎src/sonic-config-engine/tests/sample_output/py2/interfaces_syslog‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,10 @@ iface eth0 inet static
2424
up ip -4 route add 10.0.0.0/24 dev eth0 table default
2525
up ip -4 route add default via 10.0.0.1 dev eth0 table default metric 201
2626
up ip -4 rule add pref 32765 from 10.0.0.100/32 table default
27-
up ip rule add pref 32764 to 10.3.145.8/32 table default
28-
up ip rule add pref 32764 to 100.127.20.21/32 table default
2927
# management port down rules
3028
pre-down ip -4 route delete default via 10.0.0.1 dev eth0 table default
3129
pre-down ip -4 route delete 10.0.0.0/24 dev eth0 table default
3230
pre-down ip -4 rule delete pref 32765 from 10.0.0.100/32 table default
33-
down ip rule delete pref 32764 to 10.3.145.8/32 table default
34-
down ip rule delete pref 32764 to 100.127.20.21/32 table default
3531
iface eth0 inet6 static
3632
address 2603:10e2:0:2902::8
3733
netmask 64

‎src/sonic-config-engine/tests/sample_output/py2/interfaces_syslog_vrf‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎src/sonic-config-engine/tests/sample_output/py2/mvrf_interfaces‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,12 @@ iface eth0 inet static
3636
up ip -4 rule add pref 32765 from 10.0.0.100/32 table 6000
3737
up ip -4 rule add pref 32764 to 11.11.11.11 table 6000
3838
up ip -4 rule add pref 32764 to 22.22.22.0/23 table 6000
39-
up ip rule add pref 32764 to 10.20.6.16/32 table 6000
4039
# management port down rules
4140
pre-down ip -4 route delete default via 10.0.0.1 dev eth0 table 6000
4241
pre-down ip -4 route delete 10.0.0.0/24 dev eth0 table 6000
4342
pre-down ip -4 rule delete pref 32765 from 10.0.0.100/32 table 6000
4443
pre-down ip -4 rule delete pref 32764 to 11.11.11.11 table 6000
4544
pre-down ip -4 rule delete pref 32764 to 22.22.22.0/23 table 6000
46-
down ip rule delete pref 32764 to 10.20.6.16/32 table 6000
4745
iface eth0 inet6 static
4846
address 2603:10e2:0:2902::8
4947
netmask 64

‎src/sonic-config-engine/tests/sample_output/py2/two_mgmt_interfaces‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,10 @@ iface eth1 inet static
2525
up ip -4 route add 10.0.10.0/24 dev eth1 table default
2626
up ip -4 route add default via 10.0.10.1 dev eth1 table default metric 201
2727
up ip -4 rule add pref 32765 from 10.0.10.100/32 table default
28-
up ip rule add pref 32764 to 10.20.6.16/32 table default
2928
# management port down rules
3029
pre-down ip -4 route delete default via 10.0.10.1 dev eth1 table default
3130
pre-down ip -4 route delete 10.0.10.0/24 dev eth1 table default
3231
pre-down ip -4 rule delete pref 32765 from 10.0.10.100/32 table default
33-
down ip rule delete pref 32764 to 10.20.6.16/32 table default
3432
iface eth0 inet static
3533
address 10.0.0.100
3634
netmask 255.255.255.0
@@ -41,12 +39,10 @@ iface eth0 inet static
4139
up ip -4 route add 10.0.0.0/24 dev eth0 table default
4240
up ip -4 route add default via 10.0.0.1 dev eth0 table default metric 201
4341
up ip -4 rule add pref 32765 from 10.0.0.100/32 table default
44-
up ip rule add pref 32764 to 10.20.6.16/32 table default
4542
# management port down rules
4643
pre-down ip -4 route delete default via 10.0.0.1 dev eth0 table default
4744
pre-down ip -4 route delete 10.0.0.0/24 dev eth0 table default
4845
pre-down ip -4 rule delete pref 32765 from 10.0.0.100/32 table default
49-
down ip rule delete pref 32764 to 10.20.6.16/32 table default
5046
iface eth1 inet6 static
5147
address 2603:10e2:0:abcd::8
5248
netmask 64

‎src/sonic-config-engine/tests/sample_output/py3/interfaces‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@ iface eth0 inet static
2424
up ip -4 route add 10.0.0.0/24 dev eth0 table default
2525
up ip -4 route add default via 10.0.0.1 dev eth0 table default metric 201
2626
up ip -4 rule add pref 32765 from 10.0.0.100/32 table default
27-
up ip rule add pref 32764 to 10.20.6.16/32 table default
2827
# management port down rules
2928
pre-down ip -4 route delete default via 10.0.0.1 dev eth0 table default
3029
pre-down ip -4 route delete 10.0.0.0/24 dev eth0 table default
3130
pre-down ip -4 rule delete pref 32765 from 10.0.0.100/32 table default
32-
down ip rule delete pref 32764 to 10.20.6.16/32 table default
3331
iface eth0 inet6 static
3432
address 2603:10e2:0:2902::8
3533
netmask 64

‎src/sonic-config-engine/tests/sample_output/py3/interfaces_mgmt31‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@ iface eth0 inet static
2323
up ip -4 route add 10.10.4.12/31 dev eth0 table default
2424
up ip -4 route add default via 10.10.4.12 dev eth0 table default metric 201
2525
up ip -4 rule add pref 32765 from 10.10.4.13/32 table default
26-
up ip rule add pref 32764 to 10.20.6.16/32 table default
2726
# management port down rules
2827
pre-down ip -4 route delete default via 10.10.4.12 dev eth0 table default
2928
pre-down ip -4 route delete 10.10.4.12/31 dev eth0 table default
3029
pre-down ip -4 rule delete pref 32765 from 10.10.4.13/32 table default
31-
down ip rule delete pref 32764 to 10.20.6.16/32 table default
3230
iface eth0 inet6 static
3331
address 2603:10e2:0:2902::8
3432
netmask 64

‎src/sonic-config-engine/tests/sample_output/py3/interfaces_syslog‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,10 @@ iface eth0 inet static
2424
up ip -4 route add 10.0.0.0/24 dev eth0 table default
2525
up ip -4 route add default via 10.0.0.1 dev eth0 table default metric 201
2626
up ip -4 rule add pref 32765 from 10.0.0.100/32 table default
27-
up ip rule add pref 32764 to 10.3.145.8/32 table default
28-
up ip rule add pref 32764 to 100.127.20.21/32 table default
2927
# management port down rules
3028
pre-down ip -4 route delete default via 10.0.0.1 dev eth0 table default
3129
pre-down ip -4 route delete 10.0.0.0/24 dev eth0 table default
3230
pre-down ip -4 rule delete pref 32765 from 10.0.0.100/32 table default
33-
down ip rule delete pref 32764 to 10.3.145.8/32 table default
34-
down ip rule delete pref 32764 to 100.127.20.21/32 table default
3531
iface eth0 inet6 static
3632
address 2603:10e2:0:2902::8
3733
netmask 64

0 commit comments

Comments
 (0)