From a139faad94601b1e77b4e3a36544f4a4a4edb048 Mon Sep 17 00:00:00 2001 From: Tony Najjar Date: Thu, 17 Aug 2023 17:59:39 +0200 Subject: [PATCH] Rename PushRosNamespace to PushROSNamespace (#3763) Signed-off-by: enricosutera --- nav2_bringup/launch/bringup_launch.py | 4 ++-- .../launch/collision_detector_node.launch.py | 6 +++--- .../launch/collision_monitor_node.launch.py | 6 +++--- nav2_system_tests/src/system/test_multi_robot_launch.py | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nav2_bringup/launch/bringup_launch.py b/nav2_bringup/launch/bringup_launch.py index 24668627c8..8af81ac28e 100644 --- a/nav2_bringup/launch/bringup_launch.py +++ b/nav2_bringup/launch/bringup_launch.py @@ -23,7 +23,7 @@ from launch.launch_description_sources import PythonLaunchDescriptionSource from launch.substitutions import LaunchConfiguration, PythonExpression from launch_ros.actions import Node -from launch_ros.actions import PushRosNamespace +from launch_ros.actions import PushROSNamespace from launch_ros.descriptions import ParameterFile from nav2_common.launch import RewrittenYaml @@ -113,7 +113,7 @@ def generate_launch_description(): # Specify the actions bringup_cmd_group = GroupAction([ - PushRosNamespace( + PushROSNamespace( condition=IfCondition(use_namespace), namespace=namespace), diff --git a/nav2_collision_monitor/launch/collision_detector_node.launch.py b/nav2_collision_monitor/launch/collision_detector_node.launch.py index ccd58c2e15..5440cfedc3 100644 --- a/nav2_collision_monitor/launch/collision_detector_node.launch.py +++ b/nav2_collision_monitor/launch/collision_detector_node.launch.py @@ -25,7 +25,7 @@ from launch.substitutions import NotEqualsSubstitution from launch_ros.actions import LoadComposableNodes, SetParameter from launch_ros.actions import Node -from launch_ros.actions import PushRosNamespace +from launch_ros.actions import PushROSNamespace from launch_ros.descriptions import ComposableNode from nav2_common.launch import RewrittenYaml @@ -84,7 +84,7 @@ def generate_launch_description(): condition=IfCondition(PythonExpression(['not ', use_composition])), actions=[ SetParameter('use_sim_time', use_sim_time), - PushRosNamespace( + PushROSNamespace( condition=IfCondition(NotEqualsSubstitution(LaunchConfiguration('namespace'), '')), namespace=namespace), Node( @@ -110,7 +110,7 @@ def generate_launch_description(): condition=IfCondition(use_composition), actions=[ SetParameter('use_sim_time', use_sim_time), - PushRosNamespace( + PushROSNamespace( condition=IfCondition(NotEqualsSubstitution(LaunchConfiguration('namespace'), '')), namespace=namespace), LoadComposableNodes( diff --git a/nav2_collision_monitor/launch/collision_monitor_node.launch.py b/nav2_collision_monitor/launch/collision_monitor_node.launch.py index 3d0006ac85..f4d0a953e3 100644 --- a/nav2_collision_monitor/launch/collision_monitor_node.launch.py +++ b/nav2_collision_monitor/launch/collision_monitor_node.launch.py @@ -25,7 +25,7 @@ from launch.substitutions import NotEqualsSubstitution from launch_ros.actions import LoadComposableNodes, SetParameter from launch_ros.actions import Node -from launch_ros.actions import PushRosNamespace +from launch_ros.actions import PushROSNamespace from launch_ros.descriptions import ComposableNode, ParameterFile from nav2_common.launch import RewrittenYaml @@ -86,7 +86,7 @@ def generate_launch_description(): condition=IfCondition(PythonExpression(['not ', use_composition])), actions=[ SetParameter('use_sim_time', use_sim_time), - PushRosNamespace( + PushROSNamespace( condition=IfCondition(NotEqualsSubstitution(LaunchConfiguration('namespace'), '')), namespace=namespace), Node( @@ -112,7 +112,7 @@ def generate_launch_description(): condition=IfCondition(use_composition), actions=[ SetParameter('use_sim_time', use_sim_time), - PushRosNamespace( + PushROSNamespace( condition=IfCondition(NotEqualsSubstitution(LaunchConfiguration('namespace'), '')), namespace=namespace), LoadComposableNodes( diff --git a/nav2_system_tests/src/system/test_multi_robot_launch.py b/nav2_system_tests/src/system/test_multi_robot_launch.py index d323f97567..ea7e00db93 100755 --- a/nav2_system_tests/src/system/test_multi_robot_launch.py +++ b/nav2_system_tests/src/system/test_multi_robot_launch.py @@ -24,7 +24,7 @@ IncludeLaunchDescription, SetEnvironmentVariable) from launch.launch_description_sources import PythonLaunchDescriptionSource from launch.substitutions import TextSubstitution -from launch_ros.actions import Node, PushRosNamespace +from launch_ros.actions import Node, PushROSNamespace from launch_testing.legacy import LaunchTestService @@ -95,7 +95,7 @@ def generate_launch_description(): group = GroupAction([ # Instances use the robot's name for namespace - PushRosNamespace(robot['name']), + PushROSNamespace(robot['name']), IncludeLaunchDescription( PythonLaunchDescriptionSource( os.path.join(bringup_dir, 'launch', 'bringup_launch.py')),