issue-695: correcting namespace to node_namespace

ros-controls · Dec 20, 2023 · a54bbd9 · a54bbd9
1 parent f069bdd
commit a54bbd9
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/controller_interface/include/controller_interface/controller_interface_base.hpp b/controller_interface/include/controller_interface/controller_interface_base.hpp
@@ -115,7 +115,7 @@ class ControllerInterfaceBase : public rclcpp_lifecycle::node_interfaces::Lifecy
   CONTROLLER_INTERFACE_PUBLIC
   virtual return_type init(
     const std::string & controller_name, const std::string & urdf, unsigned int cm_update_rate,
-    const std::string & namespace_ = "",
+    const std::string & node_namespace_ = "",
     const rclcpp::NodeOptions & node_options = rclcpp::NodeOptions().enable_logger_service(true));
 
   /// Custom configure method to read additional parameters for controller-nodes

diff --git a/controller_interface/src/controller_interface_base.cpp b/controller_interface/src/controller_interface_base.cpp
@@ -26,10 +26,10 @@ namespace controller_interface
 {
 return_type ControllerInterfaceBase::init(
   const std::string & controller_name, const std::string & urdf, unsigned int cm_update_rate,
-  const std::string & namespace_, const rclcpp::NodeOptions & node_options)
+  const std::string & node_namespace_, const rclcpp::NodeOptions & node_options)
 {
   node_ = std::make_shared<rclcpp_lifecycle::LifecycleNode>(
-    controller_name, namespace_, node_options, false);  // disable LifecycleNode service interfaces
+    controller_name, node_namespace_, node_options, false);  // disable LifecycleNode service interfaces
   urdf_ = urdf;
 
   try

diff --git a/controller_interface/test/test_controller_with_options.hpp b/controller_interface/test/test_controller_with_options.hpp
@@ -41,13 +41,13 @@ class ControllerWithOptions : public controller_interface::ControllerInterface
 
   controller_interface::return_type init(
     const std::string & controller_name, const std::string & urdf, unsigned int cm_update_rate,
-    const std::string & namespace_ = "",
+    const std::string & node_namespace_ = "",
     const rclcpp::NodeOptions & node_options =
       rclcpp::NodeOptions()
         .allow_undeclared_parameters(true)
         .automatically_declare_parameters_from_overrides(true)) override
   {
-    ControllerInterface::init(controller_name, urdf, cm_update_rate, namespace_, node_options);
+    ControllerInterface::init(controller_name, urdf, cm_update_rate, node_namespace_, node_options);
 
     switch (on_init())
     {

diff --git a/controller_manager/include/controller_manager/controller_manager.hpp b/controller_manager/include/controller_manager/controller_manager.hpp
@@ -71,14 +71,14 @@ class ControllerManager : public rclcpp::Node
     std::unique_ptr<hardware_interface::ResourceManager> resource_manager,
     std::shared_ptr<rclcpp::Executor> executor,
     const std::string & manager_node_name = "controller_manager",
-    const std::string & namespace_ = "",
+    const std::string & node_namespace_ = "",
     const rclcpp::NodeOptions & options = get_cm_node_options());
 
   CONTROLLER_MANAGER_PUBLIC
   ControllerManager(
     std::shared_ptr<rclcpp::Executor> executor,
     const std::string & manager_node_name = "controller_manager",
-    const std::string & namespace_ = "",
+    const std::string & node_namespace_ = "",
     const rclcpp::NodeOptions & options = get_cm_node_options());
 
   CONTROLLER_MANAGER_PUBLIC

diff --git a/controller_manager/src/controller_manager.cpp b/controller_manager/src/controller_manager.cpp
@@ -255,8 +255,8 @@ rclcpp::NodeOptions get_cm_node_options()
 
 ControllerManager::ControllerManager(
   std::shared_ptr<rclcpp::Executor> executor, const std::string & manager_node_name,
-  const std::string & namespace_, const rclcpp::NodeOptions & options)
-: rclcpp::Node(manager_node_name, namespace_, options),
+  const std::string & node_namespace_, const rclcpp::NodeOptions & options)
+: rclcpp::Node(manager_node_name, node_namespace_, options),
   resource_manager_(std::make_unique<hardware_interface::ResourceManager>(
     update_rate_, this->get_node_clock_interface())),
   diagnostics_updater_(this),
