matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove staticd.conf (#9657)

Browse Source 
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 <arlakshm@microsoft.com>
This commit is contained in:
arlakshm 2022-02-17 18:31:30 -08:00 committed by GitHub
parent 9f55979696
commit 1d84ff5bd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dockers/docker-fpm-frr/frr/frr.conf.j2
View File

@ -13,7 +13,5 @@ agentx
!
{% include "zebra/zebra.interfaces.conf.j2" %}
!
{% include "staticd/staticd.default_route.conf.j2" %}
!
{% include "bgpd/bgpd.main.conf.j2" %}
!

2
dockers/docker-fpm-frr/frr/staticd/staticd.conf.j2
View File

@ -8,5 +8,3 @@
!
{% include "common/daemons.common.conf.j2" %}
!
{% include "staticd.default_route.conf.j2" %}
!

10
dockers/docker-fpm-frr/frr/staticd/staticd.default_route.conf.j2
View File

@ -1,10 +0,0 @@
!
{% block default_route %}
! set static default route to mgmt gateway as a backup to learned default
{% for (name, prefix) in MGMT_INTERFACE|pfx_filter %}
{% if prefix | ipv4 %}
ip route 0.0.0.0/0 {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} 200
{% endif %}
{% endfor %}
{% endblock default_route %}
!

4
src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
View File

@ -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

2
src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.conf
View File

@ -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
!!

5
src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.conf.json
View File

@ -3,10 +3,5 @@
"localhost": {
"hostname": "new_hostname"
}
},
"MGMT_INTERFACE": {
"eth0|10.10.10.10/24": {
"gwaddr": "10.10.10.1"
}
}
}

4
src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.default_route.conf
View File

@ -1,4 +0,0 @@
!
! 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
!

7
src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.default_route.conf.json
View File

@ -1,7 +0,0 @@
{
"MGMT_INTERFACE": {
"eth0|10.10.10.10/24": {
"gwaddr": "10.10.10.1"
}
}
}

6
src/sonic-bgpcfgd/tests/test_sonic-cfggen.py
View File

@ -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",

4
src/sonic-config-engine/tests/sample_output/frr.conf
View File

@ -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

2
src/sonic-config-engine/tests/test_frr.py
View File

@ -60,6 +60,4 @@ class TestCfgGen(TestCase):
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'))