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

Jump to bottom

ospfd: OSPF multi-instance default origination fixes (backport #17436) #17481

Closed
wants to merge 2 commits into from
Closed

ospfd: OSPF multi-instance default origination fixes (backport #17436) #17481

wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 21, 2024

When originating a default AS-External LSA in one OSPF instance, it wasn't working if the criteria route was installed by another OSPF instance. This required more flexible processing of the OSPF external route information.

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

@aceelindem @mergify
ospfd: OSPF multi-instance default origination fixes
b923ad3 
When originating a default AS-External LSA in one OSPF instance,
it wasn't working if the criteria route was installed by another OSPF
instance. This required more flexible processing of the OSPF external
route information.

Also fix problem multi-instance display for "show ip ospf
 <instance> database ...".

Signed-off-by: Acee Lindem <acee@lindem.com>
(cherry picked from commit 6afd56d)

# Conflicts:
#	ospfd/ospf_zebra.c
@aceelindem @mergify
tests: Add topotest for OSPF multi-instance default origination.
4c21de2 
This change adds a topotest to test various case of OSPF multi-instance
origination including cases where the criteria route is from another
instance of OSPF, as well as the same OSPF instance (where a default
should not be originated).

Signed-off-by: Acee Lindem <acee@lindem.com>
(cherry picked from commit 82f4349)
@mergify Mergify
Copy link
Author

mergify bot commented Nov 21, 2024

Cherry-pick of 6afd56d has failed:

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

You are currently cherry-picking commit 6afd56da96.
  (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)

Changes to be committed:
	modified:   ospfd/ospf_asbr.c
	modified:   ospfd/ospf_asbr.h
	modified:   ospfd/ospf_lsa.c
	modified:   ospfd/ospf_vty.c
	modified:   ospfd/ospf_zebra.h

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ospfd/ospf_zebra.c

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 mergify bot added the conflicts label Nov 21, 2024
@mergify mergify bot mentioned this pull request Nov 21, 2024
Merged
@frrbot frrbot bot added ospf tests Topotests, make check, etc labels Nov 21, 2024
@donaldsharp
Copy link
Member

failure to merge ,closing

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
ospf size/XL stable/9.1 tests Topotests, make check, etc
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@donaldsharp @aceelindem