mgmt: hawkbit: do not prepend custom controllerId #89500
Merged
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
maass-hamburg
requested changes
May 6, 2025
|
About the compliance failure, note that the email address in the sign-off line should be inside square bracket, I. e. |
nealjack
force-pushed
the
hawkbit_controllerid
branch
2 times, most recently
from
d8d4a94 to
663f7d5
Compare
nealjack
force-pushed
the
hawkbit_controllerid
branch
2 times, most recently
from
700f1b8 to
c0cc20f
Compare
maass-hamburg
requested changes
May 7, 2025
nealjack
force-pushed
the
hawkbit_controllerid
branch
from
c0cc20f to
f68ae2b
Compare
|
Are there any other changes that are required for this pull request? |
|
@nealjack please rebase |
maass-hamburg
previously approved these changes
May 27, 2025
This commit changes how the controllerId is generated based on device id, and disentangles the two. The controllerId is what hawkbit uses to uniquely identify a device, and is not necessarily the same as the device id, and should be fully customizeable by the user if needed. Previously, all custom device ids were being prepended with `CONFIG_BOARD`. When a user selects `CONFIG_HAWKBIT_CUSTOM_DEVICE_ID`, they should be able to specify the full controllerId used with hawkbit, without a forced prepend. Signed-off-by: Neal Jackson <[email protected]>
When `CONFIG_HAWKBIT_CUSTOM_DEVICE_ID` is selected, the device_id will no longer be automatically prepended with `CONFIG_BOARD`. Signed-off-by: Neal Jackson <[email protected]>
nealjack
force-pushed
the
hawkbit_controllerid
branch
from
f68ae2b to
e2dcc0d
Compare
|
|
@nealjack needs another rebase, due to some bug, that lets ci fail, that is fixed now on the current main |
Apparently rerun was enough, no need to rebase. |
rlubos
approved these changes
May 28, 2025
maass-hamburg
approved these changes
May 28, 2025
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.
This PR changes how the controllerId is generated based on device id, and disentangles the two. The controllerId is what hawkbit uses to uniquely identify a device, and is not necessarily the same as the device id, and should be fully customizeable by the user if needed. Previously, all custom device ids were being prepended with
CONFIG_BOARD. When a user selectsCONFIG_HAWKBIT_CUSTOM_DEVICE_ID, they should be able to specify the full controllerId used with hawkbit, without a forced prepend.The default handler (
hawkbit_get_device_identity_default) for returning the controllerId is modified to also include the prefix, so the default behavior withoutCONFIG_HAWKBIT_CUSTOM_DEVICE_IDenabled is preserved.