From 0336c7367e5e91950d018d5aa7598000ad8bd4ec Mon Sep 17 00:00:00 2001 From: Hu Yueh-Wei Date: Mon, 23 Dec 2024 11:47:22 +0800 Subject: [PATCH] feat!: do not need to specify extension_group in graph connections (#452) --- .vscode/launch.json | 2 +- .../addons/test_data_embed/app_property.json | 2 - .../src/designer/graphs/connections.rs | 11 ------ .../graphs/test_data_embed/app_property.json | 2 - .../app_property.json | 5 --- .../update_graph_success/input_data.json | 2 - .../test_data_embed/app_property.json | 5 --- .../dump_property_success_input_data.json | 2 - .../predefined_graphs/connection.rs | 2 - .../start_graph.json | 4 +- .../property.json | 4 -- .../property.json | 4 +- .../cmd_check_single_app/start_graph.json | 2 - .../start_graph.json | 2 - ...check_unique_extension_in_connections.json | 4 -- .../start_graph.json | 2 - .../start_graph.json | 8 ++-- .../property.json | 2 - .../property.json | 2 - .../extension/extension_info/extension_info.c | 9 ++--- .../extension/extension_info/value.c | 33 ++-------------- .../src/json_schema/data/property.schema.json | 18 ++------- core/src/ten_rust/src/json_schema/mod.rs | 7 ---- .../graph/check/connections_are_compatible.rs | 10 ++++- .../check/connections_nodes_are_defined.rs | 25 ++++-------- .../extension_uniqueness_in_connections.rs | 11 ++---- core/src/ten_rust/src/pkg_info/graph/mod.rs | 2 - ...duplicated_cmd_name_in_one_connection.json | 8 +--- .../graph_message_conversion_fixed_value.json | 2 - ...es_same_name_in_different_type_are_ok.json | 5 +-- ...tension_in_two_section_of_connections.json | 6 +-- ...h_app_in_connections_not_all_declared.json | 4 +- ...pp_in_connections_should_not_declared.json | 4 +- ...ed_graph_app_in_dest_not_all_declared.json | 4 +- ...graph_app_in_dest_should_not_declared.json | 4 +- ...d_graph_app_in_nodes_not_all_declared.json | 4 +- ...efined_graph_connection_app_localhost.json | 2 - ...fined_graph_connection_dest_not_found.json | 6 +-- ...efined_graph_connection_src_not_found.json | 6 +-- .../predefined_graph_node_app_localhost.json | 2 - .../dump_property_with_msg_conversion.json | 2 - .../property/test_data_embed/property.json | 2 - .../property.json | 5 --- .../property.json | 2 - .../graph_check_single_app/graph.json | 3 -- .../graph.json | 3 -- docs/ten_framework/api/interface.md | 39 +++++++++++++------ docs/ten_framework/graph.md | 30 -------------- docs/ten_framework/ten_manager/check_graph.md | 23 ----------- docs/ten_framework/ten_manager/designer.md | 3 -- .../how_to_build_extension_in_c++_beta.md | 2 - .../default_extension_cpp/src/main.cc | 14 +------ .../ffmpeg_basic_app_source/property.json | 10 ----- .../ffmpeg_bypass_app_source/property.json | 12 ------ .../restful_app_source/property.json | 2 - .../large_result_source/property.json | 2 - .../cpp/multi_apps/app_1_source/property.json | 2 - .../cpp/multi_apps/client/client.cc | 2 - .../expired_ten_go_app/property.json | 2 - .../frequently_cgo_call_go_app/property.json | 2 - .../handle_error_go_app/property.json | 2 - .../prepare_to_stop_go_app/property.json | 7 ---- .../return_result_go_app/property.json | 2 - .../return_value_go_app/property.json | 2 - .../three_extension_cmd_go/client/client.cc | 4 -- .../transfer_pointer_go_app/property.json | 2 - .../client/client.cc | 2 - .../aio_http_server_python_app/property.json | 2 - .../property.json | 4 -- .../async_io_basic_python_app/property.json | 4 -- .../property.json | 4 -- .../cpp_app_python_app_source/property.json | 4 -- .../get_set_prop_python_app/property.json | 4 -- .../property.json | 5 --- .../go_app_cythonize_app/property.json | 5 --- .../property.json | 5 --- .../go_app_python_app/property.json | 5 --- .../large_json_python_app/property.json | 4 -- .../multi_process_python_app/property.json | 4 -- .../property.json | 4 -- .../property.json | 5 --- .../property.json | 5 --- .../no_dest_async_python_app/property.json | 4 -- .../no_dest_python_app/property.json | 4 -- .../property.json | 4 -- .../property.json | 6 --- .../send_cmd_python_app/property.json | 4 -- .../property.json | 4 -- .../send_data_python_app/property.json | 8 ---- .../send_recv_image_python_app/property.json | 7 ---- .../send_recv_pcm_python_app/property.json | 6 --- .../property.json | 6 --- .../two_async_exts_python_app/property.json | 6 --- .../unused_addon_python_app/property.json | 2 - .../smoke/audio_frame_test/basic.cc | 4 -- .../audio_frame_test/create_from_json.cc | 4 -- .../smoke/audio_frame_test/from_json.cc | 4 -- .../audio_frame_test/multi_dest_pcm_frame.cc | 3 -- .../basic/basic_extensions_init_dependency.cc | 4 -- tests/ten_runtime/smoke/basic/basic_loop.cc | 4 -- .../ten_runtime/smoke/basic/basic_loop_cmd.cc | 4 -- .../smoke/basic/basic_loop_cmd_snap_shot.cc | 4 -- .../basic/basic_msg_property_to_prop_store.cc | 2 - .../smoke/basic/basic_multi_app.cc | 2 - .../basic_multi_app_close_through_engine.cc | 2 - .../smoke/basic/basic_multi_extension.cc | 2 - .../basic/basic_multi_extension_group.cc | 2 - .../basic_throw_exception_in_extension.cc | 6 --- .../smoke/basic/basic_two_extensions.cc | 2 - .../cmd_conversion_connect_cmd.cc | 2 - .../cmd_conversion/cmd_conversion_data.cc | 2 - .../cmd_conversion/cmd_conversion_graph.cc | 2 - .../cmd_conversion_graph_default_uri.cc | 5 --- .../cmd_conversion/cmd_conversion_path.cc | 2 - .../cmd_conversion_path_array_1.cc | 2 - .../cmd_conversion_path_array_2.cc | 2 - .../cmd_conversion_path_array_3.cc | 2 - .../cmd_conversion_path_array_4.cc | 2 - .../cmd_conversion_path_array_5.cc | 2 - .../cmd_conversion_path_array_6.cc | 2 - .../cmd_conversion_path_array_7.cc | 2 - .../cmd_conversion_path_keep_original.cc | 2 - .../cmd_conversion_path_nested_1.cc | 2 - .../cmd_conversion_path_nested_2.cc | 2 - .../cmd_conversion_path_nested_3.cc | 2 - .../cmd_conversion_path_nested_4.cc | 2 - .../cmd_conversion_path_nested_5.cc | 2 - .../cmd_conversion_path_nested_6.cc | 2 - .../cmd_result_test/multiple_result_1.cc | 2 - .../cmd_result_test/multiple_result_2.cc | 3 -- .../cmd_result_test/multiple_result_3.cc | 3 -- .../smoke/command/command_check_cmd_out.cc | 2 - .../smoke/command/command_send_enum.cc | 2 - .../smoke/command/command_send_ptr.cc | 2 - .../command/command_send_ptr_through_cmd.cc | 2 - .../command/command_stop_graph_actively.cc | 6 --- ...command_stop_graph_actively_through_cmd.cc | 6 --- ...nd_stop_graph_actively_through_cmd_dest.cc | 6 --- .../smoke/concurrent/multi_app_concurrent.cc | 2 - .../smoke/concurrent/multi_app_sequential.cc | 2 - .../smoke/concurrent/one_engine_concurrent.cc | 2 - tests/ten_runtime/smoke/data_test/basic_2.cc | 4 -- .../smoke/data_test/create_from_json.cc | 4 -- .../ten_runtime/smoke/data_test/from_json.cc | 4 -- .../smoke/data_test/multi_dest_data.cc | 3 -- .../smoke/dest/no_audio_frame_dest.cc | 4 -- .../smoke/engine/engine_long_running_mode.cc | 2 - .../error/failed_to_connect_to_remote.cc | 2 - ...sion_group_with_same_name_and_topo_info.cc | 2 - .../smoke/graph/graph_lack_something_1.cc | 2 - .../smoke/graph/graph_lack_something_2.cc | 2 - .../smoke/graph/graph_lack_something_3.cc | 2 - .../smoke/graph/graph_loop_in_multi_app.cc | 8 ---- .../smoke/graph/graph_loop_in_one_app.cc | 4 -- .../smoke/graph/graph_loop_multiple_circle.cc | 8 ---- .../graph_loop_multiple_circle_through_cmd.cc | 8 ---- ...ultiple_circle_through_cmd_with_default.cc | 8 ---- .../smoke/graph/graph_multiple_polygon.cc | 7 ---- .../graph/graph_multiple_polygon_one_app.cc | 17 -------- .../graph_polygon_in_one_app_return_all_1.cc | 7 ---- .../graph_polygon_in_one_app_return_all_2.cc | 7 ---- .../smoke/graph/graph_y_shape_in_multi_app.cc | 2 - .../smoke/graph/graph_y_shape_in_one_app.cc | 1 - .../smoke/graph_name/graph_name_basic.cc | 2 - .../graph_test/group_node_missing_2_apps.cc | 1 - .../http_server_extension_close_app.cc | 2 - .../http_server_extension_two_extensions.cc | 2 - .../interface_out_cmd_in_schema.cc | 1 - .../interface_out_cmd_not_in_schema.cc | 1 - .../interface_out_result_error.cc | 1 - tests/ten_runtime/smoke/lock/lock_data_1.cc | 2 - .../msg_property_send_c_string.cc | 2 - .../msg_property/msg_property_send_cpp_ptr.cc | 2 - .../msg_property_send_cpp_string.cc | 2 - .../msg_property_send_float_ptr.cc | 2 - .../msg_property/msg_property_send_int.cc | 2 - .../msg_property_send_int32_ptr.cc | 2 - tests/ten_runtime/smoke/msg_test/msg_10.cc | 2 - tests/ten_runtime/smoke/msg_test/msg_12.cc | 2 - tests/ten_runtime/smoke/msg_test/msg_13.cc | 2 - tests/ten_runtime/smoke/msg_test/msg_8.cc | 2 - tests/ten_runtime/smoke/msg_test/msg_9.cc | 2 - .../smoke/multi_dest/multi_dest_basic.cc | 3 -- .../multi_dest/multi_dest_in_multi_app.cc | 15 ------- ...dest_in_multi_app_with_response_handler.cc | 15 ------- ..._multi_app_with_response_handler_lambda.cc | 15 ------- .../smoke/multi_dest/multi_dest_in_one_app.cc | 1 - .../multi_dest/multi_dest_resp_when_all.cc | 3 -- .../multi_dest_resp_when_all_in_multi_app.cc | 1 - .../multi_dest_send_in_stop_period.cc | 3 -- .../smoke/multi_dest/multi_dest_y_topo.cc | 5 --- .../128_threads_attempt_to_suspend_1.cc | 5 --- .../16_threads_attempt_to_suspend_1.cc | 3 -- .../2_threads_attempt_to_suspend_1.cc | 3 -- .../2_threads_attempt_to_suspend_2.cc | 3 -- .../2_threads_attempt_to_suspend_3.cc | 3 -- .../2_threads_attempt_to_suspend_4.cc | 3 -- .../2_threads_attempt_to_suspend_5.cc | 3 -- .../2_threads_attempt_to_suspend_6.cc | 3 -- .../2_threads_attempt_to_suspend_7.cc | 3 -- .../32_threads_attempt_to_suspend_1.cc | 3 -- .../32_threads_attempt_to_suspend_2.cc | 3 -- .../32_threads_attempt_to_suspend_3.cc | 3 -- .../32_threads_attempt_to_suspend_4.cc | 3 -- .../32_threads_attempt_to_suspend_5.cc | 5 --- .../32_threads_attempt_to_suspend_6.cc | 5 --- .../outer_thread/auto_free_out_of_scope.cc | 3 -- .../outer_thread/outer_thread_send_data.cc | 3 -- .../outer_thread_send_data_resp_handler.cc | 3 -- .../smoke/path/clean_when_stopped.cc | 3 -- tests/ten_runtime/smoke/path/path_timeout.cc | 3 -- .../ten_runtime/smoke/path/path_timeout_2.cc | 3 -- .../predefined_graph_multi_app.cc | 2 - .../predefined_graph_multi_extension_1.cc | 2 - .../predefined_graph_multi_extension_2.cc | 2 - .../predefined_graph_multi_extension_3.cc | 2 - .../predefined_graph_multi_extension_4.cc | 4 -- .../smoke/prepare_to_stop/different_thread.cc | 3 -- .../smoke/prepare_to_stop/same_thread.cc | 3 -- .../property_2_extensions_set_object.cc | 2 - .../resp_handler/resp_handler_async_basic.cc | 6 --- .../smoke/resp_handler/resp_handler_basic.cc | 6 --- .../resp_handler_basic_wait_in_on_start.cc | 6 --- .../result_conversion/result_conversion_1.cc | 2 - tests/ten_runtime/smoke/return/return_1.cc | 3 -- tests/ten_runtime/smoke/return/return_2.cc | 3 -- tests/ten_runtime/smoke/return/return_3.cc | 3 -- tests/ten_runtime/smoke/return/return_4.cc | 3 -- .../same_thread_ext_on_data.cc | 3 -- .../same_thread_ext_on_xxx_basic.cc | 2 - .../schema_cmd_property_required.cc | 2 - .../smoke/schema_test/schema_cmd_result.cc | 2 - .../schema_test/schema_cmd_result_error.cc | 2 - .../smoke/schema_test/schema_data_prop.cc | 1 - .../smoke/schema_test/schema_on_cmd.cc | 2 - .../smoke/schema_test/schema_send_cmd.cc | 2 - .../schema_test/schema_set_property_buf.cc | 2 - .../schema_test/schema_set_property_ptr.cc | 2 - .../smoke/send/not_specify_dest.cc | 2 - .../smoke/standalone_test/basic_graph.cc | 6 --- .../standalone_test/basic_graph_cross_app.cc | 8 +--- .../basic_graph_outer_thread_1.cc | 6 --- .../basic_graph_outer_thread_2.cc | 6 --- .../start_predefined_graph_cross_app.cc | 2 - .../start_two_predefined_graphs.cc | 4 -- .../smoke/suspend_resume/suspend_resume_1.cc | 3 -- .../smoke/suspend_resume/suspend_resume_2.cc | 3 -- .../smoke/video_frame_test/basic.cc | 4 -- .../video_frame_test/create_from_json.cc | 4 -- .../smoke/video_frame_test/from_json.cc | 4 -- .../multi_dest_video_frame.cc | 3 -- 251 files changed, 76 insertions(+), 1000 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index b269a96f13..d45d566b83 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -137,7 +137,7 @@ "request": "launch", "program": "${workspaceFolder}/out/linux/x64/tests/standalone/ten_runtime_smoke_test", "args": [ - "--gtest_filter=SendTest.NotSpecifyDest" + "--gtest_filter=ExtensionTest.PredefinedGraphMultiExtension1" ], "cwd": "${workspaceFolder}/out/linux/x64/tests/standalone/", "env": { diff --git a/core/src/ten_manager/src/designer/addons/test_data_embed/app_property.json b/core/src/ten_manager/src/designer/addons/test_data_embed/app_property.json index 58194f17e6..7649daa954 100644 --- a/core/src/ten_manager/src/designer/addons/test_data_embed/app_property.json +++ b/core/src/ten_manager/src/designer/addons/test_data_embed/app_property.json @@ -29,14 +29,12 @@ ], "connections": [ { - "extension_group": "extension_group_1", "extension": "extension_1", "cmd": [ { "name": "hello_world", "dest": [ { - "extension_group": "extension_group_1", "extension": "extension_2" } ] diff --git a/core/src/ten_manager/src/designer/graphs/connections.rs b/core/src/ten_manager/src/designer/graphs/connections.rs index dde1a915cf..d2e5aba412 100644 --- a/core/src/ten_manager/src/designer/graphs/connections.rs +++ b/core/src/ten_manager/src/designer/graphs/connections.rs @@ -23,7 +23,6 @@ use crate::designer::DesignerState; #[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] pub struct DesignerConnection { pub app: String, - pub extension_group: String, pub extension: String, #[serde(skip_serializing_if = "Option::is_none")] @@ -43,7 +42,6 @@ impl From for DesignerConnection { fn from(conn: GraphConnection) -> Self { DesignerConnection { app: conn.get_app_uri().to_string(), - extension_group: conn.extension_group, extension: conn.extension, cmd: conn.cmd.map(get_designer_msg_flow_from_property), @@ -89,7 +87,6 @@ fn get_designer_msg_flow_from_property( #[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] pub struct DesignerDestination { pub app: String, - pub extension_group: String, pub extension: String, #[serde(skip_serializing_if = "Option::is_none")] @@ -100,7 +97,6 @@ impl From for DesignerDestination { fn from(destination: GraphDestination) -> Self { DesignerDestination { app: destination.get_app_uri().to_string(), - extension_group: destination.extension_group, extension: destination.extension, msg_conversion: destination.msg_conversion, } @@ -240,13 +236,11 @@ mod tests { let expected_connections = vec![DesignerConnection { app: localhost(), - extension_group: "extension_group_1".to_string(), extension: "extension_1".to_string(), cmd: Some(vec![DesignerMessageFlow { name: "hello_world".to_string(), dest: vec![DesignerDestination { app: localhost(), - extension_group: "extension_group_1".to_string(), extension: "extension_2".to_string(), msg_conversion: None, }], @@ -322,13 +316,11 @@ mod tests { let expected_connections = vec![DesignerConnection { app: localhost(), - extension_group: "extension_group_1".to_string(), extension: "extension_1".to_string(), cmd: Some(vec![DesignerMessageFlow { name: "hello_world".to_string(), dest: vec![DesignerDestination { app: localhost(), - extension_group: "extension_group_1".to_string(), extension: "extension_2".to_string(), msg_conversion: None, }], @@ -337,7 +329,6 @@ mod tests { name: "data".to_string(), dest: vec![DesignerDestination { app: localhost(), - extension_group: "extension_group_1".to_string(), extension: "extension_2".to_string(), msg_conversion: None, }], @@ -346,7 +337,6 @@ mod tests { name: "pcm".to_string(), dest: vec![DesignerDestination { app: localhost(), - extension_group: "extension_group_1".to_string(), extension: "extension_2".to_string(), msg_conversion: None, }], @@ -355,7 +345,6 @@ mod tests { name: "image".to_string(), dest: vec![DesignerDestination { app: localhost(), - extension_group: "extension_group_1".to_string(), extension: "extension_2".to_string(), msg_conversion: None, }], diff --git a/core/src/ten_manager/src/designer/graphs/test_data_embed/app_property.json b/core/src/ten_manager/src/designer/graphs/test_data_embed/app_property.json index 58194f17e6..7649daa954 100644 --- a/core/src/ten_manager/src/designer/graphs/test_data_embed/app_property.json +++ b/core/src/ten_manager/src/designer/graphs/test_data_embed/app_property.json @@ -29,14 +29,12 @@ ], "connections": [ { - "extension_group": "extension_group_1", "extension": "extension_1", "cmd": [ { "name": "hello_world", "dest": [ { - "extension_group": "extension_group_1", "extension": "extension_2" } ] diff --git a/core/src/ten_manager/src/designer/graphs/test_data_embed/get_connections_have_all_data_type/app_property.json b/core/src/ten_manager/src/designer/graphs/test_data_embed/get_connections_have_all_data_type/app_property.json index 2776154199..1265262276 100644 --- a/core/src/ten_manager/src/designer/graphs/test_data_embed/get_connections_have_all_data_type/app_property.json +++ b/core/src/ten_manager/src/designer/graphs/test_data_embed/get_connections_have_all_data_type/app_property.json @@ -20,14 +20,12 @@ ], "connections": [ { - "extension_group": "extension_group_1", "extension": "extension_1", "cmd": [ { "name": "hello_world", "dest": [ { - "extension_group": "extension_group_1", "extension": "extension_2" } ] @@ -38,7 +36,6 @@ "name": "data", "dest": [ { - "extension_group": "extension_group_1", "extension": "extension_2" } ] @@ -49,7 +46,6 @@ "name": "pcm", "dest": [ { - "extension_group": "extension_group_1", "extension": "extension_2" } ] @@ -60,7 +56,6 @@ "name": "image", "dest": [ { - "extension_group": "extension_group_1", "extension": "extension_2" } ] diff --git a/core/src/ten_manager/src/designer/graphs/test_data_embed/update_graph_success/input_data.json b/core/src/ten_manager/src/designer/graphs/test_data_embed/update_graph_success/input_data.json index 083610d362..69bdc6cfb1 100644 --- a/core/src/ten_manager/src/designer/graphs/test_data_embed/update_graph_success/input_data.json +++ b/core/src/ten_manager/src/designer/graphs/test_data_embed/update_graph_success/input_data.json @@ -20,7 +20,6 @@ "connections": [ { "app": "localhost", - "extension_group": "extension_group_1", "extension": "extension_1", "cmd": [ { @@ -28,7 +27,6 @@ "dest": [ { "app": "localhost", - "extension_group": "extension_group_1", "extension": "extension_2" } ] diff --git a/core/src/ten_manager/src/designer/property/test_data_embed/app_property.json b/core/src/ten_manager/src/designer/property/test_data_embed/app_property.json index 2776154199..1265262276 100644 --- a/core/src/ten_manager/src/designer/property/test_data_embed/app_property.json +++ b/core/src/ten_manager/src/designer/property/test_data_embed/app_property.json @@ -20,14 +20,12 @@ ], "connections": [ { - "extension_group": "extension_group_1", "extension": "extension_1", "cmd": [ { "name": "hello_world", "dest": [ { - "extension_group": "extension_group_1", "extension": "extension_2" } ] @@ -38,7 +36,6 @@ "name": "data", "dest": [ { - "extension_group": "extension_group_1", "extension": "extension_2" } ] @@ -49,7 +46,6 @@ "name": "pcm", "dest": [ { - "extension_group": "extension_group_1", "extension": "extension_2" } ] @@ -60,7 +56,6 @@ "name": "image", "dest": [ { - "extension_group": "extension_group_1", "extension": "extension_2" } ] diff --git a/core/src/ten_manager/src/designer/property/test_data_embed/dump_property_success_input_data.json b/core/src/ten_manager/src/designer/property/test_data_embed/dump_property_success_input_data.json index 083610d362..69bdc6cfb1 100644 --- a/core/src/ten_manager/src/designer/property/test_data_embed/dump_property_success_input_data.json +++ b/core/src/ten_manager/src/designer/property/test_data_embed/dump_property_success_input_data.json @@ -20,7 +20,6 @@ "connections": [ { "app": "localhost", - "extension_group": "extension_group_1", "extension": "extension_1", "cmd": [ { @@ -28,7 +27,6 @@ "dest": [ { "app": "localhost", - "extension_group": "extension_group_1", "extension": "extension_2" } ] diff --git a/core/src/ten_manager/src/package_info/predefined_graphs/connection.rs b/core/src/ten_manager/src/package_info/predefined_graphs/connection.rs index 4950ff85f7..18a274dfe3 100644 --- a/core/src/ten_manager/src/package_info/predefined_graphs/connection.rs +++ b/core/src/ten_manager/src/package_info/predefined_graphs/connection.rs @@ -16,7 +16,6 @@ impl From for GraphConnection { fn from(designer_connection: DesignerConnection) -> Self { GraphConnection { app: Some(designer_connection.app), - extension_group: designer_connection.extension_group, extension: designer_connection.extension, cmd: designer_connection @@ -58,7 +57,6 @@ impl From for GraphDestination { fn from(designer_destination: DesignerDestination) -> Self { GraphDestination { app: Some(designer_destination.app), - extension_group: designer_destination.extension_group, extension: designer_destination.extension, msg_conversion: designer_destination.msg_conversion, } diff --git a/core/src/ten_manager/tests/test_data/cmd_check_multi_apps_node_cannot_be_localhost/start_graph.json b/core/src/ten_manager/tests/test_data/cmd_check_multi_apps_node_cannot_be_localhost/start_graph.json index ed66b62152..38b782c9da 100644 --- a/core/src/ten_manager/tests/test_data/cmd_check_multi_apps_node_cannot_be_localhost/start_graph.json +++ b/core/src/ten_manager/tests/test_data/cmd_check_multi_apps_node_cannot_be_localhost/start_graph.json @@ -18,15 +18,13 @@ ], "connections": [ { - "extension_group": "some_group", - "extension": "ext_a", "app": "http://localhost:8000", + "extension": "ext_a", "cmd": [ { "name": "cmd_1", "dest": [ { - "extension_group": "some_group", "extension": "ext_b" } ] diff --git a/core/src/ten_manager/tests/test_data/cmd_check_predefined_graph_only_check_specified/property.json b/core/src/ten_manager/tests/test_data/cmd_check_predefined_graph_only_check_specified/property.json index 804c93d103..4634e7ee72 100644 --- a/core/src/ten_manager/tests/test_data/cmd_check_predefined_graph_only_check_specified/property.json +++ b/core/src/ten_manager/tests/test_data/cmd_check_predefined_graph_only_check_specified/property.json @@ -20,14 +20,12 @@ ], "connections": [ { - "extension_group": "some_group", "extension": "ext_a", "cmd": [ { "name": "cmd_1", "dest": [ { - "extension_group": "some_group", "extension": "ext_b" } ] @@ -55,14 +53,12 @@ ], "connections": [ { - "extension_group": "some_group", "extension": "ext_a", "cmd": [ { "name": "cmd_1", "dest": [ { - "extension_group": "some_group", "extension": "ext_c" } ] diff --git a/core/src/ten_manager/tests/test_data/cmd_check_predefined_graph_success/property.json b/core/src/ten_manager/tests/test_data/cmd_check_predefined_graph_success/property.json index 31f6bdd67a..b0733048c3 100644 --- a/core/src/ten_manager/tests/test_data/cmd_check_predefined_graph_success/property.json +++ b/core/src/ten_manager/tests/test_data/cmd_check_predefined_graph_success/property.json @@ -20,14 +20,12 @@ ], "connections": [ { - "extension_group": "some_group", "extension": "ext_a", "cmd": [ { "name": "cmd_1", "dest": [ { - "extension_group": "some_group", "extension": "ext_b" } ] @@ -38,4 +36,4 @@ } ] } -} +} \ No newline at end of file diff --git a/core/src/ten_manager/tests/test_data/cmd_check_single_app/start_graph.json b/core/src/ten_manager/tests/test_data/cmd_check_single_app/start_graph.json index ff418182f3..ebdbd261e5 100644 --- a/core/src/ten_manager/tests/test_data/cmd_check_single_app/start_graph.json +++ b/core/src/ten_manager/tests/test_data/cmd_check_single_app/start_graph.json @@ -16,14 +16,12 @@ ], "connections": [ { - "extension_group": "some_group", "extension": "ext_a", "cmd": [ { "name": "cmd_1", "dest": [ { - "extension_group": "some_group", "extension": "ext_b" } ] diff --git a/core/src/ten_manager/tests/test_data/cmd_check_single_app_node_cannot_be_localhost/start_graph.json b/core/src/ten_manager/tests/test_data/cmd_check_single_app_node_cannot_be_localhost/start_graph.json index cd32b7a8f7..f13ccbd479 100644 --- a/core/src/ten_manager/tests/test_data/cmd_check_single_app_node_cannot_be_localhost/start_graph.json +++ b/core/src/ten_manager/tests/test_data/cmd_check_single_app_node_cannot_be_localhost/start_graph.json @@ -18,14 +18,12 @@ ], "connections": [ { - "extension_group": "some_group", "extension": "ext_a", "cmd": [ { "name": "cmd_1", "dest": [ { - "extension_group": "some_group", "extension": "ext_b" } ] diff --git a/core/src/ten_manager/tests/test_data/cmd_check_start_graph_cmd/cmd_check_unique_extension_in_connections.json b/core/src/ten_manager/tests/test_data/cmd_check_start_graph_cmd/cmd_check_unique_extension_in_connections.json index 9808c171f5..77286d85a9 100644 --- a/core/src/ten_manager/tests/test_data/cmd_check_start_graph_cmd/cmd_check_unique_extension_in_connections.json +++ b/core/src/ten_manager/tests/test_data/cmd_check_start_graph_cmd/cmd_check_unique_extension_in_connections.json @@ -16,13 +16,11 @@ "connections": [ { "extension": "some_extension", - "extension_group": "some_group", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "another_ext" } ] @@ -31,13 +29,11 @@ }, { "extension": "some_extension", - "extension_group": "some_group", "cmd": [ { "name": "hello_2", "dest": [ { - "extension_group": "some_group", "extension": "another_ext" } ] diff --git a/core/src/ten_manager/tests/test_data/cmd_check_start_graph_cmd/start_graph.json b/core/src/ten_manager/tests/test_data/cmd_check_start_graph_cmd/start_graph.json index ff418182f3..ebdbd261e5 100644 --- a/core/src/ten_manager/tests/test_data/cmd_check_start_graph_cmd/start_graph.json +++ b/core/src/ten_manager/tests/test_data/cmd_check_start_graph_cmd/start_graph.json @@ -16,14 +16,12 @@ ], "connections": [ { - "extension_group": "some_group", "extension": "ext_a", "cmd": [ { "name": "cmd_1", "dest": [ { - "extension_group": "some_group", "extension": "ext_b" } ] diff --git a/core/src/ten_manager/tests/test_data/cmd_check_start_graph_multi_apps/start_graph.json b/core/src/ten_manager/tests/test_data/cmd_check_start_graph_multi_apps/start_graph.json index 30675119ca..8c27b29f5d 100644 --- a/core/src/ten_manager/tests/test_data/cmd_check_start_graph_multi_apps/start_graph.json +++ b/core/src/ten_manager/tests/test_data/cmd_check_start_graph_multi_apps/start_graph.json @@ -19,17 +19,15 @@ ], "connections": [ { - "extension_group": "some_group", - "extension": "ext_a", "app": "http://localhost:8001", + "extension": "ext_a", "cmd": [ { "name": "cmd_1", "dest": [ { - "extension_group": "some_group", - "extension": "ext_b", - "app": "http://localhost:8002" + "app": "http://localhost:8002", + "extension": "ext_b" } ] } diff --git a/core/src/ten_manager/tests/test_data/cmd_designer_connections_has_msg_conversion/property.json b/core/src/ten_manager/tests/test_data/cmd_designer_connections_has_msg_conversion/property.json index 020f70376c..264d4542dc 100644 --- a/core/src/ten_manager/tests/test_data/cmd_designer_connections_has_msg_conversion/property.json +++ b/core/src/ten_manager/tests/test_data/cmd_designer_connections_has_msg_conversion/property.json @@ -20,14 +20,12 @@ ], "connections": [ { - "extension_group": "some_group", "extension": "ext_a", "cmd": [ { "name": "cmd_1", "dest": [ { - "extension_group": "some_group", "extension": "ext_b", "msg_conversion": { "type": "per_property", diff --git a/core/src/ten_manager/tests/test_data/cmd_designer_graphs_some_property_invalid/property.json b/core/src/ten_manager/tests/test_data/cmd_designer_graphs_some_property_invalid/property.json index b40219aa55..564471b9ba 100644 --- a/core/src/ten_manager/tests/test_data/cmd_designer_graphs_some_property_invalid/property.json +++ b/core/src/ten_manager/tests/test_data/cmd_designer_graphs_some_property_invalid/property.json @@ -21,14 +21,12 @@ ], "connections": [ { - "extension_group": "some_group", "extension": "ext_a", "cmd": [ { "name": "cmd_1", "dest": [ { - "extension_group": "some_group", "extension": "ext_b" } ] diff --git a/core/src/ten_runtime/extension/extension_info/extension_info.c b/core/src/ten_runtime/extension/extension_info/extension_info.c index 953df40381..f6d95a8c67 100644 --- a/core/src/ten_runtime/extension/extension_info/extension_info.c +++ b/core/src/ten_runtime/extension/extension_info/extension_info.c @@ -70,9 +70,9 @@ bool ten_extension_info_is_desired_extension_group( static bool ten_extension_info_is_specified_extension( ten_extension_info_t *self, const char *app_uri, const char *graph_id, const char *extension_group_name, const char *extension_name) { - TEN_ASSERT(self && ten_extension_info_check_integrity(self, true) && - extension_group_name && extension_name, - "Should not happen."); + TEN_ASSERT( + self && ten_extension_info_check_integrity(self, true) && extension_name, + "Should not happen."); if (app_uri && !ten_string_is_equal_c_str(&self->loc.app_uri, app_uri)) { return false; @@ -141,8 +141,7 @@ ten_shared_ptr_t *get_extension_info_in_extensions_info( ten_list_t *extensions_info, const char *app_uri, const char *graph_id, const char *extension_group_name, const char *extension_addon_name, const char *extension_instance_name, bool should_exist, ten_error_t *err) { - TEN_ASSERT(extensions_info && extension_group_name && extension_instance_name, - "Should not happen."); + TEN_ASSERT(extensions_info && extension_instance_name, "Should not happen."); if (!should_exist) { TEN_ASSERT( diff --git a/core/src/ten_runtime/extension/extension_info/value.c b/core/src/ten_runtime/extension/extension_info/value.c index 6a5436378b..5b81541fe1 100644 --- a/core/src/ten_runtime/extension/extension_info/value.c +++ b/core/src/ten_runtime/extension/extension_info/value.c @@ -129,19 +129,6 @@ ten_shared_ptr_t *ten_extension_info_parse_connection_src_part_from_value( const char *app_uri = ten_value_object_peek_string(value, TEN_STR_APP); const char *graph_id = ten_value_object_peek_string(value, TEN_STR_GRAPH); - const char *extension_group_name = - ten_value_object_peek_string(value, TEN_STR_EXTENSION_GROUP); - if (!extension_group_name || ten_c_string_is_empty(extension_group_name)) { - if (err) { - ten_error_set(err, TEN_ERRNO_INVALID_GRAPH, - "The extension_group in connection is required."); - } else { - TEN_ASSERT(0, "The extension_group in connection is required."); - } - - return NULL; - } - const char *extension_name = ten_value_object_peek_string(value, TEN_STR_EXTENSION); if (!extension_name || ten_c_string_is_empty(extension_name)) { @@ -156,8 +143,8 @@ ten_shared_ptr_t *ten_extension_info_parse_connection_src_part_from_value( } ten_shared_ptr_t *self = get_extension_info_in_extensions_info( - extensions_info, app_uri, graph_id, extension_group_name, NULL, - extension_name, true, err); + extensions_info, app_uri, graph_id, NULL, NULL, extension_name, true, + err); if (!self) { return NULL; } @@ -231,18 +218,6 @@ ten_shared_ptr_t *ten_extension_info_parse_connection_dest_part_from_value( const char *app_uri = ten_value_object_peek_string(value, TEN_STR_APP); const char *graph_id = ten_value_object_peek_string(value, TEN_STR_GRAPH); - const char *extension_group_name = - ten_value_object_peek_string(value, TEN_STR_EXTENSION_GROUP); - if (!extension_group_name || ten_c_string_is_empty(extension_group_name)) { - if (err) { - ten_error_set(err, TEN_ERRNO_INVALID_GRAPH, - "The extension_group in connection is required."); - } else { - TEN_ASSERT(0, "The extension_group in connection is required."); - } - return NULL; - } - const char *extension_name = ten_value_object_peek_string(value, TEN_STR_EXTENSION); if (!extension_name || ten_c_string_is_empty(extension_name)) { @@ -256,8 +231,8 @@ ten_shared_ptr_t *ten_extension_info_parse_connection_dest_part_from_value( } ten_shared_ptr_t *self = get_extension_info_in_extensions_info( - extensions_info, app_uri, graph_id, extension_group_name, NULL, - extension_name, true, err); + extensions_info, app_uri, graph_id, NULL, NULL, extension_name, true, + err); if (!self) { return NULL; } diff --git a/core/src/ten_rust/src/json_schema/data/property.schema.json b/core/src/ten_rust/src/json_schema/data/property.schema.json index c5dacb2f88..62b77c05e6 100644 --- a/core/src/ten_rust/src/json_schema/data/property.schema.json +++ b/core/src/ten_rust/src/json_schema/data/property.schema.json @@ -63,18 +63,14 @@ "type": "object", "additionalProperties": false, "required": [ - "extension_group", "extension" ], "properties": { "app": { "$ref": "#/$defs/notEmptyString" }, - "extension_group": { - "$ref": "#/$defs/notEmptyString" - }, "extension": { - "$ref": "#/$defs/notEmptyString" + "$ref": "#/$defs/alphanumericCharacters" }, "msg_conversion": { "type": "object", @@ -140,18 +136,14 @@ "type": "object", "additionalProperties": false, "required": [ - "extension_group", "extension" ], "properties": { "app": { "$ref": "#/$defs/notEmptyString" }, - "extension_group": { - "$ref": "#/$defs/notEmptyString" - }, "extension": { - "$ref": "#/$defs/notEmptyString" + "$ref": "#/$defs/alphanumericCharacters" }, "msg_conversion": { "$ref": "#/$defs/msgConversion" @@ -222,18 +214,14 @@ "type": "object", "additionalProperties": false, "required": [ - "extension_group", "extension" ], "properties": { "app": { "$ref": "#/$defs/notEmptyString" }, - "extension_group": { - "$ref": "#/$defs/notEmptyString" - }, "extension": { - "$ref": "#/$defs/notEmptyString" + "$ref": "#/$defs/alphanumericCharacters" }, "cmd": { "$ref": "#/$defs/extensionCmdsInGraph" diff --git a/core/src/ten_rust/src/json_schema/mod.rs b/core/src/ten_rust/src/json_schema/mod.rs index b2bbcb03eb..a5e253f291 100644 --- a/core/src/ten_rust/src/json_schema/mod.rs +++ b/core/src/ten_rust/src/json_schema/mod.rs @@ -223,14 +223,12 @@ mod tests { }], "connections": [ { - "extension_group": "default_extension_group", "extension": "default_extension_cpp", "cmd": [ { "name": "", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_cpp" } ] @@ -267,7 +265,6 @@ mod tests { }], "connections": [ { - "extension_group":"default_extension_group", "extension": "default_extension_cpp", "cmd": [ { @@ -952,13 +949,11 @@ mod tests { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "result_mapping_1__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "result_mapping_1__extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", @@ -1008,14 +1003,12 @@ mod tests { }], "connections": [ { - "extension_group": "default_extension_group", "extension": "default_extension_cpp", "cmd": [ { "name": "invalid command", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_cpp" } ] diff --git a/core/src/ten_rust/src/pkg_info/graph/check/connections_are_compatible.rs b/core/src/ten_rust/src/pkg_info/graph/check/connections_are_compatible.rs index 486feb8ee5..be1194f7d7 100644 --- a/core/src/ten_rust/src/pkg_info/graph/check/connections_are_compatible.rs +++ b/core/src/ten_rust/src/pkg_info/graph/check/connections_are_compatible.rs @@ -71,7 +71,10 @@ impl Graph { if let Err(e) = are_ten_schemas_compatible(src_msg_schema, dest_msg_schema) { - errors.push(format!("Schema incompatible to [extension_group: {}, extension: {}], {}", dest.extension_group, dest.extension, e)); + errors.push(format!( + "Schema incompatible to [extension: {}], {}", + dest.extension, e + )); } } @@ -120,7 +123,10 @@ impl Graph { if let Err(e) = are_cmd_schemas_compatible(src_cmd_schema, dest_cmd_schema) { - errors.push(format!("Schema incompatible to [extension_group: {}, extension: {}], {}", dest.extension_group, dest.extension, e)); + errors.push(format!( + "Schema incompatible to [extension: {}], {}", + dest.extension, e + )); } } diff --git a/core/src/ten_rust/src/pkg_info/graph/check/connections_nodes_are_defined.rs b/core/src/ten_rust/src/pkg_info/graph/check/connections_nodes_are_defined.rs index 96f6d2df2e..a7d6b29fa2 100644 --- a/core/src/ten_rust/src/pkg_info/graph/check/connections_nodes_are_defined.rs +++ b/core/src/ten_rust/src/pkg_info/graph/check/connections_nodes_are_defined.rs @@ -20,20 +20,15 @@ impl Graph { ) -> Result<()> { for (flow_idx, flow) in flows.iter().enumerate() { for dest in &flow.dest { - let dest_extension = format!( - "{}:{}:{}", - dest.get_app_uri(), - dest.extension_group, - dest.extension - ); + let dest_extension = + format!("{}:{}", dest.get_app_uri(), dest.extension); if !all_extensions.contains(&dest_extension) { return Err(anyhow::anyhow!( - "The extension declared in connections[{}].{}[{}] is not defined in nodes, extension_group: {}, extension: {}.", + "The extension declared in connections[{}].{}[{}] is not defined in nodes, extension: {}.", conn_idx, msg_type, flow_idx, - dest.extension_group, dest.extension )); } @@ -53,12 +48,8 @@ impl Graph { let mut all_extensions: Vec = Vec::new(); for node in &self.nodes { if node.node_type == PkgType::Extension { - let unique_ext_name = format!( - "{}:{}:{}", - node.get_app_uri(), - node.extension_group.as_ref().unwrap(), - node.name - ); + let unique_ext_name = + format!("{}:{}", node.get_app_uri(), node.name); all_extensions.push(unique_ext_name); } } @@ -66,16 +57,14 @@ impl Graph { let connections = self.connections.as_ref().unwrap(); for (conn_idx, connection) in connections.iter().enumerate() { let src_extension = format!( - "{}:{}:{}", + "{}:{}", connection.get_app_uri(), - connection.extension_group, connection.extension ); if !all_extensions.contains(&src_extension) { return Err(anyhow::anyhow!( - "The extension declared in connections[{}] is not defined in nodes, extension_group: {}, extension: {}.", + "The extension declared in connections[{}] is not defined in nodes, extension: {}.", conn_idx, - connection.extension_group, connection.extension )); } diff --git a/core/src/ten_rust/src/pkg_info/graph/check/extension_uniqueness_in_connections.rs b/core/src/ten_rust/src/pkg_info/graph/check/extension_uniqueness_in_connections.rs index 4fdffa47a2..6957e0c914 100644 --- a/core/src/ten_rust/src/pkg_info/graph/check/extension_uniqueness_in_connections.rs +++ b/core/src/ten_rust/src/pkg_info/graph/check/extension_uniqueness_in_connections.rs @@ -16,14 +16,12 @@ impl Graph { // "connections": [ // { // "extension": "some_ext", - // "extension_group": "some_group", // "cmd": [ // { // "name": "some_cmd", // "dest": [ // { - // "extension": "ext_2", - // "extension_group": "group_2" + // "extension": "ext_2" // } // ] // } @@ -31,14 +29,12 @@ impl Graph { // }, // { // "extension": "some_ext", - // "extension_group": "some_group", // "cmd": [ // { // "name": "another_cmd", // "dest": [ // { - // "extension": "ext_3", - // "extension_group": "group_3" + // "extension": "ext_3" // } // ] // } @@ -53,9 +49,8 @@ impl Graph { self.connections.as_ref().unwrap().iter().enumerate() { let extension = format!( - "{}:{}:{}", + "{}:{}", connection.get_app_uri(), - connection.extension_group, connection.extension ); diff --git a/core/src/ten_rust/src/pkg_info/graph/mod.rs b/core/src/ten_rust/src/pkg_info/graph/mod.rs index 5446f94b84..1a1374c7a0 100644 --- a/core/src/ten_rust/src/pkg_info/graph/mod.rs +++ b/core/src/ten_rust/src/pkg_info/graph/mod.rs @@ -275,7 +275,6 @@ pub struct GraphConnection { #[serde(skip_serializing_if = "is_app_default_loc_or_none")] pub app: Option, - pub extension_group: String, pub extension: String, #[serde(skip_serializing_if = "Option::is_none")] @@ -393,7 +392,6 @@ pub struct GraphDestination { #[serde(skip_serializing_if = "is_app_default_loc_or_none")] pub app: Option, - pub extension_group: String, pub extension: String, #[serde(skip_serializing_if = "Option::is_none")] diff --git a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/graph_duplicated_cmd_name_in_one_connection.json b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/graph_duplicated_cmd_name_in_one_connection.json index f0e9a4553c..6fd4e186d1 100644 --- a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/graph_duplicated_cmd_name_in_one_connection.json +++ b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/graph_duplicated_cmd_name_in_one_connection.json @@ -22,13 +22,11 @@ "connections": [ { "extension": "some_extension", - "extension_group": "some_group", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "another_ext" } ] @@ -37,7 +35,6 @@ "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "third_ext" } ] @@ -46,17 +43,14 @@ }, { "extension": "another_ext", - "extension_group": "some_group", "data": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "third_ext" }, { - "extension_group": "some_group", "extension": "some_extension" } ] @@ -64,4 +58,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/graph_message_conversion_fixed_value.json b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/graph_message_conversion_fixed_value.json index 058e8def43..d7f2cb1728 100644 --- a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/graph_message_conversion_fixed_value.json +++ b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/graph_message_conversion_fixed_value.json @@ -17,14 +17,12 @@ ], "connections": [ { - "extension_group": "test_extension_group", "extension": "ext_1", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "test_extension_group", "extension": "ext_2", "msg_conversion": { "type": "per_property", diff --git a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/graph_messages_same_name_in_different_type_are_ok.json b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/graph_messages_same_name_in_different_type_are_ok.json index 9e6a28de94..f4ad6208d7 100644 --- a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/graph_messages_same_name_in_different_type_are_ok.json +++ b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/graph_messages_same_name_in_different_type_are_ok.json @@ -22,13 +22,11 @@ "connections": [ { "extension": "some_extension", - "extension_group": "some_group", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "another_ext" } ] @@ -39,7 +37,6 @@ "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "third_ext" } ] @@ -47,4 +44,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/graph_same_extension_in_two_section_of_connections.json b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/graph_same_extension_in_two_section_of_connections.json index 2b87b255ba..94d90225a6 100644 --- a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/graph_same_extension_in_two_section_of_connections.json +++ b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/graph_same_extension_in_two_section_of_connections.json @@ -16,13 +16,11 @@ "connections": [ { "extension": "some_extension", - "extension_group": "some_group", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "another_ext" } ] @@ -31,13 +29,11 @@ }, { "extension": "some_extension", - "extension_group": "some_group", "cmd": [ { "name": "hello_2", "dest": [ { - "extension_group": "some_group", "extension": "another_ext" } ] @@ -45,4 +41,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_connections_not_all_declared.json b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_connections_not_all_declared.json index 57f899670e..8941f3456c 100644 --- a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_connections_not_all_declared.json +++ b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_connections_not_all_declared.json @@ -23,13 +23,11 @@ "connections": [ { "extension": "some_extension", - "extension_group": "some_group", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "some_extension_2" } ] @@ -40,4 +38,4 @@ } ] } -} +} \ No newline at end of file diff --git a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_connections_should_not_declared.json b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_connections_should_not_declared.json index 6726c4cb26..12819d383a 100644 --- a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_connections_should_not_declared.json +++ b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_connections_should_not_declared.json @@ -21,14 +21,12 @@ "connections": [ { "extension": "some_extension", - "extension_group": "some_group", "app": "http://localhost:8080", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "some_extension_2" } ] @@ -39,4 +37,4 @@ } ] } -} +} \ No newline at end of file diff --git a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_dest_not_all_declared.json b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_dest_not_all_declared.json index 94824aa482..dc18b65743 100644 --- a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_dest_not_all_declared.json +++ b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_dest_not_all_declared.json @@ -23,14 +23,12 @@ "connections": [ { "extension": "some_extension", - "extension_group": "some_group", "app": "http://localhost:8080", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "some_extension_2" } ] @@ -41,4 +39,4 @@ } ] } -} +} \ No newline at end of file diff --git a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_dest_should_not_declared.json b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_dest_should_not_declared.json index 281a6efc86..325c4e1e41 100644 --- a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_dest_should_not_declared.json +++ b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_dest_should_not_declared.json @@ -21,14 +21,12 @@ "connections": [ { "extension": "some_extension", - "extension_group": "some_group", "cmd": [ { "name": "hello", "dest": [ { "app": "http://localhost:8080", - "extension_group": "some_group", "extension": "some_extension_2" } ] @@ -39,4 +37,4 @@ } ] } -} +} \ No newline at end of file diff --git a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_nodes_not_all_declared.json b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_nodes_not_all_declared.json index 4cdcafa250..8a43533cbf 100644 --- a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_nodes_not_all_declared.json +++ b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_app_in_nodes_not_all_declared.json @@ -22,13 +22,11 @@ "connections": [ { "extension": "some_extension", - "extension_group": "producer", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "some_extension" } ] @@ -39,4 +37,4 @@ } ] } -} +} \ No newline at end of file diff --git a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_connection_app_localhost.json b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_connection_app_localhost.json index 1f078415c7..1c9911b083 100644 --- a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_connection_app_localhost.json +++ b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_connection_app_localhost.json @@ -15,13 +15,11 @@ "connections": [ { "extension": "some_extension", - "extension_group": "producer", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "some_extension", "app": "localhost" } diff --git a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_connection_dest_not_found.json b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_connection_dest_not_found.json index ad65bf5d63..463eb3ea60 100644 --- a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_connection_dest_not_found.json +++ b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_connection_dest_not_found.json @@ -21,13 +21,11 @@ "connections": [ { "extension": "some_extension", - "extension_group": "some_group", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "some_extension_1" } ] @@ -36,11 +34,9 @@ "name": "world", "dest": [ { - "extension_group": "some_group", "extension": "some_extension_1" }, { - "extension_group": "some_group", "extension": "consumer" } ] @@ -51,4 +47,4 @@ } ] } -} +} \ No newline at end of file diff --git a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_connection_src_not_found.json b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_connection_src_not_found.json index a80eb46216..4a49165504 100644 --- a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_connection_src_not_found.json +++ b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_connection_src_not_found.json @@ -14,14 +14,12 @@ ], "connections": [ { - "extension": "some_extension", - "extension_group": "producer", + "extension": "some_extension_1", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "some_extension" } ] @@ -32,4 +30,4 @@ } ] } -} +} \ No newline at end of file diff --git a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_node_app_localhost.json b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_node_app_localhost.json index 1989aa790a..153ba0604a 100644 --- a/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_node_app_localhost.json +++ b/core/src/ten_rust/src/pkg_info/graph/test_data_embed/predefined_graph_node_app_localhost.json @@ -16,13 +16,11 @@ "connections": [ { "extension": "some_extension", - "extension_group": "producer", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "some_extension" } ] diff --git a/core/src/ten_rust/src/pkg_info/property/test_data_embed/dump_property_with_msg_conversion.json b/core/src/ten_rust/src/pkg_info/property/test_data_embed/dump_property_with_msg_conversion.json index 00bd80a697..cf049d9f50 100644 --- a/core/src/ten_rust/src/pkg_info/property/test_data_embed/dump_property_with_msg_conversion.json +++ b/core/src/ten_rust/src/pkg_info/property/test_data_embed/dump_property_with_msg_conversion.json @@ -26,7 +26,6 @@ "connections": [ { "app": "msgpack://127.0.0.1:8001/", - "extension_group": "result_mapping_1__extension_group", "extension": "test_extension_1", "cmd": [ { @@ -34,7 +33,6 @@ "dest": [ { "app": "msgpack://127.0.0.1:8001/", - "extension_group": "result_mapping_1__extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/core/src/ten_rust/src/pkg_info/property/test_data_embed/property.json b/core/src/ten_rust/src/pkg_info/property/test_data_embed/property.json index 94c8f45d7c..2ecfb79b8b 100644 --- a/core/src/ten_rust/src/pkg_info/property/test_data_embed/property.json +++ b/core/src/ten_rust/src/pkg_info/property/test_data_embed/property.json @@ -20,14 +20,12 @@ ], "connections": [ { - "extension_group": "ext_group", "extension": "ext1", "cmd": [ { "name": "hello_world", "dest": [ { - "extension_group": "ext_group", "extension": "ext2" } ] diff --git a/core/src/ten_rust/tests/test_data/graph_check_all_msgs_schema_incompatible/property.json b/core/src/ten_rust/tests/test_data/graph_check_all_msgs_schema_incompatible/property.json index ee72edcfd8..4d7a32f074 100644 --- a/core/src/ten_rust/tests/test_data/graph_check_all_msgs_schema_incompatible/property.json +++ b/core/src/ten_rust/tests/test_data/graph_check_all_msgs_schema_incompatible/property.json @@ -20,14 +20,12 @@ ], "connections": [ { - "extension_group": "some_group", "extension": "ext_1", "cmd": [ { "name": "cmd_1", "dest": [ { - "extension_group": "some_group", "extension": "ext_2" } ] @@ -38,7 +36,6 @@ "name": "data_1", "dest": [ { - "extension_group": "some_group", "extension": "ext_2" } ] @@ -49,7 +46,6 @@ "name": "audio_frame_1", "dest": [ { - "extension_group": "some_group", "extension": "ext_2" } ] @@ -60,7 +56,6 @@ "name": "video_frame_1", "dest": [ { - "extension_group": "some_group", "extension": "ext_2" } ] diff --git a/core/src/ten_rust/tests/test_data/graph_check_predefined_graph_success/property.json b/core/src/ten_rust/tests/test_data/graph_check_predefined_graph_success/property.json index daa011291d..e4dfe16e7c 100644 --- a/core/src/ten_rust/tests/test_data/graph_check_predefined_graph_success/property.json +++ b/core/src/ten_rust/tests/test_data/graph_check_predefined_graph_success/property.json @@ -20,14 +20,12 @@ ], "connections": [ { - "extension_group": "some_group", "extension": "ext_a", "cmd": [ { "name": "cmd_1", "dest": [ { - "extension_group": "some_group", "extension": "ext_b" } ] diff --git a/core/src/ten_rust/tests/test_data/graph_check_single_app/graph.json b/core/src/ten_rust/tests/test_data/graph_check_single_app/graph.json index 63746a303e..12d93f4617 100644 --- a/core/src/ten_rust/tests/test_data/graph_check_single_app/graph.json +++ b/core/src/ten_rust/tests/test_data/graph_check_single_app/graph.json @@ -24,7 +24,6 @@ ], "connections": [ { - "extension_group": "some_group", "extension": "ext_a", "app": "http://localhost:8001", "cmd": [ @@ -32,12 +31,10 @@ "name": "cmd_1", "dest": [ { - "extension_group": "some_group", "extension": "ext_b", "app": "http://localhost:8001" }, { - "extension_group": "some_group", "extension": "ext_c", "app": "http://localhost:8002" } diff --git a/core/src/ten_rust/tests/test_data/graph_check_single_app_schema_incompatible/graph.json b/core/src/ten_rust/tests/test_data/graph_check_single_app_schema_incompatible/graph.json index 63746a303e..12d93f4617 100644 --- a/core/src/ten_rust/tests/test_data/graph_check_single_app_schema_incompatible/graph.json +++ b/core/src/ten_rust/tests/test_data/graph_check_single_app_schema_incompatible/graph.json @@ -24,7 +24,6 @@ ], "connections": [ { - "extension_group": "some_group", "extension": "ext_a", "app": "http://localhost:8001", "cmd": [ @@ -32,12 +31,10 @@ "name": "cmd_1", "dest": [ { - "extension_group": "some_group", "extension": "ext_b", "app": "http://localhost:8001" }, { - "extension_group": "some_group", "extension": "ext_c", "app": "http://localhost:8002" } diff --git a/docs/ten_framework/api/interface.md b/docs/ten_framework/api/interface.md index fdf9a180a8..7151cb5703 100644 --- a/docs/ten_framework/api/interface.md +++ b/docs/ten_framework/api/interface.md @@ -25,6 +25,7 @@ In addition to these, the framework also supports composite API mechanisms: The basic syntax for defining an interface includes a mandatory `name` field. This `name` serves the same purpose as the `name` field in `cmd_in` and `cmd_out`, representing the name of the interface. It is significant only within the extension’s context and must be unique within that scope. {% code title=".json" %} + ```json { "api": { @@ -41,6 +42,7 @@ The basic syntax for defining an interface includes a mandatory `name` field. Th } } ``` + {% endcode %} ## Using Interfaces in Graphs @@ -48,6 +50,7 @@ The basic syntax for defining an interface includes a mandatory `name` field. Th The `name` of an interface is primarily used in graphs to specify routing. In the example below, `src_extension` uses the `foo` interface provided by `dest_extension`. The `src_extension` recognizes the `foo` interface from its `interface_out` definition, while `dest_extension` recognizes the `foo` interface from its `interface_in` definition. {% code title=".json" %} + ```json { "predefined_graphs": [{ @@ -73,12 +76,10 @@ The `name` of an interface is primarily used in graphs to specify routing. In th } ], "connections": [{ - "extension_group": "default_extension_group", "extension": "src_extension", "interface": [{ "name": "foo", "dest": [{ - "extension_group": "default_extension_group", "extension": "dest_extension" }] }] @@ -86,8 +87,8 @@ The `name` of an interface is primarily used in graphs to specify routing. In th }] } ``` -{% endcode %} +{% endcode %} ## Meaning of `interface_in` and `interface_out` @@ -96,6 +97,7 @@ The `name` of an interface is primarily used in graphs to specify routing. In th Indicates that the extension supports the specified interface's functionality. {% code title=".json" %} + ```json { "api": { @@ -108,14 +110,15 @@ The `name` of an interface is primarily used in graphs to specify routing. In th } } ``` -{% endcode %} +{% endcode %} 2. **`interface_out`** Indicates that the extension requires another extension to provide the specified interface's functionality. {% code title=".json" %} + ```json { "api": { @@ -128,6 +131,7 @@ The `name` of an interface is primarily used in graphs to specify routing. In th } } ``` + {% endcode %} ## Interface and Message Declaration @@ -147,10 +151,10 @@ For example, if an interface defines three commands and one data message, an ext In the current design, an extension cannot declare support for two interfaces with the same message name under a single API item. For example, if both `foo` and `bar` interfaces define a command named `xxx`, the following combinations are either allowed or not allowed: - - - Not allowed +- Not allowed {% code title=".json" %} + ```json { "api": { @@ -167,11 +171,13 @@ In the current design, an extension cannot declare support for two interfaces wi } } ``` + {% endcode %} - Allowed {% code title=".json" %} + ```json { "api": { @@ -188,12 +194,13 @@ In the current design, an extension cannot declare support for two interfaces wi } } ``` - {% endcode %} + {% endcode %} {% tab title="Allowed" %} {% code title=".json" %} + ```json { "api": { @@ -212,6 +219,7 @@ In the current design, an extension cannot declare support for two interfaces wi } } ``` + {% endcode %} {% endtab %} @@ -220,6 +228,7 @@ In the current design, an extension cannot declare support for two interfaces wi The definition of an `interface` is similar to the `api` field in a manifest. Below is an example of an `interface` definition: {% code title=".json" %} + ```json { "cmd": [ @@ -262,8 +271,8 @@ The definition of an `interface` is similar to the `api` field in a manifest. Be "audio_frame": [] } ``` - {% endcode %} + {% endcode %} The TEN framework processes this interface by integrating its definitions into the extension’s manifest under the `api` field. For instance, commands defined in `interface_in` are integrated into `cmd_in`, and those in `interface_out` are integrated into `cmd_out`. @@ -276,6 +285,7 @@ There are two ways to specify the content of an interface: Directly embed the interface definition in the manifest. Example: {% code title=".json" %} + ```json { "api": { @@ -291,6 +301,7 @@ Directly embed the interface definition in the manifest. Example: } } ``` + {% endcode %} {% endtab %} @@ -299,6 +310,7 @@ Directly embed the interface definition in the manifest. Example: Use a reference to specify the interface definition, similar to the `$ref` syntax in JSON schema. {% code title=".json" %} + ```json { "api": { @@ -311,15 +323,16 @@ Use a reference to specify the interface definition, similar to the `$ref` synta } } ``` + {% endcode %} {% endtab %} - ## Determining Interface Compatibility Since an interface is essentially syntactic sugar, whether two interfaces can be connected depends on the compatibility of the underlying messages. When the source extension specifies an output interface `foo`, and the destination extension specifies an input interface `bar`, the TEN runtime checks whether the `foo` interface of the source can connect to the `bar` interface of the destination. {% code title=".json" %} + ```json { "api": { @@ -328,10 +341,11 @@ Since an interface is essentially syntactic sugar, whether two interfaces can be } } ``` - {% endcode %} + {% endcode %} {% code title=".json" %} + ```json { "api": { @@ -340,10 +354,11 @@ Since an interface is essentially syntactic sugar, whether two interfaces can be } } ``` - {% endcode %} + {% endcode %} {% code title=".json" %} + ```json { "extension_group": { @@ -373,7 +388,7 @@ Since an interface is essentially syntactic sugar, whether two interfaces can be ] } ``` - {% endcode %} + {% endcode %} The TEN framework will look for the definition of `foo` in the `interface_out` section of the source extension's manifest. It then checks each message defined in this interface against the destination extension’s manifest, both in its message definitions and in any interfaces it declares in `interface_in`. If any message cannot be matched according to the TEN framework’s schema-checking rules, the graph configuration will be considered invalid. diff --git a/docs/ten_framework/graph.md b/docs/ten_framework/graph.md index 342d13c972..cceeab1d32 100644 --- a/docs/ten_framework/graph.md +++ b/docs/ten_framework/graph.md @@ -139,7 +139,6 @@ A complete example is as follows: "connections": [ { "app": "msgpack://127.0.0.1:8001/", - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { @@ -147,7 +146,6 @@ A complete example is as follows: "dest": [ { "app": "msgpack://127.0.0.1:8001/", - "extension_group": "gateway_group", "extension": "gateway" } ] @@ -157,7 +155,6 @@ A complete example is as follows: "dest": [ { "app": "msgpack://127.0.0.1:8001/", - "extension_group": "gateway_group", "extension": "gateway" } ] @@ -166,7 +163,6 @@ A complete example is as follows: }, { "app": "msgpack://127.0.0.1:8001/", - "extension_group": "gateway_group", "extension": "gateway", "cmd": [ { @@ -174,7 +170,6 @@ A complete example is as follows: "dest": [ { "app": "msgpack://127.0.0.1:8001/", - "extension_group": "uap_group", "extension": "uap" } ] @@ -231,7 +226,6 @@ So it looks like this: "connections": [ { "app": "msgpack://127.0.0.1:8001/", - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { @@ -239,7 +233,6 @@ So it looks like this: "dest": [ { "app": "msgpack://127.0.0.1:8001/", - "extension_group": "gateway_group", "extension": "gateway" } ] @@ -249,7 +242,6 @@ So it looks like this: "dest": [ { "app": "msgpack://127.0.0.1:8001/", - "extension_group": "gateway_group", "extension": "gateway" } ] @@ -258,7 +250,6 @@ So it looks like this: }, { "app": "msgpack://127.0.0.1:8001/", - "extension_group": "gateway_group", "extension": "gateway", "cmd": [ { @@ -266,7 +257,6 @@ So it looks like this: "dest": [ { "app": "msgpack://127.0.0.1:8001/", - "extension_group": "uap_group", "extension": "uap" } ] @@ -322,7 +312,6 @@ The following is a complete definition of the `start_graph` command: "connections": [ { "app": "msgpack://127.0.0.1:8001/", - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { @@ -330,7 +319,6 @@ The following is a complete definition of the `start_graph` command: "dest": [ { "app": "msgpack://127.0.0.1:8001/", - "extension_group": "gateway_group", "extension": "gateway" } ] @@ -340,7 +328,6 @@ The following is a complete definition of the `start_graph` command: "dest": [ { "app": "msgpack://127.0.0.1:8001/", - "extension_group": "gateway_group", "extension": "gateway" } ] @@ -348,14 +335,12 @@ The following is a complete definition of the `start_graph` command: ] }, { - "extension_group": "gateway_group", "extension": "gateway", "cmd": [ { "name": "push_status_online", "dest": [ { - "extension_group": "uap_group", "extension": "uap" } ] @@ -414,14 +399,12 @@ The following is a complete definition of the `start_graph` command: ], "connections": [ { - "extension_group": "some_group", "extension": "ext_1", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "ext_2" } ] @@ -441,14 +424,12 @@ The following is a complete definition of the `start_graph` command: { "connections": [ { - "extension_group": "some_group", "extension": "ext_1", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "ext_2" } ] @@ -456,14 +437,12 @@ The following is a complete definition of the `start_graph` command: ] }, { - "extension_group": "some_group", "extension": "ext_1", "data": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "ext_2" } ] @@ -480,14 +459,12 @@ The following is a complete definition of the `start_graph` command: { "connections": [ { - "extension_group": "some_group", "extension": "ext_1", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "ext_2" } ] @@ -498,7 +475,6 @@ The following is a complete definition of the `start_graph` command: "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "ext_2" } ] @@ -518,14 +494,12 @@ The following is a complete definition of the `start_graph` command: { "connections": [ { - "extension_group": "some_group", "extension": "ext_1", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "ext_2" } ] @@ -534,7 +508,6 @@ The following is a complete definition of the `start_graph` command: "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "ext_3" } ] @@ -551,18 +524,15 @@ The following is a complete definition of the `start_graph` command: { "connections": [ { - "extension_group": "some_group", "extension": "ext_1", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "ext_2" }, { - "extension_group": "some_group", "extension": "ext_3" } ] diff --git a/docs/ten_framework/ten_manager/check_graph.md b/docs/ten_framework/ten_manager/check_graph.md index 5a4209144d..a60b864570 100644 --- a/docs/ten_framework/ten_manager/check_graph.md +++ b/docs/ten_framework/ten_manager/check_graph.md @@ -159,13 +159,11 @@ All extension instances referenced in the `connections` field, whether as a sour "connections": [ { "extension": "some_extension", - "extension_group": "producer", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "some_extension" } ] @@ -221,13 +219,11 @@ All extension instances referenced in the `connections` field, whether as a sour "connections": [ { "extension": "some_extension", - "extension_group": "some_group", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "some_extension_1" } ] @@ -236,11 +232,9 @@ All extension instances referenced in the `connections` field, whether as a sour "name": "world", "dest": [ { - "extension_group": "some_group", "extension": "some_extension_1" }, { - "extension_group": "some_group", "extension": "consumer" } ] @@ -378,13 +372,11 @@ All extension instances referenced in the `connections` field, whether as a sour "connections": [ { "extension": "some_extension", - "extension_group": "some_group", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "another_ext" } ] @@ -393,13 +385,11 @@ All extension instances referenced in the `connections` field, whether as a sour }, { "extension": "some_extension", - "extension_group": "some_group", "cmd": [ { "name": "hello_2", "dest": [ { - "extension_group": "some_group", "extension": "another_ext" } ] @@ -445,13 +435,11 @@ All extension instances referenced in the `connections` field, whether as a sour "connections": [ { "extension": "some_extension", - "extension_group": "some_group", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "another_ext" } ] @@ -460,7 +448,6 @@ All extension instances referenced in the `connections` field, whether as a sour "name": "hello", "dest": [ { - "extension_group": "some_group", "extension": "some_extension" } ] @@ -584,13 +571,11 @@ The message declared in each message flow in the connections will be checked if "connections": [ { "extension": "some_extension", - "extension_group": "some_group", "cmd": [ { "name": "cmd_1", "dest": [ { - "extension_group": "some_group", "extension": "another_ext" } ] @@ -677,14 +662,12 @@ The `app` field in each node must met the following rules. "connections": [ { "extension": "some_extension", - "extension_group": "some_group", "app": "http://localhost:8000", "cmd": [ { "name": "cmd_1", "dest": [ { - "extension_group": "some_group", "extension": "another_ext" } ] @@ -727,13 +710,11 @@ The `app` field in each node must met the following rules. "connections": [ { "extension": "some_extension", - "extension_group": "some_group", "cmd": [ { "name": "cmd_1", "dest": [ { - "extension_group": "some_group", "extension": "another_ext", "app": "http://localhost:8000" } @@ -782,13 +763,11 @@ The `app` field in each node must met the following rules. "connections": [ { "extension": "some_extension", - "extension_group": "some_group", "cmd": [ { "name": "cmd_1", "dest": [ { - "extension_group": "some_group", "extension": "another_ext" } ] @@ -830,14 +809,12 @@ The `app` field in each node must met the following rules. "connections": [ { "extension": "some_extension", - "extension_group": "some_group", "app": "http://localhost:8000", "cmd": [ { "name": "cmd_1", "dest": [ { - "extension_group": "some_group", "extension": "another_ext" } ] diff --git a/docs/ten_framework/ten_manager/designer.md b/docs/ten_framework/ten_manager/designer.md index c5d0cab276..b9184dc6bf 100644 --- a/docs/ten_framework/ten_manager/designer.md +++ b/docs/ten_framework/ten_manager/designer.md @@ -238,7 +238,6 @@ You will receive a `200 OK` response. Ex: "data": [ { "app": "localhost", - "extension_group": "some_group", "extension": "ext_a", "cmd": [ { @@ -388,7 +387,6 @@ Input data (body): "connections": [ { "app": "localhost", - "extension_group": "extension_group_1", "extension": "extension_1", "cmd": [ { @@ -396,7 +394,6 @@ Input data (body): "dest": [ { "app": "localhost", - "extension_group": "extension_group_1", "extension": "extension_2" } ] diff --git a/docs/tutorials/how_to_build_extension_in_c++_beta.md b/docs/tutorials/how_to_build_extension_in_c++_beta.md index d14656d227..0bc27ce0f8 100644 --- a/docs/tutorials/how_to_build_extension_in_c++_beta.md +++ b/docs/tutorials/how_to_build_extension_in_c++_beta.md @@ -998,14 +998,12 @@ In the app's `manifest.json`, configure `predefined_graph` to specify that the ` > ], > "connections": [ > { -> "extension_group": "http_thread", > "extension": "http_server", > "cmd": [ > { > "name": "hello", > "dest": [ > { -> "extension_group": "http_thread", > "extension": "first_cxx_extension" > } > ] diff --git a/tests/ten_runtime/integration/cpp/check_start_graph/check_start_graph_source/ten_packages/extension/default_extension_cpp/src/main.cc b/tests/ten_runtime/integration/cpp/check_start_graph/check_start_graph_source/ten_packages/extension/default_extension_cpp/src/main.cc index cb5dc590d5..d549479efb 100644 --- a/tests/ten_runtime/integration/cpp/check_start_graph/check_start_graph_source/ten_packages/extension/default_extension_cpp/src/main.cc +++ b/tests/ten_runtime/integration/cpp/check_start_graph/check_start_graph_source/ten_packages/extension/default_extension_cpp/src/main.cc @@ -44,15 +44,13 @@ class test_extension : public ten::extension_t { ], "connections": [ { - "extension": "default_extension_cpp", - "extension_group": "default_extension_group", + "extension": "default_extension_cpp_1", "cmd": [ { "name": "test", "dest": [ { - "extension": "default_extension_cpp_2", - "extension_group": "default_extension_group_2" + "extension": "default_extension_cpp_2" } ] } @@ -62,14 +60,6 @@ class test_extension : public ten::extension_t { })", &err); assert(!result && "The graph should be invalid."); - - // The extension_info is not found, extension_group: - // default_extension_group_2, extension: default_extension_cpp_2. - std::string err_msg = err.errmsg(); - - // NOLINTNEXTLINE - assert(err_msg.find("default_extension_group_2") != std::string::npos && - "Incorrect msg."); } void on_start(ten::ten_env_t &ten_env) override { diff --git a/tests/ten_runtime/integration/cpp/ffmpeg_basic/ffmpeg_basic_app_source/property.json b/tests/ten_runtime/integration/cpp/ffmpeg_basic/ffmpeg_basic_app_source/property.json index c294dd0ab1..160ac25f3f 100644 --- a/tests/ten_runtime/integration/cpp/ffmpeg_basic/ffmpeg_basic_app_source/property.json +++ b/tests/ten_runtime/integration/cpp/ffmpeg_basic/ffmpeg_basic_app_source/property.json @@ -28,14 +28,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "ffmpeg_client", "cmd": [ { "name": "prepare_demuxer", "dest": [ { - "extension_group": "demuxer_group", "extension": "ffmpeg_demuxer" } ] @@ -44,7 +42,6 @@ "name": "start_muxer", "dest": [ { - "extension_group": "muxer_group", "extension": "ffmpeg_muxer" } ] @@ -53,7 +50,6 @@ "name": "start_demuxer", "dest": [ { - "extension_group": "demuxer_group", "extension": "ffmpeg_demuxer" } ] @@ -61,14 +57,12 @@ ] }, { - "extension_group": "muxer_group", "extension": "ffmpeg_muxer", "cmd": [ { "name": "complete", "dest": [ { - "extension_group": "default_extension_group", "extension": "ffmpeg_client", "msg_conversion": { "type": "per_property", @@ -86,14 +80,12 @@ ] }, { - "extension_group": "demuxer_group", "extension": "ffmpeg_demuxer", "cmd": [ { "name": "complete", "dest": [ { - "extension_group": "default_extension_group", "extension": "ffmpeg_client", "msg_conversion": { "type": "per_property", @@ -114,7 +106,6 @@ "name": "video_frame", "dest": [ { - "extension_group": "muxer_group", "extension": "ffmpeg_muxer" } ] @@ -125,7 +116,6 @@ "name": "audio_frame", "dest": [ { - "extension_group": "muxer_group", "extension": "ffmpeg_muxer" } ] diff --git a/tests/ten_runtime/integration/cpp/ffmpeg_bypass/ffmpeg_bypass_app_source/property.json b/tests/ten_runtime/integration/cpp/ffmpeg_bypass/ffmpeg_bypass_app_source/property.json index 25383de0cf..2f3d2e2b3f 100644 --- a/tests/ten_runtime/integration/cpp/ffmpeg_bypass/ffmpeg_bypass_app_source/property.json +++ b/tests/ten_runtime/integration/cpp/ffmpeg_bypass/ffmpeg_bypass_app_source/property.json @@ -28,14 +28,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "ffmpeg_client", "cmd": [ { "name": "prepare_demuxer", "dest": [ { - "extension_group": "demuxer_group", "extension": "ffmpeg_demuxer" } ] @@ -44,7 +42,6 @@ "name": "start_muxer", "dest": [ { - "extension_group": "muxer_group", "extension": "ffmpeg_muxer" } ] @@ -53,7 +50,6 @@ "name": "start_demuxer", "dest": [ { - "extension_group": "demuxer_group", "extension": "ffmpeg_demuxer" } ] @@ -64,7 +60,6 @@ "name": "video_frame", "dest": [ { - "extension_group": "muxer_group", "extension": "ffmpeg_muxer" } ] @@ -75,7 +70,6 @@ "name": "audio_frame", "dest": [ { - "extension_group": "muxer_group", "extension": "ffmpeg_muxer" } ] @@ -83,14 +77,12 @@ ] }, { - "extension_group": "muxer_group", "extension": "ffmpeg_muxer", "cmd": [ { "name": "complete", "dest": [ { - "extension_group": "default_extension_group", "extension": "ffmpeg_client", "msg_conversion": { "type": "per_property", @@ -108,14 +100,12 @@ ] }, { - "extension_group": "demuxer_group", "extension": "ffmpeg_demuxer", "cmd": [ { "name": "complete", "dest": [ { - "extension_group": "default_extension_group", "extension": "ffmpeg_client", "msg_conversion": { "type": "per_property", @@ -136,7 +126,6 @@ "name": "video_frame", "dest": [ { - "extension_group": "default_extension_group", "extension": "ffmpeg_client" } ] @@ -147,7 +136,6 @@ "name": "audio_frame", "dest": [ { - "extension_group": "default_extension_group", "extension": "ffmpeg_client" } ] diff --git a/tests/ten_runtime/integration/cpp/http_basic/restful_app_source/property.json b/tests/ten_runtime/integration/cpp/http_basic/restful_app_source/property.json index 91ed0a2028..676baf8355 100644 --- a/tests/ten_runtime/integration/cpp/http_basic/restful_app_source/property.json +++ b/tests/ten_runtime/integration/cpp/http_basic/restful_app_source/property.json @@ -20,14 +20,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "hello_world", "dest": [ { - "extension_group": "default_extension_group", "extension": "test_extension" } ] diff --git a/tests/ten_runtime/integration/cpp/large_result/large_result_source/property.json b/tests/ten_runtime/integration/cpp/large_result/large_result_source/property.json index a5096146de..768b08be97 100644 --- a/tests/ten_runtime/integration/cpp/large_result/large_result_source/property.json +++ b/tests/ten_runtime/integration/cpp/large_result/large_result_source/property.json @@ -20,14 +20,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "hello_world", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_cpp" } ] diff --git a/tests/ten_runtime/integration/cpp/multi_apps/app_1_source/property.json b/tests/ten_runtime/integration/cpp/multi_apps/app_1_source/property.json index 5cd22bf8eb..8087bd6377 100644 --- a/tests/ten_runtime/integration/cpp/multi_apps/app_1_source/property.json +++ b/tests/ten_runtime/integration/cpp/multi_apps/app_1_source/property.json @@ -25,7 +25,6 @@ "connections": [ { "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "ext_a", "cmd": [ { @@ -33,7 +32,6 @@ "dest": [ { "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "ext_b" } ] diff --git a/tests/ten_runtime/integration/cpp/multi_apps/client/client.cc b/tests/ten_runtime/integration/cpp/multi_apps/client/client.cc index 0f224d61cc..4da2c5edd1 100644 --- a/tests/ten_runtime/integration/cpp/multi_apps/client/client.cc +++ b/tests/ten_runtime/integration/cpp/multi_apps/client/client.cc @@ -71,13 +71,11 @@ void test_extension_in_app2_not_installed() { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "ext_a", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "test_extension_group", "extension": "ext_b" }] }] diff --git a/tests/ten_runtime/integration/go/expired_ten_go/expired_ten_go_app/property.json b/tests/ten_runtime/integration/go/expired_ten_go/expired_ten_go_app/property.json index 37d2599a40..4cc2ab1fab 100644 --- a/tests/ten_runtime/integration/go/expired_ten_go/expired_ten_go_app/property.json +++ b/tests/ten_runtime/integration/go/expired_ten_go/expired_ten_go_app/property.json @@ -23,14 +23,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "extension_a", "cmd": [ { "name": "B", "dest": [ { - "extension_group": "default_extension_group", "extension": "extension_b" } ] diff --git a/tests/ten_runtime/integration/go/frequently_cgo_call_go/frequently_cgo_call_go_app/property.json b/tests/ten_runtime/integration/go/frequently_cgo_call_go/frequently_cgo_call_go_app/property.json index 37d2599a40..4cc2ab1fab 100644 --- a/tests/ten_runtime/integration/go/frequently_cgo_call_go/frequently_cgo_call_go_app/property.json +++ b/tests/ten_runtime/integration/go/frequently_cgo_call_go/frequently_cgo_call_go_app/property.json @@ -23,14 +23,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "extension_a", "cmd": [ { "name": "B", "dest": [ { - "extension_group": "default_extension_group", "extension": "extension_b" } ] diff --git a/tests/ten_runtime/integration/go/handle_error_go/handle_error_go_app/property.json b/tests/ten_runtime/integration/go/handle_error_go/handle_error_go_app/property.json index 37d2599a40..4cc2ab1fab 100644 --- a/tests/ten_runtime/integration/go/handle_error_go/handle_error_go_app/property.json +++ b/tests/ten_runtime/integration/go/handle_error_go/handle_error_go_app/property.json @@ -23,14 +23,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "extension_a", "cmd": [ { "name": "B", "dest": [ { - "extension_group": "default_extension_group", "extension": "extension_b" } ] diff --git a/tests/ten_runtime/integration/go/prepare_to_stop_go/prepare_to_stop_go_app/property.json b/tests/ten_runtime/integration/go/prepare_to_stop_go/prepare_to_stop_go_app/property.json index 3c0db15d7c..be13c45ac7 100644 --- a/tests/ten_runtime/integration/go/prepare_to_stop_go/prepare_to_stop_go_app/property.json +++ b/tests/ten_runtime/integration/go/prepare_to_stop_go/prepare_to_stop_go_app/property.json @@ -29,14 +29,12 @@ ], "connections": [ { - "extension_group": "nodetest_group", "extension": "A", "cmd": [ { "name": "start", "dest": [ { - "extension_group": "nodetest_group", "extension": "B" } ] @@ -45,7 +43,6 @@ "name": "stop", "dest": [ { - "extension_group": "nodetest_group", "extension": "B" } ] @@ -53,14 +50,12 @@ ] }, { - "extension_group": "nodetest_group", "extension": "B", "cmd": [ { "name": "start", "dest": [ { - "extension_group": "nodetest_group", "extension": "C" } ] @@ -69,7 +64,6 @@ "name": "stop", "dest": [ { - "extension_group": "nodetest_group", "extension": "C" } ] @@ -77,7 +71,6 @@ ] }, { - "extension_group": "nodetest_group", "extension": "C" } ] diff --git a/tests/ten_runtime/integration/go/return_result_go/return_result_go_app/property.json b/tests/ten_runtime/integration/go/return_result_go/return_result_go_app/property.json index 37d2599a40..4cc2ab1fab 100644 --- a/tests/ten_runtime/integration/go/return_result_go/return_result_go_app/property.json +++ b/tests/ten_runtime/integration/go/return_result_go/return_result_go_app/property.json @@ -23,14 +23,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "extension_a", "cmd": [ { "name": "B", "dest": [ { - "extension_group": "default_extension_group", "extension": "extension_b" } ] diff --git a/tests/ten_runtime/integration/go/return_value_go/return_value_go_app/property.json b/tests/ten_runtime/integration/go/return_value_go/return_value_go_app/property.json index 37d2599a40..4cc2ab1fab 100644 --- a/tests/ten_runtime/integration/go/return_value_go/return_value_go_app/property.json +++ b/tests/ten_runtime/integration/go/return_value_go/return_value_go_app/property.json @@ -23,14 +23,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "extension_a", "cmd": [ { "name": "B", "dest": [ { - "extension_group": "default_extension_group", "extension": "extension_b" } ] diff --git a/tests/ten_runtime/integration/go/three_extension_cmd_go/client/client.cc b/tests/ten_runtime/integration/go/three_extension_cmd_go/client/client.cc index 6610709571..3ac0ad5d16 100644 --- a/tests/ten_runtime/integration/go/three_extension_cmd_go/client/client.cc +++ b/tests/ten_runtime/integration/go/three_extension_cmd_go/client/client.cc @@ -42,26 +42,22 @@ int main(TEN_UNUSED int argc, TEN_UNUSED char **argv) { "connections": [ { "app": "msgpack://127.0.0.1:8007/", - "extension_group": "nodetest_group", "extension": "A", "cmd": [{ "name": "B", "dest": [{ "app": "msgpack://127.0.0.1:8007/", - "extension_group": "nodetest_group", "extension": "B" }] }] }, { "app": "msgpack://127.0.0.1:8007/", - "extension_group": "nodetest_group", "extension": "B", "cmd": [{ "name": "C", "dest": [{ "app": "msgpack://127.0.0.1:8007/", - "extension_group": "nodetest_group", "extension": "C" }] }] diff --git a/tests/ten_runtime/integration/go/transfer_pointer_go/transfer_pointer_go_app/property.json b/tests/ten_runtime/integration/go/transfer_pointer_go/transfer_pointer_go_app/property.json index 37d2599a40..4cc2ab1fab 100644 --- a/tests/ten_runtime/integration/go/transfer_pointer_go/transfer_pointer_go_app/property.json +++ b/tests/ten_runtime/integration/go/transfer_pointer_go/transfer_pointer_go_app/property.json @@ -23,14 +23,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "extension_a", "cmd": [ { "name": "B", "dest": [ { - "extension_group": "default_extension_group", "extension": "extension_b" } ] diff --git a/tests/ten_runtime/integration/go/two_extension_one_group_cmd_go/client/client.cc b/tests/ten_runtime/integration/go/two_extension_one_group_cmd_go/client/client.cc index e89406880e..d506d5505b 100644 --- a/tests/ten_runtime/integration/go/two_extension_one_group_cmd_go/client/client.cc +++ b/tests/ten_runtime/integration/go/two_extension_one_group_cmd_go/client/client.cc @@ -34,13 +34,11 @@ int main(TEN_UNUSED int argc, TEN_UNUSED char **argv) { "connections": [ { "app": "msgpack://127.0.0.1:8007/", - "extension_group": "nodetest", "extension": "A", "data": [{ "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8007/", - "extension_group": "nodetest", "extension": "B" }] }] diff --git a/tests/ten_runtime/integration/python/aio_http_server_python/aio_http_server_python_app/property.json b/tests/ten_runtime/integration/python/aio_http_server_python/aio_http_server_python_app/property.json index a18433525f..7fc6fe2264 100644 --- a/tests/ten_runtime/integration/python/aio_http_server_python/aio_http_server_python_app/property.json +++ b/tests/ten_runtime/integration/python/aio_http_server_python/aio_http_server_python_app/property.json @@ -24,14 +24,12 @@ ], "connections": [ { - "extension_group": "test", "extension": "aio_http_server_python", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] diff --git a/tests/ten_runtime/integration/python/async_extension_basic_python/async_extension_basic_python_app/property.json b/tests/ten_runtime/integration/python/async_extension_basic_python/async_extension_basic_python_app/property.json index f154d32dd2..b338b73c23 100644 --- a/tests/ten_runtime/integration/python/async_extension_basic_python/async_extension_basic_python_app/property.json +++ b/tests/ten_runtime/integration/python/async_extension_basic_python/async_extension_basic_python_app/property.json @@ -30,14 +30,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "test", "extension": "default_async_extension_python" } ] @@ -45,14 +43,12 @@ ] }, { - "extension_group": "test", "extension": "default_async_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] diff --git a/tests/ten_runtime/integration/python/async_io_basic_python/async_io_basic_python_app/property.json b/tests/ten_runtime/integration/python/async_io_basic_python/async_io_basic_python_app/property.json index 3a8f23fac0..334da3e80d 100644 --- a/tests/ten_runtime/integration/python/async_io_basic_python/async_io_basic_python_app/property.json +++ b/tests/ten_runtime/integration/python/async_io_basic_python/async_io_basic_python_app/property.json @@ -30,14 +30,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "test", "extension": "default_extension_python" } ] @@ -45,14 +43,12 @@ ] }, { - "extension_group": "test", "extension": "default_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] diff --git a/tests/ten_runtime/integration/python/cpp_app_multi_process_python/cpp_app_multi_process_python_app_source/property.json b/tests/ten_runtime/integration/python/cpp_app_multi_process_python/cpp_app_multi_process_python_app_source/property.json index 0a465a6a1f..473a588b42 100644 --- a/tests/ten_runtime/integration/python/cpp_app_multi_process_python/cpp_app_multi_process_python_app_source/property.json +++ b/tests/ten_runtime/integration/python/cpp_app_multi_process_python/cpp_app_multi_process_python_app_source/property.json @@ -30,14 +30,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_python" } ] @@ -45,14 +43,12 @@ ] }, { - "extension_group": "default_extension_group", "extension": "default_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] diff --git a/tests/ten_runtime/integration/python/cpp_app_python/cpp_app_python_app_source/property.json b/tests/ten_runtime/integration/python/cpp_app_python/cpp_app_python_app_source/property.json index 92ecb6a82c..0cc57ff498 100644 --- a/tests/ten_runtime/integration/python/cpp_app_python/cpp_app_python_app_source/property.json +++ b/tests/ten_runtime/integration/python/cpp_app_python/cpp_app_python_app_source/property.json @@ -36,14 +36,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_python" } ] @@ -51,14 +49,12 @@ ] }, { - "extension_group": "default_extension_group", "extension": "default_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] diff --git a/tests/ten_runtime/integration/python/get_set_prop_python/get_set_prop_python_app/property.json b/tests/ten_runtime/integration/python/get_set_prop_python/get_set_prop_python_app/property.json index 0ae17ca166..a2e09306bf 100644 --- a/tests/ten_runtime/integration/python/get_set_prop_python/get_set_prop_python_app/property.json +++ b/tests/ten_runtime/integration/python/get_set_prop_python/get_set_prop_python_app/property.json @@ -33,14 +33,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_python" } ] @@ -48,14 +46,12 @@ ] }, { - "extension_group": "default_extension_group", "extension": "default_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "echo_group", "extension": "simple_echo_cpp" } ] diff --git a/tests/ten_runtime/integration/python/go_app_async_extension_python/go_app_async_extension_python_app/property.json b/tests/ten_runtime/integration/python/go_app_async_extension_python/go_app_async_extension_python_app/property.json index d0ccbb78a6..710ad532ef 100644 --- a/tests/ten_runtime/integration/python/go_app_async_extension_python/go_app_async_extension_python_app/property.json +++ b/tests/ten_runtime/integration/python/go_app_async_extension_python/go_app_async_extension_python_app/property.json @@ -42,14 +42,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_python" } ] @@ -57,14 +55,12 @@ ] }, { - "extension_group": "default_extension_group", "extension": "default_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] @@ -73,7 +69,6 @@ "name": "greeting", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_go" } ] diff --git a/tests/ten_runtime/integration/python/go_app_cythonize/go_app_cythonize_app/property.json b/tests/ten_runtime/integration/python/go_app_cythonize/go_app_cythonize_app/property.json index d0ccbb78a6..710ad532ef 100644 --- a/tests/ten_runtime/integration/python/go_app_cythonize/go_app_cythonize_app/property.json +++ b/tests/ten_runtime/integration/python/go_app_cythonize/go_app_cythonize_app/property.json @@ -42,14 +42,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_python" } ] @@ -57,14 +55,12 @@ ] }, { - "extension_group": "default_extension_group", "extension": "default_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] @@ -73,7 +69,6 @@ "name": "greeting", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_go" } ] diff --git a/tests/ten_runtime/integration/python/go_app_partially_cythonize/go_app_partially_cythonize_app/property.json b/tests/ten_runtime/integration/python/go_app_partially_cythonize/go_app_partially_cythonize_app/property.json index d0ccbb78a6..710ad532ef 100644 --- a/tests/ten_runtime/integration/python/go_app_partially_cythonize/go_app_partially_cythonize_app/property.json +++ b/tests/ten_runtime/integration/python/go_app_partially_cythonize/go_app_partially_cythonize_app/property.json @@ -42,14 +42,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_python" } ] @@ -57,14 +55,12 @@ ] }, { - "extension_group": "default_extension_group", "extension": "default_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] @@ -73,7 +69,6 @@ "name": "greeting", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_go" } ] diff --git a/tests/ten_runtime/integration/python/go_app_python/go_app_python_app/property.json b/tests/ten_runtime/integration/python/go_app_python/go_app_python_app/property.json index d0ccbb78a6..710ad532ef 100644 --- a/tests/ten_runtime/integration/python/go_app_python/go_app_python_app/property.json +++ b/tests/ten_runtime/integration/python/go_app_python/go_app_python_app/property.json @@ -42,14 +42,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_python" } ] @@ -57,14 +55,12 @@ ] }, { - "extension_group": "default_extension_group", "extension": "default_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] @@ -73,7 +69,6 @@ "name": "greeting", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_go" } ] diff --git a/tests/ten_runtime/integration/python/large_json_python/large_json_python_app/property.json b/tests/ten_runtime/integration/python/large_json_python/large_json_python_app/property.json index bf321144b2..c73febc084 100644 --- a/tests/ten_runtime/integration/python/large_json_python/large_json_python_app/property.json +++ b/tests/ten_runtime/integration/python/large_json_python/large_json_python_app/property.json @@ -30,14 +30,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "test", "extension": "default_extension_python" } ] @@ -45,14 +43,12 @@ ] }, { - "extension_group": "test", "extension": "default_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] diff --git a/tests/ten_runtime/integration/python/multi_process_python/multi_process_python_app/property.json b/tests/ten_runtime/integration/python/multi_process_python/multi_process_python_app/property.json index 0a465a6a1f..473a588b42 100644 --- a/tests/ten_runtime/integration/python/multi_process_python/multi_process_python_app/property.json +++ b/tests/ten_runtime/integration/python/multi_process_python/multi_process_python_app/property.json @@ -30,14 +30,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_python" } ] @@ -45,14 +43,12 @@ ] }, { - "extension_group": "default_extension_group", "extension": "default_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] diff --git a/tests/ten_runtime/integration/python/multiple_results_python_1/multiple_results_python_1_app/property.json b/tests/ten_runtime/integration/python/multiple_results_python_1/multiple_results_python_1_app/property.json index a0dc31ad96..988b102edb 100644 --- a/tests/ten_runtime/integration/python/multiple_results_python_1/multiple_results_python_1_app/property.json +++ b/tests/ten_runtime/integration/python/multiple_results_python_1/multiple_results_python_1_app/property.json @@ -30,14 +30,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "test1", "extension": "default_extension_python_1" } ] @@ -45,14 +43,12 @@ ] }, { - "extension_group": "test1", "extension": "default_extension_python_1", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "test2", "extension": "default_extension_python_2" } ] diff --git a/tests/ten_runtime/integration/python/multiple_results_python_2/multiple_results_python_2_app/property.json b/tests/ten_runtime/integration/python/multiple_results_python_2/multiple_results_python_2_app/property.json index a0dd94adf7..74347108fb 100644 --- a/tests/ten_runtime/integration/python/multiple_results_python_2/multiple_results_python_2_app/property.json +++ b/tests/ten_runtime/integration/python/multiple_results_python_2/multiple_results_python_2_app/property.json @@ -36,14 +36,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "test1", "extension": "default_extension_python_1" } ] @@ -51,18 +49,15 @@ ] }, { - "extension_group": "test1", "extension": "default_extension_python_1", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "test2", "extension": "default_extension_python_2" }, { - "extension_group": "test2", "extension": "default_extension_python_3" } ] diff --git a/tests/ten_runtime/integration/python/multiple_results_python_3/multiple_results_python_3_app/property.json b/tests/ten_runtime/integration/python/multiple_results_python_3/multiple_results_python_3_app/property.json index a0dd94adf7..74347108fb 100644 --- a/tests/ten_runtime/integration/python/multiple_results_python_3/multiple_results_python_3_app/property.json +++ b/tests/ten_runtime/integration/python/multiple_results_python_3/multiple_results_python_3_app/property.json @@ -36,14 +36,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "test1", "extension": "default_extension_python_1" } ] @@ -51,18 +49,15 @@ ] }, { - "extension_group": "test1", "extension": "default_extension_python_1", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "test2", "extension": "default_extension_python_2" }, { - "extension_group": "test2", "extension": "default_extension_python_3" } ] diff --git a/tests/ten_runtime/integration/python/no_dest_async_python/no_dest_async_python_app/property.json b/tests/ten_runtime/integration/python/no_dest_async_python/no_dest_async_python_app/property.json index f154d32dd2..b338b73c23 100644 --- a/tests/ten_runtime/integration/python/no_dest_async_python/no_dest_async_python_app/property.json +++ b/tests/ten_runtime/integration/python/no_dest_async_python/no_dest_async_python_app/property.json @@ -30,14 +30,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "test", "extension": "default_async_extension_python" } ] @@ -45,14 +43,12 @@ ] }, { - "extension_group": "test", "extension": "default_async_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] diff --git a/tests/ten_runtime/integration/python/no_dest_python/no_dest_python_app/property.json b/tests/ten_runtime/integration/python/no_dest_python/no_dest_python_app/property.json index 3a8f23fac0..334da3e80d 100644 --- a/tests/ten_runtime/integration/python/no_dest_python/no_dest_python_app/property.json +++ b/tests/ten_runtime/integration/python/no_dest_python/no_dest_python_app/property.json @@ -30,14 +30,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "test", "extension": "default_extension_python" } ] @@ -45,14 +43,12 @@ ] }, { - "extension_group": "test", "extension": "default_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] diff --git a/tests/ten_runtime/integration/python/resp_handler_yield_python/resp_handler_yield_python_app/property.json b/tests/ten_runtime/integration/python/resp_handler_yield_python/resp_handler_yield_python_app/property.json index 3a8f23fac0..334da3e80d 100644 --- a/tests/ten_runtime/integration/python/resp_handler_yield_python/resp_handler_yield_python_app/property.json +++ b/tests/ten_runtime/integration/python/resp_handler_yield_python/resp_handler_yield_python_app/property.json @@ -30,14 +30,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "test", "extension": "default_extension_python" } ] @@ -45,14 +43,12 @@ ] }, { - "extension_group": "test", "extension": "default_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] diff --git a/tests/ten_runtime/integration/python/send_cmd_discard_result_python/send_cmd_discard_result_python_app/property.json b/tests/ten_runtime/integration/python/send_cmd_discard_result_python/send_cmd_discard_result_python_app/property.json index 74f3bea7bb..c8ba1094ba 100644 --- a/tests/ten_runtime/integration/python/send_cmd_discard_result_python/send_cmd_discard_result_python_app/property.json +++ b/tests/ten_runtime/integration/python/send_cmd_discard_result_python/send_cmd_discard_result_python_app/property.json @@ -30,14 +30,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "test1", "extension": "default_extension_python_1" } ] @@ -45,14 +43,12 @@ ] }, { - "extension_group": "test1", "extension": "default_extension_python_1", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "test2", "extension": "default_extension_python_2" } ] @@ -60,14 +56,12 @@ ] }, { - "extension_group": "test2", "extension": "default_extension_python_2", "cmd": [ { "name": "hello2", "dest": [ { - "extension_group": "test1", "extension": "default_extension_python_1" } ] diff --git a/tests/ten_runtime/integration/python/send_cmd_python/send_cmd_python_app/property.json b/tests/ten_runtime/integration/python/send_cmd_python/send_cmd_python_app/property.json index 3a8f23fac0..334da3e80d 100644 --- a/tests/ten_runtime/integration/python/send_cmd_python/send_cmd_python_app/property.json +++ b/tests/ten_runtime/integration/python/send_cmd_python/send_cmd_python_app/property.json @@ -30,14 +30,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "test", "extension": "default_extension_python" } ] @@ -45,14 +43,12 @@ ] }, { - "extension_group": "test", "extension": "default_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] diff --git a/tests/ten_runtime/integration/python/send_cmd_set_object_python/send_cmd_set_object_python_app/property.json b/tests/ten_runtime/integration/python/send_cmd_set_object_python/send_cmd_set_object_python_app/property.json index 3a8f23fac0..334da3e80d 100644 --- a/tests/ten_runtime/integration/python/send_cmd_set_object_python/send_cmd_set_object_python_app/property.json +++ b/tests/ten_runtime/integration/python/send_cmd_set_object_python/send_cmd_set_object_python_app/property.json @@ -30,14 +30,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "test", "extension": "default_extension_python" } ] @@ -45,14 +43,12 @@ ] }, { - "extension_group": "test", "extension": "default_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] diff --git a/tests/ten_runtime/integration/python/send_data_python/send_data_python_app/property.json b/tests/ten_runtime/integration/python/send_data_python/send_data_python_app/property.json index 0d1809c4ad..40b6403499 100644 --- a/tests/ten_runtime/integration/python/send_data_python/send_data_python_app/property.json +++ b/tests/ten_runtime/integration/python/send_data_python/send_data_python_app/property.json @@ -36,14 +36,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_python" } ] @@ -51,14 +49,12 @@ ] }, { - "extension_group": "default_extension_group", "extension": "default_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] @@ -69,7 +65,6 @@ "name": "data", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] @@ -78,7 +73,6 @@ "name": "data2", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_python2" } ] @@ -86,14 +80,12 @@ ] }, { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp", "data": [ { "name": "data", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_python" } ] diff --git a/tests/ten_runtime/integration/python/send_recv_image_python/send_recv_image_python_app/property.json b/tests/ten_runtime/integration/python/send_recv_image_python/send_recv_image_python_app/property.json index c86d6fdfcb..b0b76e3451 100644 --- a/tests/ten_runtime/integration/python/send_recv_image_python/send_recv_image_python_app/property.json +++ b/tests/ten_runtime/integration/python/send_recv_image_python/send_recv_image_python_app/property.json @@ -36,14 +36,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_python" } ] @@ -51,18 +49,15 @@ ] }, { - "extension_group": "default_extension_group", "extension": "default_extension_python", "video_frame": [ { "name": "image", "dest": [ { - "extension_group": "default_extension_group", "extension": "pil_demo_python" }, { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] @@ -70,14 +65,12 @@ ] }, { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp", "video_frame": [ { "name": "image", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_python" } ] diff --git a/tests/ten_runtime/integration/python/send_recv_pcm_python/send_recv_pcm_python_app/property.json b/tests/ten_runtime/integration/python/send_recv_pcm_python/send_recv_pcm_python_app/property.json index 58bef9bb8e..003e444321 100644 --- a/tests/ten_runtime/integration/python/send_recv_pcm_python/send_recv_pcm_python_app/property.json +++ b/tests/ten_runtime/integration/python/send_recv_pcm_python/send_recv_pcm_python_app/property.json @@ -30,14 +30,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "start", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_python" } ] @@ -45,14 +43,12 @@ ] }, { - "extension_group": "default_extension_group", "extension": "default_extension_python", "audio_frame": [ { "name": "pcm", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] @@ -60,14 +56,12 @@ ] }, { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp", "audio_frame": [ { "name": "pcm", "dest": [ { - "extension_group": "default_extension_group", "extension": "default_extension_python" } ] diff --git a/tests/ten_runtime/integration/python/two_async_exts_one_group_python/two_async_exts_one_group_python_app/property.json b/tests/ten_runtime/integration/python/two_async_exts_one_group_python/two_async_exts_one_group_python_app/property.json index 3254e6dc75..387fb864e2 100644 --- a/tests/ten_runtime/integration/python/two_async_exts_one_group_python/two_async_exts_one_group_python_app/property.json +++ b/tests/ten_runtime/integration/python/two_async_exts_one_group_python/two_async_exts_one_group_python_app/property.json @@ -36,14 +36,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "test", "extension": "default_extension_python" } ] @@ -51,14 +49,12 @@ ] }, { - "extension_group": "test", "extension": "default_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "test", "extension": "default_extension_python2" } ] @@ -66,14 +62,12 @@ ] }, { - "extension_group": "test", "extension": "default_extension_python2", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] diff --git a/tests/ten_runtime/integration/python/two_async_exts_python/two_async_exts_python_app/property.json b/tests/ten_runtime/integration/python/two_async_exts_python/two_async_exts_python_app/property.json index 12cd22dfc1..712a7bba10 100644 --- a/tests/ten_runtime/integration/python/two_async_exts_python/two_async_exts_python_app/property.json +++ b/tests/ten_runtime/integration/python/two_async_exts_python/two_async_exts_python_app/property.json @@ -36,14 +36,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "test", "extension": "default_extension_python" } ] @@ -51,14 +49,12 @@ ] }, { - "extension_group": "test", "extension": "default_extension_python", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "test2", "extension": "default_extension_python2" } ] @@ -66,14 +62,12 @@ ] }, { - "extension_group": "test2", "extension": "default_extension_python2", "cmd": [ { "name": "hello", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] diff --git a/tests/ten_runtime/integration/python/unused_addon_python/unused_addon_python_app/property.json b/tests/ten_runtime/integration/python/unused_addon_python/unused_addon_python_app/property.json index 762e84c187..a04dce202e 100644 --- a/tests/ten_runtime/integration/python/unused_addon_python/unused_addon_python_app/property.json +++ b/tests/ten_runtime/integration/python/unused_addon_python/unused_addon_python_app/property.json @@ -36,14 +36,12 @@ ], "connections": [ { - "extension_group": "default_extension_group", "extension": "simple_http_server_cpp", "cmd": [ { "name": "test", "dest": [ { - "extension_group": "default_extension_group", "extension": "simple_echo_cpp" } ] diff --git a/tests/ten_runtime/smoke/audio_frame_test/basic.cc b/tests/ten_runtime/smoke/audio_frame_test/basic.cc index ddb330d2a9..c421123894 100644 --- a/tests/ten_runtime/smoke/audio_frame_test/basic.cc +++ b/tests/ten_runtime/smoke/audio_frame_test/basic.cc @@ -111,25 +111,21 @@ TEST(AudioFrameTest, Basic) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "audio_frame": [{ "name": "audio_frame", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2", "cmd": [{ "name": "audio_frame_ack", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1" }] }] diff --git a/tests/ten_runtime/smoke/audio_frame_test/create_from_json.cc b/tests/ten_runtime/smoke/audio_frame_test/create_from_json.cc index dfc025cf2b..68052352f5 100644 --- a/tests/ten_runtime/smoke/audio_frame_test/create_from_json.cc +++ b/tests/ten_runtime/smoke/audio_frame_test/create_from_json.cc @@ -125,25 +125,21 @@ TEST(AudioFrameTest, CreateFromJson) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "audio_frame": [{ "name": "audio_frame", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2", "cmd": [{ "name": "audio_frame_ack", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1" }] }] diff --git a/tests/ten_runtime/smoke/audio_frame_test/from_json.cc b/tests/ten_runtime/smoke/audio_frame_test/from_json.cc index b38f702626..8b8f8abbb4 100644 --- a/tests/ten_runtime/smoke/audio_frame_test/from_json.cc +++ b/tests/ten_runtime/smoke/audio_frame_test/from_json.cc @@ -123,25 +123,21 @@ TEST(AudioFrameTest, FromJson) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "audio_frame": [{ "name": "audio_frame", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2", "cmd": [{ "name": "audio_frame_ack", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1" }] }] diff --git a/tests/ten_runtime/smoke/audio_frame_test/multi_dest_pcm_frame.cc b/tests/ten_runtime/smoke/audio_frame_test/multi_dest_pcm_frame.cc index 246d735201..e254a7248f 100644 --- a/tests/ten_runtime/smoke/audio_frame_test/multi_dest_pcm_frame.cc +++ b/tests/ten_runtime/smoke/audio_frame_test/multi_dest_pcm_frame.cc @@ -195,17 +195,14 @@ TEST(AudioFrameTest, MultiDestAudioFrame) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "extension 1", "audio_frame": [{ "name": "audio_frame", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "extension 2" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "extension 3" }] }] diff --git a/tests/ten_runtime/smoke/basic/basic_extensions_init_dependency.cc b/tests/ten_runtime/smoke/basic/basic_extensions_init_dependency.cc index c77ae528d1..f818ac8ecf 100644 --- a/tests/ten_runtime/smoke/basic/basic_extensions_init_dependency.cc +++ b/tests/ten_runtime/smoke/basic/basic_extensions_init_dependency.cc @@ -173,25 +173,21 @@ TEST(BasicTest, ExtensionsInitDependency) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extensions_init_dependency", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extensions_init_dependency", "extension": "test_extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extensions_init_dependency", "extension": "test_extension_2", "cmd": [{ "name": "get_name", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extensions_init_dependency", "extension": "test_extension_1" }] }] diff --git a/tests/ten_runtime/smoke/basic/basic_loop.cc b/tests/ten_runtime/smoke/basic/basic_loop.cc index bfbe373d78..ea3eaec9cf 100644 --- a/tests/ten_runtime/smoke/basic/basic_loop.cc +++ b/tests/ten_runtime/smoke/basic/basic_loop.cc @@ -133,25 +133,21 @@ TEST(BasicTest, Loop) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world_1", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "test_extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "test_extension_2", "cmd": [{ "name": "hello_world_2", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "test_extension_1" }] }] diff --git a/tests/ten_runtime/smoke/basic/basic_loop_cmd.cc b/tests/ten_runtime/smoke/basic/basic_loop_cmd.cc index 15e86e52f9..405e930519 100644 --- a/tests/ten_runtime/smoke/basic/basic_loop_cmd.cc +++ b/tests/ten_runtime/smoke/basic/basic_loop_cmd.cc @@ -139,25 +139,21 @@ TEST(BasicTest, LoopCmd) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world_1", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "test_extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "test_extension_2", "cmd": [{ "name": "hello_world_2", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "test_extension_1" }] }] diff --git a/tests/ten_runtime/smoke/basic/basic_loop_cmd_snap_shot.cc b/tests/ten_runtime/smoke/basic/basic_loop_cmd_snap_shot.cc index c4605d27a7..965826a3ed 100644 --- a/tests/ten_runtime/smoke/basic/basic_loop_cmd_snap_shot.cc +++ b/tests/ten_runtime/smoke/basic/basic_loop_cmd_snap_shot.cc @@ -138,25 +138,21 @@ TEST(BasicTest, LoopCmdSnapShot) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world_1", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "test_extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "test_extension_2", "cmd": [{ "name": "hello_world_2", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "test_extension_1" }] }] diff --git a/tests/ten_runtime/smoke/basic/basic_msg_property_to_prop_store.cc b/tests/ten_runtime/smoke/basic/basic_msg_property_to_prop_store.cc index f4b14f533a..9f949b1ea7 100644 --- a/tests/ten_runtime/smoke/basic/basic_msg_property_to_prop_store.cc +++ b/tests/ten_runtime/smoke/basic/basic_msg_property_to_prop_store.cc @@ -111,13 +111,11 @@ TEST(BasicTest, MsgPropertyToPropStore) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/basic/basic_multi_app.cc b/tests/ten_runtime/smoke/basic/basic_multi_app.cc index f4240298c5..51c6bd8a07 100644 --- a/tests/ten_runtime/smoke/basic/basic_multi_app.cc +++ b/tests/ten_runtime/smoke/basic/basic_multi_app.cc @@ -170,13 +170,11 @@ TEST(BasicTest, MultiApp) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group 1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "test_extension_group 2", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/basic/basic_multi_app_close_through_engine.cc b/tests/ten_runtime/smoke/basic/basic_multi_app_close_through_engine.cc index edab67121e..68752b5c5d 100644 --- a/tests/ten_runtime/smoke/basic/basic_multi_app_close_through_engine.cc +++ b/tests/ten_runtime/smoke/basic/basic_multi_app_close_through_engine.cc @@ -155,13 +155,11 @@ TEST(BasicTest, MultiAppCloseThroughEngine) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group 1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "test_extension_group 2", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/basic/basic_multi_extension.cc b/tests/ten_runtime/smoke/basic/basic_multi_extension.cc index 075e619d96..d98cc9f722 100644 --- a/tests/ten_runtime/smoke/basic/basic_multi_extension.cc +++ b/tests/ten_runtime/smoke/basic/basic_multi_extension.cc @@ -103,13 +103,11 @@ TEST(BasicTest, MultiExtension) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_multi_extension", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_multi_extension", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/basic/basic_multi_extension_group.cc b/tests/ten_runtime/smoke/basic/basic_multi_extension_group.cc index 3b429f85cc..5ec4402bbc 100644 --- a/tests/ten_runtime/smoke/basic/basic_multi_extension_group.cc +++ b/tests/ten_runtime/smoke/basic/basic_multi_extension_group.cc @@ -103,13 +103,11 @@ TEST(BasicTest, MultiExtensionGroup) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_multi_extension_group__extension_group_1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_multi_extension_group__extension_group_2", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/basic/basic_throw_exception_in_extension.cc b/tests/ten_runtime/smoke/basic/basic_throw_exception_in_extension.cc index aea9c4ee24..4885d2b857 100644 --- a/tests/ten_runtime/smoke/basic/basic_throw_exception_in_extension.cc +++ b/tests/ten_runtime/smoke/basic/basic_throw_exception_in_extension.cc @@ -212,37 +212,31 @@ TEST(BasicTest, ThrowExceptionInExtension) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_throw_exception_in_extension_1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "basic_throw_exception_in_extension_2", "extension": "test_extension_3" }] }] },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "basic_throw_exception_in_extension_2", "extension": "test_extension_2", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "basic_throw_exception_in_extension_2", "extension": "test_extension_3" }] }] },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "basic_throw_exception_in_extension_2", "extension": "test_extension_3", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8003/", - "extension_group": "basic_throw_exception_in_extension_3", "extension": "test_extension_4" }] }] diff --git a/tests/ten_runtime/smoke/basic/basic_two_extensions.cc b/tests/ten_runtime/smoke/basic/basic_two_extensions.cc index 71d336742e..20c0b5c84a 100644 --- a/tests/ten_runtime/smoke/basic/basic_two_extensions.cc +++ b/tests/ten_runtime/smoke/basic/basic_two_extensions.cc @@ -103,13 +103,11 @@ TEST(BasicTest, TwoExtensions) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_connect_cmd.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_connect_cmd.cc index 498b5e386e..80f7349ce8 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_connect_cmd.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_connect_cmd.cc @@ -104,13 +104,11 @@ TEST(CmdConversionTest, CmdConversionConnectCmd) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_conversion_connect_cmd_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_conversion_connect_cmd_extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_data.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_data.cc index a015422653..e40decd6a2 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_data.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_data.cc @@ -112,13 +112,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_data_extension_group", "extension": "test_extension_1", "data": [{ "name": "aaa", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_data_extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_graph.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_graph.cc index 212a3c0fa8..9a0eb095fe 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_graph.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_graph.cc @@ -82,13 +82,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "default_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "default_extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_graph_default_uri.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_graph_default_uri.cc index 02411a2b8a..f82385ed91 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_graph_default_uri.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_graph_default_uri.cc @@ -78,12 +78,10 @@ class test_app : public ten::app_t { "extension_group": "cmd_conversion_graph_default_uri_extension_group" }], "connections": [{ - "extension_group": "cmd_conversion_graph_default_uri_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ - "extension_group": "cmd_conversion_graph_default_uri_extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", @@ -95,9 +93,6 @@ class test_app : public ten::app_t { } }] }] - },{ - "extension_group": "cmd_conversion_graph_default_uri_extension_group", - "extension": "test_extension_1" }] }] } diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path.cc index 557362809e..5a94f56223 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path.cc @@ -85,13 +85,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path__extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_1.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_1.cc index 12254852d1..da610decf3 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_1.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_1.cc @@ -85,13 +85,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_array_1__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_array_1__extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_2.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_2.cc index 2c853de793..b2dd4b187e 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_2.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_2.cc @@ -87,13 +87,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_array_2__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_array_2__extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_3.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_3.cc index 0472f1ad55..a918f9d671 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_3.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_3.cc @@ -87,13 +87,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_array_3__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_array_3__extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_4.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_4.cc index 270aadfd6e..97a9fd9eb0 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_4.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_4.cc @@ -88,13 +88,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_array_4__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_array_4__extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_5.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_5.cc index d141f9317c..c4ccc1f1f1 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_5.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_5.cc @@ -88,13 +88,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_array_5__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_array_5__extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_6.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_6.cc index 12844fee43..2cb67816a5 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_6.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_6.cc @@ -88,13 +88,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_array_6__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_array_6__extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_7.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_7.cc index 63ce205068..27b8a0a35c 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_7.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_array_7.cc @@ -88,13 +88,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_array_7__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_array_7__extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_keep_original.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_keep_original.cc index 505ae4c1c6..7f83f48ce9 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_keep_original.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_keep_original.cc @@ -87,13 +87,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_keep_original__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_keep_original__extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_1.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_1.cc index 58043a3481..d41bcc9fe8 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_1.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_1.cc @@ -87,13 +87,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_nested_1__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_nested_1__extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_2.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_2.cc index 6c88b984ac..ace733be6b 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_2.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_2.cc @@ -87,13 +87,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_nested_2__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_nested_2__extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_3.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_3.cc index 24a915d2ff..6bd11613b9 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_3.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_3.cc @@ -87,13 +87,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_nested_3__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_nested_3__extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_4.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_4.cc index b773378af8..f398dd0f49 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_4.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_4.cc @@ -87,13 +87,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_nested_4__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_nested_4__extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_5.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_5.cc index 3654af5d4f..9e7cc5797b 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_5.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_5.cc @@ -88,13 +88,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_nested_5__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_nested_5__extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_6.cc b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_6.cc index 87c90d0349..a637503f88 100644 --- a/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_6.cc +++ b/tests/ten_runtime/smoke/cmd_conversion/cmd_conversion_path_nested_6.cc @@ -87,13 +87,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_nested_6__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "cmd_mapping_path_nested_6__extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/cmd_result_test/multiple_result_1.cc b/tests/ten_runtime/smoke/cmd_result_test/multiple_result_1.cc index bf37945fcc..9e47919710 100644 --- a/tests/ten_runtime/smoke/cmd_result_test/multiple_result_1.cc +++ b/tests/ten_runtime/smoke/cmd_result_test/multiple_result_1.cc @@ -123,13 +123,11 @@ TEST(CmdResultTest, MultipleResult1) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/cmd_result_test/multiple_result_2.cc b/tests/ten_runtime/smoke/cmd_result_test/multiple_result_2.cc index 21ce3809c7..f394227e1c 100644 --- a/tests/ten_runtime/smoke/cmd_result_test/multiple_result_2.cc +++ b/tests/ten_runtime/smoke/cmd_result_test/multiple_result_2.cc @@ -143,17 +143,14 @@ TEST(CmdResultTest, MultipleResult2) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_3" }] }] diff --git a/tests/ten_runtime/smoke/cmd_result_test/multiple_result_3.cc b/tests/ten_runtime/smoke/cmd_result_test/multiple_result_3.cc index 7e9550fab4..c09b7e1134 100644 --- a/tests/ten_runtime/smoke/cmd_result_test/multiple_result_3.cc +++ b/tests/ten_runtime/smoke/cmd_result_test/multiple_result_3.cc @@ -143,17 +143,14 @@ TEST(CmdResultTest, MultipleResult3) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_3" }] }] diff --git a/tests/ten_runtime/smoke/command/command_check_cmd_out.cc b/tests/ten_runtime/smoke/command/command_check_cmd_out.cc index 3c36a829e9..060895aa8f 100644 --- a/tests/ten_runtime/smoke/command/command_check_cmd_out.cc +++ b/tests/ten_runtime/smoke/command/command_check_cmd_out.cc @@ -81,12 +81,10 @@ class test_app : public ten::app_t { "extension_group": "command_check_cmd_out_extension_1" }], "connections": [{ - "extension_group": "command_check_cmd_out_extension_1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ - "extension_group": "command_check_cmd_out_extension_1", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/command/command_send_enum.cc b/tests/ten_runtime/smoke/command/command_send_enum.cc index d45593a8dc..777dbcd1cb 100644 --- a/tests/ten_runtime/smoke/command/command_send_enum.cc +++ b/tests/ten_runtime/smoke/command/command_send_enum.cc @@ -130,13 +130,11 @@ TEST(ExtensionTest, CommandSendEnum) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "command_send_enum__extension_group_1", "extension": "command_send_enum__extension_1", "cmd": [{ "name": "send enum", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "command_send_enum__extension_group_2", "extension": "command_send_enum__extension_2" }] }] diff --git a/tests/ten_runtime/smoke/command/command_send_ptr.cc b/tests/ten_runtime/smoke/command/command_send_ptr.cc index 52f97e03cc..f7a0415a10 100644 --- a/tests/ten_runtime/smoke/command/command_send_ptr.cc +++ b/tests/ten_runtime/smoke/command/command_send_ptr.cc @@ -124,13 +124,11 @@ TEST(ExtensionTest, CommandSendPtr) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "command_send_ptr__extension_group_1", "extension": "command_send_ptr__extension_1", "cmd": [{ "name": "send_ptr", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "command_send_ptr__extension_group_2", "extension": "command_send_ptr__extension_2" }] }] diff --git a/tests/ten_runtime/smoke/command/command_send_ptr_through_cmd.cc b/tests/ten_runtime/smoke/command/command_send_ptr_through_cmd.cc index 3c445b6f07..d3bae9d51c 100644 --- a/tests/ten_runtime/smoke/command/command_send_ptr_through_cmd.cc +++ b/tests/ten_runtime/smoke/command/command_send_ptr_through_cmd.cc @@ -128,13 +128,11 @@ TEST(ExtensionTest, CommandSendPtrThroughCmd) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "command_send_ptr_through_cmd__extension_group_1", "extension": "command_send_ptr_through_cmd__extension_1", "cmd": [{ "name": "send_ptr", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "command_send_ptr_through_cmd__extension_group_2", "extension": "command_send_ptr_through_cmd__extension_2" }] }] diff --git a/tests/ten_runtime/smoke/command/command_stop_graph_actively.cc b/tests/ten_runtime/smoke/command/command_stop_graph_actively.cc index 9a37b9dbe6..2246287c76 100644 --- a/tests/ten_runtime/smoke/command/command_stop_graph_actively.cc +++ b/tests/ten_runtime/smoke/command/command_stop_graph_actively.cc @@ -218,37 +218,31 @@ TEST(ExtensionTest, CommandStopGraphActively) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "command_stop_graph_actively_1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "command_stop_graph_actively_2", "extension": "test_extension_3" }] }] },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "command_stop_graph_actively_2", "extension": "test_extension_2", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "command_stop_graph_actively_2", "extension": "test_extension_3" }] }] },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "command_stop_graph_actively_2", "extension": "test_extension_3", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8003/", - "extension_group": "command_stop_graph_actively_3", "extension": "test_extension_4" }] }] diff --git a/tests/ten_runtime/smoke/command/command_stop_graph_actively_through_cmd.cc b/tests/ten_runtime/smoke/command/command_stop_graph_actively_through_cmd.cc index e24a66cec5..253d134a58 100644 --- a/tests/ten_runtime/smoke/command/command_stop_graph_actively_through_cmd.cc +++ b/tests/ten_runtime/smoke/command/command_stop_graph_actively_through_cmd.cc @@ -226,37 +226,31 @@ TEST(ExtensionTest, CommandStopGraphActivelyThroughCmd) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "command_stop_graph_actively_through_cmd_1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "command_stop_graph_actively_through_cmd_2", "extension": "test_extension_3" }] }] },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "command_stop_graph_actively_through_cmd_2", "extension": "test_extension_2", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "command_stop_graph_actively_through_cmd_2", "extension": "test_extension_3" }] }] },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "command_stop_graph_actively_through_cmd_2", "extension": "test_extension_3", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8003/", - "extension_group": "command_stop_graph_actively_through_cmd_3", "extension": "test_extension_4" }] }] diff --git a/tests/ten_runtime/smoke/command/command_stop_graph_actively_through_cmd_dest.cc b/tests/ten_runtime/smoke/command/command_stop_graph_actively_through_cmd_dest.cc index 16f44e225b..f7080ad10f 100644 --- a/tests/ten_runtime/smoke/command/command_stop_graph_actively_through_cmd_dest.cc +++ b/tests/ten_runtime/smoke/command/command_stop_graph_actively_through_cmd_dest.cc @@ -221,37 +221,31 @@ TEST(ExtensionTest, CommandStopGraphActivelyThroughCmdDest) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "command_stop_graph_actively_through_cmd_dest_1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "command_stop_graph_actively_through_cmd_dest_2", "extension": "test_extension_3" }] }] },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "command_stop_graph_actively_through_cmd_dest_2", "extension": "test_extension_2", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "command_stop_graph_actively_through_cmd_dest_2", "extension": "test_extension_3" }] }] },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "command_stop_graph_actively_through_cmd_dest_2", "extension": "test_extension_3", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8003/", - "extension_group": "command_stop_graph_actively_through_cmd_dest_3", "extension": "test_extension_4" }] }] diff --git a/tests/ten_runtime/smoke/concurrent/multi_app_concurrent.cc b/tests/ten_runtime/smoke/concurrent/multi_app_concurrent.cc index 13bca2c514..09d6d27cd7 100644 --- a/tests/ten_runtime/smoke/concurrent/multi_app_concurrent.cc +++ b/tests/ten_runtime/smoke/concurrent/multi_app_concurrent.cc @@ -157,13 +157,11 @@ void *client_thread_main(TEN_UNUSED void *args) { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group 1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "test_extension_group 2", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/concurrent/multi_app_sequential.cc b/tests/ten_runtime/smoke/concurrent/multi_app_sequential.cc index 6359abac8e..fd4ef54a9a 100644 --- a/tests/ten_runtime/smoke/concurrent/multi_app_sequential.cc +++ b/tests/ten_runtime/smoke/concurrent/multi_app_sequential.cc @@ -165,13 +165,11 @@ TEST(ExtensionTest, MultiAppSequential) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group 1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "test_extension_group 2", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/concurrent/one_engine_concurrent.cc b/tests/ten_runtime/smoke/concurrent/one_engine_concurrent.cc index b1318c1d18..58302419c4 100644 --- a/tests/ten_runtime/smoke/concurrent/one_engine_concurrent.cc +++ b/tests/ten_runtime/smoke/concurrent/one_engine_concurrent.cc @@ -175,13 +175,11 @@ TEST(ExtensionTest, OneEngineConcurrent) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "extension_group_A", "extension": "A", "cmd": [{ "name": "test", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "extension_group_B", "extension": "B" }] }] diff --git a/tests/ten_runtime/smoke/data_test/basic_2.cc b/tests/ten_runtime/smoke/data_test/basic_2.cc index 4ef18e1faf..cb9fe4d0cf 100644 --- a/tests/ten_runtime/smoke/data_test/basic_2.cc +++ b/tests/ten_runtime/smoke/data_test/basic_2.cc @@ -110,25 +110,21 @@ TEST(DataTest, Basic2) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "data": [{ "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2", "cmd": [{ "name": "data_ack", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1" }] }] diff --git a/tests/ten_runtime/smoke/data_test/create_from_json.cc b/tests/ten_runtime/smoke/data_test/create_from_json.cc index c0cacf225d..026374d19c 100644 --- a/tests/ten_runtime/smoke/data_test/create_from_json.cc +++ b/tests/ten_runtime/smoke/data_test/create_from_json.cc @@ -115,25 +115,21 @@ TEST(DataTest, CreateFromJson) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "data": [{ "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2", "cmd": [{ "name": "data_ack", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1" }] }] diff --git a/tests/ten_runtime/smoke/data_test/from_json.cc b/tests/ten_runtime/smoke/data_test/from_json.cc index 308e4f6068..42a65cc8a6 100644 --- a/tests/ten_runtime/smoke/data_test/from_json.cc +++ b/tests/ten_runtime/smoke/data_test/from_json.cc @@ -119,25 +119,21 @@ TEST(DataTest, FromJson) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "data": [{ "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2", "cmd": [{ "name": "data_ack", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1" }] }] diff --git a/tests/ten_runtime/smoke/data_test/multi_dest_data.cc b/tests/ten_runtime/smoke/data_test/multi_dest_data.cc index 7fc3b3998c..6a649e1857 100644 --- a/tests/ten_runtime/smoke/data_test/multi_dest_data.cc +++ b/tests/ten_runtime/smoke/data_test/multi_dest_data.cc @@ -184,17 +184,14 @@ TEST(DataTest, MultiDestData) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "extension 1", "data": [{ "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "extension 2" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "extension 3" }] }] diff --git a/tests/ten_runtime/smoke/dest/no_audio_frame_dest.cc b/tests/ten_runtime/smoke/dest/no_audio_frame_dest.cc index 67b1dce8e0..bf9c4d0762 100644 --- a/tests/ten_runtime/smoke/dest/no_audio_frame_dest.cc +++ b/tests/ten_runtime/smoke/dest/no_audio_frame_dest.cc @@ -129,25 +129,21 @@ TEST(ExtensionTest, NoAudioFrameDest) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "audio_frame": [{ "name": "audio_frame", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2", "cmd": [{ "name": "audio_frame_ack", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1" }] }] diff --git a/tests/ten_runtime/smoke/engine/engine_long_running_mode.cc b/tests/ten_runtime/smoke/engine/engine_long_running_mode.cc index 67d765ff19..507d7e982e 100644 --- a/tests/ten_runtime/smoke/engine/engine_long_running_mode.cc +++ b/tests/ten_runtime/smoke/engine/engine_long_running_mode.cc @@ -145,13 +145,11 @@ TEST(ExtensionTest, EngineLongRunningMode) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "engine_long_running_mode__extension_group_A", "extension": "A", "cmd": [{ "name": "test", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "engine_long_running_mode__extension_group_B", "extension": "B" }] }] diff --git a/tests/ten_runtime/smoke/error/failed_to_connect_to_remote.cc b/tests/ten_runtime/smoke/error/failed_to_connect_to_remote.cc index caf6b52603..0e26beb9e1 100644 --- a/tests/ten_runtime/smoke/error/failed_to_connect_to_remote.cc +++ b/tests/ten_runtime/smoke/error/failed_to_connect_to_remote.cc @@ -103,13 +103,11 @@ class test_app_1 : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "failed_to_connect_to_remote__normal_extension_group", "extension": "normal_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8888/", - "extension_group": "failed_to_connect_to_remote__normal_extension_group", "extension": "normal_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/extension_group/extension_group_with_same_name_and_topo_info.cc b/tests/ten_runtime/smoke/extension_group/extension_group_with_same_name_and_topo_info.cc index 7947f69e03..3c2ad4e668 100644 --- a/tests/ten_runtime/smoke/extension_group/extension_group_with_same_name_and_topo_info.cc +++ b/tests/ten_runtime/smoke/extension_group/extension_group_with_same_name_and_topo_info.cc @@ -87,13 +87,11 @@ TEST(ExtensionTest, ExtensionGroupWithSameNameAndGraphInfo) { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "same_name_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "cmd_1", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "same_name_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/graph/graph_lack_something_1.cc b/tests/ten_runtime/smoke/graph/graph_lack_something_1.cc index ed40c2b377..0b3015fc0f 100644 --- a/tests/ten_runtime/smoke/graph/graph_lack_something_1.cc +++ b/tests/ten_runtime/smoke/graph/graph_lack_something_1.cc @@ -103,13 +103,11 @@ TEST(ExtensionTest, GraphLackSomething1) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_lack_something_1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_lack_something_1", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/graph/graph_lack_something_2.cc b/tests/ten_runtime/smoke/graph/graph_lack_something_2.cc index 6d0327aa71..a09c69c1de 100644 --- a/tests/ten_runtime/smoke/graph/graph_lack_something_2.cc +++ b/tests/ten_runtime/smoke/graph/graph_lack_something_2.cc @@ -103,13 +103,11 @@ TEST(ExtensionTest, GraphLackSomething2) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_lack_something_2", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_lack_something_2", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/graph/graph_lack_something_3.cc b/tests/ten_runtime/smoke/graph/graph_lack_something_3.cc index c3cbf01a6f..9c2893af26 100644 --- a/tests/ten_runtime/smoke/graph/graph_lack_something_3.cc +++ b/tests/ten_runtime/smoke/graph/graph_lack_something_3.cc @@ -103,13 +103,11 @@ TEST(ExtensionTest, GraphLackSomething3) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_lack_something_3", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_lack_something_3", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/graph/graph_loop_in_multi_app.cc b/tests/ten_runtime/smoke/graph/graph_loop_in_multi_app.cc index 81e0864597..448740359e 100644 --- a/tests/ten_runtime/smoke/graph/graph_loop_in_multi_app.cc +++ b/tests/ten_runtime/smoke/graph/graph_loop_in_multi_app.cc @@ -214,49 +214,41 @@ TEST(ExtensionTest, GraphLoopInMultiApp) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_in_multi_app__extension_group_1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "graph_loop_in_multi_app__extension_group_2", "extension": "test_extension_3" }] }] },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "graph_loop_in_multi_app__extension_group_2", "extension": "test_extension_2", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "graph_loop_in_multi_app__extension_group_2", "extension": "test_extension_3" }] }] },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "graph_loop_in_multi_app__extension_group_2", "extension": "test_extension_3", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8003/", - "extension_group": "graph_loop_in_multi_app__extension_group_3", "extension": "test_extension_4" }] }] },{ "app": "msgpack://127.0.0.1:8003/", - "extension_group": "graph_loop_in_multi_app__extension_group_3", "extension": "test_extension_4", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "graph_loop_in_multi_app__extension_group_2", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/graph/graph_loop_in_one_app.cc b/tests/ten_runtime/smoke/graph/graph_loop_in_one_app.cc index 09288a84bc..5a59ad4772 100644 --- a/tests/ten_runtime/smoke/graph/graph_loop_in_one_app.cc +++ b/tests/ten_runtime/smoke/graph/graph_loop_in_one_app.cc @@ -146,7 +146,6 @@ TEST(ExtensionTest, GraphLoopInOneApp) { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_in_one_app__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", @@ -158,7 +157,6 @@ TEST(ExtensionTest, GraphLoopInOneApp) { }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_in_one_app__extension_group", "extension": "test_extension_2", "cmd": [{ "name": "hello_world", @@ -170,7 +168,6 @@ TEST(ExtensionTest, GraphLoopInOneApp) { }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_in_one_app__extension_group", "extension": "test_extension_3", "cmd": [{ "name": "hello_world", @@ -182,7 +179,6 @@ TEST(ExtensionTest, GraphLoopInOneApp) { }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_in_one_app__extension_group", "extension": "test_extension_4", "cmd": [{ "name": "hello_world", diff --git a/tests/ten_runtime/smoke/graph/graph_loop_multiple_circle.cc b/tests/ten_runtime/smoke/graph/graph_loop_multiple_circle.cc index c5aa805dce..bbb725b1a3 100644 --- a/tests/ten_runtime/smoke/graph/graph_loop_multiple_circle.cc +++ b/tests/ten_runtime/smoke/graph/graph_loop_multiple_circle.cc @@ -156,49 +156,41 @@ TEST(ExtensionTest, GraphLoopMultipleCircle) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle__extension_group", "extension": "A", "cmd": [{ "name": "sum", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle__extension_group", "extension": "B" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle__extension_group", "extension": "B", "cmd": [{ "name": "sum", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle__extension_group", "extension": "C" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle__extension_group", "extension": "C", "cmd": [{ "name": "sum", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle__extension_group", "extension": "D" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle__extension_group", "extension": "D", "cmd": [{ "name": "sum", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle__extension_group", "extension": "B" }] }] diff --git a/tests/ten_runtime/smoke/graph/graph_loop_multiple_circle_through_cmd.cc b/tests/ten_runtime/smoke/graph/graph_loop_multiple_circle_through_cmd.cc index 8233006dc3..889227801d 100644 --- a/tests/ten_runtime/smoke/graph/graph_loop_multiple_circle_through_cmd.cc +++ b/tests/ten_runtime/smoke/graph/graph_loop_multiple_circle_through_cmd.cc @@ -167,49 +167,41 @@ TEST(ExtensionTest, }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle_through_cmd__extension_group", "extension": "A", "cmd": [{ "name": "sum", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle_through_cmd__extension_group", "extension": "B" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle_through_cmd__extension_group", "extension": "B", "cmd": [{ "name": "sum", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle_through_cmd__extension_group", "extension": "C" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle_through_cmd__extension_group", "extension": "C", "cmd": [{ "name": "sum", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle_through_cmd__extension_group", "extension": "D" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle_through_cmd__extension_group", "extension": "D", "cmd": [{ "name": "sum", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle_through_cmd__extension_group", "extension": "B" }] }] diff --git a/tests/ten_runtime/smoke/graph/graph_loop_multiple_circle_through_cmd_with_default.cc b/tests/ten_runtime/smoke/graph/graph_loop_multiple_circle_through_cmd_with_default.cc index 03cf79a288..f9aac992d6 100644 --- a/tests/ten_runtime/smoke/graph/graph_loop_multiple_circle_through_cmd_with_default.cc +++ b/tests/ten_runtime/smoke/graph/graph_loop_multiple_circle_through_cmd_with_default.cc @@ -171,49 +171,41 @@ TEST(ExtensionTest, }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle_through_cmd_with_default__extension_group", "extension": "A", "cmd": [{ "name": "sum", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle_through_cmd_with_default__extension_group", "extension": "B" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle_through_cmd_with_default__extension_group", "extension": "B", "cmd": [{ "name": "sum", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle_through_cmd_with_default__extension_group", "extension": "C" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle_through_cmd_with_default__extension_group", "extension": "C", "cmd": [{ "name": "sum", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle_through_cmd_with_default__extension_group", "extension": "D" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle_through_cmd_with_default__extension_group", "extension": "D", "cmd": [{ "name": "sum", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_loop_multiple_circle_through_cmd_with_default__extension_group", "extension": "B" }] }] diff --git a/tests/ten_runtime/smoke/graph/graph_multiple_polygon.cc b/tests/ten_runtime/smoke/graph/graph_multiple_polygon.cc index a27f71668f..586aba333d 100644 --- a/tests/ten_runtime/smoke/graph/graph_multiple_polygon.cc +++ b/tests/ten_runtime/smoke/graph/graph_multiple_polygon.cc @@ -306,7 +306,6 @@ TEST(ExtensionTest, GraphMultiplePolygon) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_1", "extension": "A", "cmd": [{ "name": "send", @@ -330,7 +329,6 @@ TEST(ExtensionTest, GraphMultiplePolygon) { // NOLINT }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_1", "extension": "B", "cmd": [{ "name": "send", @@ -342,7 +340,6 @@ TEST(ExtensionTest, GraphMultiplePolygon) { // NOLINT }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_1", "extension": "C", "cmd": [{ "name": "send", @@ -354,7 +351,6 @@ TEST(ExtensionTest, GraphMultiplePolygon) { // NOLINT }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_1", "extension": "D", "cmd": [{ "name": "send", @@ -366,7 +362,6 @@ TEST(ExtensionTest, GraphMultiplePolygon) { // NOLINT }] },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "graph_multiple_polygon_2", "extension": "E", "cmd": [{ "name": "send", @@ -378,7 +373,6 @@ TEST(ExtensionTest, GraphMultiplePolygon) { // NOLINT }] },{ "app": "msgpack://127.0.0.1:8003/", - "extension_group": "graph_multiple_polygon_3", "extension": "F", "cmd": [{ "name": "send", @@ -390,7 +384,6 @@ TEST(ExtensionTest, GraphMultiplePolygon) { // NOLINT }] },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "graph_multiple_polygon_2", "extension": "G", "cmd": [{ "name": "send", diff --git a/tests/ten_runtime/smoke/graph/graph_multiple_polygon_one_app.cc b/tests/ten_runtime/smoke/graph/graph_multiple_polygon_one_app.cc index ce0b00bba8..e5bfa80c1a 100644 --- a/tests/ten_runtime/smoke/graph/graph_multiple_polygon_one_app.cc +++ b/tests/ten_runtime/smoke/graph/graph_multiple_polygon_one_app.cc @@ -229,97 +229,80 @@ TEST(ExtensionTest, GraphMultiplePolygonOneApp) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_one_app__extension_group", "extension": "A", "cmd": [{ "name": "send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_one_app__extension_group", "extension": "B" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_one_app__extension_group", "extension": "C" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_one_app__extension_group", "extension": "D" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_one_app__extension_group", "extension": "E" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_one_app__extension_group", "extension": "B", "cmd": [{ "name": "send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_one_app__extension_group", "extension": "F" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_one_app__extension_group", "extension": "C", "cmd": [{ "name": "send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_one_app__extension_group", "extension": "F" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_one_app__extension_group", "extension": "D", "cmd": [{ "name": "send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_one_app__extension_group", "extension": "G" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_one_app__extension_group", "extension": "E", "cmd": [{ "name": "send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_one_app__extension_group", "extension": "G" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_one_app__extension_group", "extension": "F", "cmd": [{ "name": "send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_one_app__extension_group", "extension": "H" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_one_app__extension_group", "extension": "G", "cmd": [{ "name": "send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_multiple_polygon_one_app__extension_group", "extension": "H" }] }] diff --git a/tests/ten_runtime/smoke/graph/graph_polygon_in_one_app_return_all_1.cc b/tests/ten_runtime/smoke/graph/graph_polygon_in_one_app_return_all_1.cc index 87c1420269..e3ce3949f8 100644 --- a/tests/ten_runtime/smoke/graph/graph_polygon_in_one_app_return_all_1.cc +++ b/tests/ten_runtime/smoke/graph/graph_polygon_in_one_app_return_all_1.cc @@ -173,41 +173,34 @@ TEST(ExtensionTest, GraphPolygonInOneAppReturnAll1) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_polygon_in_one_app_return_all_1__extension_group", "extension": "A", "cmd": [{ "name": "send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_polygon_in_one_app_return_all_1__extension_group", "extension": "B" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_polygon_in_one_app_return_all_1__extension_group", "extension": "C" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_polygon_in_one_app_return_all_1__extension_group", "extension": "B", "cmd": [{ "name": "send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_polygon_in_one_app_return_all_1__extension_group", "extension": "D" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_polygon_in_one_app_return_all_1__extension_group", "extension": "C", "cmd": [{ "name": "send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_polygon_in_one_app_return_all_1__extension_group", "extension": "D" }] }] diff --git a/tests/ten_runtime/smoke/graph/graph_polygon_in_one_app_return_all_2.cc b/tests/ten_runtime/smoke/graph/graph_polygon_in_one_app_return_all_2.cc index 1381f4d5d4..99737d3d62 100644 --- a/tests/ten_runtime/smoke/graph/graph_polygon_in_one_app_return_all_2.cc +++ b/tests/ten_runtime/smoke/graph/graph_polygon_in_one_app_return_all_2.cc @@ -173,41 +173,34 @@ TEST(ExtensionTest, GraphPolygonInOneAppReturnAll2) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_polygon_in_one_app_return_all_2__extension_group", "extension": "A", "cmd": [{ "name": "send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_polygon_in_one_app_return_all_2__extension_group", "extension": "B" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_polygon_in_one_app_return_all_2__extension_group", "extension": "C" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_polygon_in_one_app_return_all_2__extension_group", "extension": "B", "cmd": [{ "name": "send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_polygon_in_one_app_return_all_2__extension_group", "extension": "D" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_polygon_in_one_app_return_all_2__extension_group", "extension": "C", "cmd": [{ "name": "send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_polygon_in_one_app_return_all_2__extension_group", "extension": "D" }] }] diff --git a/tests/ten_runtime/smoke/graph/graph_y_shape_in_multi_app.cc b/tests/ten_runtime/smoke/graph/graph_y_shape_in_multi_app.cc index f329994600..629616b19f 100644 --- a/tests/ten_runtime/smoke/graph/graph_y_shape_in_multi_app.cc +++ b/tests/ten_runtime/smoke/graph/graph_y_shape_in_multi_app.cc @@ -213,7 +213,6 @@ TEST(ExtensionTest, GraphYShapeInMultiApp) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_y_shape_in_multi_app__extension_group_1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", @@ -225,7 +224,6 @@ TEST(ExtensionTest, GraphYShapeInMultiApp) { // NOLINT }] },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "graph_y_shape_in_multi_app__extension_group_2", "extension": "test_extension_2", "cmd": [{ "name": "hello_world", diff --git a/tests/ten_runtime/smoke/graph/graph_y_shape_in_one_app.cc b/tests/ten_runtime/smoke/graph/graph_y_shape_in_one_app.cc index 196404cfd4..dcd010bb16 100644 --- a/tests/ten_runtime/smoke/graph/graph_y_shape_in_one_app.cc +++ b/tests/ten_runtime/smoke/graph/graph_y_shape_in_one_app.cc @@ -145,7 +145,6 @@ TEST(ExtensionTest, GraphYShapeInOneApp) { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_y_shape_in_one_app__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", diff --git a/tests/ten_runtime/smoke/graph_name/graph_name_basic.cc b/tests/ten_runtime/smoke/graph_name/graph_name_basic.cc index 4fcd6f857b..5deb072a5c 100644 --- a/tests/ten_runtime/smoke/graph_name/graph_name_basic.cc +++ b/tests/ten_runtime/smoke/graph_name/graph_name_basic.cc @@ -161,7 +161,6 @@ TEST(ExtensionTest, GraphNameBasic) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "graph_id_basic__extension_group_1", "extension": "extension1", "cmd": [{ "name": "send_message", @@ -173,7 +172,6 @@ TEST(ExtensionTest, GraphNameBasic) { // NOLINT }] },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "graph_id_basic__extension_group_2", "extension": "extension3", "cmd": [{ "name": "send_message", diff --git a/tests/ten_runtime/smoke/graph_test/group_node_missing_2_apps.cc b/tests/ten_runtime/smoke/graph_test/group_node_missing_2_apps.cc index 3a2e1d64e3..aeedb79c9b 100644 --- a/tests/ten_runtime/smoke/graph_test/group_node_missing_2_apps.cc +++ b/tests/ten_runtime/smoke/graph_test/group_node_missing_2_apps.cc @@ -168,7 +168,6 @@ TEST(GraphTest, GroupNodeMissing2Apps) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group 1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", diff --git a/tests/ten_runtime/smoke/http_server_extension/http_server_extension_close_app.cc b/tests/ten_runtime/smoke/http_server_extension/http_server_extension_close_app.cc index 543dc3ea56..ed2cfcd29c 100644 --- a/tests/ten_runtime/smoke/http_server_extension/http_server_extension_close_app.cc +++ b/tests/ten_runtime/smoke/http_server_extension/http_server_extension_close_app.cc @@ -71,12 +71,10 @@ class test_app : public ten::app_t { "extension_group": "test_extension_group" }], "connections": [{ - "extension_group": "test_extension_group", "extension": "simple_http_server_cpp", "cmd": [{ "name": "hello_world", "dest": [{ - "extension_group": "test_extension_group", "extension": "test_extension" }] }] diff --git a/tests/ten_runtime/smoke/http_server_extension/http_server_extension_two_extensions.cc b/tests/ten_runtime/smoke/http_server_extension/http_server_extension_two_extensions.cc index 141691bf92..989bc092cc 100644 --- a/tests/ten_runtime/smoke/http_server_extension/http_server_extension_two_extensions.cc +++ b/tests/ten_runtime/smoke/http_server_extension/http_server_extension_two_extensions.cc @@ -70,12 +70,10 @@ class test_app : public ten::app_t { "extension_group": "test_extension_group" }], "connections": [{ - "extension_group": "test_extension_group", "extension": "simple_http_server_cpp", "cmd": [{ "name": "hello_world", "dest": [{ - "extension_group": "test_extension_group", "extension": "test_extension" }] }] diff --git a/tests/ten_runtime/smoke/interface_test/interface_out_cmd_in_schema.cc b/tests/ten_runtime/smoke/interface_test/interface_out_cmd_in_schema.cc index 16d8475739..6fb46e3629 100644 --- a/tests/ten_runtime/smoke/interface_test/interface_out_cmd_in_schema.cc +++ b/tests/ten_runtime/smoke/interface_test/interface_out_cmd_in_schema.cc @@ -140,7 +140,6 @@ TEST(InterfaceTest, OutCmdInSchema) { // NOLINT "name": "ia", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/interface_test/interface_out_cmd_not_in_schema.cc b/tests/ten_runtime/smoke/interface_test/interface_out_cmd_not_in_schema.cc index e1877b5205..fb49aa0cea 100644 --- a/tests/ten_runtime/smoke/interface_test/interface_out_cmd_not_in_schema.cc +++ b/tests/ten_runtime/smoke/interface_test/interface_out_cmd_not_in_schema.cc @@ -140,7 +140,6 @@ TEST(InterfaceTest, OutCmdNotInSchema) { // NOLINT "name": "ia", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/interface_test/interface_out_result_error.cc b/tests/ten_runtime/smoke/interface_test/interface_out_result_error.cc index c430b7d51d..dac1d768c0 100644 --- a/tests/ten_runtime/smoke/interface_test/interface_out_result_error.cc +++ b/tests/ten_runtime/smoke/interface_test/interface_out_result_error.cc @@ -181,7 +181,6 @@ TEST(InterfaceTest, OutResultError) { // NOLINT "name": "ia", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/lock/lock_data_1.cc b/tests/ten_runtime/smoke/lock/lock_data_1.cc index 133394a86c..709792fb30 100644 --- a/tests/ten_runtime/smoke/lock/lock_data_1.cc +++ b/tests/ten_runtime/smoke/lock/lock_data_1.cc @@ -192,11 +192,9 @@ TEST(ExtensionTest, LockData1) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "extension 2" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "extension 3" }] }] diff --git a/tests/ten_runtime/smoke/msg_property/msg_property_send_c_string.cc b/tests/ten_runtime/smoke/msg_property/msg_property_send_c_string.cc index 4bf044928e..31d06db6e6 100644 --- a/tests/ten_runtime/smoke/msg_property/msg_property_send_c_string.cc +++ b/tests/ten_runtime/smoke/msg_property/msg_property_send_c_string.cc @@ -125,13 +125,11 @@ TEST(MsgPropertyTest, SendCString) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_property_send_c_string__extension_group_1", "extension": "msg_property_send_c_string__extension_1", "cmd": [{ "name": "send_ptr", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_property_send_c_string__extension_group_2", "extension": "msg_property_send_c_string__extension_2" }] }] diff --git a/tests/ten_runtime/smoke/msg_property/msg_property_send_cpp_ptr.cc b/tests/ten_runtime/smoke/msg_property/msg_property_send_cpp_ptr.cc index 867a963682..98471596c8 100644 --- a/tests/ten_runtime/smoke/msg_property/msg_property_send_cpp_ptr.cc +++ b/tests/ten_runtime/smoke/msg_property/msg_property_send_cpp_ptr.cc @@ -150,13 +150,11 @@ TEST(MsgPropertyTest, SendCppPtr) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_property_send_cpp_ptr__extension_group_1", "extension": "msg_property_send_cpp_ptr__extension_1", "cmd": [{ "name": "send_ptr", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_property_send_cpp_ptr__extension_group_2", "extension": "msg_property_send_cpp_ptr__extension_2" }] }] diff --git a/tests/ten_runtime/smoke/msg_property/msg_property_send_cpp_string.cc b/tests/ten_runtime/smoke/msg_property/msg_property_send_cpp_string.cc index 3648e49836..c0eb800364 100644 --- a/tests/ten_runtime/smoke/msg_property/msg_property_send_cpp_string.cc +++ b/tests/ten_runtime/smoke/msg_property/msg_property_send_cpp_string.cc @@ -123,13 +123,11 @@ TEST(MsgPropertyTest, SendCppString) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_property_send_cpp_string__extension_group_1", "extension": "msg_property_send_cpp_string__extension_1", "cmd": [{ "name": "send_ptr", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_property_send_cpp_string__extension_group_2", "extension": "msg_property_send_cpp_string__extension_2" }] }] diff --git a/tests/ten_runtime/smoke/msg_property/msg_property_send_float_ptr.cc b/tests/ten_runtime/smoke/msg_property/msg_property_send_float_ptr.cc index da1ac8718c..99d25420dc 100644 --- a/tests/ten_runtime/smoke/msg_property/msg_property_send_float_ptr.cc +++ b/tests/ten_runtime/smoke/msg_property/msg_property_send_float_ptr.cc @@ -132,13 +132,11 @@ TEST(MsgPropertyTest, SendFloatPtr) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_property_send_float_ptr__extension_group_1", "extension": "msg_property_send_float_ptr__extension_1", "cmd": [{ "name": "send_ptr", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_property_send_float_ptr__extension_group_2", "extension": "msg_property_send_float_ptr__extension_2" }] }] diff --git a/tests/ten_runtime/smoke/msg_property/msg_property_send_int.cc b/tests/ten_runtime/smoke/msg_property/msg_property_send_int.cc index 5bb8754fce..119c9cdcd5 100644 --- a/tests/ten_runtime/smoke/msg_property/msg_property_send_int.cc +++ b/tests/ten_runtime/smoke/msg_property/msg_property_send_int.cc @@ -124,13 +124,11 @@ TEST(MsgPropertyTest, SendInt) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_property_send_int__extension_group_1", "extension": "msg_property_send_int__extension_1", "cmd": [{ "name": "send_ptr", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_property_send_int__extension_group_2", "extension": "msg_property_send_int__extension_2" }] }] diff --git a/tests/ten_runtime/smoke/msg_property/msg_property_send_int32_ptr.cc b/tests/ten_runtime/smoke/msg_property/msg_property_send_int32_ptr.cc index d44660460f..af5d64f4f8 100644 --- a/tests/ten_runtime/smoke/msg_property/msg_property_send_int32_ptr.cc +++ b/tests/ten_runtime/smoke/msg_property/msg_property_send_int32_ptr.cc @@ -132,13 +132,11 @@ TEST(MsgPropertyTest, SendInt32Ptr) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_property_send_int32_ptr__extension_group_1", "extension": "msg_property_send_int32_ptr__extension_1", "cmd": [{ "name": "send_ptr", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_property_send_int32_ptr__extension_group_2", "extension": "msg_property_send_int32_ptr__extension_2" }] }] diff --git a/tests/ten_runtime/smoke/msg_test/msg_10.cc b/tests/ten_runtime/smoke/msg_test/msg_10.cc index 16d5c692d1..5948e444cc 100644 --- a/tests/ten_runtime/smoke/msg_test/msg_10.cc +++ b/tests/ten_runtime/smoke/msg_test/msg_10.cc @@ -150,13 +150,11 @@ TEST(MsgTest, Msg10) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_10__extension_group_1", "extension": "msg_10__extension_1", "cmd": [{ "name": "test", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_10__extension_group_2", "extension": "msg_10__extension_2" }] }] diff --git a/tests/ten_runtime/smoke/msg_test/msg_12.cc b/tests/ten_runtime/smoke/msg_test/msg_12.cc index 927c47321b..eace69fcf8 100644 --- a/tests/ten_runtime/smoke/msg_test/msg_12.cc +++ b/tests/ten_runtime/smoke/msg_test/msg_12.cc @@ -151,13 +151,11 @@ TEST(MsgTest, Msg12) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_12__extension_group_1", "extension": "msg_12__extension_1", "cmd": [{ "name": "test", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_12__extension_group_2", "extension": "msg_12__extension_2" }] }] diff --git a/tests/ten_runtime/smoke/msg_test/msg_13.cc b/tests/ten_runtime/smoke/msg_test/msg_13.cc index 18ddc82969..348f6f8472 100644 --- a/tests/ten_runtime/smoke/msg_test/msg_13.cc +++ b/tests/ten_runtime/smoke/msg_test/msg_13.cc @@ -150,13 +150,11 @@ TEST(MsgTest, Msg13) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_13__extension_group_1", "extension": "msg_13__extension_1", "cmd": [{ "name": "test", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_13__extension_group_2", "extension": "msg_13__extension_2" }] }] diff --git a/tests/ten_runtime/smoke/msg_test/msg_8.cc b/tests/ten_runtime/smoke/msg_test/msg_8.cc index a1e610244e..6c7ac3572b 100644 --- a/tests/ten_runtime/smoke/msg_test/msg_8.cc +++ b/tests/ten_runtime/smoke/msg_test/msg_8.cc @@ -122,13 +122,11 @@ TEST(MsgTest, Msg8) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_8__extension_group_1", "extension": "msg_8__extension_1", "cmd": [{ "name": "test", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_8__extension_group_2", "extension": "msg_8__extension_2" }] }] diff --git a/tests/ten_runtime/smoke/msg_test/msg_9.cc b/tests/ten_runtime/smoke/msg_test/msg_9.cc index 0deabc211e..d019743ccf 100644 --- a/tests/ten_runtime/smoke/msg_test/msg_9.cc +++ b/tests/ten_runtime/smoke/msg_test/msg_9.cc @@ -151,13 +151,11 @@ TEST(MsgTest, Msg9) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_9__extension_group_1", "extension": "msg_9__extension_1", "cmd": [{ "name": "test", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "msg_9__extension_group_2", "extension": "msg_9__extension_2" }] }] diff --git a/tests/ten_runtime/smoke/multi_dest/multi_dest_basic.cc b/tests/ten_runtime/smoke/multi_dest/multi_dest_basic.cc index abc45bfebc..f729c76f52 100644 --- a/tests/ten_runtime/smoke/multi_dest/multi_dest_basic.cc +++ b/tests/ten_runtime/smoke/multi_dest/multi_dest_basic.cc @@ -125,17 +125,14 @@ TEST(ExtensionTest, MultiDestBasic) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "extension 1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "extension 2" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "extension 3" }] }] diff --git a/tests/ten_runtime/smoke/multi_dest/multi_dest_in_multi_app.cc b/tests/ten_runtime/smoke/multi_dest/multi_dest_in_multi_app.cc index f82a4e54b2..274aca7e02 100644 --- a/tests/ten_runtime/smoke/multi_dest/multi_dest_in_multi_app.cc +++ b/tests/ten_runtime/smoke/multi_dest/multi_dest_in_multi_app.cc @@ -260,65 +260,50 @@ TEST(ExtensionTest, MultiDestInMultiApp) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "multi_dest_in_multi_app__extension_group_1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "multi_dest_in_multi_app__extension_group_1", "extension": "test_extension_2" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "multi_dest_in_multi_app__extension_group_1", "extension": "test_extension_3" },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "multi_dest_in_multi_app__extension_group_2", "extension": "test_extension_4" },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "multi_dest_in_multi_app__extension_group_2", "extension": "test_extension_5" },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "multi_dest_in_multi_app__extension_group_2", "extension": "test_extension_6" },{ "app": "msgpack://127.0.0.1:8003/", - "extension_group": "multi_dest_in_multi_app__extension_group_3", "extension": "test_extension_7" },{ "app": "msgpack://127.0.0.1:8003/", - "extension_group": "multi_dest_in_multi_app__extension_group_3", "extension": "test_extension_8" },{ "app": "msgpack://127.0.0.1:8003/", - "extension_group": "multi_dest_in_multi_app__extension_group_3", "extension": "test_extension_9" },{ "app": "msgpack://127.0.0.1:8004/", - "extension_group": "multi_dest_in_multi_app__extension_group_4", "extension": "test_extension_10" },{ "app": "msgpack://127.0.0.1:8004/", - "extension_group": "multi_dest_in_multi_app__extension_group_4", "extension": "test_extension_11" },{ "app": "msgpack://127.0.0.1:8004/", - "extension_group": "multi_dest_in_multi_app__extension_group_4", "extension": "test_extension_12" },{ "app": "msgpack://127.0.0.1:8005/", - "extension_group": "multi_dest_in_multi_app__extension_group_5", "extension": "test_extension_13" },{ "app": "msgpack://127.0.0.1:8005/", - "extension_group": "multi_dest_in_multi_app__extension_group_5", "extension": "test_extension_14" },{ "app": "msgpack://127.0.0.1:8005/", - "extension_group": "multi_dest_in_multi_app__extension_group_5", "extension": "test_extension_15" }] }] diff --git a/tests/ten_runtime/smoke/multi_dest/multi_dest_in_multi_app_with_response_handler.cc b/tests/ten_runtime/smoke/multi_dest/multi_dest_in_multi_app_with_response_handler.cc index 04b6e12bb4..2cdde89bff 100644 --- a/tests/ten_runtime/smoke/multi_dest/multi_dest_in_multi_app_with_response_handler.cc +++ b/tests/ten_runtime/smoke/multi_dest/multi_dest_in_multi_app_with_response_handler.cc @@ -261,65 +261,50 @@ TEST(ExtensionTest, MultiDestInMultiAppWithResponseHandler) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "multi_dest_in_multi_app_with_result_handler__extension_group_1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "multi_dest_in_multi_app_with_result_handler__extension_group_1", "extension": "test_extension_2" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "multi_dest_in_multi_app_with_result_handler__extension_group_1", "extension": "test_extension_3" },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "multi_dest_in_multi_app_with_result_handler__extension_group_2", "extension": "test_extension_4" },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "multi_dest_in_multi_app_with_result_handler__extension_group_2", "extension": "test_extension_5" },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "multi_dest_in_multi_app_with_result_handler__extension_group_2", "extension": "test_extension_6" },{ "app": "msgpack://127.0.0.1:8003/", - "extension_group": "multi_dest_in_multi_app_with_result_handler__extension_group_3", "extension": "test_extension_7" },{ "app": "msgpack://127.0.0.1:8003/", - "extension_group": "multi_dest_in_multi_app_with_result_handler__extension_group_3", "extension": "test_extension_8" },{ "app": "msgpack://127.0.0.1:8003/", - "extension_group": "multi_dest_in_multi_app_with_result_handler__extension_group_3", "extension": "test_extension_9" },{ "app": "msgpack://127.0.0.1:8004/", - "extension_group": "multi_dest_in_multi_app_with_result_handler__extension_group_4", "extension": "test_extension_10" },{ "app": "msgpack://127.0.0.1:8004/", - "extension_group": "multi_dest_in_multi_app_with_result_handler__extension_group_4", "extension": "test_extension_11" },{ "app": "msgpack://127.0.0.1:8004/", - "extension_group": "multi_dest_in_multi_app_with_result_handler__extension_group_4", "extension": "test_extension_12" },{ "app": "msgpack://127.0.0.1:8005/", - "extension_group": "multi_dest_in_multi_app_with_result_handler__extension_group_5", "extension": "test_extension_13" },{ "app": "msgpack://127.0.0.1:8005/", - "extension_group": "multi_dest_in_multi_app_with_result_handler__extension_group_5", "extension": "test_extension_14" },{ "app": "msgpack://127.0.0.1:8005/", - "extension_group": "multi_dest_in_multi_app_with_result_handler__extension_group_5", "extension": "test_extension_15" }] }] diff --git a/tests/ten_runtime/smoke/multi_dest/multi_dest_in_multi_app_with_response_handler_lambda.cc b/tests/ten_runtime/smoke/multi_dest/multi_dest_in_multi_app_with_response_handler_lambda.cc index 3f0eb1254e..76010e49fc 100644 --- a/tests/ten_runtime/smoke/multi_dest/multi_dest_in_multi_app_with_response_handler_lambda.cc +++ b/tests/ten_runtime/smoke/multi_dest/multi_dest_in_multi_app_with_response_handler_lambda.cc @@ -265,65 +265,50 @@ TEST(ExtensionTest, MultiDestInMultiAppWithResponseHandlerLambda) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "multi_dest_in_multi_app_with_result_handler_lambda__extension_group_1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "multi_dest_in_multi_app_with_result_handler_lambda__extension_group_1", "extension": "test_extension_2" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "multi_dest_in_multi_app_with_result_handler_lambda__extension_group_1", "extension": "test_extension_3" },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "multi_dest_in_multi_app_with_result_handler_lambda__extension_group_2", "extension": "test_extension_4" },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "multi_dest_in_multi_app_with_result_handler_lambda__extension_group_2", "extension": "test_extension_5" },{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "multi_dest_in_multi_app_with_result_handler_lambda__extension_group_2", "extension": "test_extension_6" },{ "app": "msgpack://127.0.0.1:8003/", - "extension_group": "multi_dest_in_multi_app_with_result_handler_lambda__extension_group_3", "extension": "test_extension_7" },{ "app": "msgpack://127.0.0.1:8003/", - "extension_group": "multi_dest_in_multi_app_with_result_handler_lambda__extension_group_3", "extension": "test_extension_8" },{ "app": "msgpack://127.0.0.1:8003/", - "extension_group": "multi_dest_in_multi_app_with_result_handler_lambda__extension_group_3", "extension": "test_extension_9" },{ "app": "msgpack://127.0.0.1:8004/", - "extension_group": "multi_dest_in_multi_app_with_result_handler_lambda__extension_group_4", "extension": "test_extension_10" },{ "app": "msgpack://127.0.0.1:8004/", - "extension_group": "multi_dest_in_multi_app_with_result_handler_lambda__extension_group_4", "extension": "test_extension_11" },{ "app": "msgpack://127.0.0.1:8004/", - "extension_group": "multi_dest_in_multi_app_with_result_handler_lambda__extension_group_4", "extension": "test_extension_12" },{ "app": "msgpack://127.0.0.1:8005/", - "extension_group": "multi_dest_in_multi_app_with_result_handler_lambda__extension_group_5", "extension": "test_extension_13" },{ "app": "msgpack://127.0.0.1:8005/", - "extension_group": "multi_dest_in_multi_app_with_result_handler_lambda__extension_group_5", "extension": "test_extension_14" },{ "app": "msgpack://127.0.0.1:8005/", - "extension_group": "multi_dest_in_multi_app_with_result_handler_lambda__extension_group_5", "extension": "test_extension_15" }] }] diff --git a/tests/ten_runtime/smoke/multi_dest/multi_dest_in_one_app.cc b/tests/ten_runtime/smoke/multi_dest/multi_dest_in_one_app.cc index b781cb8c6e..460e83fe3a 100644 --- a/tests/ten_runtime/smoke/multi_dest/multi_dest_in_one_app.cc +++ b/tests/ten_runtime/smoke/multi_dest/multi_dest_in_one_app.cc @@ -216,7 +216,6 @@ TEST(ExtensionTest, MultiDestInOneApp) { // NOLINT "nodes": [], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "multi_dest_in_one_app__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", diff --git a/tests/ten_runtime/smoke/multi_dest/multi_dest_resp_when_all.cc b/tests/ten_runtime/smoke/multi_dest/multi_dest_resp_when_all.cc index d3cb6c735a..9a24296221 100644 --- a/tests/ten_runtime/smoke/multi_dest/multi_dest_resp_when_all.cc +++ b/tests/ten_runtime/smoke/multi_dest/multi_dest_resp_when_all.cc @@ -125,17 +125,14 @@ TEST(ExtensionTest, MultiDestRespWhenAll) { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "extension 1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "extension 2" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "extension 3" }] }] diff --git a/tests/ten_runtime/smoke/multi_dest/multi_dest_resp_when_all_in_multi_app.cc b/tests/ten_runtime/smoke/multi_dest/multi_dest_resp_when_all_in_multi_app.cc index eabe11549d..6535027f8d 100644 --- a/tests/ten_runtime/smoke/multi_dest/multi_dest_resp_when_all_in_multi_app.cc +++ b/tests/ten_runtime/smoke/multi_dest/multi_dest_resp_when_all_in_multi_app.cc @@ -191,7 +191,6 @@ TEST(ExtensionTest, MultiDestRespWhenAllInMultiApp) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "extension 1", "cmd": [{ "name": "hello_world", diff --git a/tests/ten_runtime/smoke/multi_dest/multi_dest_send_in_stop_period.cc b/tests/ten_runtime/smoke/multi_dest/multi_dest_send_in_stop_period.cc index 3c705f5b2c..08232ca5cb 100644 --- a/tests/ten_runtime/smoke/multi_dest/multi_dest_send_in_stop_period.cc +++ b/tests/ten_runtime/smoke/multi_dest/multi_dest_send_in_stop_period.cc @@ -132,17 +132,14 @@ TEST(ExtensionTest, MultiDestSendInStopPeriod) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group1", "extension": "extension 1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group2", "extension": "extension 2" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group3", "extension": "extension 3" }] }] diff --git a/tests/ten_runtime/smoke/multi_dest/multi_dest_y_topo.cc b/tests/ten_runtime/smoke/multi_dest/multi_dest_y_topo.cc index 0260778d36..7662d87336 100644 --- a/tests/ten_runtime/smoke/multi_dest/multi_dest_y_topo.cc +++ b/tests/ten_runtime/smoke/multi_dest/multi_dest_y_topo.cc @@ -165,29 +165,24 @@ TEST(ExtensionTest, MultiDestYGraph) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "extension_group", "extension": "extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "extension_group", "extension": "extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "extension_group", "extension": "extension_2", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "extension_group", "extension": "extension_3" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "extension_group", "extension": "extension_4" }] }] diff --git a/tests/ten_runtime/smoke/outer_thread/128_threads_attempt_to_suspend_1.cc b/tests/ten_runtime/smoke/outer_thread/128_threads_attempt_to_suspend_1.cc index 190f0b788c..629f59591e 100644 --- a/tests/ten_runtime/smoke/outer_thread/128_threads_attempt_to_suspend_1.cc +++ b/tests/ten_runtime/smoke/outer_thread/128_threads_attempt_to_suspend_1.cc @@ -1055,13 +1055,11 @@ TEST(ExtensionTest, }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "start_to_send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -1069,19 +1067,16 @@ TEST(ExtensionTest, "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2", "cmd": [{ "name": "from_extension_2", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1" }] }] diff --git a/tests/ten_runtime/smoke/outer_thread/16_threads_attempt_to_suspend_1.cc b/tests/ten_runtime/smoke/outer_thread/16_threads_attempt_to_suspend_1.cc index dad387f3c2..82ef8c2c4e 100644 --- a/tests/ten_runtime/smoke/outer_thread/16_threads_attempt_to_suspend_1.cc +++ b/tests/ten_runtime/smoke/outer_thread/16_threads_attempt_to_suspend_1.cc @@ -317,13 +317,11 @@ TEST(ExtensionTest, SixteenThreadsAttemptToSuspend1) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "start_to_send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -331,7 +329,6 @@ TEST(ExtensionTest, SixteenThreadsAttemptToSuspend1) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_1.cc b/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_1.cc index 345e8c515a..ad81bfde26 100644 --- a/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_1.cc +++ b/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_1.cc @@ -237,13 +237,11 @@ TEST(ExtensionTest, TwoThreadsAttemptToSuspend1) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "start_to_send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -251,7 +249,6 @@ TEST(ExtensionTest, TwoThreadsAttemptToSuspend1) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_2.cc b/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_2.cc index 1bbb86eed9..00cd89dd9a 100644 --- a/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_2.cc +++ b/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_2.cc @@ -239,13 +239,11 @@ TEST(ExtensionTest, TwoThreadsAttemptToSuspend2) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "start_to_send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -253,7 +251,6 @@ TEST(ExtensionTest, TwoThreadsAttemptToSuspend2) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_3.cc b/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_3.cc index 046683237c..e87e6d3b86 100644 --- a/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_3.cc +++ b/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_3.cc @@ -262,13 +262,11 @@ TEST(ExtensionTest, TwoThreadsAttemptToSuspend3) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "start_to_send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -276,7 +274,6 @@ TEST(ExtensionTest, TwoThreadsAttemptToSuspend3) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_4.cc b/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_4.cc index 19685ac1ef..5a0530ae3e 100644 --- a/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_4.cc +++ b/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_4.cc @@ -272,13 +272,11 @@ TEST(ExtensionTest, TwoThreadsAttemptToSuspend4) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "start_to_send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -286,7 +284,6 @@ TEST(ExtensionTest, TwoThreadsAttemptToSuspend4) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_5.cc b/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_5.cc index 5599032124..e1190be4f5 100644 --- a/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_5.cc +++ b/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_5.cc @@ -277,13 +277,11 @@ TEST(ExtensionTest, TwoThreadsAttemptToSuspend5) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "start_to_send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -291,7 +289,6 @@ TEST(ExtensionTest, TwoThreadsAttemptToSuspend5) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_6.cc b/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_6.cc index f21c3407e3..cc03f3a81e 100644 --- a/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_6.cc +++ b/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_6.cc @@ -238,13 +238,11 @@ TEST(ExtensionTest, TwoThreadsAttemptToSuspend6) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "start_to_send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -252,7 +250,6 @@ TEST(ExtensionTest, TwoThreadsAttemptToSuspend6) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_7.cc b/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_7.cc index ce3fdf13fb..9e02688e53 100644 --- a/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_7.cc +++ b/tests/ten_runtime/smoke/outer_thread/2_threads_attempt_to_suspend_7.cc @@ -238,13 +238,11 @@ TEST(ExtensionTest, TwoThreadsAttemptToSuspend7) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "start_to_send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -252,7 +250,6 @@ TEST(ExtensionTest, TwoThreadsAttemptToSuspend7) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_1.cc b/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_1.cc index c7a8866ed4..7ed4143fe3 100644 --- a/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_1.cc +++ b/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_1.cc @@ -437,13 +437,11 @@ TEST(ExtensionTest, ThirtyTwoThreadsAttemptToSuspend1) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "start_to_send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -451,7 +449,6 @@ TEST(ExtensionTest, ThirtyTwoThreadsAttemptToSuspend1) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_2.cc b/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_2.cc index 05a3648322..f367caf4d2 100644 --- a/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_2.cc +++ b/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_2.cc @@ -444,13 +444,11 @@ TEST(ExtensionTest, ThirtyTwoThreadsAttemptToSuspend2) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "start_to_send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -458,7 +456,6 @@ TEST(ExtensionTest, ThirtyTwoThreadsAttemptToSuspend2) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_3.cc b/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_3.cc index a795e0d487..719cdf95b7 100644 --- a/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_3.cc +++ b/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_3.cc @@ -439,13 +439,11 @@ TEST(ExtensionTest, ThirtyTwoThreadsAttemptToSuspend3) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "start_to_send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -453,7 +451,6 @@ TEST(ExtensionTest, ThirtyTwoThreadsAttemptToSuspend3) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_4.cc b/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_4.cc index db522eb7c3..b9ea4a980d 100644 --- a/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_4.cc +++ b/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_4.cc @@ -449,13 +449,11 @@ TEST(ExtensionTest, ThirtyTwoThreadsAttemptToSuspend4) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "start_to_send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -463,7 +461,6 @@ TEST(ExtensionTest, ThirtyTwoThreadsAttemptToSuspend4) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_5.cc b/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_5.cc index 14f4c0715e..e164c7504f 100644 --- a/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_5.cc +++ b/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_5.cc @@ -531,13 +531,11 @@ TEST(ExtensionTest, ThirtyTwoThreadsAttemptToSuspend5) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "start_to_send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -545,19 +543,16 @@ TEST(ExtensionTest, ThirtyTwoThreadsAttemptToSuspend5) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2", "cmd": [{ "name": "from_extension_2", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1" }] }] diff --git a/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_6.cc b/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_6.cc index ff588533b9..9ce7c2eb4f 100644 --- a/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_6.cc +++ b/tests/ten_runtime/smoke/outer_thread/32_threads_attempt_to_suspend_6.cc @@ -548,13 +548,11 @@ TEST(ExtensionTest, ThirtyTwoThreadsAttemptToSuspend6) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "start_to_send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -562,19 +560,16 @@ TEST(ExtensionTest, ThirtyTwoThreadsAttemptToSuspend6) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2", "cmd": [{ "name": "from_extension_2", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1" }] }] diff --git a/tests/ten_runtime/smoke/outer_thread/auto_free_out_of_scope.cc b/tests/ten_runtime/smoke/outer_thread/auto_free_out_of_scope.cc index 0fb3fecf80..8e80b05642 100644 --- a/tests/ten_runtime/smoke/outer_thread/auto_free_out_of_scope.cc +++ b/tests/ten_runtime/smoke/outer_thread/auto_free_out_of_scope.cc @@ -224,13 +224,11 @@ TEST(ExtensionTest, AutoFreeOutOfScope) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "start_to_send", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -238,7 +236,6 @@ TEST(ExtensionTest, AutoFreeOutOfScope) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/outer_thread/outer_thread_send_data.cc b/tests/ten_runtime/smoke/outer_thread/outer_thread_send_data.cc index 7116d07796..50b99f1e84 100644 --- a/tests/ten_runtime/smoke/outer_thread/outer_thread_send_data.cc +++ b/tests/ten_runtime/smoke/outer_thread/outer_thread_send_data.cc @@ -189,13 +189,11 @@ TEST(ExtensionTest, OuterThreadSendData) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -203,7 +201,6 @@ TEST(ExtensionTest, OuterThreadSendData) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/outer_thread/outer_thread_send_data_resp_handler.cc b/tests/ten_runtime/smoke/outer_thread/outer_thread_send_data_resp_handler.cc index 9b1a5007db..b1e280afdb 100644 --- a/tests/ten_runtime/smoke/outer_thread/outer_thread_send_data_resp_handler.cc +++ b/tests/ten_runtime/smoke/outer_thread/outer_thread_send_data_resp_handler.cc @@ -214,13 +214,11 @@ TEST(ExtensionTest, OuterThreadSendDataRespHandler) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -228,7 +226,6 @@ TEST(ExtensionTest, OuterThreadSendDataRespHandler) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/path/clean_when_stopped.cc b/tests/ten_runtime/smoke/path/clean_when_stopped.cc index 9deb7f2366..f50bd00a1a 100644 --- a/tests/ten_runtime/smoke/path/clean_when_stopped.cc +++ b/tests/ten_runtime/smoke/path/clean_when_stopped.cc @@ -120,20 +120,17 @@ TEST(ExtensionTest, CleanWhenStopped) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] },{ "name": "hello_world2", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/path/path_timeout.cc b/tests/ten_runtime/smoke/path/path_timeout.cc index 7e5440240a..68347881a6 100644 --- a/tests/ten_runtime/smoke/path/path_timeout.cc +++ b/tests/ten_runtime/smoke/path/path_timeout.cc @@ -132,20 +132,17 @@ TEST(ExtensionTest, PathTimeout) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] },{ "name": "hello_world2", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/path/path_timeout_2.cc b/tests/ten_runtime/smoke/path/path_timeout_2.cc index f1f3bd827f..d8d52a411b 100644 --- a/tests/ten_runtime/smoke/path/path_timeout_2.cc +++ b/tests/ten_runtime/smoke/path/path_timeout_2.cc @@ -135,20 +135,17 @@ TEST(ExtensionTest, PathTimeout2) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] },{ "name": "hello_world2", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_app.cc b/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_app.cc index 8b27caf775..be31e40384 100644 --- a/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_app.cc +++ b/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_app.cc @@ -83,13 +83,11 @@ class test_app_1 : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "predefined_graph_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "predefined_graph_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_extension_1.cc b/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_extension_1.cc index 2a8b2b3759..d11b588320 100644 --- a/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_extension_1.cc +++ b/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_extension_1.cc @@ -82,13 +82,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "predefined_graph_multi_extension_1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "predefined_graph_multi_extension_1", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_extension_2.cc b/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_extension_2.cc index 7d0fd19594..d1bb1e4fc6 100644 --- a/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_extension_2.cc +++ b/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_extension_2.cc @@ -80,12 +80,10 @@ class test_app : public ten::app_t { "extension_group": "predefined_graph_multi_extension_2" }], "connections": [{ - "extension_group": "predefined_graph_multi_extension_2", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ - "extension_group": "predefined_graph_multi_extension_2", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_extension_3.cc b/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_extension_3.cc index 1346d54685..577f2535c3 100644 --- a/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_extension_3.cc +++ b/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_extension_3.cc @@ -79,12 +79,10 @@ class test_app : public ten::app_t { "extension_group": "predefined_graph_group" }], "connections": [{ - "extension_group": "predefined_graph_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ - "extension_group": "predefined_graph_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_extension_4.cc b/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_extension_4.cc index 2a6949dfa6..f74c5ff1e0 100644 --- a/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_extension_4.cc +++ b/tests/ten_runtime/smoke/predefined_graph/predefined_graph_multi_extension_4.cc @@ -105,25 +105,21 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "predefined_graph_multi_extension_4", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "predefined_graph_multi_extension_4", "extension": "test_extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "predefined_graph_multi_extension_4", "extension": "test_extension_2", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "predefined_graph_multi_extension_4", "extension": "test_extension_3" }] }] diff --git a/tests/ten_runtime/smoke/prepare_to_stop/different_thread.cc b/tests/ten_runtime/smoke/prepare_to_stop/different_thread.cc index 3aa57f7eb6..04fa937f04 100644 --- a/tests/ten_runtime/smoke/prepare_to_stop/different_thread.cc +++ b/tests/ten_runtime/smoke/prepare_to_stop/different_thread.cc @@ -130,20 +130,17 @@ TEST(ExtensionTest, PrepareToStopDifferentThread) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] },{ "name": "extension_1_stop", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/prepare_to_stop/same_thread.cc b/tests/ten_runtime/smoke/prepare_to_stop/same_thread.cc index 686df07b87..7a6cbd196c 100644 --- a/tests/ten_runtime/smoke/prepare_to_stop/same_thread.cc +++ b/tests/ten_runtime/smoke/prepare_to_stop/same_thread.cc @@ -131,20 +131,17 @@ TEST(ExtensionTest, PrepareToStopSameThread) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "prepare_to_stop_same_thread", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "prepare_to_stop_same_thread", "extension": "test_extension_2" }] },{ "name": "extension_1_stop", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "prepare_to_stop_same_thread", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/property/property_2_extensions_set_object.cc b/tests/ten_runtime/smoke/property/property_2_extensions_set_object.cc index c1a090f600..713a7934fc 100644 --- a/tests/ten_runtime/smoke/property/property_2_extensions_set_object.cc +++ b/tests/ten_runtime/smoke/property/property_2_extensions_set_object.cc @@ -163,13 +163,11 @@ TEST(PropertyTest, TwoExtensionsSetObject) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "internal_cmd", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/resp_handler/resp_handler_async_basic.cc b/tests/ten_runtime/smoke/resp_handler/resp_handler_async_basic.cc index 5cab202377..9614377e2a 100644 --- a/tests/ten_runtime/smoke/resp_handler/resp_handler_async_basic.cc +++ b/tests/ten_runtime/smoke/resp_handler/resp_handler_async_basic.cc @@ -186,41 +186,35 @@ TEST(ExtensionTest, RespHandlerAsyncBasic) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "resp_handler_async_basic__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world_1", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "resp_handler_async_basic__extension_group", "extension": "test_extension_2" }] },{ "name": "hello_world_2", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "resp_handler_async_basic__extension_group", "extension": "test_extension_2" }] },{ "name": "hello_world_3", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "resp_handler_async_basic__extension_group", "extension": "test_extension_2" }] },{ "name": "hello_world_5", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "resp_handler_async_basic__extension_group", "extension": "test_extension_2" }] },{ "name": "hello_world_6", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "resp_handler_async_basic__extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/resp_handler/resp_handler_basic.cc b/tests/ten_runtime/smoke/resp_handler/resp_handler_basic.cc index bad2eec041..181f0adeb6 100644 --- a/tests/ten_runtime/smoke/resp_handler/resp_handler_basic.cc +++ b/tests/ten_runtime/smoke/resp_handler/resp_handler_basic.cc @@ -193,41 +193,35 @@ TEST(ExtensionTest, RespHandlerBasic) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "resp_handler_basic__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world_1", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "resp_handler_basic__extension_group", "extension": "test_extension_2" }] },{ "name": "hello_world_2", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "resp_handler_basic__extension_group", "extension": "test_extension_2" }] },{ "name": "hello_world_3", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "resp_handler_basic__extension_group", "extension": "test_extension_2" }] },{ "name": "hello_world_5", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "resp_handler_basic__extension_group", "extension": "test_extension_2" }] },{ "name": "hello_world_6", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "resp_handler_basic__extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/resp_handler/resp_handler_basic_wait_in_on_start.cc b/tests/ten_runtime/smoke/resp_handler/resp_handler_basic_wait_in_on_start.cc index 67d3e1495e..5dcdf1002e 100644 --- a/tests/ten_runtime/smoke/resp_handler/resp_handler_basic_wait_in_on_start.cc +++ b/tests/ten_runtime/smoke/resp_handler/resp_handler_basic_wait_in_on_start.cc @@ -199,41 +199,35 @@ TEST(ExtensionTest, RespHandlerBasicWaitInOnStart) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "resp_handler_basic_wait_in_on_start__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world_1", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "resp_handler_basic_wait_in_on_start__extension_group", "extension": "test_extension_2" }] },{ "name": "hello_world_2", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "resp_handler_basic_wait_in_on_start__extension_group", "extension": "test_extension_2" }] },{ "name": "hello_world_3", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "resp_handler_basic_wait_in_on_start__extension_group", "extension": "test_extension_2" }] },{ "name": "hello_world_5", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "resp_handler_basic_wait_in_on_start__extension_group", "extension": "test_extension_2" }] },{ "name": "hello_world_6", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "resp_handler_basic_wait_in_on_start__extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/result_conversion/result_conversion_1.cc b/tests/ten_runtime/smoke/result_conversion/result_conversion_1.cc index 8d6b1a7d17..ef5628ada1 100644 --- a/tests/ten_runtime/smoke/result_conversion/result_conversion_1.cc +++ b/tests/ten_runtime/smoke/result_conversion/result_conversion_1.cc @@ -96,13 +96,11 @@ class test_app : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "result_mapping_1__extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "result_mapping_1__extension_group", "extension": "test_extension_2", "msg_conversion": { "type": "per_property", diff --git a/tests/ten_runtime/smoke/return/return_1.cc b/tests/ten_runtime/smoke/return/return_1.cc index 028206db46..3590e7c1ce 100644 --- a/tests/ten_runtime/smoke/return/return_1.cc +++ b/tests/ten_runtime/smoke/return/return_1.cc @@ -134,17 +134,14 @@ TEST(ExtensionTest, Return1) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "test_extension_2" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "test_extension_3" }] }] diff --git a/tests/ten_runtime/smoke/return/return_2.cc b/tests/ten_runtime/smoke/return/return_2.cc index deae80daf0..af4e3c73e5 100644 --- a/tests/ten_runtime/smoke/return/return_2.cc +++ b/tests/ten_runtime/smoke/return/return_2.cc @@ -134,17 +134,14 @@ TEST(ExtensionTest, Return2) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group 1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group 1", "extension": "test_extension_2" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group 2", "extension": "test_extension_3" }] }] diff --git a/tests/ten_runtime/smoke/return/return_3.cc b/tests/ten_runtime/smoke/return/return_3.cc index 2a641fd3a1..b1a427e58e 100644 --- a/tests/ten_runtime/smoke/return/return_3.cc +++ b/tests/ten_runtime/smoke/return/return_3.cc @@ -162,17 +162,14 @@ TEST(ExtensionTest, Return3) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group 1", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group 1", "extension": "test_extension_2" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group 2", "extension": "test_extension_3" }] }] diff --git a/tests/ten_runtime/smoke/return/return_4.cc b/tests/ten_runtime/smoke/return/return_4.cc index 2eab80c4a5..f673e5b03d 100644 --- a/tests/ten_runtime/smoke/return/return_4.cc +++ b/tests/ten_runtime/smoke/return/return_4.cc @@ -162,17 +162,14 @@ TEST(ExtensionTest, Return4) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "test_extension_2" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "test_extension_3" }] }] diff --git a/tests/ten_runtime/smoke/same_thread_ext_on_xxx/same_thread_ext_on_data.cc b/tests/ten_runtime/smoke/same_thread_ext_on_xxx/same_thread_ext_on_data.cc index 46b985484f..5073a12f1a 100644 --- a/tests/ten_runtime/smoke/same_thread_ext_on_xxx/same_thread_ext_on_data.cc +++ b/tests/ten_runtime/smoke/same_thread_ext_on_xxx/same_thread_ext_on_data.cc @@ -129,13 +129,11 @@ TEST(ExtensionTest, SameThreadExtOnData) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -143,7 +141,6 @@ TEST(ExtensionTest, SameThreadExtOnData) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/same_thread_ext_on_xxx/same_thread_ext_on_xxx_basic.cc b/tests/ten_runtime/smoke/same_thread_ext_on_xxx/same_thread_ext_on_xxx_basic.cc index c557be511a..c5725570fb 100644 --- a/tests/ten_runtime/smoke/same_thread_ext_on_xxx/same_thread_ext_on_xxx_basic.cc +++ b/tests/ten_runtime/smoke/same_thread_ext_on_xxx/same_thread_ext_on_xxx_basic.cc @@ -138,13 +138,11 @@ TEST(ExtensionTest, SameThreadExtOnXxxBasic) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/schema_test/schema_cmd_property_required.cc b/tests/ten_runtime/smoke/schema_test/schema_cmd_property_required.cc index 64e448aba1..2035cb68bc 100644 --- a/tests/ten_runtime/smoke/schema_test/schema_cmd_property_required.cc +++ b/tests/ten_runtime/smoke/schema_test/schema_cmd_property_required.cc @@ -219,13 +219,11 @@ TEST(SchemaTest, SendCmdPropertyRequired) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/schema_test/schema_cmd_result.cc b/tests/ten_runtime/smoke/schema_test/schema_cmd_result.cc index dee6102a39..229459f477 100644 --- a/tests/ten_runtime/smoke/schema_test/schema_cmd_result.cc +++ b/tests/ten_runtime/smoke/schema_test/schema_cmd_result.cc @@ -165,13 +165,11 @@ TEST(SchemaTest, CmdResult) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/schema_test/schema_cmd_result_error.cc b/tests/ten_runtime/smoke/schema_test/schema_cmd_result_error.cc index 569d5f8025..80e3420574 100644 --- a/tests/ten_runtime/smoke/schema_test/schema_cmd_result_error.cc +++ b/tests/ten_runtime/smoke/schema_test/schema_cmd_result_error.cc @@ -165,13 +165,11 @@ TEST(SchemaTest, CmdResultError) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/schema_test/schema_data_prop.cc b/tests/ten_runtime/smoke/schema_test/schema_data_prop.cc index 7518865a9f..a8568e7e8e 100644 --- a/tests/ten_runtime/smoke/schema_test/schema_data_prop.cc +++ b/tests/ten_runtime/smoke/schema_test/schema_data_prop.cc @@ -205,7 +205,6 @@ TEST(SchemaTest, DataProp) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/schema_test/schema_on_cmd.cc b/tests/ten_runtime/smoke/schema_test/schema_on_cmd.cc index 1e6bc3f503..01045d04a0 100644 --- a/tests/ten_runtime/smoke/schema_test/schema_on_cmd.cc +++ b/tests/ten_runtime/smoke/schema_test/schema_on_cmd.cc @@ -153,13 +153,11 @@ TEST(SchemaTest, OnCmd) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/schema_test/schema_send_cmd.cc b/tests/ten_runtime/smoke/schema_test/schema_send_cmd.cc index a4e7e4b393..b93a8a810e 100644 --- a/tests/ten_runtime/smoke/schema_test/schema_send_cmd.cc +++ b/tests/ten_runtime/smoke/schema_test/schema_send_cmd.cc @@ -150,13 +150,11 @@ TEST(SchemaTest, SendCmd) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/schema_test/schema_set_property_buf.cc b/tests/ten_runtime/smoke/schema_test/schema_set_property_buf.cc index d1cb65a18d..7f5a739010 100644 --- a/tests/ten_runtime/smoke/schema_test/schema_set_property_buf.cc +++ b/tests/ten_runtime/smoke/schema_test/schema_set_property_buf.cc @@ -151,13 +151,11 @@ TEST(SchemaTest, SetPropertyBuf) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/schema_test/schema_set_property_ptr.cc b/tests/ten_runtime/smoke/schema_test/schema_set_property_ptr.cc index 2017a8cf24..09e2ffb9dc 100644 --- a/tests/ten_runtime/smoke/schema_test/schema_set_property_ptr.cc +++ b/tests/ten_runtime/smoke/schema_test/schema_set_property_ptr.cc @@ -153,13 +153,11 @@ TEST(SchemaTest, SetPropertyPtr) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/send/not_specify_dest.cc b/tests/ten_runtime/smoke/send/not_specify_dest.cc index bb5715e40a..6d49befec2 100644 --- a/tests/ten_runtime/smoke/send/not_specify_dest.cc +++ b/tests/ten_runtime/smoke/send/not_specify_dest.cc @@ -110,13 +110,11 @@ TEST(SendTest, NotSpecifyDest) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/standalone_test/basic_graph.cc b/tests/ten_runtime/smoke/standalone_test/basic_graph.cc index 7e249ef9c3..3e2a83dca1 100644 --- a/tests/ten_runtime/smoke/standalone_test/basic_graph.cc +++ b/tests/ten_runtime/smoke/standalone_test/basic_graph.cc @@ -148,34 +148,28 @@ TEST(StandaloneTest, BasicGraph) { // NOLINT "extension_group": "test_extension_group" }], "connections": [{ - "extension_group": "test_extension_group", "extension": "ten:test_extension", "cmd": [{ "name": "process", "dest": [{ - "extension_group": "test_extension_group_1", "extension": "test_extension_1" }] }] }, { - "extension_group": "test_extension_group_1", "extension": "test_extension_1", "cmd": [{ "name": "process", "dest": [{ - "extension_group": "test_extension_group_2", "extension": "test_extension_2" }] }] }, { - "extension_group": "test_extension_group_2", "extension": "test_extension_2", "cmd": [{ "name": "hello_world", "dest": [{ - "extension_group": "test_extension_group", "extension": "ten:test_extension" }] }] diff --git a/tests/ten_runtime/smoke/standalone_test/basic_graph_cross_app.cc b/tests/ten_runtime/smoke/standalone_test/basic_graph_cross_app.cc index c932d39a89..3e2a60a9a5 100644 --- a/tests/ten_runtime/smoke/standalone_test/basic_graph_cross_app.cc +++ b/tests/ten_runtime/smoke/standalone_test/basic_graph_cross_app.cc @@ -190,39 +190,33 @@ TEST(StandaloneTest, BasicGraphCrossApp) { // NOLINT }], "connections": [{ "app": "client:aaa", - "extension_group": "test_extension_group", - "extension": "ten:test_extension", + "extension": "ten:test_extension", "cmd": [{ "name": "process", "dest": [{ "app": "client:aaa", - "extension_group": "test_extension_group_1", "extension": "test_extension_1" }] }] }, { "app": "client:aaa", - "extension_group": "test_extension_group_1", "extension": "test_extension_1", "cmd": [{ "name": "process", "dest": [{ "app": "msgpack://127.0.0.1:8088/", - "extension_group": "test_extension_group_2", "extension": "test_extension_2" }] }] }, { - "extension_group": "test_extension_group_2", "extension": "test_extension_2", "app": "msgpack://127.0.0.1:8088/", "cmd": [{ "name": "hello_world", "dest": [{ "app": "client:aaa", - "extension_group": "test_extension_group", "extension": "ten:test_extension" }] }] diff --git a/tests/ten_runtime/smoke/standalone_test/basic_graph_outer_thread_1.cc b/tests/ten_runtime/smoke/standalone_test/basic_graph_outer_thread_1.cc index 44dd7b191e..6502760518 100644 --- a/tests/ten_runtime/smoke/standalone_test/basic_graph_outer_thread_1.cc +++ b/tests/ten_runtime/smoke/standalone_test/basic_graph_outer_thread_1.cc @@ -178,34 +178,28 @@ TEST(StandaloneTest, BasicGraphOuterThread1) { // NOLINT "extension_group": "test_extension_group" }], "connections": [{ - "extension_group": "test_extension_group", "extension": "ten:test_extension", "cmd": [{ "name": "process", "dest": [{ - "extension_group": "test_extension_group_1", "extension": "test_extension_1" }] }] }, { - "extension_group": "test_extension_group_1", "extension": "test_extension_1", "cmd": [{ "name": "process", "dest": [{ - "extension_group": "test_extension_group_2", "extension": "test_extension_2" }] }] }, { - "extension_group": "test_extension_group_2", "extension": "test_extension_2", "cmd": [{ "name": "hello_world", "dest": [{ - "extension_group": "test_extension_group", "extension": "ten:test_extension" }] }] diff --git a/tests/ten_runtime/smoke/standalone_test/basic_graph_outer_thread_2.cc b/tests/ten_runtime/smoke/standalone_test/basic_graph_outer_thread_2.cc index 30700a627b..06ce375322 100644 --- a/tests/ten_runtime/smoke/standalone_test/basic_graph_outer_thread_2.cc +++ b/tests/ten_runtime/smoke/standalone_test/basic_graph_outer_thread_2.cc @@ -175,34 +175,28 @@ TEST(StandaloneTest, BasicGraphOuterThread2) { // NOLINT "extension_group": "test_extension_group" }], "connections": [{ - "extension_group": "test_extension_group", "extension": "ten:test_extension", "cmd": [{ "name": "process", "dest": [{ - "extension_group": "test_extension_group_1", "extension": "test_extension_1" }] }] }, { - "extension_group": "test_extension_group_1", "extension": "test_extension_1", "cmd": [{ "name": "process", "dest": [{ - "extension_group": "test_extension_group_2", "extension": "test_extension_2" }] }] }, { - "extension_group": "test_extension_group_2", "extension": "test_extension_2", "cmd": [{ "name": "hello_world", "dest": [{ - "extension_group": "test_extension_group", "extension": "ten:test_extension" }] }] diff --git a/tests/ten_runtime/smoke/start_graph/start_predefined_graph_cross_app.cc b/tests/ten_runtime/smoke/start_graph/start_predefined_graph_cross_app.cc index 0d21ce2a18..c061501eff 100644 --- a/tests/ten_runtime/smoke/start_graph/start_predefined_graph_cross_app.cc +++ b/tests/ten_runtime/smoke/start_graph/start_predefined_graph_cross_app.cc @@ -165,13 +165,11 @@ class test_app_1 : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "start_predefined_graph_cross_app__normal_extension_group", "extension": "normal_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "start_predefined_graph_cross_app__normal_extension_group", "extension": "normal_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/start_graph/start_two_predefined_graphs.cc b/tests/ten_runtime/smoke/start_graph/start_two_predefined_graphs.cc index 7c93432573..e6c327972f 100644 --- a/tests/ten_runtime/smoke/start_graph/start_two_predefined_graphs.cc +++ b/tests/ten_runtime/smoke/start_graph/start_two_predefined_graphs.cc @@ -155,13 +155,11 @@ class test_app_1 : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "start_two_predefined_graphs__normal_extension_group", "extension": "normal_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "start_two_predefined_graphs__normal_extension_group", "extension": "normal_extension_2" }] }] @@ -184,13 +182,11 @@ class test_app_1 : public ten::app_t { }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "start_two_predefined_graphs__normal_extension_group", "extension": "normal_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8002/", - "extension_group": "start_two_predefined_graphs__normal_extension_group", "extension": "normal_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/suspend_resume/suspend_resume_1.cc b/tests/ten_runtime/smoke/suspend_resume/suspend_resume_1.cc index 16445fad1c..94dfee545c 100644 --- a/tests/ten_runtime/smoke/suspend_resume/suspend_resume_1.cc +++ b/tests/ten_runtime/smoke/suspend_resume/suspend_resume_1.cc @@ -201,13 +201,11 @@ TEST(ExtensionTest, SuspendResume1) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -215,7 +213,6 @@ TEST(ExtensionTest, SuspendResume1) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/suspend_resume/suspend_resume_2.cc b/tests/ten_runtime/smoke/suspend_resume/suspend_resume_2.cc index 075e8424c4..de74aa4cd2 100644 --- a/tests/ten_runtime/smoke/suspend_resume/suspend_resume_2.cc +++ b/tests/ten_runtime/smoke/suspend_resume/suspend_resume_2.cc @@ -210,13 +210,11 @@ TEST(ExtensionTest, SuspendResume2) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "cmd": [{ "name": "hello_world", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }], @@ -224,7 +222,6 @@ TEST(ExtensionTest, SuspendResume2) { // NOLINT "name": "data", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] diff --git a/tests/ten_runtime/smoke/video_frame_test/basic.cc b/tests/ten_runtime/smoke/video_frame_test/basic.cc index 5896cf6467..71fff5c0fe 100644 --- a/tests/ten_runtime/smoke/video_frame_test/basic.cc +++ b/tests/ten_runtime/smoke/video_frame_test/basic.cc @@ -111,25 +111,21 @@ TEST(VideoFrameTest, Basic) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "video_frame": [{ "name": "video_frame", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2", "cmd": [{ "name": "video_frame_ack", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1" }] }] diff --git a/tests/ten_runtime/smoke/video_frame_test/create_from_json.cc b/tests/ten_runtime/smoke/video_frame_test/create_from_json.cc index 1cff82fd28..cc0c5eb331 100644 --- a/tests/ten_runtime/smoke/video_frame_test/create_from_json.cc +++ b/tests/ten_runtime/smoke/video_frame_test/create_from_json.cc @@ -121,25 +121,21 @@ TEST(VideoFrameTest, CreateFromJson) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "video_frame": [{ "name": "video_frame", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2", "cmd": [{ "name": "video_frame_ack", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1" }] }] diff --git a/tests/ten_runtime/smoke/video_frame_test/from_json.cc b/tests/ten_runtime/smoke/video_frame_test/from_json.cc index cdc9fbf38f..c0a9c1af0c 100644 --- a/tests/ten_runtime/smoke/video_frame_test/from_json.cc +++ b/tests/ten_runtime/smoke/video_frame_test/from_json.cc @@ -119,25 +119,21 @@ TEST(VideoFrameTest, FromJson) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1", "video_frame": [{ "name": "video_frame", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2" }] }] },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_2", "cmd": [{ "name": "video_frame_ack", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "basic_extension_group", "extension": "test_extension_1" }] }] diff --git a/tests/ten_runtime/smoke/video_frame_test/multi_dest_video_frame.cc b/tests/ten_runtime/smoke/video_frame_test/multi_dest_video_frame.cc index d6a0420313..b2ef5210a1 100644 --- a/tests/ten_runtime/smoke/video_frame_test/multi_dest_video_frame.cc +++ b/tests/ten_runtime/smoke/video_frame_test/multi_dest_video_frame.cc @@ -191,17 +191,14 @@ TEST(VideoFrameTest, MultiDestVideoFrame) { // NOLINT }], "connections": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "extension 1", "video_frame": [{ "name": "video_frame", "dest": [{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "extension 2" },{ "app": "msgpack://127.0.0.1:8001/", - "extension_group": "test_extension_group", "extension": "extension 3" }] }]