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

lib: Do not convert EVPN prefixes into IPv4/IPv6 if not needed (backport #15377) #15415

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 23, 2024

This is an automatic backport of pull request #15377 done by Mergify.
Cherry-pick of 439b739 has failed:

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

You are currently cherry-picking commit 439b73949.
  (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 <file>..." to mark resolution)
	both modified:   lib/routemap.c

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

Cherry-pick of 049a2c0 has failed:

On branch mergify/bp/stable/8.5/pr-15377
Your branch is ahead of 'origin/stable/8.5' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 049a2c0c0.
  (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_evpn_route_map_match/r1/frr.conf
	deleted by us:   tests/topotests/bgp_evpn_route_map_match/test_bgp_evpn_route_map_match.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


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

Convert only when this is really needed, e.g. `match ip address prefix-list ...`.

Otherwise, we can't have mixed match clauses, like:

```
match ip address prefix-list p1
match evpn route-type prefix
```

This won't work, because the prefix is already converted, and we can't extract
route type, vni, etc. from the original EVPN prefix.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 439b739)

# Conflicts:
#	lib/routemap.c
Test prefix-list matching and some other EVPN stuff.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 049a2c0)

# Conflicts:
#	tests/topotests/bgp_evpn_route_map_match/r1/frr.conf
#	tests/topotests/bgp_evpn_route_map_match/test_bgp_evpn_route_map_match.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant