ros2 · clalancette · Mar 9, 2023 · Nov 4, 2022
diff --git a/composition/README.md b/composition/README.md
@@ -54,7 +54,7 @@ ros2 run composition linktime_composition
 Rather than using the command line tool to run each composition, we can **automate this action** with `ros2 launch` functionality:
 
 ```bash
-ros2 launch composition composition_demo.launch.py
+ros2 launch composition composition_demo_launch.py
 ```
 
 ## Verify

diff --git a/...osition/launch/composition_demo.launch.py → ...osition/launch/composition_demo_launch.py b/...osition/launch/composition_demo.launch.py → ...osition/launch/composition_demo_launch.py
diff --git a/...nch/services/add_two_ints_async.launch.py → ...nch/services/add_two_ints_async_launch.py b/...nch/services/add_two_ints_async.launch.py → ...nch/services/add_two_ints_async_launch.py
diff --git a/...ch/services/add_two_ints_async.launch.xml → ...ch/services/add_two_ints_async_launch.xml b/...ch/services/add_two_ints_async.launch.xml → ...ch/services/add_two_ints_async_launch.xml
diff --git a/...pp/launch/services/add_two_ints.launch.py → ...pp/launch/services/add_two_ints_launch.py b/...pp/launch/services/add_two_ints.launch.py → ...pp/launch/services/add_two_ints_launch.py
diff --git a/...p/launch/services/add_two_ints.launch.xml → ...p/launch/services/add_two_ints_launch.xml b/...p/launch/services/add_two_ints.launch.xml → ...p/launch/services/add_two_ints_launch.xml
diff --git a/...ch/services/introspect_services.launch.py → ...ch/services/introspect_services_launch.py b/...ch/services/introspect_services.launch.py → ...ch/services/introspect_services_launch.py
diff --git a/...ics/talker_listener_best_effort.launch.py → ...ics/talker_listener_best_effort_launch.py b/...ics/talker_listener_best_effort.launch.py → ...ics/talker_listener_best_effort_launch.py
diff --git a/...cs/talker_listener_best_effort.launch.xml → ...cs/talker_listener_best_effort_launch.xml b/...cs/talker_listener_best_effort.launch.xml → ...cs/talker_listener_best_effort_launch.xml
diff --git a/...p/launch/topics/talker_listener.launch.py → ...p/launch/topics/talker_listener_launch.py b/...p/launch/topics/talker_listener.launch.py → ...p/launch/topics/talker_listener_launch.py
diff --git a/.../launch/topics/talker_listener.launch.xml → .../launch/topics/talker_listener_launch.xml b/.../launch/topics/talker_listener.launch.xml → .../launch/topics/talker_listener_launch.xml
diff --git a/demo_nodes_cpp/src/services/introspection_client.cpp b/demo_nodes_cpp/src/services/introspection_client.cpp
@@ -46,7 +46,7 @@
 //
 // To see this in action, run the following:
 //
-// ros2 launch demo_nodes_cpp introspect_services.launch.py
+// ros2 launch demo_nodes_cpp introspect_services_launch.py
 //   Since the default for introspection is 'off', this is no different than
 //   a normal client and server.  No additional topics will be made, and
 //   no introspection data will be sent.  However, changing the introspection

diff --git a/demo_nodes_cpp/src/services/introspection_service.cpp b/demo_nodes_cpp/src/services/introspection_service.cpp
@@ -43,7 +43,7 @@
 //
 // To see this in action, run the following:
 //
-// ros2 launch demo_nodes_cpp introspect_services.launch.py
+// ros2 launch demo_nodes_cpp introspect_services_launch.py
 //   Since the default for introspection is 'off', this is no different than
 //   a normal client and server.  No additional topics will be made, and
 //   no introspection data will be sent.  However, changing the introspection

diff --git a/...ngup/launch/dummy_robot_bringup.launch.py → ...ngup/launch/dummy_robot_bringup_launch.py b/...ngup/launch/dummy_robot_bringup.launch.py → ...ngup/launch/dummy_robot_bringup_launch.py
diff --git a/lifecycle/README.rst b/lifecycle/README.rst
@@ -97,7 +97,7 @@ Alternatively, these three programs can be run together in the same terminal usi
 
 .. code-block:: bash
 
-   ros2 launch lifecycle lifecycle_demo.launch.py
+   ros2 launch lifecycle lifecycle_demo_launch.py
 
 If we look at the output of the ``lifecycle_talker``\ , we notice that nothing seems to happen.
 This makes sense, since every node starts as ``unconfigured``.

