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

frr-reload: backport fixes from master for stable/9.1 #15334

Merged
merged 3 commits into from
Feb 9, 2024

Conversation

c-po
Copy link
Contributor

@c-po c-po commented Feb 8, 2024

This is a combined backport PR with all later fixes in master to stable/9.1.

Closes #15299

Related to

ton31337 and others added 3 commits February 8, 2024 22:03
Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit 885613e)
…eload.py

Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit 2045084)
(cherry picked from commit b1bdb55)
Ensure to change description for index 0 from the list.

Ticket: #3628756
Testing Done:

After fix:
start with three interfaces description delete in lines_to_del:
(Pdb) lines_to_del
[(('interface swp1',), "description swp1 -> sp1's swp1"),
(('interface swp2',), "description swp2 -> sp2's swp
1"), (('interface swp3',), "description swp3 -> sp3's swp1")]

After first iteration swp1:
(Pdb) index
0
(Pdb) lines_to_del
[(('interface swp1',), 'description'), (('interface swp2',),
"description swp2 -> sp2's swp1"), (('interface swp
1s2',), "description swp3 -> sp3's swp1")]

After second iteration swp2:
(Pdb) lines_to_del
[(('interface swp1',), 'description'), (('interface swp2',),
'description'), (('interface swp3',), "description
swp3 -> sp3's swp1")]

After third iteration swp3 fix
(Pdb) lines_to_del
[(('interface swp1',), 'description'), (('interface swp2',),
'description'), (('interface swp3',), 'description'
)]

Signed-off-by: Chirag Shah <[email protected]>
(cherry picked from commit 8a5c6e4)
(cherry picked from commit dfc0a16)
@ton31337 ton31337 merged commit b61bd36 into FRRouting:stable/9.1 Feb 9, 2024
13 checks passed
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.

3 participants