Skip to content

T9169: update for vyos1x-config refactor - #5395

Merged
dmbaturin merged 3 commits into
vyos:rollingfrom
jestabro:diff-functor
Aug 14, 2026
Merged

T9169: update for vyos1x-config refactor#5395
dmbaturin merged 3 commits into
vyos:rollingfrom
jestabro:diff-functor

Conversation

@jestabro

@jestabro jestabro commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

Change summary

Update for refactoring of vyos1x-config for organization and readability.
DRAFT state until merge of the following and update of libvyosconfig/Makefile:
vyos/vyos1x-config#90
vyos/vyconf#64

Until the above are merged, integration will fail quickly.

It can be reviewed, as the changes are obviously needed for changes to the libvyosconfig bindings.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Related PR(s)

vyos/vyos1x-config#90
vyos/vyconf#64

How to test / Smoketest result

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • I have run the components SMOKETESTS if applicable
  • I have thoroughly reviewed, understood, and tested the code contained in the PR, including any code produced by GenAI tools
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

@jestabro jestabro self-assigned this Aug 12, 2026
@coderabbitai

coderabbitai Bot commented Aug 12, 2026

Copy link
Copy Markdown

Review Change Stack

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited), Organization UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: 78cdd58d-9c73-4752-81c0-c602249c6ff5

📥 Commits

Reviewing files that changed from the base of the PR and between ba8924d and 54d419d.

📒 Files selected for processing (2)
  • libvyosconfig/lib/bindings.ml
  • python/vyos/configtree.py

📝 Walkthrough

Summary by CodeRabbit

  • New Features

    • Added support for displaying configuration differences at a specified path.
    • Added separate inclusive and exclusive masking operations for configuration comparisons.
  • Bug Fixes

    • Improved handling of diff results and backend errors through the public configuration API.
    • Updated masking behavior to use dedicated operations for more consistent results.

Walkthrough

The OCaml bindings now use dedicated diff, union, derived-subtree, and mask modules. The API adds diff_show and replaces mask_tree with mask_inclusive and mask_exclusive.

Changes

Diff and mask API

Layer / File(s) Summary
Backend operation bindings
libvyosconfig/lib/bindings.ml
Dedicated modules and exceptions handle diff, union, mask, and derived-subtree operations. C stubs register diff_show, mask_inclusive, and mask_exclusive, and remove mask_tree (lines 10-18, 422-543, 609-614).
Python API wrappers
python/vyos/configtree.py
Adds diff_show with validation, backend error conversion, and result unescaping. Mask methods call the dedicated backend functions (lines 582-607, 659-666, 685-692).
✨ Finishing Touches
✨ Simplify code
  • Create PR with simplified code

Comment @coderabbitai help to get the list of available commands.

@jestabro
jestabro requested review from c-po and dmbaturin August 12, 2026 15:29
@mergify mergify Bot added the rolling label Aug 12, 2026
@github-actions

Copy link
Copy Markdown

CI integration ❌ failed!

Details

CI logs

  • CLI Smoketests ❌ failed
  • CLI Smoketests (interfaces only) ❌ failed
  • Config tests ❌ failed
  • RAID1 tests ❌ failed
  • CLI Smoketests VPP ⏭️ skipped
  • Config tests VPP ⏭️ skipped
  • TPM tests ⏭️ skipped

@dmbaturin
dmbaturin marked this pull request as ready for review August 14, 2026 14:46

@dmbaturin dmbaturin left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a straightforward interface update and prerequisite PRs are now merged.

@dmbaturin
dmbaturin merged commit f7e2b42 into vyos:rolling Aug 14, 2026
20 of 22 checks passed
@mergify

mergify Bot commented Aug 14, 2026

Copy link
Copy Markdown
Contributor

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@vyos-bot vyos-bot Bot added mirror-initiated This PR initiated for mirror sync workflow mirror-completed and removed mirror-initiated This PR initiated for mirror sync workflow labels Aug 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

2 participants