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.

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

pim(6): T5733: add missing FRR related features (backport #2476) #2489

Merged
merged 8 commits into from
Nov 16, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 15, 2023

This is an automatic backport of pull request #2476 done by Mergify.
Cherry-pick of 9abc02e has failed:


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Nov 15, 2023
@vyosbot vyosbot requested review from a team, dmbaturin, sarthurdev, zdc, jestabro and sever-sever and removed request for a team November 15, 2023 19:22
@github-actions github-actions bot added the sagitta VyOS 1.4 LTS label Nov 15, 2023
@vyosbot vyosbot requested a review from c-po November 15, 2023 19:22
Migrate CLI configuration retrival to common get_config_dict(). In addition
add new functionality to VyOS that is PIM related and already available in FRR.

(cherry picked from commit 9abc02e)

# Conflicts:
#	python/vyos/frr.py
#	src/op_mode/restart_frr.py
IGMP and PIM are two different but related things.

FRR has both combined in pimd. As we use get_config_dict() and FRR reload it
is better to have both centrally stored under the same CLI node (as FRR does,
too) to just "fire and forget" the commit to the daemon.

"set protocols igmp interface eth1" -> "set protocols pim interface eth1 igmp"

(cherry picked from commit bc83fb0)
(cherry picked from commit 403d2ff)

# Conflicts:
#	data/templates/frr/pim6d.frr.j2
#	interface-definitions/protocols-pim6.xml.in
#	smoketest/scripts/cli/test_protocols_pim6.py
#	src/conf_mode/protocols_pim6.py
@c-po c-po removed the conflicts label Nov 15, 2023
@c-po c-po merged commit 71823db into sagitta Nov 16, 2023
3 checks passed
@mergify mergify bot deleted the mergify/bp/sagitta/pr-2476 branch November 16, 2023 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sagitta VyOS 1.4 LTS
2 participants