diff --git a/lifecycle/launch/lifecycle_demo.launch.py → lifecycle/launch/lifecycle_demo_launch.py b/lifecycle/launch/lifecycle_demo.launch.py → lifecycle/launch/lifecycle_demo_launch.py
diff --git a/lifecycle_py/launch/lifecycle_demo.launch.py → lifecycle_py/launch/lifecycle_demo_launch.py b/lifecycle_py/launch/lifecycle_demo.launch.py → lifecycle_py/launch/lifecycle_demo_launch.py
diff --git a/lifecycle_py/setup.py b/lifecycle_py/setup.py
@@ -15,7 +15,7 @@
             ['resource/' + package_name]),
         ('share/' + package_name, ['package.xml']),
         ('share/lifecycle_py/launch',
-            glob.glob(os.path.join('launch', '*.launch.py'))),
+            glob.glob(os.path.join('launch', '*_launch.py'))),
     ],
     install_requires=['setuptools'],
     zip_safe=True,

diff --git a/topic_monitor/README.md b/topic_monitor/README.md
@@ -19,7 +19,7 @@ ros2 run topic_monitor topic_monitor --display
 ### Comparing reliability QoS settings
 You will need two machines with ROS 2: one mobile and one stationary.
 
-1. Run the `ros2 launch topic_monitor reliability_demo.launch.py` executable on the stationary machine.
+1. Run the `ros2 launch topic_monitor reliability_demo_launch.py` executable on the stationary machine.
 This will start two nodes: one publishing in “reliable” mode, and one in “best effort”.
 1. Start the monitor on a mobile machine such as a laptop.
 Use `ros2 run topic_monitor topic_monitor --display --allowed-latency 5` to account for any latency that may occur re-sending the reliable messages.
@@ -54,7 +54,7 @@ If the 10th latest message has not been successfully acknowledged by the time th
 
 You will need two machines with ROS 2: one mobile and one stationary.
 
-1. Run the `ros2 launch topic_monitor depth_demo.launch.py` executable on the stationary machine.
+1. Run the `ros2 launch topic_monitor depth_demo_launch.py` executable on the stationary machine.
 This will start some nodes publishing both small (payload of 1-character string) and large data (payload of 100,000-character string) with different depths: a pair publishing with a depth of 1, and a pair with a larger depth (50).
 1. Start the monitor on a mobile machine such as a laptop with `ros2 run topic_monitor topic_monitor --display`.
 1. Take the mobile machine out of range of the monitor, and observe how the reception rates differ for the different topics.
@@ -74,7 +74,7 @@ You will need two machines running ROS 2: one stationary and one mobile.
 You should not use the Fast RTPS ROS middleware implementation for this part.
 See [DDS and ROS Middleware Implementations](https://docs.ros.org/en/rolling/Concepts/About-Different-Middleware-Vendors.html) for instructions on how to change the vendor.
 
-1. Run the `ros2 launch topic_monitor fragmentation_demo.launch.py` executable on the stationary machine.
+1. Run the `ros2 launch topic_monitor fragmentation_demo_launch.py` executable on the stationary machine.
 1. Run `ros2 run topic_monitor topic_monitor --display --expected-period 4` on the mobile machine.
 This will launch four publishers publishing messages of strings of different lengths: small (1), medium (50000), large (100000) and xlarge (150000).
 1. Take the mobile machine out of range of the monitor, and observe how the reception rates differ for the different topics.

diff --git a/topic_monitor/launch/depth_demo.launch.py → topic_monitor/launch/depth_demo_launch.py b/topic_monitor/launch/depth_demo.launch.py → topic_monitor/launch/depth_demo_launch.py
diff --git a/...nitor/launch/fragmentation_demo.launch.py → ...nitor/launch/fragmentation_demo_launch.py b/...nitor/launch/fragmentation_demo.launch.py → ...nitor/launch/fragmentation_demo_launch.py
diff --git a/...monitor/launch/reliability_demo.launch.py → ...monitor/launch/reliability_demo_launch.py b/...monitor/launch/reliability_demo.launch.py → ...monitor/launch/reliability_demo_launch.py
diff --git a/topic_monitor/setup.py b/topic_monitor/setup.py
@@ -15,7 +15,7 @@
             ['resource/' + package_name]),
         ('share/' + package_name, ['package.xml']),
         ('share/topic_monitor/launch',
-            glob.glob(os.path.join('launch', '*.launch.py'))),
+            glob.glob(os.path.join('launch', '*_launch.py'))),
     ],
     install_requires=[
         'launch',