refactor(json-schema): align schema and config file names (autowarefo…

…undation#5798) The schema files need to follow a NODE_NAME.schema.json naming convention and the configuration files need to follow a NODE_NAME*.param.yaml naming convention. It allows to have one schema file per node in a package. Rename files that didn't match this pattern. Signed-off-by: Ambroise Vincent <[email protected]>
Interplai · May 26, 2024 · d512ccd · d512ccd
1 parent 5145582
commit d512ccd
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/...dar_fusion_to_detected_object.schema.json → ...ect_fusion_to_detected_object.schema.json b/...dar_fusion_to_detected_object.schema.json → ...ect_fusion_to_detected_object.schema.json
@@ -3,7 +3,7 @@
   "title": "Parameters for Radar Fusion to Detected Object Node",
   "type": "object",
   "definitions": {
-    "radar_fusion_to_detected_object": {
+    "radar_object_fusion_to_detected_object": {
       "type": "object",
       "properties": {
         "node_params": {
@@ -104,7 +104,7 @@
       "type": "object",
       "properties": {
         "ros__parameters": {
-          "$ref": "#/definitions/radar_fusion_to_detected_object"
+          "$ref": "#/definitions/radar_object_fusion_to_detected_object"
         }
       },
       "required": ["ros__parameters"]

diff --git a/.../schema/mission_planner_nodes.schema.json → ...lanner/schema/mission_planner.schema.json b/.../schema/mission_planner_nodes.schema.json → ...lanner/schema/mission_planner.schema.json
@@ -3,7 +3,7 @@
   "title": "Parameters for Mission Planner nodes",
   "type": "object",
   "definitions": {
-    "mission_planner_nodes": {
+    "mission_planner": {
       "type": "object",
       "properties": {
         "map_frame": {
@@ -73,7 +73,7 @@
       "type": "object",
       "properties": {
         "ros__parameters": {
-          "$ref": "#/definitions/mission_planner_nodes"
+          "$ref": "#/definitions/mission_planner"
         }
       },
       "required": ["ros__parameters"]

diff --git a/system/autoware_auto_msgs_adapter/README.md b/system/autoware_auto_msgs_adapter/README.md
@@ -21,7 +21,7 @@ The `autoware_auto_msgs_adapter` package provides the following capabilities:
 
 ## Usage
 
-Customize the adapter configuration by replicating and editing the `adapter_control.param.yaml` file located
+Customize the adapter configuration by replicating and editing the `autoware_auto_msgs_adapter_control.param.yaml` file located
 in the `autoware_auto_msgs_adapter/config` directory. Example configuration:
 
 ```yaml
@@ -90,7 +90,7 @@ To add a new message pair,
 - Add a new entry to the [schema/autoware_auto_msgs_adapter.schema.json](schema/autoware_auto_msgs_adapter.schema.json) file in the `definitions:autoware_auto_msgs_adapter:properties:msg_type_target:enum` section.
   - Learn more about JSON schema usage in [here](https://autowarefoundation.github.io/autoware-documentation/main/contributing/coding-guidelines/ros-nodes/parameters/#json-schema).
 - Create a new config file by replicating and editing:
-  - [adapter_control.param.yaml](config/adapter_control.param.yaml)
+  - [autoware_auto_msgs_adapter_control.param.yaml](config/autoware_auto_msgs_adapter_control.param.yaml)
 - Add a new test file by replicating and editing:
   - [test_msg_ackermann_control_command.cpp](test/test_msg_ackermann_control_command.cpp)
   - No need to edit the `CMakeLists.txt` file as it will automatically detect the new test file.

diff --git a/...adapter/config/adapter_control.param.yaml → ...ware_auto_msgs_adapter_control.param.yaml b/...adapter/config/adapter_control.param.yaml → ...ware_auto_msgs_adapter_control.param.yaml
diff --git a/...sgs_adapter/config/adapter_map.param.yaml → ...autoware_auto_msgs_adapter_map.param.yaml b/...sgs_adapter/config/adapter_map.param.yaml → ...autoware_auto_msgs_adapter_map.param.yaml
diff --git a/...pter/config/adapter_perception.param.yaml → ...e_auto_msgs_adapter_perception.param.yaml b/...pter/config/adapter_perception.param.yaml → ...e_auto_msgs_adapter_perception.param.yaml
diff --git a/...dapter/config/adapter_planning.param.yaml → ...are_auto_msgs_adapter_planning.param.yaml b/...dapter/config/adapter_planning.param.yaml → ...are_auto_msgs_adapter_planning.param.yaml
diff --git a/system/autoware_auto_msgs_adapter/launch/autoware_auto_msgs_adapter.launch.xml b/system/autoware_auto_msgs_adapter/launch/autoware_auto_msgs_adapter.launch.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <launch>
-  <arg name="control_param_path" default="$(find-pkg-share autoware_auto_msgs_adapter)/config/adapter_control.param.yaml"/>
-  <arg name="map_param_path" default="$(find-pkg-share autoware_auto_msgs_adapter)/config/adapter_map.param.yaml"/>
-  <arg name="perception_param_path" default="$(find-pkg-share autoware_auto_msgs_adapter)/config/adapter_perception.param.yaml"/>
-  <arg name="planning_param_path" default="$(find-pkg-share autoware_auto_msgs_adapter)/config/adapter_planning.param.yaml"/>
+  <arg name="control_param_path" default="$(find-pkg-share autoware_auto_msgs_adapter)/config/autoware_auto_msgs_adapter_control.param.yaml"/>
+  <arg name="map_param_path" default="$(find-pkg-share autoware_auto_msgs_adapter)/config/autoware_auto_msgs_adapter_map.param.yaml"/>
+  <arg name="perception_param_path" default="$(find-pkg-share autoware_auto_msgs_adapter)/config/autoware_auto_msgs_adapter_perception.param.yaml"/>
+  <arg name="planning_param_path" default="$(find-pkg-share autoware_auto_msgs_adapter)/config/autoware_auto_msgs_adapter_planning.param.yaml"/>
 
   <node pkg="autoware_auto_msgs_adapter" exec="autoware_auto_msgs_adapter_exe" name="autoware_auto_msgs_adapter_control" output="screen">
     <param from="$(var control_param_path)"/>