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

[config]: Fix management interface configuration (#966)

Browse Source 
* [config]: Fix management interface configuration

* [config]: Fix management interface configuration

* Fix comments
This commit is contained in:
Volodymyr Samotiy 2017-09-21 09:55:50 +03:00 committed by lguohan
parent d117f09343
commit 763205ff7d
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/image_config/interfaces/interfaces.j2
View File

@ -27,14 +27,14 @@ iface eth0 {{ 'inet' if prefix | ipv4 else 'inet6' }} static
netmask {{ prefix | netmask if prefix | ipv4 else prefix | prefixlen }} netmask {{ prefix | netmask if prefix | ipv4 else prefix | prefixlen }}
########## management network policy routing rules ########## management network policy routing rules
# management port up rules # management port up rules
up ip route add default via {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} dev eth0 table default up ip {{ '-4' if prefix | ipv4 else '-6' }} route add default via {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} dev eth0 table default
up ip rule add from {{ prefix | ip }}/32 table default up ip {{ '-4' if prefix | ipv4 else '-6' }} rule add from {{ prefix | ip }}/{{ '32' if prefix | ipv4 else '128' }} table default
{% for route in MGMT_INTERFACE[(name, prefix)]['forced_mgmt_routes'] %} {% for route in MGMT_INTERFACE[(name, prefix)]['forced_mgmt_routes'] %}
up ip rule add to {{ route }} table default up ip rule add to {{ route }} table default
{% endfor %} {% endfor %}
# management port down rules # management port down rules
down ip route delete default via {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} dev eth0 table default down ip {{ '-4' if prefix | ipv4 else '-6' }} route delete default via {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} dev eth0 table default
down ip rule delete from {{ prefix | ip }}/32 table default down ip {{ '-4' if prefix | ipv4 else '-6' }} rule delete from {{ prefix | ip }}/{{ '32' if prefix | ipv4 else '128' }} table default
{% for route in MGMT_INTERFACE[(name, prefix)]['forced_mgmt_routes'] %} {% for route in MGMT_INTERFACE[(name, prefix)]['forced_mgmt_routes'] %}
down ip rule delete to {{ route }} table default down ip rule delete to {{ route }} table default
{% endfor %} {% endfor %}

16
src/sonic-config-engine/tests/sample_output/interfaces
View File

@ -22,21 +22,21 @@ iface eth0 inet static
netmask 255.255.255.0 netmask 255.255.255.0
########## management network policy routing rules ########## management network policy routing rules
# management port up rules # management port up rules
up ip route add default via 10.0.0.1 dev eth0 table default up ip -4 route add default via 10.0.0.1 dev eth0 table default
up ip rule add from 10.0.0.100/32 table default up ip -4 rule add from 10.0.0.100/32 table default
# management port down rules # management port down rules
down ip route delete default via 10.0.0.1 dev eth0 table default down ip -4 route delete default via 10.0.0.1 dev eth0 table default
down ip rule delete from 10.0.0.100/32 table default down ip -4 rule delete from 10.0.0.100/32 table default
iface eth0 inet6 static iface eth0 inet6 static
address 2603:10e2:0:2902::8 address 2603:10e2:0:2902::8
netmask 64 netmask 64
########## management network policy routing rules ########## management network policy routing rules
# management port up rules # management port up rules
up ip route add default via 2603:10e2:0:2902::1 dev eth0 table default up ip -6 route add default via 2603:10e2:0:2902::1 dev eth0 table default
up ip rule add from 2603:10e2:0:2902::8/32 table default up ip -6 rule add from 2603:10e2:0:2902::8/128 table default
# management port down rules # management port down rules
down ip route delete default via 2603:10e2:0:2902::1 dev eth0 table default down ip -6 route delete default via 2603:10e2:0:2902::1 dev eth0 table default
down ip rule delete from 2603:10e2:0:2902::8/32 table default down ip -6 rule delete from 2603:10e2:0:2902::8/128 table default
# #
# The switch front panel interfaces # The switch front panel interfaces
# "|| true" is added to suppress the error when interface is already a member of VLAN # "|| true" is added to suppress the error when interface is already a member of VLAN