From f43fcd2e3327f271cf73a7056cd88626fa8c6384 Mon Sep 17 00:00:00 2001
From: Kenneth Cheung <kennethcheung@arista.com>
Date: Wed, 14 Jun 2023 11:58:53 -0700
Subject: [PATCH] Removed extra 'ip addr del' on the lo inteface

The 'post-up ip addr del 127.0.0.1/8 dev lo' was thought to be required
when the loopback interface subnet mask was narrowed from /8 to /16.
After testing first reboot, subsequent reboots, config reloads, and
systemctl restart networking on linecards and supevisors (DNX VOQ
chassis), this cleanup command does not appear to be required. As such,
this change removes it as well as reverts
https://github.com/sonic-net/sonic-buildimage/pull/15080.
---
 files/image_config/interfaces/interfaces.j2                     | 2 --
 src/sonic-config-engine/tests/sample_output/py2/interfaces      | 2 --
 .../tests/sample_output/py2/interfaces_nomgmt                   | 2 --
 .../tests/sample_output/py2/interfaces_nomgmt_ztp               | 2 --
 .../tests/sample_output/py2/interfaces_nomgmt_ztp_inband        | 2 --
 .../tests/sample_output/py2/interfaces_nomgmt_ztp_inband_ip     | 2 --
 .../tests/sample_output/py2/interfaces_nomgmt_ztp_ip            | 2 --
 src/sonic-config-engine/tests/sample_output/py2/mvrf_interfaces | 2 --
 .../tests/sample_output/py2/mvrf_interfaces_nomgmt              | 2 --
 .../tests/sample_output/py2/two_mgmt_interfaces                 | 2 --
 src/sonic-config-engine/tests/sample_output/py3/interfaces      | 2 --
 .../tests/sample_output/py3/interfaces_nomgmt                   | 2 --
 .../tests/sample_output/py3/interfaces_nomgmt_ztp               | 2 --
 .../tests/sample_output/py3/interfaces_nomgmt_ztp_inband        | 2 --
 .../tests/sample_output/py3/interfaces_nomgmt_ztp_inband_ip     | 2 --
 .../tests/sample_output/py3/interfaces_nomgmt_ztp_ip            | 2 --
 src/sonic-config-engine/tests/sample_output/py3/mvrf_interfaces | 2 --
 .../tests/sample_output/py3/mvrf_interfaces_nomgmt              | 2 --
 .../tests/sample_output/py3/two_mgmt_interfaces                 | 2 --
 19 files changed, 38 deletions(-)

diff --git a/files/image_config/interfaces/interfaces.j2 b/files/image_config/interfaces/interfaces.j2
index 18e1181c71cf..f0cc668ec025 100644
--- a/files/image_config/interfaces/interfaces.j2
+++ b/files/image_config/interfaces/interfaces.j2
@@ -25,8 +25,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 {% endblock loopback %}
 {% block mgmt_interface %}
 
diff --git a/src/sonic-config-engine/tests/sample_output/py2/interfaces b/src/sonic-config-engine/tests/sample_output/py2/interfaces
index a47c89258e34..193eefce90c7 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/interfaces
+++ b/src/sonic-config-engine/tests/sample_output/py2/interfaces
@@ -9,8 +9,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 
 # The management network interface
 auto eth0
diff --git a/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt b/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt
index c447cfbc6d34..0a4613de5e77 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt
+++ b/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt
@@ -9,8 +9,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 
 # The management network interface
 auto eth0
diff --git a/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt_ztp b/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt_ztp
index b41038fd8d67..9023d90dc20f 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt_ztp
+++ b/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt_ztp
@@ -9,8 +9,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 
 # The management network interface
 auto eth0
diff --git a/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt_ztp_inband b/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt_ztp_inband
index 543819734f03..2004778f7219 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt_ztp_inband
+++ b/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt_ztp_inband
@@ -9,8 +9,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 
 # The management network interface
 auto eth0
diff --git a/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt_ztp_inband_ip b/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt_ztp_inband_ip
index 57bf924ce717..bc022b7ec205 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt_ztp_inband_ip
+++ b/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt_ztp_inband_ip
@@ -9,8 +9,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 
 # The management network interface
 auto eth0
diff --git a/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt_ztp_ip b/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt_ztp_ip
index 31a6d3325771..7359d400ca75 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt_ztp_ip
+++ b/src/sonic-config-engine/tests/sample_output/py2/interfaces_nomgmt_ztp_ip
@@ -9,8 +9,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 
 # The management network interface
 auto eth0
