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

Fix the spawner to support full wildcard parameter entries #1933

Merged
merged 6 commits into from
Dec 12, 2024
Merged

Fix the spawner to support full wildcard parameter entries #1933

merged 6 commits into from
Dec 12, 2024

Conversation

saikishor
Copy link
Member

Fixes #1932

@saikishor saikishor mentioned this pull request Dec 11, 2024
Closed
@codecov Codecov
Copy link

codecov bot commented Dec 11, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 87.09677% with 4 lines in your changes missing coverage. Please review.

Project coverage is 87.72%. Comparing base (d62be07) to head (06ac752).
Report is 2 commits behind head on master.

Files with missing lines Patch % Lines
controller_manager/test/test_spawner_unspawner.cpp 83.33% 0 Missing and 4 partials ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #1933      +/-   ##
==========================================
- Coverage   87.72%   87.72%   -0.01%     
==========================================
  Files         122      122              
  Lines       12979    13010      +31     
  Branches     1158     1165       +7     
==========================================
+ Hits        11386    11413      +27     
  Misses       1165     1165              
- Partials      428      432       +4
Flag Coverage Δ
unittests 87.72% <87.09%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
.../controller_manager/controller_manager_services.py 79.37% <100.00%> (+0.94%) ⬆️
controller_manager/test/test_spawner_unspawner.cpp 96.47% <83.33%> (-0.85%) ⬇️

bijoua29
bijoua29 approved these changes Dec 11, 2024
View reviewed changes
Copy link
Contributor

@bijoua29 bijoua29 left a comment

Choose a reason for hiding this comment

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

Looks good

christophfroehlich
christophfroehlich requested changes Dec 12, 2024
View reviewed changes
Copy link
Contributor

@christophfroehlich christophfroehlich 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 to be fine (at least what you added in the test makes sense for me). Please add a new example in https://github.com/ros-controls/ros2_control/blob/master/controller_manager/doc/userdoc.rst#spawner

@saikishor
Copy link
Member Author

The fix seems to be fine (at least what you added in the test makes sense for me). Please add a new example in https://github.com/ros-controls/ros2_control/blob/master/controller_manager/doc/userdoc.rst#spawner

Sure. On it

