remove staticd.conf.j2 (#9182)

arlakshm · web-flow · commit 583085283290 · 2021-11-24T15:32:16.000-08:00
Why I did it resolves #8979 and #9055 How I did it Remove the file static.conf.j2,which adds the default route on eth0 from bgp docker Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>
diff --git a/dockers/docker-fpm-frr/frr/frr.conf.j2 b/dockers/docker-fpm-frr/frr/frr.conf.j2
@@ -13,8 +13,6 @@ agentx
 !
 {% include "zebra/zebra.interfaces.conf.j2" %}
 !
-{% include "staticd/staticd.default_route.conf.j2" %}
-!
 {% include "staticd/staticd.loopback_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,7 +8,5 @@
 !
 {% include "common/daemons.common.conf.j2" %}
 !
-{% include "staticd.default_route.conf.j2" %}
-!
 {% include "staticd.loopback_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
-!!
-!
 ! add static ipv6 /64 loopback route to allow bgpd to advertise the loopback route prefix
 ipv6 route fc00::/64 Loopback0
 !!
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,8 +14,6 @@ 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
 !!
 !
 ! add static ipv6 /64 loopback route to allow bgpd to advertise the loopback route prefix
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
@@ -4,11 +4,6 @@
             "hostname": "new_hostname"
         }
     },
-    "MGMT_INTERFACE": {
-        "eth0|10.10.10.10/24": {
-            "gwaddr": "10.10.10.1"
-        }
-    },
     "LOOPBACK_INTERFACE": {
         "Loopback0|FC00:1::32/128": {}
     }
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
@@ -81,12 +81,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_loopback_route():
     run_test("staticd.loopback_route.conf.j2",
              "staticd/staticd.loopback_route.conf.j2",
diff --git a/src/sonic-config-engine/tests/sample_output/py2/frr.conf b/src/sonic-config-engine/tests/sample_output/py2/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
-!!
-!
 !
 ! add static ipv6 /64 loopback route to allow bgpd to advertise the loopback route prefix
 ipv6 route fc00:1::/64 Loopback0
diff --git a/src/sonic-config-engine/tests/sample_output/py3/frr.conf b/src/sonic-config-engine/tests/sample_output/py3/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
-!!
-!
 !
 ! add static ipv6 /64 loopback route to allow bgpd to advertise the loopback route prefix
 ipv6 route fc00:1::/64 Loopback0
diff --git a/src/sonic-config-engine/tests/test_frr.py b/src/sonic-config-engine/tests/test_frr.py
@@ -69,6 +69,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,8 +13,6 @@ 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 "staticd/staticd.loopback_route.conf.j2" %}`
`19`	`17`	`!`
`20`	`18`	`{% include "bgpd/bgpd.main.conf.j2" %}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,5 @@`
`8`	`8`	`!`
`9`	`9`	`{% include "common/daemons.common.conf.j2" %}`
`10`	`10`	`!`
`11`		`-{% include "staticd.default_route.conf.j2" %}`
`12`		`-!`
`13`	`11`	`{% include "staticd.loopback_route.conf.j2" %}`
`14`	`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`	`! add static ipv6 /64 loopback route to allow bgpd to advertise the loopback route prefix`
`40`	`36`	`ipv6 route fc00::/64 Loopback0`
`41`	`37`	`!!`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,6 @@ 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`	`!!`
`20`	`18`	`!`
`21`	`19`	`! add static ipv6 /64 loopback route to allow bgpd to advertise the loopback route prefix`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,6 @@`
`4`	`4`	`"hostname": "new_hostname"`
`5`	`5`	`}`
`6`	`6`	`},`
`7`		`- "MGMT_INTERFACE": {`
`8`		`- "eth0\|10.10.10.10/24": {`
`9`		`- "gwaddr": "10.10.10.1"`
`10`		`- }`
`11`		`- },`
`12`	`7`	`"LOOPBACK_INTERFACE": {`
`13`	`8`	`"Loopback0\|FC00:1::32/128": {}`
`14`	`9`	`}`
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`	`!`
`43`	`39`	`! add static ipv6 /64 loopback route to allow bgpd to advertise the loopback route prefix`
`44`	`40`	`ipv6 route fc00:1::/64 Loopback0`