Skip to content

dhcpv6: T7967: fix migration script for automatic SLAAC selection #4817

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Oct 29, 2025
Merged

dhcpv6: T7967: fix migration script for automatic SLAAC selection #4817

merged 1 commit into from
Oct 29, 2025

Conversation

@c-po
Copy link
Member

@c-po c-po commented Oct 29, 2025 •
edited
Loading

Change summary

Commit f08a570 (dhcpv6: T7646: restore missing default route after upgrade) introduced a regression affecting both non-VIF and VIF interfaces.

The addressing mode check in the migration logic was incorrect for both cases. For non-VIF interfaces, the migration was skipped entirely due to a missing configuration test. For VIF (VLAN) interfaces, the existing test always evaluated to true, since it incorrectly assumed that DHCPv6 was configured even when a static address was present.

Smoketests have been extended to cover for these cases.

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)

How to test / Smoketest result

Manual tests:

vyos@vyos# load /usr/libexec/vyos/tests/config/basic-ipv6
Load complete. Use 'commit' to make changes effective.

vyos@vyos# compare commands | match "set interfaces ethernet"
set interfaces ethernet eth0 vif 5 address 'dhcpv6'
set interfaces ethernet eth0 vif 5 ipv6 address autoconf
set interfaces ethernet eth0 vif-s 10 address 'dhcpv6'
set interfaces ethernet eth0 vif-s 10 ipv6 address autoconf
set interfaces ethernet eth0 vif-s 10 vif-c 20 address 'dhcpv6'
set interfaces ethernet eth0 vif-s 10 vif-c 20 ipv6 address autoconf
set interfaces ethernet eth1 vif 50 address '1.2.3.4/31'
set interfaces ethernet eth1 vif-s 60 vif-c 70 address '2.3.4.5/31'
set interfaces ethernet eth2 address 'dhcpv6'
set interfaces ethernet eth2 ipv6 address autoconf

Automatic tests from CI with extended smoketests:

DEBUG - test_basic_ipv6 (__main__.TestConfigBasicIpv6.test_basic_ipv6) ...  time: 27.780
DEBUG - ok

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

@github-actions
Copy link

github-actions bot commented Oct 29, 2025 •
edited
Loading

👍
No issues in PR Title / Commit Title

@c-po c-po added bp/sagitta Create automatic backport for sagitta LTS version bp/circinus Create automatic backport for circinus labels Oct 29, 2025
@c-po
dhcpv6: T7967: fix migration script for automatic SLAAC selection
c5ef4f4 
Commit f08a570 ("dhcpv6: T7646: restore missing default route after upgrade")
introduced a regression affecting both non-VIF and VIF interfaces.

The addressing mode check in the migration logic was incorrect for both cases.
For non-VIF interfaces, the migration was skipped entirely due to a missing
configuration test. For VIF (VLAN) interfaces, the existing test always
evaluated to true, since it incorrectly assumed that DHCPv6 was configured
even when a static address was present.

Smoketests have been extended to cover for these cases.
@c-po c-po force-pushed the dhcpv6-migrator-fix branch from 0996c6e to c5ef4f4 Compare October 29, 2025 11:23
@c-po c-po requested review from natali-rs1985 and removed request for dmbaturin October 29, 2025 11:46
dmbaturin
dmbaturin approved these changes Oct 29, 2025
View reviewed changes
Copy link
Member

@dmbaturin dmbaturin left a comment

Choose a reason for hiding this comment

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

The fix seems obvious in hindsight... and we should certainly fix the bug, so let's merge this.

natali-rs1985
natali-rs1985 approved these changes Oct 29, 2025
View reviewed changes
Copy link
Contributor

@natali-rs1985 natali-rs1985 left a comment

Choose a reason for hiding this comment

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

The changes look correct and fix the issue

@github-actions
Copy link

CI integration 👍 passed!

Details

CI logs

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

@c-po c-po merged commit 449f3d4 into vyos:current Oct 29, 2025
21 checks passed
@c-po c-po deleted the dhcpv6-migrator-fix branch October 29, 2025 15:10
@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 Oct 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmbaturin dmbaturin dmbaturin approved these changes

@natali-rs1985 natali-rs1985 natali-rs1985 approved these changes

@jestabro jestabro Awaiting requested review from jestabro

@sever-sever sever-sever Awaiting requested review from sever-sever

Assignees

@c-po c-po

Labels

bp/circinus Create automatic backport for circinus bp/sagitta Create automatic backport for sagitta LTS version current mirror-completed

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@c-po @dmbaturin @natali-rs1985 @vyosbot