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

bgpd: compare aigp after local route check in bgp_path_info_cmp() (backport #17199) #17235

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 25, 2024

For consistency between RIB and BGP, the aigp comparison should be made after the local route check in bgp bestpath selection.

As a reference, that's exactly what Cisco IOS does:

https://www.cisco.com/c/en/us/support/docs/ip/border-gateway-protocol-bgp/119001-configure-aigp-00.html


This is an automatic backport of pull request #17199 done by Mergify.

The topotest verifies that a local route is favored irrespective
of its AIGP value.

Signed-off-by: Enke Chen <enchen@paloaltonetworks.com>
(cherry picked from commit 1a2c3d6)

# Conflicts:
#	tests/topotests/bgp_aigp_rr/r1/bgpd.conf
#	tests/topotests/bgp_aigp_rr/r2/bgpd.conf
#	tests/topotests/bgp_aigp_rr/test_bgp_aigp_rr.py
For consistency between RIB and BGP, the aigp comparison should
be made after the local route check in bgp bestpath selection.

Signed-off-by: Enke Chen <enchen@paloaltonetworks.com>
(cherry picked from commit 6a7049a)
Copy link
Author

mergify bot commented Oct 25, 2024

Cherry-pick of 1a2c3d6 has failed:

On branch mergify/bp/stable/10.1/pr-17199
Your branch is up to date with 'origin/stable/10.1'.

You are currently cherry-picking commit 1a2c3d684a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   tests/topotests/bgp_aigp_rr/r1/bgpd.conf
	deleted by us:   tests/topotests/bgp_aigp_rr/r2/bgpd.conf
	deleted by us:   tests/topotests/bgp_aigp_rr/test_bgp_aigp_rr.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ton31337
Copy link
Member

Created a manual backport here #17239, closing this.

@ton31337 ton31337 closed this Oct 25, 2024
@ton31337 ton31337 deleted the mergify/bp/stable/10.1/pr-17199 branch October 25, 2024 10:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bgp size/L stable/10.1 tests Topotests, make check, etc
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants