Skip to content

remove staticd.conf.j2 #9182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2021
Merged

remove staticd.conf.j2 #9182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions dockers/docker-fpm-frr/frr/frr.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" %}
Expand Down
2 changes: 0 additions & 2 deletions dockers/docker-fpm-frr/frr/staticd/staticd.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,5 @@
!
{% include "common/daemons.common.conf.j2" %}
!
{% include "staticd.default_route.conf.j2" %}
!
{% include "staticd.loopback_route.conf.j2" %}
!
10 changes: 0 additions & 10 deletions dockers/docker-fpm-frr/frr/staticd/staticd.default_route.conf.j2
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
!!
Expand Down
2 changes: 0 additions & 2 deletions src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {}
}
Expand Down
4 changes: 0 additions & 4 deletions src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.default_route.conf
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions src/sonic-bgpcfgd/tests/data/sonic-cfggen/staticd/staticd.default_route.conf.json
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/sonic-bgpcfgd/tests/test_sonic-cfggen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 0 additions & 4 deletions src/sonic-config-engine/tests/sample_output/py2/frr.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions src/sonic-config-engine/tests/sample_output/py3/frr.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions src/sonic-config-engine/tests/test_frr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))