Skip to content

xml: T8271: cleanup duplicate includes and split duplicate code into new building blocks#4991

Merged
c-po merged 6 commits intovyos:currentfrom
c-po:policy-xml-cleanup
Feb 16, 2026
Merged

xml: T8271: cleanup duplicate includes and split duplicate code into new building blocks#4991
c-po merged 6 commits intovyos:currentfrom
c-po:policy-xml-cleanup

Conversation

@c-po
Copy link
Member

@c-po c-po commented Feb 15, 2026

Change summary

  • Remove duplicate XML includes in policy route(6) tree
  • Create re-usable XML block for port-group and domain-group
  • Consolidate source-destination-group.xml.i and it's IPv4 equivalent
  • Add additional information for ICMPv6 compeltion help

After every XML refactoring the generated node.def files got evaluated by:

$ make interface_definitions
$ git add -f templates-cfg
$ ... refactor
$ make interface_definitions
$ git diff templates-cfg

So that no change in any node.def file detected - ecept the one which changes the CLI completion helper strings.

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)

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
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

c-po added 6 commits February 15, 2026 12:17
During development and XML node refactoring the resulting node.def files are
rebuild over and over again. Unfortunately they are not cleaned up during
subsequent calls to "make interface_definitions" or "make op_mode_definitions".

This could cause previous build node.def files to still exist after a rebuild
which adds potential false-positives during refactoring.
Verified that the resulting node.def files are still the same by:

$ make interface_definitions
$ git add -f templates-cfg
$ ... refactor
$ make interface_definitions
$ git diff templates-cfg

No change in any node.def file detected.
$ make interface_definitions
$ git add -f templates-cfg
$ ... refactor
$ make interface_definitions
$ git diff templates-cfg

No change in any node.def file detected.
…equivalent

$ make interface_definitions
$ git add -f templates-cfg
$ ... refactor
$ make interface_definitions
$ git diff templates-cfg

No change in any node.def file detected.
@c-po c-po requested review from jestabro and sarthurdev February 15, 2026 12:01
@c-po c-po added the bp/circinus Create automatic backport for circinus label Feb 15, 2026
@github-actions
Copy link

👍
No issues in PR Title / Commit Title

@github-actions
Copy link

CI integration 👍 passed!

Details

CI logs

  • CLI Smoketests 👍 passed
  • CLI Smoketests (interfaces only) 👍 passed
  • Config tests 👍 passed
  • RAID1 tests 👍 passed
  • CLI Smoketests VPP 👍 passed
  • Config tests VPP 👍 passed
  • TPM tests 👍 passed

Copy link
Member

@sarthurdev sarthurdev left a comment

Choose a reason for hiding this comment

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

Cleanup XML, trust Christian's testing. Smoketests pass.

Copy link
Contributor

@jestabro jestabro left a comment

Choose a reason for hiding this comment

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

This was smartly tested for changes in generated node.def files. All looks good.

@c-po c-po merged commit 33752c9 into vyos:current Feb 16, 2026
20 checks passed
@c-po c-po deleted the policy-xml-cleanup branch February 16, 2026 14:45
@vyosbot vyosbot added mirror-initiated This PR initiated for mirror sync workflow mirror-completed and removed mirror-initiated This PR initiated for mirror sync workflow labels Feb 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bp/circinus Create automatic backport for circinus current mirror-completed

Development

Successfully merging this pull request may close these issues.

4 participants

Comments