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

staticd: Fix SRv6 SID installation and deletion (backport #18064) #18152

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 13, 2025

The SRv6 support in staticd (PR #16894) does not set the correct SID parameters (block length, node length, function length).

This PR fixes the issue and computes the correct parameters.

The bug was reported by SONiC testing.


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

The SRv6 support in staticd (PR #16894) does not set the correct SID
parameters (block length, node length, function length).

This commit fixes the issue and computes the correct parameters.

Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
(cherry picked from commit e1654ba)

# Conflicts:
#	staticd/static_zebra.c
The `show ipv6 route json` command displays the IPv6 routing table in
JSON format, including SRv6 SIDs. For each SRv6 SID, it provides
behavior and SID attributes. However, it does not include the SID
structure.

This commit adds the SID structure to the SRv6 SID JSON output.

Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
(cherry picked from commit 312f7b3)
The `static_srv6_sids` topotest verifies that staticd correctly
programs the SIDs in the zebra RIB. Currently, the topotest only
validates the programmed behavior and SID attributes.

This commit extends the topotest to also validate the SID structure.

Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
(cherry picked from commit a6d02fe)

# Conflicts:
#	tests/topotests/static_srv6_sids/expected_srv6_sids.json
#	tests/topotests/static_srv6_sids/expected_srv6_sids_sid_delete_1.json
#	tests/topotests/static_srv6_sids/expected_srv6_sids_sid_delete_2.json
@mergify mergify bot added the conflicts label Feb 13, 2025
Copy link
Author

mergify bot commented Feb 13, 2025

Cherry-pick of e1654ba has failed:

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

You are currently cherry-picking commit e1654ba55.
  (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:   staticd/static_zebra.c

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

Cherry-pick of a6d02fe has failed:

On branch mergify/bp/stable/10.2/pr-18064
Your branch is ahead of 'origin/stable/10.2' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a6d02fe2f.
  (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/static_srv6_sids/expected_srv6_sids.json
	deleted by us:   tests/topotests/static_srv6_sids/expected_srv6_sids_sid_delete_1.json
	deleted by us:   tests/topotests/static_srv6_sids/expected_srv6_sids_sid_delete_2.json

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

@cscarpitta
Copy link
Contributor

FRR 10.2 does not have SRv6 support in staticd. This fix is not applicable to 10.2

@cscarpitta cscarpitta closed this Feb 14, 2025
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