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

[submodules]: update swss/sairedis/utilities #3733

Merged
merged 2 commits into from
Nov 10, 2019
Merged

[submodules]: update swss/sairedis/utilities #3733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ebc205
[submodules]: update swss/sairedis/utilities
lguohan Nov 9, 2019
e2bb284
Loopback ip addresses move to intfmgrd for supporting VRF
Nov 9, 2019
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: 0 additions & 7 deletions files/image_config/interfaces/interfaces.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@ iface mgmt
# The loopback network interface
auto lo
iface lo inet loopback
# Use command 'ip addr list dev lo' to check all addresses
{% for (name, prefix) in LOOPBACK_INTERFACE|pfx_filter %}
iface lo {{ 'inet' if prefix | ipv4 else 'inet6' }} static
address {{ prefix | ip }}
netmask {{ prefix | netmask if prefix | ipv4 else prefix | prefixlen }}
#
{% endfor %}
{% if (MGMT_VRF_CONFIG) and (MGMT_VRF_CONFIG['vrf_global']['mgmtVrfEnabled'] == "true") %}
# The loopback network interface for mgmt VRF that is required for applications like NTP
up ip link add lo-m type dummy
Expand Down
13 changes: 0 additions & 13 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 @@ -6,19 +6,6 @@
# The loopback network interface
auto lo
iface lo inet loopback
# Use command 'ip addr list dev lo' to check all addresses
iface lo inet static
address 10.1.0.32
netmask 255.255.255.255
#
iface lo inet6 static
address fc00:1::32
netmask 128
#
iface lo inet static
address 10.10.0.99
netmask 255.255.255.255
#

# The management network interface
auto eth0
Expand Down
13 changes: 0 additions & 13 deletions src/sonic-config-engine/tests/sample_output/mvrf_interfaces
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,6 @@ iface mgmt
# The loopback network interface
auto lo
iface lo inet loopback
# Use command 'ip addr list dev lo' to check all addresses
iface lo inet static
address 10.1.0.32
netmask 255.255.255.255
#
iface lo inet6 static
address fc00:1::32
netmask 128
#
iface lo inet static
address 10.10.0.99
netmask 255.255.255.255
#
# The loopback network interface for mgmt VRF that is required for applications like NTP
up ip link add lo-m type dummy
up ip addr add 127.0.0.1/8 dev lo-m
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-sairedis
Open in desktop
Submodule sonic-sairedis updated from 1f4a1d to d9faa5
2 changes: 1 addition & 1 deletion src/sonic-swss
Open in desktop
Submodule sonic-swss updated from 20747f to f35479
2 changes: 1 addition & 1 deletion src/sonic-utilities
Open in desktop
Submodule sonic-utilities updated from 0e23e1 to e4a5e4