Skip to content
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

[bgpcfgd]: Extract classes into their own files. Run bgpcfgd as a module #5535

Merged
merged 14 commits into from
Oct 6, 2020
Merged

[bgpcfgd]: Extract classes into their own files. Run bgpcfgd as a module #5535

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2a0cba4
Revert "[bgpcfgd]: Don't use neighbor metadata in bgpmon sessions (#5…
Oct 2, 2020
9a91fdd
Remove classes which is already moved
Sep 28, 2020
990998e
Move class Runner to the modules
Sep 28, 2020
69ef5c9
Extract managers from bgpcfgd
Sep 28, 2020
8381436
Extract functions to utils
Sep 28, 2020
13dadc9
Create everything to run bgpcfgd as a module
Sep 28, 2020
96e52fe
Remove bgpcfgd script
Sep 28, 2020
b92441c
Rename app directory to bgpcfgd
Sep 28, 2020
64ce4b7
Remove bgpcfgd prefix from 'from'. Fix some other minor issues
Sep 28, 2020
9277999
Run bgpcfgd as a module
Sep 28, 2020
8b40c26
Update monit configuration
Sep 28, 2020
6572372
Fixes after cherry-picking
Oct 2, 2020
12de9f7
Use console_scripts
Oct 5, 2020
7708523
Update supervisord.conf.j2
pavel-shirshov Oct 5, 2020
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: 1 addition & 1 deletion dockers/docker-fpm-frr/base_image_files/monit_bgp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ check program bgp|bgpd with path "/usr/bin/process_checker bgp /usr/lib/frr/bgpd
check program bgp|staticd with path "/usr/bin/process_checker bgp /usr/lib/frr/staticd"
if status != 0 for 5 times within 5 cycles then alert

check program bgp|bgpcfgd with path "/usr/bin/process_checker bgp /usr/bin/python /usr/local/bin/bgpcfgd"
check program bgp|bgpcfgd with path "/usr/bin/process_checker bgp /usr/bin/python -m bgpcfgd"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can use console_script

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

if status != 0 for 5 times within 5 cycles then alert

check program bgp|bgpmon with path "/usr/bin/process_checker bgp /usr/bin/python /usr/local/bin/bgpmon"
Expand Down
2 changes: 1 addition & 1 deletion dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ dependent_startup=true
dependent_startup_wait_for=bgpd:running

[program:bgpcfgd]
command=/usr/local/bin/bgpcfgd
command=/usr/bin/env python -m bgpcfgd
priority=6
autostart=false
autorestart=false
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-bgpcfgd/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
build/
dist/
*.egg-info/
app/*.pyc
bgpcfgd/*.pyc
tests/*.pyc
tests/__pycache__/
.idea
Expand Down
22 changes: 0 additions & 22 deletions src/sonic-bgpcfgd/app/util.py
View file
Open in desktop

This file was deleted.

Loading