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.

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

ipoe: T6205: error in migration script logic while renaming mac-address to mac node (backport #3263) #3268

Merged
merged 2 commits into from
Apr 7, 2024
Merged

ipoe: T6205: error in migration script logic while renaming mac-address to mac node (backport #3263) #3268

merged 2 commits into from
Apr 7, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 6, 2024

Change Summary

The problem was introduced in [1] but the config migrator part unfortunately was added to the wrong version [2]. As IPoE config version 0 was only active during the 1.3 development cycle and VyOS 1.3.0 was already released with config version 1 we can safely drop the migrator 0-to-1 and move the code to 1-to-2 to properly support upgrades from VyOS 1.3 -> 1.4 or newer.

1: 05df2a5#diff-08291bf77870abe3af8bbe3e8ce4bbf344fd0498b2c5c75a75aa7235d381c88eL168
2: 05df2a5#diff-b8bb58b75607d3653e74d82eff02442f9f3ab82698f160ba37858f7cdf6c79ccR44-R46

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)

Component(s) name

IPoE server

Proposed changes

How to test

Smoketest result

cpo@LR1.wue3:~$ /usr/libexec/vyos/tests/smoke/cli/test_service_ipoe-server.py
test_accel_ipv4_pool (__main__.TestServiceIPoEServer.test_accel_ipv4_pool) ... ok
test_accel_ipv6_pool (__main__.TestServiceIPoEServer.test_accel_ipv6_pool) ... ok
test_accel_limits (__main__.TestServiceIPoEServer.test_accel_limits) ... ok
test_accel_local_authentication (__main__.TestServiceIPoEServer.test_accel_local_authentication) ... ok
test_accel_name_servers (__main__.TestServiceIPoEServer.test_accel_name_servers) ... ok
test_accel_next_pool (__main__.TestServiceIPoEServer.test_accel_next_pool) ... ok
test_accel_ppp_options (__main__.TestServiceIPoEServer.test_accel_ppp_options) ... skipped 'PPP is not a part of IPoE'
test_accel_radius_authentication (__main__.TestServiceIPoEServer.test_accel_radius_authentication) ... ok
test_accel_shaper (__main__.TestServiceIPoEServer.test_accel_shaper) ... ok
test_accel_snmp (__main__.TestServiceIPoEServer.test_accel_snmp) ... ok
test_accel_wins_server (__main__.TestServiceIPoEServer.test_accel_wins_server) ... skipped 'WINS server is not used in IPoE'

----------------------------------------------------------------------
Ran 11 tests in 37.432s

OK (skipped=2)

DEBUG - vyos@vyos:~$ echo EXITCODE:$?
DEBUG - echo EXITCODE:$?
DEBUG - EXITCODE:0
 INFO - Configtest finished successfully!
 INFO - Powering off system
DEBUG - poweroff now
 INFO - Shutting down virtual machine
 INFO - Waiting for shutdown...
DEBUG - poweroff now
 INFO - Waiting for shutdown...
DEBUG - poweroff now
 INFO - VM is shut down!
 INFO - Cleaning up

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
This is an automatic backport of pull request #3263 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Apr 6, 2024
@mergify mergify bot mentioned this pull request Apr 6, 2024
Merged
12 tasks
@github-actions github-actions bot added the sagitta VyOS 1.4 LTS label Apr 6, 2024
@vyosbot vyosbot requested review from a team, dmbaturin, sarthurdev, zdc, jestabro, sever-sever and c-po and removed request for a team April 6, 2024 11:59
@c-po
ipoe: T6205: error in migration script logic while renaming mac-addre…
4ad1185 
…ss to mac node

The problem was introduced in [1] but the config migrator part unfortunately
was added to the wrong version [2]. As IPoE config version 0 was only active
during the 1.3 development cycle and VyOS 1.3.0 was already released with config
version 1 we can safely drop the migrator 0-to-1 and move the code to 1-to-2 to
properly support upgrades from VyOS 1.3 -> 1.4 or newer.

1: 05df2a5#diff-08291bf77870abe3af8bbe3e8ce4bbf344fd0498b2c5c75a75aa7235d381c88eL168
2: 05df2a5#diff-b8bb58b75607d3653e74d82eff02442f9f3ab82698f160ba37858f7cdf6c79ccR44-R46

(cherry picked from commit a5ccc06)
@c-po c-po force-pushed the mergify/bp/sagitta/pr-3263 branch from 3afae47 to 4ad1185 Compare April 6, 2024 19:16
@c-po c-po removed the conflicts label Apr 6, 2024
@vyos vyos deleted a comment from mergify bot Apr 6, 2024
jestabro
jestabro approved these changes Apr 6, 2024
View reviewed changes
src/migration-scripts/ipoe-server/1-to-2 Outdated Show resolved Hide resolved
@jestabro jestabro self-requested a review April 6, 2024 20:35
jestabro
jestabro previously requested changes Apr 6, 2024
View reviewed changes
src/migration-scripts/ipoe-server/1-to-2 Outdated Show resolved Hide resolved
@c-po
ipoe: T6205: fix conditional branch error in config migrator
c2b0381 
Commit a5ccc06 ("ipoe: T6205: error in migration script logic while renaming
mac-address to mac node") added a conditional path into the config which could
result in the migrated config not beeing written if precondition was not met.

(cherry picked from commit 2bbded1)
@c-po
Copy link
Member

c-po commented Apr 7, 2024

Thank you @jestabro - fixed

@c-po c-po requested review from jestabro, sever-sever and c-po April 7, 2024 05:44
@c-po c-po dismissed jestabro’s stale review April 7, 2024 10:08

Rereviewed

@c-po c-po merged commit 812bb6a into sagitta Apr 7, 2024
3 of 4 checks passed
@mergify mergify bot deleted the mergify/bp/sagitta/pr-3263 branch April 7, 2024 10:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sever-sever sever-sever sever-sever approved these changes

@c-po c-po c-po approved these changes

@dmbaturin dmbaturin Awaiting requested review from dmbaturin dmbaturin is a code owner automatically assigned from vyos/reviewers

@sarthurdev sarthurdev Awaiting requested review from sarthurdev sarthurdev is a code owner automatically assigned from vyos/reviewers

@zdc zdc Awaiting requested review from zdc zdc is a code owner automatically assigned from vyos/reviewers

@jestabro jestabro Awaiting requested review from jestabro

Assignees
No one assigned
Labels
sagitta VyOS 1.4 LTS
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@c-po @jestabro @sever-sever