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.

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

Added remapping resolution for action names #1170

Open
wants to merge 6 commits into
base: rolling
Choose a base branch
from

Conversation

JustusBraun
Copy link

@JustusBraun JustusBraun commented Jul 16, 2024

Currently remapping of action names is not possible see ros2/ros2#1312 .
I have now stumbled over this multiple times and I think it is a useful feature, so i took a shot at implementing the remapping of action names. Please let me know if you have any comments or if I overlooked something.
Fixes ros2/ros2#1312.

@JustusBraun
Copy link
Author

JustusBraun commented Jul 22, 2024

I wasn't able to reproduce the test error locally. I think this might be related to/the same as #1016.

Copy link
Collaborator

@fujitatomoya fujitatomoya left a comment

Choose a reason for hiding this comment

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

test would be ideal, similar with https://github.com/ros2/rcl/blob/rolling/rcl/test/rcl/test_remap_integration.cpp.

most of the comments for the action client can be applied to server implementation as well.

rcl_action/src/rcl_action/action_client.c Outdated Show resolved Hide resolved
rcl_action/src/rcl_action/action_client.c Show resolved Hide resolved
rcl_action/src/rcl_action/action_client.c Outdated Show resolved Hide resolved
rcl_action/src/rcl_action/action_client.c Outdated Show resolved Hide resolved
rcl_action/src/rcl_action/action_client.c Outdated Show resolved Hide resolved
@JustusBraun
Copy link
Author

I have added tests for action name remapping as requested. @fujitatomoya do you think it is necessary to add tests for local arguments passed to rcl_node_init also?

@JustusBraun
Copy link
Author

Hi, I was was busy for some time and forgot about this PR.

As far as I understand the errors, they are not related to my changes. There seem to be a lot of unexpected 'test_broadcaster_xy' nodes in the test environment of the rcl and projectroot test suites.

Sorry for leaving this pr stale for so long.

@fujitatomoya
Copy link
Collaborator

@Mergifyio rebase

Copy link

mergify bot commented Jan 17, 2025

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/6)
Auto-merging rcl_action/src/rcl_action/action_client.c
CONFLICT (content): Merge conflict in rcl_action/src/rcl_action/action_client.c
Auto-merging rcl_action/src/rcl_action/action_server.c
Auto-merging rcl_action/test/rcl_action/test_action_server.cpp
error: could not apply 44dcad3... Added remapping resolution for action names
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 44dcad3... Added remapping resolution for action names

@fujitatomoya
Copy link
Collaborator

@JustusBraun can you rebase this? i tried that via Mergifyio but failed.

@JustusBraun
Copy link
Author

@fujitatomoya done! Locally all test passed with colcon test

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remapping action names does not work
3 participants