remove staticd.conf (#9657)

arlakshm · web-flow · commit 1d84ff5bd923 · 2022-02-17T18:31:30.000-08:00
resolves #8979 and #9055

How I did it
Remove the file static.conf.j2,which adds the default route on eth0 from frr docker

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan &lt;arlakshm@microsoft.com&gt;
diff --git a/dockers/docker-fpm-frr/frr/frr.conf.j2 b/dockers/docker-fpm-frr/frr/frr.conf.j2
@@ -13,7 +13,5 @@ agentx
 !
 {% include "zebra/zebra.interfaces.conf.j2" %}
 !
-{% include "staticd/staticd.default_route.conf.j2" %}
-!
 {% include "bgpd/bgpd.main.conf.j2" %}
 !
diff --git a/dockers/docker-fpm-frr/frr/staticd/staticd.conf.j2 b/dockers/docker-fpm-frr/frr/staticd/staticd.conf.j2
@@ -8,5 +8,3 @@
 !
 {% include "common/daemons.common.conf.j2" %}
 !
-{% include "staticd.default_route.conf.j2" %}
-!
diff --git a/dockers/docker-fpm-frr/frr/staticd/staticd.default_route.conf.j2 b/dockers/docker-fpm-frr/frr/staticd/staticd.default_route.conf.j2
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
@@ -32,10 +32,6 @@ link-detect
 !
 !!
 !
-! set static default route to mgmt gateway as a backup to learned default
-ip route 0.0.0.0/0 10.10.10.1 200
-!!
-!
 ! template: bgpd/bgpd.main.conf.j2
 !
 ! bgp multiple-instance
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.conf
@@ -14,6 +14,4 @@ log facility local4
 !
 ! end of template: common/daemons.common.conf.j2!
 !
-! set static default route to mgmt gateway as a backup to learned default
-ip route 0.0.0.0/0 10.10.10.1 200
 !!
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.conf.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.conf.json
@@ -3,10 +3,5 @@
         "localhost": {
             "hostname": "new_hostname"
         }
-    },
-    "MGMT_INTERFACE": {
-        "eth0|10.10.10.10/24": {
-            "gwaddr": "10.10.10.1"
-        }
     }
 }
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.default_route.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.default_route.conf
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.default_route.conf.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.default_route.conf.json
diff --git a/src/sonic-bgpcfgd/tests/test_sonic-cfggen.py b/src/sonic-bgpcfgd/tests/test_sonic-cfggen.py
@@ -72,12 +72,6 @@ def test_common_functions():
              "common/functions.conf.json",
              "common/functions.conf")
 
-def test_staticd_default_route():
-    run_test("staticd.default_route.conf.j2",
-             "staticd/staticd.default_route.conf.j2",
-             "staticd/staticd.default_route.conf.json",
-             "staticd/staticd.default_route.conf")
-
 def test_staticd():
     run_test("staticd.conf.j2",
              "staticd/staticd.conf.j2",
diff --git a/src/sonic-config-engine/tests/sample_output/frr.conf b/src/sonic-config-engine/tests/sample_output/frr.conf
@@ -35,10 +35,6 @@ link-detect
 !
 !!
 !
-! set static default route to mgmt gateway as a backup to learned default
-ip route 0.0.0.0/0 10.0.0.1 200
-!!
-!
 ! template: bgpd/bgpd.main.conf.j2
 !
 ! bgp multiple-instance
diff --git a/src/sonic-config-engine/tests/test_frr.py b/src/sonic-config-engine/tests/test_frr.py
@@ -60,6 +60,4 @@ def test_bgpd_frr(self):
     def test_zebra_frr(self):
         self.assertTrue(*self.run_case('zebra/zebra.conf.j2', 'zebra_frr.conf'))
 
-    def test_staticd_frr(self):
-        self.assertTrue(*self.run_case('staticd/staticd.conf.j2', 'staticd_frr.conf'))
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,5 @@ agentx`
`13`	`13`	`!`
`14`	`14`	`{% include "zebra/zebra.interfaces.conf.j2" %}`
`15`	`15`	`!`
`16`		`-{% include "staticd/staticd.default_route.conf.j2" %}`
`17`		`-!`
`18`	`16`	`{% include "bgpd/bgpd.main.conf.j2" %}`
`19`	`17`	`!`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,3 @@`
`8`	`8`	`!`
`9`	`9`	`{% include "common/daemons.common.conf.j2" %}`
`10`	`10`	`!`
`11`		`-{% include "staticd.default_route.conf.j2" %}`
`12`		`-!`
Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,6 @@ link-detect`
`32`	`32`	`!`
`33`	`33`	`!!`
`34`	`34`	`!`
`35`		`-! set static default route to mgmt gateway as a backup to learned default`
`36`		`-ip route 0.0.0.0/0 10.10.10.1 200`
`37`		`-!!`
`38`		`-!`
`39`	`35`	`! template: bgpd/bgpd.main.conf.j2`
`40`	`36`	`!`
`41`	`37`	`! bgp multiple-instance`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,4 @@ log facility local4`
`14`	`14`	`!`
`15`	`15`	`! end of template: common/daemons.common.conf.j2!`
`16`	`16`	`!`
`17`		`-! set static default route to mgmt gateway as a backup to learned default`
`18`		`-ip route 0.0.0.0/0 10.10.10.1 200`
`19`	`17`	`!!`
Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,5 @@`
`3`	`3`	`"localhost": {`
`4`	`4`	`"hostname": "new_hostname"`
`5`	`5`	`}`
`6`		`- },`
`7`		`- "MGMT_INTERFACE": {`
`8`		`- "eth0\|10.10.10.10/24": {`
`9`		`- "gwaddr": "10.10.10.1"`
`10`		`- }`
`11`	`6`	`}`
`12`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,6 @@ link-detect`
`35`	`35`	`!`
`36`	`36`	`!!`
`37`	`37`	`!`
`38`		`-! set static default route to mgmt gateway as a backup to learned default`
`39`		`-ip route 0.0.0.0/0 10.0.0.1 200`
`40`		`-!!`
`41`		`-!`
`42`	`38`	`! template: bgpd/bgpd.main.conf.j2`
`43`	`39`	`!`
`44`	`40`	`! bgp multiple-instance`