diff --git a/src/sonic-config-engine/tests/sample_output/py2/mvrf_interfaces b/src/sonic-config-engine/tests/sample_output/py2/mvrf_interfaces
index 5777bce1837c..dcdc99afe2cd 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/mvrf_interfaces
+++ b/src/sonic-config-engine/tests/sample_output/py2/mvrf_interfaces
@@ -18,8 +18,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 
 # The management network interface
 auto eth0
diff --git a/src/sonic-config-engine/tests/sample_output/py2/mvrf_interfaces_nomgmt b/src/sonic-config-engine/tests/sample_output/py2/mvrf_interfaces_nomgmt
index 04490892fe3f..9021b90e108d 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/mvrf_interfaces_nomgmt
+++ b/src/sonic-config-engine/tests/sample_output/py2/mvrf_interfaces_nomgmt
@@ -18,8 +18,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 
 # The management network interface
 auto eth0
diff --git a/src/sonic-config-engine/tests/sample_output/py2/two_mgmt_interfaces b/src/sonic-config-engine/tests/sample_output/py2/two_mgmt_interfaces
index ce3961f1a786..9c020c95ef25 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/two_mgmt_interfaces
+++ b/src/sonic-config-engine/tests/sample_output/py2/two_mgmt_interfaces
@@ -9,8 +9,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 
 # The management network interface
 auto eth1
diff --git a/src/sonic-config-engine/tests/sample_output/py3/interfaces b/src/sonic-config-engine/tests/sample_output/py3/interfaces
index a47c89258e34..193eefce90c7 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/interfaces
+++ b/src/sonic-config-engine/tests/sample_output/py3/interfaces
@@ -9,8 +9,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 
 # The management network interface
 auto eth0
diff --git a/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt b/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt
index c447cfbc6d34..0a4613de5e77 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt
+++ b/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt
@@ -9,8 +9,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 
 # The management network interface
 auto eth0
diff --git a/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt_ztp b/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt_ztp
index b41038fd8d67..9023d90dc20f 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt_ztp
+++ b/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt_ztp
@@ -9,8 +9,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 
 # The management network interface
 auto eth0
diff --git a/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt_ztp_inband b/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt_ztp_inband
index 543819734f03..2004778f7219 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt_ztp_inband
+++ b/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt_ztp_inband
@@ -9,8 +9,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 
 # The management network interface
 auto eth0
diff --git a/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt_ztp_inband_ip b/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt_ztp_inband_ip
index 57bf924ce717..bc022b7ec205 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt_ztp_inband_ip
+++ b/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt_ztp_inband_ip
@@ -9,8 +9,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 
 # The management network interface
 auto eth0
diff --git a/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt_ztp_ip b/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt_ztp_ip
index 31a6d3325771..7359d400ca75 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt_ztp_ip
+++ b/src/sonic-config-engine/tests/sample_output/py3/interfaces_nomgmt_ztp_ip
@@ -9,8 +9,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 
 # The management network interface
 auto eth0
diff --git a/src/sonic-config-engine/tests/sample_output/py3/mvrf_interfaces b/src/sonic-config-engine/tests/sample_output/py3/mvrf_interfaces
index 5777bce1837c..dcdc99afe2cd 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/mvrf_interfaces
+++ b/src/sonic-config-engine/tests/sample_output/py3/mvrf_interfaces
@@ -18,8 +18,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 
 # The management network interface
 auto eth0
diff --git a/src/sonic-config-engine/tests/sample_output/py3/mvrf_interfaces_nomgmt b/src/sonic-config-engine/tests/sample_output/py3/mvrf_interfaces_nomgmt
index 04490892fe3f..9021b90e108d 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/mvrf_interfaces_nomgmt
+++ b/src/sonic-config-engine/tests/sample_output/py3/mvrf_interfaces_nomgmt
@@ -18,8 +18,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 
 # The management network interface
 auto eth0
diff --git a/src/sonic-config-engine/tests/sample_output/py3/two_mgmt_interfaces b/src/sonic-config-engine/tests/sample_output/py3/two_mgmt_interfaces
index 5e2680854cec..3b900bad2b2b 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/two_mgmt_interfaces
+++ b/src/sonic-config-engine/tests/sample_output/py3/two_mgmt_interfaces
@@ -9,8 +9,6 @@ iface lo inet loopback
    address 127.0.0.1
    netmask 255.255.0.0
    scope host
-   post-up ip addr del 127.0.0.1/8 dev lo
-   down ip addr add 127.0.0.1/8 dev lo
 
 # The management network interface
 auto eth0