@saikishor saikishor merged commit bb087e2 into ros-controls:master Dec 12, 2024
21 of 23 checks passed
@saikishor saikishor deleted the fix/wildcard_entries branch December 12, 2024 09:19
@saikishor saikishor added the backport-humble This label should be used by maintainers only! Label triggers PR backport to ROS2 humble. label Dec 13, 2024
mergify bot pushed a commit that referenced this pull request Dec 13, 2024
@saikishor @mergify
Fix the spawner to support full wildcard parameter entries (#1933)
1a2b768 
(cherry picked from commit bb087e2)

# Conflicts:
#	.clang-format
#	.github/ISSUE_TEMPLATE/good-first-issue.md
#	.github/mergify.yml
#	.github/workflows/humble-abi-compatibility.yml
#	.github/workflows/humble-debian-build.yml
#	.github/workflows/prerelease-check.yml
#	.github/workflows/rolling-abi-compatibility.yml
#	.github/workflows/rolling-check-docs.yml
#	README.md
#	controller_interface/CHANGELOG.rst
#	controller_interface/CMakeLists.txt
#	controller_interface/include/controller_interface/chainable_controller_interface.hpp
#	controller_interface/include/controller_interface/controller_interface.hpp
#	controller_interface/include/controller_interface/controller_interface_base.hpp
#	controller_interface/include/controller_interface/helpers.hpp
#	controller_interface/include/semantic_components/range_sensor.hpp
#	controller_interface/package.xml
#	controller_interface/src/chainable_controller_interface.cpp
#	controller_interface/src/controller_interface.cpp
#	controller_interface/src/controller_interface_base.cpp
#	controller_interface/test/test_chainable_controller_interface.cpp
#	controller_interface/test/test_chainable_controller_interface.hpp
#	controller_interface/test/test_controller_interface.cpp
#	controller_interface/test/test_controller_interface.hpp
#	controller_interface/test/test_controller_with_options.cpp
#	controller_interface/test/test_controller_with_options.hpp
#	controller_interface/test/test_force_torque_sensor.hpp
#	controller_interface/test/test_imu_sensor.hpp
#	controller_interface/test/test_semantic_component_interface.hpp
#	controller_manager/CHANGELOG.rst
#	controller_manager/CMakeLists.txt
#	controller_manager/controller_manager/controller_manager_services.py
#	controller_manager/controller_manager/launch_utils.py
#	controller_manager/controller_manager/spawner.py
#	controller_manager/controller_manager/unspawner.py
#	controller_manager/doc/controller_chaining.rst
#	controller_manager/doc/images/chaining_example2.png
#	controller_manager/doc/userdoc.rst
#	controller_manager/include/controller_manager/controller_manager.hpp
#	controller_manager/include/controller_manager/controller_spec.hpp
#	controller_manager/package.xml
#	controller_manager/src/controller_manager.cpp
#	controller_manager/src/ros2_control_node.cpp
#	controller_manager/test/controller_manager_test_common.hpp
#	controller_manager/test/test_chainable_controller/test_chainable_controller.cpp
#	controller_manager/test/test_chainable_controller/test_chainable_controller.hpp
#	controller_manager/test/test_controller/test_controller.cpp
#	controller_manager/test/test_controller/test_controller.hpp
#	controller_manager/test/test_controller_failed_init/test_controller_failed_init.cpp
#	controller_manager/test/test_controller_failed_init/test_controller_failed_init.hpp
#	controller_manager/test/test_controller_manager.cpp
#	controller_manager/test/test_controller_manager_srvs.cpp
#	controller_manager/test/test_controller_manager_urdf_passing.cpp
#	controller_manager/test/test_controller_manager_with_namespace.cpp
#	controller_manager/test/test_controller_with_interfaces/test_controller_with_interfaces.cpp
#	controller_manager/test/test_controller_with_interfaces/test_controller_with_interfaces.hpp
#	controller_manager/test/test_controllers_chaining_with_controller_manager.cpp
#	controller_manager/test/test_hardware_management_srvs.cpp
#	controller_manager/test/test_hardware_spawner.cpp
#	controller_manager/test/test_load_controller.cpp
#	controller_manager/test/test_release_interfaces.cpp
#	controller_manager/test/test_spawner_unspawner.cpp
#	controller_manager_msgs/CHANGELOG.rst
#	controller_manager_msgs/CMakeLists.txt
#	controller_manager_msgs/msg/ControllerState.msg
#	controller_manager_msgs/msg/HardwareComponentState.msg
#	controller_manager_msgs/package.xml
#	controller_manager_msgs/srv/SwitchController.srv
#	doc/debugging.rst
#	doc/migration.rst
#	doc/release_notes.rst
#	hardware_interface/CHANGELOG.rst
#	hardware_interface/CMakeLists.txt
#	hardware_interface/doc/different_update_rates_userdoc.rst
#	hardware_interface/doc/hardware_interface_types_userdoc.rst
#	hardware_interface/doc/joints_userdoc.rst
#	hardware_interface/doc/mock_components_userdoc.rst
#	hardware_interface/doc/writing_new_hardware_component.rst
#	hardware_interface/include/hardware_interface/actuator.hpp
#	hardware_interface/include/hardware_interface/actuator_interface.hpp
#	hardware_interface/include/hardware_interface/component_parser.hpp
#	hardware_interface/include/hardware_interface/controller_info.hpp
#	hardware_interface/include/hardware_interface/handle.hpp
#	hardware_interface/include/hardware_interface/hardware_component_info.hpp
#	hardware_interface/include/hardware_interface/hardware_info.hpp
#	hardware_interface/include/hardware_interface/lexical_casts.hpp
#	hardware_interface/include/hardware_interface/loaned_command_interface.hpp
#	hardware_interface/include/hardware_interface/loaned_state_interface.hpp
#	hardware_interface/include/hardware_interface/resource_manager.hpp
#	hardware_interface/include/hardware_interface/sensor.hpp
#	hardware_interface/include/hardware_interface/sensor_interface.hpp
#	hardware_interface/include/hardware_interface/system.hpp
#	hardware_interface/include/hardware_interface/system_interface.hpp
#	hardware_interface/include/hardware_interface/types/hardware_interface_return_values.hpp
#	hardware_interface/include/hardware_interface/types/hardware_interface_type_values.hpp
#	hardware_interface/include/hardware_interface/types/lifecycle_state_names.hpp
#	hardware_interface/include/mock_components/generic_system.hpp
#	hardware_interface/package.xml
#	hardware_interface/src/actuator.cpp
#	hardware_interface/src/component_parser.cpp
#	hardware_interface/src/lexical_casts.cpp
#	hardware_interface/src/mock_components/generic_system.cpp
#	hardware_interface/src/resource_manager.cpp
#	hardware_interface/src/sensor.cpp
#	hardware_interface/src/system.cpp
#	hardware_interface/test/mock_components/test_generic_system.cpp
#	hardware_interface/test/test_component_interfaces.cpp
#	hardware_interface/test/test_component_parser.cpp
#	hardware_interface/test/test_handle.cpp
#	hardware_interface/test/test_hardware_components/test_force_torque_sensor.cpp
#	hardware_interface/test/test_hardware_components/test_hardware_components.xml
#	hardware_interface/test/test_hardware_components/test_single_joint_actuator.cpp
#	hardware_interface/test/test_hardware_components/test_system_with_command_modes.cpp
#	hardware_interface/test/test_hardware_components/test_two_joint_system.cpp
#	hardware_interface/test/test_inst_hardwares.cpp
#	hardware_interface/test/test_macros.cpp
#	hardware_interface_testing/CHANGELOG.rst
#	hardware_interface_testing/CMakeLists.txt
#	hardware_interface_testing/package.xml
#	hardware_interface_testing/test/test_components/test_actuator.cpp
#	hardware_interface_testing/test/test_components/test_components.xml
#	hardware_interface_testing/test/test_components/test_sensor.cpp
#	hardware_interface_testing/test/test_components/test_system.cpp
#	hardware_interface_testing/test/test_resource_manager.cpp
#	hardware_interface_testing/test/test_resource_manager.hpp
#	hardware_interface_testing/test/test_resource_manager_prepare_perform_switch.cpp
#	joint_limits/CHANGELOG.rst
#	joint_limits/CMakeLists.txt
#	joint_limits/include/joint_limits/joint_limits.hpp
#	joint_limits/include/joint_limits/joint_limits_rosparam.hpp
#	joint_limits/package.xml
#	joint_limits/test/joint_limits_rosparam.yaml
#	joint_limits/test/joint_limits_rosparam_test.cpp
#	ros2_control/CHANGELOG.rst
#	ros2_control/CMakeLists.txt
#	ros2_control/package.xml
#	ros2_control_test_assets/CHANGELOG.rst
#	ros2_control_test_assets/CMakeLists.txt
#	ros2_control_test_assets/include/ros2_control_test_assets/components_urdfs.hpp
#	ros2_control_test_assets/include/ros2_control_test_assets/descriptions.hpp
#	ros2_control_test_assets/package.xml
#	ros2controlcli/CHANGELOG.rst
#	ros2controlcli/doc/userdoc.rst
#	ros2controlcli/package.xml
#	ros2controlcli/ros2controlcli/api/__init__.py
#	ros2controlcli/ros2controlcli/verb/list_controller_types.py
#	ros2controlcli/ros2controlcli/verb/list_controllers.py
#	ros2controlcli/ros2controlcli/verb/list_hardware_components.py
#	ros2controlcli/ros2controlcli/verb/list_hardware_interfaces.py
#	ros2controlcli/ros2controlcli/verb/load_controller.py
#	ros2controlcli/ros2controlcli/verb/reload_controller_libraries.py
#	ros2controlcli/ros2controlcli/verb/set_controller_state.py
#	ros2controlcli/ros2controlcli/verb/set_hardware_component_state.py
#	ros2controlcli/ros2controlcli/verb/switch_controllers.py
#	ros2controlcli/ros2controlcli/verb/unload_controller.py
#	ros2controlcli/ros2controlcli/verb/view_controller_chains.py
#	ros2controlcli/setup.py
#	ros2controlcli/test/test_view_controller_chains.py
#	rqt_controller_manager/CHANGELOG.rst
#	rqt_controller_manager/package.xml
#	rqt_controller_manager/rqt_controller_manager/controller_manager.py
#	rqt_controller_manager/setup.py
#	transmission_interface/CHANGELOG.rst
#	transmission_interface/CMakeLists.txt
#	transmission_interface/include/transmission_interface/accessor.hpp
#	transmission_interface/include/transmission_interface/differential_transmission.hpp
#	transmission_interface/include/transmission_interface/four_bar_linkage_transmission.hpp
#	transmission_interface/include/transmission_interface/handle.hpp
#	transmission_interface/include/transmission_interface/transmission.hpp
#	transmission_interface/package.xml
#	transmission_interface/src/differential_transmission_loader.cpp
#	transmission_interface/src/four_bar_linkage_transmission_loader.cpp
#	transmission_interface/src/simple_transmission_loader.cpp
#	transmission_interface/test/differential_transmission_loader_test.cpp
#	transmission_interface/test/four_bar_linkage_transmission_loader_test.cpp
#	transmission_interface/test/four_bar_linkage_transmission_test.cpp
#	transmission_interface/test/simple_transmission_loader_test.cpp
#	transmission_interface/test/simple_transmission_test.cpp
@mergify mergify bot mentioned this pull request Dec 13, 2024
Merged
saikishor added a commit that referenced this pull request Dec 13, 2024
@saikishor
Fix the spawner to support full wildcard parameter entries (#1933)
36eeeea
saikishor added a commit that referenced this pull request Dec 13, 2024
@saikishor
Fix the spawner to support full wildcard parameter entries (#1933)
bd29641
christophfroehlich pushed a commit that referenced this pull request Dec 13, 2024
@mergify
Fix the spawner to support full wildcard parameter entries (backport #…
38a5600 
…1933) (#1939)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bijoua29 bijoua29 bijoua29 approved these changes

@christophfroehlich christophfroehlich christophfroehlich approved these changes

@ARK3r ARK3r Awaiting requested review from ARK3r

@DasRoteSkelett DasRoteSkelett Awaiting requested review from DasRoteSkelett

@destogl destogl Awaiting requested review from destogl

@mamueluth mamueluth Awaiting requested review from mamueluth

@peterdavidfagan peterdavidfagan Awaiting requested review from peterdavidfagan

@Raivias Raivias Awaiting requested review from Raivias

Assignees
No one assigned
Labels
backport-humble This label should be used by maintainers only! Label triggers PR backport to ROS2 humble.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Wildcard nodes in parameter file not supported by controller spawner
3 participants
@saikishor @christophfroehlich @bijoua29