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

[config]: Fix management interface configuration #966

Merged
merged 2 commits into from
Sep 21, 2017
Merged

[config]: Fix management interface configuration #966

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4d1e44
[config]: Fix management interface configuration
Sep 19, 2017
5e2c8eb
[config]: Fix management interface configuration
Sep 20, 2017
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
8 changes: 4 additions & 4 deletions files/image_config/interfaces/interfaces.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ iface eth0 {{ 'inet' if prefix | ipv4 else 'inet6' }} static
netmask {{ prefix | netmask if prefix | ipv4 else prefix | prefixlen }}
########## management network policy routing rules
# management port up rules
up ip 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' }} route add default via {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} dev eth0 table default
up ip {{ '-4' if prefix | ipv4 else '-6' }} rule add from {{ prefix | ip }}/32 table default
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for ipv6 the mask len should be 128.

{% for route in MGMT_INTERFACE[(name, prefix)]['forced_mgmt_routes'] %}
up ip rule add to {{ route }} table default
{% endfor %}
# management port down rules
down ip 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' }} route delete default via {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} dev eth0 table default
down ip {{ '-4' if prefix | ipv4 else '-6' }} rule delete from {{ prefix | ip }}/32 table default
{% for route in MGMT_INTERFACE[(name, prefix)]['forced_mgmt_routes'] %}
down ip rule delete to {{ route }} table default
{% endfor %}
Expand Down
16 changes: 8 additions & 8 deletions src/sonic-config-engine/tests/sample_output/interfaces
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@ iface eth0 inet static
netmask 255.255.255.0
########## management network policy routing rules
# management port up rules
up ip 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 route add default via 10.0.0.1 dev eth0 table default
up ip -4 rule add from 10.0.0.100/32 table default
# management port down rules
down ip 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 route delete default via 10.0.0.1 dev eth0 table default
down ip -4 rule delete from 10.0.0.100/32 table default
iface eth0 inet6 static
address 2603:10e2:0:2902::8
netmask 64
########## management network policy routing rules
# management port up rules
up ip 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 route add default via 2603:10e2:0:2902::1 dev eth0 table default
up ip -6 rule add from 2603:10e2:0:2902::8/32 table default
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be /128?

# management port down rules
down ip 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 route delete default via 2603:10e2:0:2902::1 dev eth0 table default
down ip -6 rule delete from 2603:10e2:0:2902::8/32 table default
#
# The switch front panel interfaces
# "|| true" is added to suppress the error when interface is already a member of VLAN
Expand Down