fix: Add PushRosNamespace action to multiple launch files for parameter namespacing

Signed-off-by: orebai <[email protected]>

Author: orebai

nav2_bringup/launch/bringup_launch.py

@@ -21,7 +21,7 @@
 from launch.conditions import IfCondition
 from launch.launch_description_sources import PythonLaunchDescriptionSource
 from launch.substitutions import LaunchConfiguration, PythonExpression
-from launch_ros.actions import Node, PushROSNamespace
+from launch_ros.actions import Node
 from launch_ros.descriptions import ParameterFile
 from nav2_common.launch import RewrittenYaml
 
@@ -150,10 +150,10 @@ def generate_launch_description() -> LaunchDescription:
     # Specify the actions
     bringup_cmd_group = GroupAction(
         [
-            PushROSNamespace(namespace),
             Node(
                 condition=IfCondition(use_composition),
                 name='nav2_container',
+                namespace=namespace,
                 package='rclcpp_components',
                 executable='component_container_isolated',
                 parameters=[configured_params, {'autostart': autostart}],

nav2_bringup/launch/keepout_zone_launch.py

@@ -19,7 +19,7 @@
 from launch.actions import DeclareLaunchArgument, GroupAction, SetEnvironmentVariable
 from launch.conditions import IfCondition
 from launch.substitutions import LaunchConfiguration, PythonExpression
-from launch_ros.actions import LoadComposableNodes, Node, SetParameter
+from launch_ros.actions import LoadComposableNodes, Node, PushRosNamespace, SetParameter
 from launch_ros.descriptions import ComposableNode, ParameterFile
 from nav2_common.launch import RewrittenYaml
 
@@ -116,6 +116,7 @@ def generate_launch_description() -> LaunchDescription:
     load_nodes = GroupAction(
         condition=IfCondition(PythonExpression(['not ', use_composition])),
         actions=[
+            PushRosNamespace(namespace),
             SetParameter('use_sim_time', use_sim_time),
             Node(
                 condition=IfCondition(use_keepout_zones),
@@ -159,6 +160,7 @@ def generate_launch_description() -> LaunchDescription:
     load_composable_nodes = GroupAction(
         condition=IfCondition(use_composition),
         actions=[
+            PushRosNamespace(namespace),
             SetParameter('use_sim_time', use_sim_time),
             LoadComposableNodes(
                 target_container=container_name_full,

nav2_bringup/launch/localization_launch.py

@@ -20,7 +20,7 @@
 from launch.conditions import IfCondition
 from launch.substitutions import (EqualsSubstitution, LaunchConfiguration, NotEqualsSubstitution,
                                   PythonExpression)
-from launch_ros.actions import LoadComposableNodes, Node, SetParameter
+from launch_ros.actions import LoadComposableNodes, Node, PushRosNamespace, SetParameter
 from launch_ros.descriptions import ComposableNode, ParameterFile
 from nav2_common.launch import RewrittenYaml
 
@@ -110,6 +110,7 @@ def generate_launch_description() -> LaunchDescription:
     load_nodes = GroupAction(
         condition=IfCondition(PythonExpression(['not ', use_composition])),
         actions=[
+            PushRosNamespace(namespace),
             SetParameter('use_sim_time', use_sim_time),
             Node(
                 condition=IfCondition(
@@ -168,6 +169,7 @@ def generate_launch_description() -> LaunchDescription:
     load_composable_nodes = GroupAction(
         condition=IfCondition(use_composition),
         actions=[
+            PushRosNamespace(namespace),
             SetParameter('use_sim_time', use_sim_time),
             LoadComposableNodes(
                 target_container=container_name_full,

nav2_bringup/launch/slam_launch.py

@@ -20,7 +20,7 @@
 from launch.conditions import IfCondition, UnlessCondition
 from launch.launch_description_sources import PythonLaunchDescriptionSource
 from launch.substitutions import LaunchConfiguration
-from launch_ros.actions import Node, SetParameter, SetRemap
+from launch_ros.actions import Node, PushRosNamespace, SetParameter, SetRemap
 from launch_ros.descriptions import ParameterFile
 from nav2_common.launch import HasNodeParams, RewrittenYaml
 
@@ -89,6 +89,7 @@ def generate_launch_description() -> LaunchDescription:
     # Nodes launching commands
     start_map_server = GroupAction(
         actions=[
+            PushRosNamespace(namespace),
             SetParameter('use_sim_time', use_sim_time),
             Node(
                 package='nav2_map_server',

nav2_bringup/launch/speed_zone_launch.py

@@ -19,7 +19,7 @@
 from launch.actions import DeclareLaunchArgument, GroupAction, SetEnvironmentVariable
 from launch.conditions import IfCondition
 from launch.substitutions import LaunchConfiguration, PythonExpression
-from launch_ros.actions import LoadComposableNodes, Node, SetParameter
+from launch_ros.actions import LoadComposableNodes, Node, PushRosNamespace, SetParameter
 from launch_ros.descriptions import ComposableNode, ParameterFile
 from nav2_common.launch import RewrittenYaml
 
@@ -116,6 +116,7 @@ def generate_launch_description() -> LaunchDescription:
     load_nodes = GroupAction(
         condition=IfCondition(PythonExpression(['not ', use_composition])),
         actions=[
+            PushRosNamespace(namespace),
             SetParameter('use_sim_time', use_sim_time),
             Node(
                 condition=IfCondition(use_speed_zones),
@@ -159,6 +160,7 @@ def generate_launch_description() -> LaunchDescription:
     load_composable_nodes = GroupAction(
         condition=IfCondition(use_composition),
         actions=[
+            PushRosNamespace(namespace),
             SetParameter('use_sim_time', use_sim_time),
             LoadComposableNodes(
                 target_container=container_name_full,