@@ -297,8 +297,8 @@ ControllerManager::ControllerManager(
 ControllerManager::ControllerManager(
   std::unique_ptr<hardware_interface::ResourceManager> resource_manager,
   std::shared_ptr<rclcpp::Executor> executor, const std::string & manager_node_name,
-  const std::string & namespace_, const rclcpp::NodeOptions & options)
-: rclcpp::Node(manager_node_name, namespace_, options),
+  const std::string & node_namespace_, const rclcpp::NodeOptions & options)
+: rclcpp::Node(manager_node_name, node_namespace_, options),
   resource_manager_(std::move(resource_manager)),
   diagnostics_updater_(this),
   executor_(executor),

diff --git a/controller_manager/test/test_controller_failed_init/test_controller_failed_init.cpp b/controller_manager/test/test_controller_failed_init/test_controller_failed_init.cpp
@@ -33,7 +33,7 @@ TestControllerFailedInit::on_init()
 
 controller_interface::return_type TestControllerFailedInit::init(
   const std::string & /* controller_name */, const std::string & /* urdf */,
-  unsigned int /*cm_update_rate*/, const std::string & /*namespace_*/,
+  unsigned int /*cm_update_rate*/, const std::string & /*node_namespace_*/,
   const rclcpp::NodeOptions & /*node_options*/)
 {
   return controller_interface::return_type::ERROR;

diff --git a/controller_manager/test/test_controller_failed_init/test_controller_failed_init.hpp b/controller_manager/test/test_controller_failed_init/test_controller_failed_init.hpp
@@ -41,7 +41,7 @@ class TestControllerFailedInit : public controller_interface::ControllerInterfac
   CONTROLLER_INTERFACE_PUBLIC
   controller_interface::return_type init(
     const std::string & controller_name, const std::string & urdf, unsigned int cm_update_rate,
-    const std::string & namespace_ = "",
+    const std::string & node_namespace_ = "",
     const rclcpp::NodeOptions & node_options =
       rclcpp::NodeOptions()
         .allow_undeclared_parameters(true)

diff --git a/controller_manager/test/test_controller_manager_hardware_error_handling.cpp b/controller_manager/test/test_controller_manager_hardware_error_handling.cpp
@@ -54,9 +54,9 @@ class TestableControllerManager : public controller_manager::ControllerManager
     std::unique_ptr<hardware_interface::ResourceManager> resource_manager,
     std::shared_ptr<rclcpp::Executor> executor,
     const std::string & manager_node_name = "controller_manager",
-    const std::string & namespace_ = "")
+    const std::string & node_namespace_ = "")
   : controller_manager::ControllerManager(
-      std::move(resource_manager), executor, manager_node_name, namespace_)
+      std::move(resource_manager), executor, manager_node_name, node_namespace_)
   {
   }
 };

diff --git a/controller_manager/test/test_controller_manager_urdf_passing.cpp b/controller_manager/test/test_controller_manager_urdf_passing.cpp
@@ -40,9 +40,9 @@ class TestableControllerManager : public controller_manager::ControllerManager
     std::unique_ptr<hardware_interface::ResourceManager> resource_manager,
     std::shared_ptr<rclcpp::Executor> executor,
     const std::string & manager_node_name = "controller_manager",
-    const std::string & namespace_ = "")
+    const std::string & node_namespace_ = "")
   : controller_manager::ControllerManager(
-      std::move(resource_manager), executor, manager_node_name, namespace_)
+      std::move(resource_manager), executor, manager_node_name, node_namespace_)
   {
   }
 };

diff --git a/controller_manager/test/test_controllers_chaining_with_controller_manager.cpp b/controller_manager/test/test_controllers_chaining_with_controller_manager.cpp
@@ -94,9 +94,9 @@ class TestableControllerManager : public controller_manager::ControllerManager
     std::unique_ptr<hardware_interface::ResourceManager> resource_manager,
     std::shared_ptr<rclcpp::Executor> executor,
     const std::string & manager_node_name = "controller_manager",
-    const std::string & namespace_ = "")
+    const std::string & node_namespace_ = "")
   : controller_manager::ControllerManager(
-      std::move(resource_manager), executor, manager_node_name, namespace_)
+      std::move(resource_manager), executor, manager_node_name, node_namespace_)
   {
   }
 };