From 8ce86f33f00d38c710882e5d8180412938e21152 Mon Sep 17 00:00:00 2001 From: Tyler Li Date: Wed, 12 Jun 2019 05:01:18 -0700 Subject: [PATCH 1/7] Loopback ip addresses move to intfmgrd for supporting VRF --- files/image_config/interfaces/interfaces.j2 | 6 ------ 1 file changed, 6 deletions(-) diff --git a/files/image_config/interfaces/interfaces.j2 b/files/image_config/interfaces/interfaces.j2 index 4e7a115b39a0..11deee9217aa 100644 --- a/files/image_config/interfaces/interfaces.j2 +++ b/files/image_config/interfaces/interfaces.j2 @@ -9,12 +9,6 @@ # 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 %} {% endblock loopback %} {% block mgmt_interface %} From 3eb72a733a99ecf8a98150b779e56ac33e4e7442 Mon Sep 17 00:00:00 2001 From: Tyler Li Date: Thu, 20 Jun 2019 23:39:39 -0700 Subject: [PATCH 2/7] Loopback ip addresses move to intfmgrd for supporting VRF Fix merging error in last commit --- files/image_config/interfaces/interfaces.j2 | 1 - 1 file changed, 1 deletion(-) diff --git a/files/image_config/interfaces/interfaces.j2 b/files/image_config/interfaces/interfaces.j2 index 11deee9217aa..261f7dbbd136 100644 --- a/files/image_config/interfaces/interfaces.j2 +++ b/files/image_config/interfaces/interfaces.j2 @@ -9,7 +9,6 @@ # The loopback network interface auto lo iface lo inet loopback -{% endfor %} {% endblock loopback %} {% block mgmt_interface %} From 587bd8f0a7d3335a95dc195f03eed3aa6c56a23f Mon Sep 17 00:00:00 2001 From: Tyler Li Date: Fri, 21 Jun 2019 00:19:41 -0700 Subject: [PATCH 3/7] Loopback ip addresses move to intfmgrd for supporting VRF Modify test sample_output file --- .../tests/sample_output/interfaces | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/sonic-config-engine/tests/sample_output/interfaces b/src/sonic-config-engine/tests/sample_output/interfaces index 7c726b15ea14..bb8af2850b7c 100644 --- a/src/sonic-config-engine/tests/sample_output/interfaces +++ b/src/sonic-config-engine/tests/sample_output/interfaces @@ -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 From 33687cad2208ce6df1b4435a026b79659a3a1b78 Mon Sep 17 00:00:00 2001 From: Tyler Li Date: Sat, 12 Oct 2019 18:09:12 +0800 Subject: [PATCH 4/7] Update interfaces.j2 Merge branch 'master' into loopback, remove blank line --- files/image_config/interfaces/interfaces.j2 | 1 - 1 file changed, 1 deletion(-) diff --git a/files/image_config/interfaces/interfaces.j2 b/files/image_config/interfaces/interfaces.j2 index 8f69199e2233..91be4437fc06 100644 --- a/files/image_config/interfaces/interfaces.j2 +++ b/files/image_config/interfaces/interfaces.j2 @@ -14,7 +14,6 @@ iface mgmt # The loopback network interface auto lo iface lo inet loopback - {% 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 From 87753d2248c730b1a4f0196560c595a4199ec30d Mon Sep 17 00:00:00 2001 From: Tyler Li Date: Sat, 12 Oct 2019 04:06:53 -0700 Subject: [PATCH 5/7] Merge branch 'master' into loopback, modify new sample_output --- .../tests/sample_output/mvrf_interfaces | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/sonic-config-engine/tests/sample_output/mvrf_interfaces b/src/sonic-config-engine/tests/sample_output/mvrf_interfaces index e66b1b252835..afd0615b81e9 100644 --- a/src/sonic-config-engine/tests/sample_output/mvrf_interfaces +++ b/src/sonic-config-engine/tests/sample_output/mvrf_interfaces @@ -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 From 39102a74b7c66408a249d7ff38a9a369d1d4039b Mon Sep 17 00:00:00 2001 From: Tyler Li Date: Wed, 6 Nov 2019 19:22:25 -0800 Subject: [PATCH 6/7] update submodule src/sonic-swss --- src/sonic-swss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss b/src/sonic-swss index 20747fa63d59..85ff17da8ec7 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 20747fa63d59f4aadaa06da282e23d8e1e0b9fdf +Subproject commit 85ff17da8ec7b750b668fb8d03d3494dcb51b555 From d9c74d3393ced408639e71be6e161ca700bd23f1 Mon Sep 17 00:00:00 2001 From: Tyler Li Date: Sun, 10 Nov 2019 17:29:11 -0800 Subject: [PATCH 7/7] update submodule src/sonic-swss --- src/sonic-swss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss b/src/sonic-swss index 85ff17da8ec7..f3547983a1e2 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 85ff17da8ec7b750b668fb8d03d3494dcb51b555 +Subproject commit f3547983a1e2c67bdacb4e87593e65f20b483d8e