Refactor nacm in klish-plugin-sysrepo after sysrepo change #1342
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Upstream sysrepo commit 90ce1f7 modified sr_nacm_init() to explicitly switch the session to SR_DS_RUNNING before initializing NACM. This broke our klish workflow which started sessions on SR_DS_CANDIDATE. This commit drops the sysrepo patch that reverts that behavior in favor of explicitly starting sessions on SR_DS_RUNNING for NACM initialization, then switch to SR_DS_CANDIDATE for editing operations. This works with sysrepo's behavior: NACM reads rules from running datastore while our editing workflow operates on candidate datastore. Also, add prompt path shortening for deep configuration hierarchies. Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
mattiaswal
approved these changes
Jan 3, 2026
Contributor
mattiaswal
left a comment
mattiaswal
left a comment
There was a problem hiding this comment.
Small but yet important fix in the klish-sysrepo-plugin.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR reverts PR #1335 with a sysrepo neutral change in klish-plugin-sysrepo instead.
Upstream sysrepo commit 90ce1f7 modified
sr_nacm_init()to explicitly switch the session toSR_DS_RUNNINGbefore initializing NACM. This broke our klish workflow which started sessions onSR_DS_CANDIDATE.This commit drops the sysrepo patch that reverts that behavior in favor of explicitly starting sessions on
SR_DS_RUNNINGfor NACM initialization, then switch toSR_DS_CANDIDATEfor editing operations. This works with sysrepo's behavior: NACM reads rules from running datastore while our editing workflow operates on candidate datastore.Also, add prompt path shortening for deep configuration hierarchies.
Checklist
Tick relevant boxes, this PR is-a or has-a: