diff --git a/ddsrouter_core/test/blackbox/ddsrouter_core/dds/WAN/DDSTestWAN.cpp b/ddsrouter_core/test/blackbox/ddsrouter_core/dds/WAN/DDSTestWAN.cpp index 1934d416d..7d3f38cd3 100644 --- a/ddsrouter_core/test/blackbox/ddsrouter_core/dds/WAN/DDSTestWAN.cpp +++ b/ddsrouter_core/test/blackbox/ddsrouter_core/dds/WAN/DDSTestWAN.cpp @@ -129,8 +129,6 @@ discovery_server_participant_configuration( conf.id = core::types::ParticipantId("WanDsParticipant_" + std::to_string((this_server_id_is_1 ? 1 : 0))); - conf.discovery_server_guid_prefix = core::types::GuidPrefix((this_server_id_is_1 ? 1u : 0u)); - if (tls) { conf.tls_configuration = tls_configuration(wan_kind); diff --git a/ddsrouter_test/compose/test_cases/dds/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/dds/ddsrouter.yaml index b57632f99..1163184c1 100644 --- a/ddsrouter_test/compose/test_cases/dds/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/dds/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 xml: raw: | diff --git a/ddsrouter_test/compose/test_cases/dds_rtps/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/dds_rtps/ddsrouter.yaml index b04a0a442..594aec5ff 100644 --- a/ddsrouter_test/compose/test_cases/dds_rtps/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/dds_rtps/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 xml: raw: | diff --git a/ddsrouter_test/compose/test_cases/discovery_server/ddsrouter_cloud_discovery.yaml b/ddsrouter_test/compose/test_cases/discovery_server/ddsrouter_cloud_discovery.yaml index fe59e5258..8fa0f738d 100644 --- a/ddsrouter_test/compose/test_cases/discovery_server/ddsrouter_cloud_discovery.yaml +++ b/ddsrouter_test/compose/test_cases/discovery_server/ddsrouter_cloud_discovery.yaml @@ -1,11 +1,9 @@ -version: v4.0 +version: v5.0 participants: - name: Cloud_Discovery_Server_Participant kind: wan-ds - discovery-server-guid: - id: 0 listening-addresses: - domain: ddsrouter_cloud port: 11666 diff --git a/ddsrouter_test/compose/test_cases/discovery_server/ddsrouter_edge_1.yaml b/ddsrouter_test/compose/test_cases/discovery_server/ddsrouter_edge_1.yaml index 5964b7399..8bc5d9d6d 100644 --- a/ddsrouter_test/compose/test_cases/discovery_server/ddsrouter_edge_1.yaml +++ b/ddsrouter_test/compose/test_cases/discovery_server/ddsrouter_edge_1.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: @@ -8,12 +8,8 @@ participants: - name: Edge_1_DS_Participant kind: wan-ds - discovery-server-guid: - id: 1 connection-addresses: - - discovery-server-guid: - id: 0 - addresses: + - addresses: - domain: ddsrouter_cloud port: 11666 transport: udp diff --git a/ddsrouter_test/compose/test_cases/discovery_server/ddsrouter_edge_2.yaml b/ddsrouter_test/compose/test_cases/discovery_server/ddsrouter_edge_2.yaml index 03693547f..b1566d714 100644 --- a/ddsrouter_test/compose/test_cases/discovery_server/ddsrouter_edge_2.yaml +++ b/ddsrouter_test/compose/test_cases/discovery_server/ddsrouter_edge_2.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: @@ -8,12 +8,8 @@ participants: - name: Edge_2_DS_Participant kind: wan-ds - discovery-server-guid: - id: 2 connection-addresses: - - discovery-server-guid: - id: 0 - addresses: + - addresses: - domain: ddsrouter_cloud port: 21666 transport: udp diff --git a/ddsrouter_test/compose/test_cases/discovery_trigger/any/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/discovery_trigger/any/ddsrouter.yaml index ed9a7c727..8910f6ba8 100644 --- a/ddsrouter_test/compose/test_cases/discovery_trigger/any/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/discovery_trigger/any/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: - name: Local_80 diff --git a/ddsrouter_test/compose/test_cases/discovery_trigger/none/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/discovery_trigger/none/ddsrouter.yaml index 0d6f586a2..b77e7ca9f 100644 --- a/ddsrouter_test/compose/test_cases/discovery_trigger/none/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/discovery_trigger/none/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: - name: Local_80 diff --git a/ddsrouter_test/compose/test_cases/discovery_trigger/reader/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/discovery_trigger/reader/ddsrouter.yaml index 0a20d41f4..de78bd242 100644 --- a/ddsrouter_test/compose/test_cases/discovery_trigger/reader/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/discovery_trigger/reader/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: - name: Local_80 diff --git a/ddsrouter_test/compose/test_cases/discovery_trigger/writer/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/discovery_trigger/writer/ddsrouter.yaml index 4d3ce417d..db72b8ee6 100644 --- a/ddsrouter_test/compose/test_cases/discovery_trigger/writer/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/discovery_trigger/writer/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: - name: Local_80 diff --git a/ddsrouter_test/compose/test_cases/forwarding_routes/basic_route/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/forwarding_routes/basic_route/ddsrouter.yaml index 92248549f..f67e3b45f 100644 --- a/ddsrouter_test/compose/test_cases/forwarding_routes/basic_route/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/forwarding_routes/basic_route/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/forwarding_routes/parallel_routes/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/forwarding_routes/parallel_routes/ddsrouter.yaml index 148ee8b13..5631f1432 100644 --- a/ddsrouter_test/compose/test_cases/forwarding_routes/parallel_routes/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/forwarding_routes/parallel_routes/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/forwarding_routes/repeater/ddsrouter_cloud.yaml b/ddsrouter_test/compose/test_cases/forwarding_routes/repeater/ddsrouter_cloud.yaml index ab37eced0..ee385773f 100644 --- a/ddsrouter_test/compose/test_cases/forwarding_routes/repeater/ddsrouter_cloud.yaml +++ b/ddsrouter_test/compose/test_cases/forwarding_routes/repeater/ddsrouter_cloud.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/forwarding_routes/repeater/ddsrouter_edge_1.yaml b/ddsrouter_test/compose/test_cases/forwarding_routes/repeater/ddsrouter_edge_1.yaml index 292fd7c59..173380090 100644 --- a/ddsrouter_test/compose/test_cases/forwarding_routes/repeater/ddsrouter_edge_1.yaml +++ b/ddsrouter_test/compose/test_cases/forwarding_routes/repeater/ddsrouter_edge_1.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/forwarding_routes/repeater/ddsrouter_edge_2.yaml b/ddsrouter_test/compose/test_cases/forwarding_routes/repeater/ddsrouter_edge_2.yaml index 2136df96e..4521c9934 100644 --- a/ddsrouter_test/compose/test_cases/forwarding_routes/repeater/ddsrouter_edge_2.yaml +++ b/ddsrouter_test/compose/test_cases/forwarding_routes/repeater/ddsrouter_edge_2.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/forwarding_routes/topic_routes/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/forwarding_routes/topic_routes/ddsrouter.yaml index 75d8135f3..aaab7baf7 100644 --- a/ddsrouter_test/compose/test_cases/forwarding_routes/topic_routes/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/forwarding_routes/topic_routes/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/frequency/downsampling/participant/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/frequency/downsampling/participant/ddsrouter.yaml index e8f83f3f9..fedfdcbcb 100644 --- a/ddsrouter_test/compose/test_cases/frequency/downsampling/participant/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/frequency/downsampling/participant/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/frequency/downsampling/specs/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/frequency/downsampling/specs/ddsrouter.yaml index 0d88e9431..07224920a 100644 --- a/ddsrouter_test/compose/test_cases/frequency/downsampling/specs/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/frequency/downsampling/specs/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/frequency/max-rx-rate/participant/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/frequency/max-rx-rate/participant/ddsrouter.yaml index 9e938b050..80f3557a5 100644 --- a/ddsrouter_test/compose/test_cases/frequency/max-rx-rate/participant/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/frequency/max-rx-rate/participant/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/frequency/max-rx-rate/specs/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/frequency/max-rx-rate/specs/ddsrouter.yaml index 8c25893b6..420c7bb92 100644 --- a/ddsrouter_test/compose/test_cases/frequency/max-rx-rate/specs/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/frequency/max-rx-rate/specs/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/frequency/max-tx-rate/participant/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/frequency/max-tx-rate/participant/ddsrouter.yaml index 11b05b581..0e7eb3098 100644 --- a/ddsrouter_test/compose/test_cases/frequency/max-tx-rate/participant/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/frequency/max-tx-rate/participant/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/frequency/max-tx-rate/specs/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/frequency/max-tx-rate/specs/ddsrouter.yaml index 85a684f28..02d5dc741 100644 --- a/ddsrouter_test/compose/test_cases/frequency/max-tx-rate/specs/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/frequency/max-tx-rate/specs/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/manual_topics/generic/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/manual_topics/generic/ddsrouter.yaml index 8c67b443e..97e6219a8 100644 --- a/ddsrouter_test/compose/test_cases/manual_topics/generic/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/manual_topics/generic/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 topics: - name: topic_0 diff --git a/ddsrouter_test/compose/test_cases/manual_topics/participants/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/manual_topics/participants/ddsrouter.yaml index 75ab7b898..b15a65476 100644 --- a/ddsrouter_test/compose/test_cases/manual_topics/participants/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/manual_topics/participants/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 topics: - name: topic_0 diff --git a/ddsrouter_test/compose/test_cases/manual_topics/precedence/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/manual_topics/precedence/ddsrouter.yaml index b28717fa6..29e13b7c8 100644 --- a/ddsrouter_test/compose/test_cases/manual_topics/precedence/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/manual_topics/precedence/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 topics: - name: topic_0 diff --git a/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect/ddsrouter.yaml index 052f1778a..55b2deb2a 100644 --- a/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_cloud_0.yaml b/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_cloud_0.yaml index 377d816b0..66d7ca1fb 100644 --- a/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_cloud_0.yaml +++ b/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_cloud_0.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_cloud_1.yaml b/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_cloud_1.yaml index 3a09f6dfd..43450ed9f 100644 --- a/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_cloud_1.yaml +++ b/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_cloud_1.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_edge_0.yaml b/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_edge_0.yaml index a849dea42..8c3df4a8e 100644 --- a/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_edge_0.yaml +++ b/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_edge_0.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_edge_1.yaml b/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_edge_1.yaml index 5811e3291..3d61b928f 100644 --- a/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_edge_1.yaml +++ b/ddsrouter_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_edge_1.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/remove_unused_entities/persist_diff_domain/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/remove_unused_entities/persist_diff_domain/ddsrouter.yaml index 1194c3023..56dc762fa 100644 --- a/ddsrouter_test/compose/test_cases/remove_unused_entities/persist_diff_domain/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/remove_unused_entities/persist_diff_domain/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/remove_unused_entities/persist_same_domain/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/remove_unused_entities/persist_same_domain/ddsrouter.yaml index 052f1778a..55b2deb2a 100644 --- a/ddsrouter_test/compose/test_cases/remove_unused_entities/persist_same_domain/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/remove_unused_entities/persist_same_domain/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect/ddsrouter.yaml index 052f1778a..55b2deb2a 100644 --- a/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect_wan/ddsrouter_cloud_0.yaml b/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect_wan/ddsrouter_cloud_0.yaml index 377d816b0..66d7ca1fb 100644 --- a/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect_wan/ddsrouter_cloud_0.yaml +++ b/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect_wan/ddsrouter_cloud_0.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect_wan/ddsrouter_cloud_1.yaml b/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect_wan/ddsrouter_cloud_1.yaml index 3a09f6dfd..43450ed9f 100644 --- a/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect_wan/ddsrouter_cloud_1.yaml +++ b/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect_wan/ddsrouter_cloud_1.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect_wan/ddsrouter_edge_0.yaml b/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect_wan/ddsrouter_edge_0.yaml index a849dea42..8c3df4a8e 100644 --- a/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect_wan/ddsrouter_edge_0.yaml +++ b/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect_wan/ddsrouter_edge_0.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect_wan/ddsrouter_edge_1.yaml b/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect_wan/ddsrouter_edge_1.yaml index 5811e3291..3d61b928f 100644 --- a/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect_wan/ddsrouter_edge_1.yaml +++ b/ddsrouter_test/compose/test_cases/remove_unused_entities/reconnect_wan/ddsrouter_edge_1.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/repeater/ddsrouter_cloud.yaml b/ddsrouter_test/compose/test_cases/repeater/ddsrouter_cloud.yaml index b2fe02474..89f06a6ad 100644 --- a/ddsrouter_test/compose/test_cases/repeater/ddsrouter_cloud.yaml +++ b/ddsrouter_test/compose/test_cases/repeater/ddsrouter_cloud.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/repeater/ddsrouter_edge_1.yaml b/ddsrouter_test/compose/test_cases/repeater/ddsrouter_edge_1.yaml index 292fd7c59..173380090 100644 --- a/ddsrouter_test/compose/test_cases/repeater/ddsrouter_edge_1.yaml +++ b/ddsrouter_test/compose/test_cases/repeater/ddsrouter_edge_1.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/repeater/ddsrouter_edge_2.yaml b/ddsrouter_test/compose/test_cases/repeater/ddsrouter_edge_2.yaml index 2136df96e..4521c9934 100644 --- a/ddsrouter_test/compose/test_cases/repeater/ddsrouter_edge_2.yaml +++ b/ddsrouter_test/compose/test_cases/repeater/ddsrouter_edge_2.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/repeater_tcp/ddsrouter_cloud.yaml b/ddsrouter_test/compose/test_cases/repeater_tcp/ddsrouter_cloud.yaml index 2fcff0efc..8a3d8d5a4 100644 --- a/ddsrouter_test/compose/test_cases/repeater_tcp/ddsrouter_cloud.yaml +++ b/ddsrouter_test/compose/test_cases/repeater_tcp/ddsrouter_cloud.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/repeater_tcp/ddsrouter_edge_1.yaml b/ddsrouter_test/compose/test_cases/repeater_tcp/ddsrouter_edge_1.yaml index 17226445e..893a120bd 100644 --- a/ddsrouter_test/compose/test_cases/repeater_tcp/ddsrouter_edge_1.yaml +++ b/ddsrouter_test/compose/test_cases/repeater_tcp/ddsrouter_edge_1.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/repeater_tcp/ddsrouter_edge_2.yaml b/ddsrouter_test/compose/test_cases/repeater_tcp/ddsrouter_edge_2.yaml index 119664411..81a37abb6 100644 --- a/ddsrouter_test/compose/test_cases/repeater_tcp/ddsrouter_edge_2.yaml +++ b/ddsrouter_test/compose/test_cases/repeater_tcp/ddsrouter_edge_2.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/rpc/ros2_services_cloud/ddsrouter_cloud.yaml b/ddsrouter_test/compose/test_cases/rpc/ros2_services_cloud/ddsrouter_cloud.yaml index 7d7e08392..abb014e87 100644 --- a/ddsrouter_test/compose/test_cases/rpc/ros2_services_cloud/ddsrouter_cloud.yaml +++ b/ddsrouter_test/compose/test_cases/rpc/ros2_services_cloud/ddsrouter_cloud.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 allowlist: - name: "*addition_service*" diff --git a/ddsrouter_test/compose/test_cases/rpc/ros2_services_cloud/ddsrouter_edge_1.yaml b/ddsrouter_test/compose/test_cases/rpc/ros2_services_cloud/ddsrouter_edge_1.yaml index e9b4cf9d6..e005fd598 100644 --- a/ddsrouter_test/compose/test_cases/rpc/ros2_services_cloud/ddsrouter_edge_1.yaml +++ b/ddsrouter_test/compose/test_cases/rpc/ros2_services_cloud/ddsrouter_edge_1.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 allowlist: - name: "*addition_service*" diff --git a/ddsrouter_test/compose/test_cases/rpc/ros2_services_cloud/ddsrouter_edge_2.yaml b/ddsrouter_test/compose/test_cases/rpc/ros2_services_cloud/ddsrouter_edge_2.yaml index 7f42b5a06..571b9a328 100644 --- a/ddsrouter_test/compose/test_cases/rpc/ros2_services_cloud/ddsrouter_edge_2.yaml +++ b/ddsrouter_test/compose/test_cases/rpc/ros2_services_cloud/ddsrouter_edge_2.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/rpc/ros2_services_correct_target/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/rpc/ros2_services_correct_target/ddsrouter.yaml index 07193717c..6c1da6ef3 100644 --- a/ddsrouter_test/compose/test_cases/rpc/ros2_services_correct_target/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/rpc/ros2_services_correct_target/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater/ddsrouter_cloud_repeater.yaml b/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater/ddsrouter_cloud_repeater.yaml index 59b6ab314..ee4f72d09 100644 --- a/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater/ddsrouter_cloud_repeater.yaml +++ b/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater/ddsrouter_cloud_repeater.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater/ddsrouter_edge_1.yaml b/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater/ddsrouter_edge_1.yaml index 17226445e..893a120bd 100644 --- a/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater/ddsrouter_edge_1.yaml +++ b/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater/ddsrouter_edge_1.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater/ddsrouter_edge_2.yaml b/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater/ddsrouter_edge_2.yaml index 119664411..81a37abb6 100644 --- a/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater/ddsrouter_edge_2.yaml +++ b/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater/ddsrouter_edge_2.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater_with_talker/ddsrouter_cloud_repeater.yaml b/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater_with_talker/ddsrouter_cloud_repeater.yaml index c1a0dee2c..a7b89fc8f 100644 --- a/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater_with_talker/ddsrouter_cloud_repeater.yaml +++ b/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater_with_talker/ddsrouter_cloud_repeater.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater_with_talker/ddsrouter_edge_1.yaml b/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater_with_talker/ddsrouter_edge_1.yaml index 0993832b6..f4f6fb883 100644 --- a/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater_with_talker/ddsrouter_edge_1.yaml +++ b/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater_with_talker/ddsrouter_edge_1.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater_with_talker/ddsrouter_edge_2.yaml b/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater_with_talker/ddsrouter_edge_2.yaml index 65b2ecace..b254e7a84 100644 --- a/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater_with_talker/ddsrouter_edge_2.yaml +++ b/ddsrouter_test/compose/test_cases/rpc/ros2_services_repeater_with_talker/ddsrouter_edge_2.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/rpc/ros2_services_simple/ddsrouter_1.yaml b/ddsrouter_test/compose/test_cases/rpc/ros2_services_simple/ddsrouter_1.yaml index 8960619b4..bd8a7eeb1 100644 --- a/ddsrouter_test/compose/test_cases/rpc/ros2_services_simple/ddsrouter_1.yaml +++ b/ddsrouter_test/compose/test_cases/rpc/ros2_services_simple/ddsrouter_1.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/rpc/ros2_services_simple/ddsrouter_2.yaml b/ddsrouter_test/compose/test_cases/rpc/ros2_services_simple/ddsrouter_2.yaml index 3786b9366..ba1b32a8e 100644 --- a/ddsrouter_test/compose/test_cases/rpc/ros2_services_simple/ddsrouter_2.yaml +++ b/ddsrouter_test/compose/test_cases/rpc/ros2_services_simple/ddsrouter_2.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/rpc/ros2_services_trivial/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/rpc/ros2_services_trivial/ddsrouter.yaml index 85a1b8d02..e8d1cfbc7 100644 --- a/ddsrouter_test/compose/test_cases/rpc/ros2_services_trivial/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/rpc/ros2_services_trivial/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/rpc/ros2_services_trivial_multiple/ddsrouter_1.yaml b/ddsrouter_test/compose/test_cases/rpc/ros2_services_trivial_multiple/ddsrouter_1.yaml index 74fbbc78b..36784aa56 100644 --- a/ddsrouter_test/compose/test_cases/rpc/ros2_services_trivial_multiple/ddsrouter_1.yaml +++ b/ddsrouter_test/compose/test_cases/rpc/ros2_services_trivial_multiple/ddsrouter_1.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/rpc/ros2_services_trivial_multiple/ddsrouter_2.yaml b/ddsrouter_test/compose/test_cases/rpc/ros2_services_trivial_multiple/ddsrouter_2.yaml index 161e4cb3e..5f6b710a8 100644 --- a/ddsrouter_test/compose/test_cases/rpc/ros2_services_trivial_multiple/ddsrouter_2.yaml +++ b/ddsrouter_test/compose/test_cases/rpc/ros2_services_trivial_multiple/ddsrouter_2.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/security/backdoor/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/security/backdoor/ddsrouter.yaml index 68906549b..3a421b0bb 100644 --- a/ddsrouter_test/compose/test_cases/security/backdoor/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/security/backdoor/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 xml: files: diff --git a/ddsrouter_test/compose/test_cases/security/backdoor_dds/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/security/backdoor_dds/ddsrouter.yaml index f46ce3b4f..9bc5cd849 100644 --- a/ddsrouter_test/compose/test_cases/security/backdoor_dds/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/security/backdoor_dds/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 xml: files: diff --git a/ddsrouter_test/compose/test_cases/security/secure_trespassing/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/security/secure_trespassing/ddsrouter.yaml index 68906549b..3a421b0bb 100644 --- a/ddsrouter_test/compose/test_cases/security/secure_trespassing/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/security/secure_trespassing/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 xml: files: diff --git a/ddsrouter_test/compose/test_cases/security/secure_wan/configurations/ddsrouter_client_secure.yaml b/ddsrouter_test/compose/test_cases/security/secure_wan/configurations/ddsrouter_client_secure.yaml index 79424e658..28749565f 100644 --- a/ddsrouter_test/compose/test_cases/security/secure_wan/configurations/ddsrouter_client_secure.yaml +++ b/ddsrouter_test/compose/test_cases/security/secure_wan/configurations/ddsrouter_client_secure.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 xml: files: diff --git a/ddsrouter_test/compose/test_cases/security/secure_wan/configurations/ddsrouter_non_secure.yaml b/ddsrouter_test/compose/test_cases/security/secure_wan/configurations/ddsrouter_non_secure.yaml index 58d34c0ff..569c855c2 100644 --- a/ddsrouter_test/compose/test_cases/security/secure_wan/configurations/ddsrouter_non_secure.yaml +++ b/ddsrouter_test/compose/test_cases/security/secure_wan/configurations/ddsrouter_non_secure.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 xml: files: diff --git a/ddsrouter_test/compose/test_cases/security/secure_wan/configurations/ddsrouter_server_secure.yaml b/ddsrouter_test/compose/test_cases/security/secure_wan/configurations/ddsrouter_server_secure.yaml index a2b1fa16e..e872abc40 100644 --- a/ddsrouter_test/compose/test_cases/security/secure_wan/configurations/ddsrouter_server_secure.yaml +++ b/ddsrouter_test/compose/test_cases/security/secure_wan/configurations/ddsrouter_server_secure.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 xml: files: diff --git a/ddsrouter_test/compose/test_cases/stress/cloud/reliable/ddsrouter_cloud_1.yaml b/ddsrouter_test/compose/test_cases/stress/cloud/reliable/ddsrouter_cloud_1.yaml index 6d807a27f..3a51ad4d4 100644 --- a/ddsrouter_test/compose/test_cases/stress/cloud/reliable/ddsrouter_cloud_1.yaml +++ b/ddsrouter_test/compose/test_cases/stress/cloud/reliable/ddsrouter_cloud_1.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/cloud/reliable/ddsrouter_cloud_2.yaml b/ddsrouter_test/compose/test_cases/stress/cloud/reliable/ddsrouter_cloud_2.yaml index 26a9a9442..5d2c96753 100644 --- a/ddsrouter_test/compose/test_cases/stress/cloud/reliable/ddsrouter_cloud_2.yaml +++ b/ddsrouter_test/compose/test_cases/stress/cloud/reliable/ddsrouter_cloud_2.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/cloud/reliable/ddsrouter_edge_1.yaml b/ddsrouter_test/compose/test_cases/stress/cloud/reliable/ddsrouter_edge_1.yaml index 8d42abaf1..c7ba8d7d1 100644 --- a/ddsrouter_test/compose/test_cases/stress/cloud/reliable/ddsrouter_edge_1.yaml +++ b/ddsrouter_test/compose/test_cases/stress/cloud/reliable/ddsrouter_edge_1.yaml @@ -3,7 +3,7 @@ ############################# # Yaml configuration file version -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/cloud/reliable/ddsrouter_edge_2.yaml b/ddsrouter_test/compose/test_cases/stress/cloud/reliable/ddsrouter_edge_2.yaml index 7c7a3382d..f51ad08e4 100644 --- a/ddsrouter_test/compose/test_cases/stress/cloud/reliable/ddsrouter_edge_2.yaml +++ b/ddsrouter_test/compose/test_cases/stress/cloud/reliable/ddsrouter_edge_2.yaml @@ -3,7 +3,7 @@ ############################# # Yaml configuration file version -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_cloud.yaml b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_cloud.yaml index e4e338419..6ec772582 100644 --- a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_cloud.yaml +++ b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_cloud.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_01.yaml b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_01.yaml index d44b57878..778cb8dbd 100644 --- a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_01.yaml +++ b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_01.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_02.yaml b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_02.yaml index 266fc515b..24bd5b63b 100644 --- a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_02.yaml +++ b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_02.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_03.yaml b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_03.yaml index 9b32d8e2d..f7d1e2046 100644 --- a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_03.yaml +++ b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_03.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_04.yaml b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_04.yaml index 680afbc7e..af471854e 100644 --- a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_04.yaml +++ b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_04.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_05.yaml b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_05.yaml index a69793169..d44218fba 100644 --- a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_05.yaml +++ b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_05.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_06.yaml b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_06.yaml index c5183f08a..a7d35fe5d 100644 --- a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_06.yaml +++ b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_06.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_07.yaml b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_07.yaml index 171530db5..b4458f6fa 100644 --- a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_07.yaml +++ b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_07.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_11.yaml b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_11.yaml index ab2030d70..db1b8278e 100644 --- a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_11.yaml +++ b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_11.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_12.yaml b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_12.yaml index abcbe2f55..204cffbca 100644 --- a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_12.yaml +++ b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_12.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_13.yaml b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_13.yaml index 89dc2734d..7ebe1b548 100644 --- a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_13.yaml +++ b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_13.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_14.yaml b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_14.yaml index 4aacab900..403d6ef96 100644 --- a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_14.yaml +++ b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_14.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_15.yaml b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_15.yaml index 2b6c7b051..9e08f65a9 100644 --- a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_15.yaml +++ b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_15.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_16.yaml b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_16.yaml index 87bec508f..579596236 100644 --- a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_16.yaml +++ b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_16.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_17.yaml b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_17.yaml index 80daf71e1..fb2c54b28 100644 --- a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_17.yaml +++ b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/ddsrouter_edge_17.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/reliable/ddsrouter_cloud.yaml b/ddsrouter_test/compose/test_cases/stress/repeater/reliable/ddsrouter_cloud.yaml index bf4a6a5e5..f2bf2ff6b 100644 --- a/ddsrouter_test/compose/test_cases/stress/repeater/reliable/ddsrouter_cloud.yaml +++ b/ddsrouter_test/compose/test_cases/stress/repeater/reliable/ddsrouter_cloud.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/reliable/ddsrouter_edge_1.yaml b/ddsrouter_test/compose/test_cases/stress/repeater/reliable/ddsrouter_edge_1.yaml index 8f7b2319e..315a5ec7d 100644 --- a/ddsrouter_test/compose/test_cases/stress/repeater/reliable/ddsrouter_edge_1.yaml +++ b/ddsrouter_test/compose/test_cases/stress/repeater/reliable/ddsrouter_edge_1.yaml @@ -3,7 +3,7 @@ ############################# # Yaml configuration file version -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/reliable/ddsrouter_edge_2.yaml b/ddsrouter_test/compose/test_cases/stress/repeater/reliable/ddsrouter_edge_2.yaml index a34be53f4..d8c956b3a 100644 --- a/ddsrouter_test/compose/test_cases/stress/repeater/reliable/ddsrouter_edge_2.yaml +++ b/ddsrouter_test/compose/test_cases/stress/repeater/reliable/ddsrouter_edge_2.yaml @@ -3,7 +3,7 @@ ############################# # Yaml configuration file version -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/stress/simple/reliable/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/stress/simple/reliable/ddsrouter.yaml index 4f5730727..78f9889d1 100644 --- a/ddsrouter_test/compose/test_cases/stress/simple/reliable/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/stress/simple/reliable/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/tcp/ddsrouter_cloud.yaml b/ddsrouter_test/compose/test_cases/tcp/ddsrouter_cloud.yaml index 72ca91a30..92dfe5040 100644 --- a/ddsrouter_test/compose/test_cases/tcp/ddsrouter_cloud.yaml +++ b/ddsrouter_test/compose/test_cases/tcp/ddsrouter_cloud.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/tcp/ddsrouter_edge_1.yaml b/ddsrouter_test/compose/test_cases/tcp/ddsrouter_edge_1.yaml index 17226445e..893a120bd 100644 --- a/ddsrouter_test/compose/test_cases/tcp/ddsrouter_edge_1.yaml +++ b/ddsrouter_test/compose/test_cases/tcp/ddsrouter_edge_1.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/tcp/ddsrouter_edge_2.yaml b/ddsrouter_test/compose/test_cases/tcp/ddsrouter_edge_2.yaml index 36738eb63..df0ab84be 100644 --- a/ddsrouter_test/compose/test_cases/tcp/ddsrouter_edge_2.yaml +++ b/ddsrouter_test/compose/test_cases/tcp/ddsrouter_edge_2.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/transparency/durability/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/transparency/durability/ddsrouter.yaml index 12f9e6704..fc487846a 100644 --- a/ddsrouter_test/compose/test_cases/transparency/durability/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/transparency/durability/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/transparency/ownership/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/transparency/ownership/ddsrouter.yaml index d9e599dd1..95aa0335f 100644 --- a/ddsrouter_test/compose/test_cases/transparency/ownership/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/transparency/ownership/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/transparency/partitions/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/transparency/partitions/ddsrouter.yaml index e4aca84e2..dfd34f157 100644 --- a/ddsrouter_test/compose/test_cases/transparency/partitions/ddsrouter.yaml +++ b/ddsrouter_test/compose/test_cases/transparency/partitions/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/udp/ddsrouter_cloud_1.yaml b/ddsrouter_test/compose/test_cases/udp/ddsrouter_cloud_1.yaml index 09f89c41b..2287db20f 100644 --- a/ddsrouter_test/compose/test_cases/udp/ddsrouter_cloud_1.yaml +++ b/ddsrouter_test/compose/test_cases/udp/ddsrouter_cloud_1.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/udp/ddsrouter_cloud_2.yaml b/ddsrouter_test/compose/test_cases/udp/ddsrouter_cloud_2.yaml index 8adffed74..a90c3b0b3 100644 --- a/ddsrouter_test/compose/test_cases/udp/ddsrouter_cloud_2.yaml +++ b/ddsrouter_test/compose/test_cases/udp/ddsrouter_cloud_2.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/udp/ddsrouter_edge_1.yaml b/ddsrouter_test/compose/test_cases/udp/ddsrouter_edge_1.yaml index c7a06d103..49b655029 100644 --- a/ddsrouter_test/compose/test_cases/udp/ddsrouter_edge_1.yaml +++ b/ddsrouter_test/compose/test_cases/udp/ddsrouter_edge_1.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_test/compose/test_cases/udp/ddsrouter_edge_2.yaml b/ddsrouter_test/compose/test_cases/udp/ddsrouter_edge_2.yaml index 94380e8b3..46662016a 100644 --- a/ddsrouter_test/compose/test_cases/udp/ddsrouter_edge_2.yaml +++ b/ddsrouter_test/compose/test_cases/udp/ddsrouter_edge_2.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/ddsrouter_yaml/src/cpp/YamlReaderConfiguration.cpp b/ddsrouter_yaml/src/cpp/YamlReaderConfiguration.cpp index fae0b9e46..7e9a1218a 100644 --- a/ddsrouter_yaml/src/cpp/YamlReaderConfiguration.cpp +++ b/ddsrouter_yaml/src/cpp/YamlReaderConfiguration.cpp @@ -41,7 +41,7 @@ YamlReaderConfiguration::load_ddsrouter_configuration( switch (version) { - case ddspipe::yaml::YamlReaderVersion::V_4_0: + case ddspipe::yaml::YamlReaderVersion::V_5_0: case ddspipe::yaml::YamlReaderVersion::LATEST: break; @@ -54,7 +54,13 @@ YamlReaderConfiguration::load_ddsrouter_configuration( throw eprosima::utils::ConfigurationException( utils::Formatter() << "The yaml configuration version " << version << - " is no longer supported. Please update to v4.0."); + " is no longer supported. Please update to v5.0."); + break; + + case ddspipe::yaml::YamlReaderVersion::V_4_0: + logWarning(DDSROUTER_YAML, + "The yaml configuration version " << version << + " is deprecated and will be removed in a future release. Please update to v5.0."); break; } } @@ -121,7 +127,7 @@ YamlReaderConfiguration::load_ddsrouter_configuration_from_file( ddspipe::yaml::YamlReaderVersion YamlReaderConfiguration::default_yaml_version() { - return ddspipe::yaml::V_4_0; + return ddspipe::yaml::V_5_0; } } // namespace yaml diff --git a/ddsrouter_yaml/test/unittest/configuration/YamlGetConfigurationDdsRouterTest.cpp b/ddsrouter_yaml/test/unittest/configuration/YamlGetConfigurationDdsRouterTest.cpp index bfc359e16..8c22a4151 100644 --- a/ddsrouter_yaml/test/unittest/configuration/YamlGetConfigurationDdsRouterTest.cpp +++ b/ddsrouter_yaml/test/unittest/configuration/YamlGetConfigurationDdsRouterTest.cpp @@ -41,7 +41,7 @@ TEST(YamlGetConfigurationDdsRouterTest, get_ddsrouter_configuration_trivial) { const char* yml_str = R"( - version: v4.0 + version: v5.0 participants: - name: "P1" kind: "echo" @@ -88,7 +88,7 @@ TEST(YamlGetConfigurationDdsRouterTest, get_ddsrouter_configuration_ros_case) { const char* yml_str = R"( - version: v4.0 + version: v5.0 builtin-topics: - name: "rt/chatter" type: "std_msgs::msg::dds_::String_" @@ -163,7 +163,7 @@ TEST(YamlGetConfigurationDdsRouterTest, get_ddsrouter_configuration_yaml_vs_comm const char* yml_str = R"( - version: v4.0 + version: v5.0 specs: logging: verbosity: info diff --git a/ddsrouter_yaml/test/unittest/configuration/YamlReaderConfigurationTest.cpp b/ddsrouter_yaml/test/unittest/configuration/YamlReaderConfigurationTest.cpp index 527a48314..79994b2a0 100644 --- a/ddsrouter_yaml/test/unittest/configuration/YamlReaderConfigurationTest.cpp +++ b/ddsrouter_yaml/test/unittest/configuration/YamlReaderConfigurationTest.cpp @@ -111,14 +111,14 @@ using namespace eprosima; /** * Do not set Yaml version and get default configuration - * (currently default is v4.0) + * (currently default is v5.0) * * CASES: - * - trivial configuration of v4.0 + * - trivial configuration of v5.0 */ TEST(YamlReaderConfigurationTest, get_ddsrouter_configuration_no_version) { - // trivial configuration of v4.0 + // trivial configuration of v5.0 { const char* yml_configuration = R"( @@ -146,7 +146,7 @@ TEST(YamlReaderConfigurationTest, get_ddsrouter_configuration_no_version) * * CASES: * - not existing version - * - get wrongly defined yaml with default version (v4.0) + * - get wrongly defined yaml with default version (v5.0) */ TEST(YamlReaderConfigurationTest, version_negative_cases) { @@ -200,7 +200,7 @@ TEST(YamlReaderConfigurationTest, number_of_threads) const char* yml_configuration = // trivial configuration R"( - version: v4.0 + version: v5.0 participants: - name: "P1" kind: "echo" @@ -237,7 +237,7 @@ TEST(YamlReaderConfigurationTest, remove_unused_entities) const char* yml_configuration = // trivial configuration R"( - version: v4.0 + version: v5.0 participants: - name: "P1" kind: "echo" @@ -274,7 +274,7 @@ TEST(YamlReaderConfigurationTest, discovery_trigger) const char* yml_configuration = // trivial configuration R"( - version: v4.0 + version: v5.0 participants: - name: "P1" kind: "echo" @@ -326,7 +326,7 @@ TEST(YamlReaderConfigurationTest, valid_routes) { const char* yml_configuration = R"( - version: v4.0 + version: v5.0 participants: - name: "P1" kind: "echo" @@ -362,7 +362,7 @@ TEST(YamlReaderConfigurationTest, invalid_routes) const char* yml_configuration = // trivial configuration R"( - version: v4.0 + version: v5.0 participants: - name: "P1" kind: "echo" @@ -395,7 +395,7 @@ TEST(YamlReaderConfigurationTest, history_depth) const char* yml_configuration = // trivial configuration R"( - version: v4.0 + version: v5.0 participants: - name: "P1" kind: "echo" @@ -435,7 +435,7 @@ TEST(YamlReaderConfigurationTest, max_tx_rate) const char* yml_configuration = // trivial configuration R"( - version: v4.0 + version: v5.0 participants: - name: "P1" kind: "echo" @@ -475,7 +475,7 @@ TEST(YamlReaderConfigurationTest, max_rx_rate) const char* yml_configuration = // trivial configuration R"( - version: v4.0 + version: v5.0 participants: - name: "P1" kind: "echo" @@ -515,7 +515,7 @@ TEST(YamlReaderConfigurationTest, downsampling) const char* yml_configuration = // trivial configuration R"( - version: v4.0 + version: v5.0 participants: - name: "P1" kind: "echo" diff --git a/docs/resources/examples/change_domain.yaml b/docs/resources/examples/change_domain.yaml index c02bef39a..eca8089a5 100644 --- a/docs/resources/examples/change_domain.yaml +++ b/docs/resources/examples/change_domain.yaml @@ -3,7 +3,7 @@ ############################# # Yaml configuration file version -version: v4.0 +version: v5.0 # DDS Router participants participants: diff --git a/docs/resources/examples/change_domain_allowlist.yaml b/docs/resources/examples/change_domain_allowlist.yaml index bd77fe63d..900b46f3d 100644 --- a/docs/resources/examples/change_domain_allowlist.yaml +++ b/docs/resources/examples/change_domain_allowlist.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -43,7 +43,7 @@ participants: # This configuration example configures a DDS Router to listen to every message published in two different domains # and transmit those messages through the other domain. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow DDS Topic Name with type . diff --git a/docs/resources/examples/echo.yaml b/docs/resources/examples/echo.yaml index 3b53e1b99..2d9f2f4fe 100644 --- a/docs/resources/examples/echo.yaml +++ b/docs/resources/examples/echo.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -46,7 +46,7 @@ participants: # HelloWorldTopic (from Fast DDS HelloWorld) and rt/chatter from ROS2 demo_nodes, and to print the received # messages in stdout. Information regarding discovery events is also printed to stdout. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow DDS Topic Name with type . diff --git a/docs/resources/examples/forwarding_routes.yaml b/docs/resources/examples/forwarding_routes.yaml index 7813b0564..3e6e86eee 100644 --- a/docs/resources/examples/forwarding_routes.yaml +++ b/docs/resources/examples/forwarding_routes.yaml @@ -4,7 +4,7 @@ ####################### # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ############## # PARTICIPANTS @@ -76,7 +76,7 @@ topic-routes: # 11 # to DDS Domain 1. # The communication is in both directions. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: List the internal participants of the router. diff --git a/docs/resources/examples/repeater_client.yaml b/docs/resources/examples/repeater_client.yaml index 1840b69d1..130471dbd 100644 --- a/docs/resources/examples/repeater_client.yaml +++ b/docs/resources/examples/repeater_client.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -46,7 +46,7 @@ participants: # The other direction of communication is also possible; receive messages at the WAN Participant and locally # publish them in domain 0. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow ROS 2 specific Topic Name with type . # Insert new topics in order to route them. diff --git a/docs/resources/examples/repeater_server.yaml b/docs/resources/examples/repeater_server.yaml index 0a150a897..8274f9c23 100644 --- a/docs/resources/examples/repeater_server.yaml +++ b/docs/resources/examples/repeater_server.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -43,7 +43,7 @@ participants: # Server specifies which DDS Router starts the communication with the other, and after communication has been # established, both routers behave in the same way. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow DDS Topic Name with type . diff --git a/docs/resources/examples/ros_discovery_client.yaml b/docs/resources/examples/ros_discovery_client.yaml index 3ab12d54f..8781c7e91 100644 --- a/docs/resources/examples/ros_discovery_client.yaml +++ b/docs/resources/examples/ros_discovery_client.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -36,13 +36,10 @@ participants: ros-discovery-server: true # 7 id: 2 # 8 connection-addresses: # 9 - - discovery-server-guid: - ros-discovery-server: true # 10 - id: 1 # 11 - addresses: - - domain: localhost # 12 - port: 11888 # 13 - # 14 + - addresses: + - domain: localhost # 10 + port: 11888 # 11 + # 12 ################################## # CONFIGURATION DESCRIPTION @@ -53,7 +50,7 @@ participants: # The other direction of communication is also possible; receive messages at the Discovery Server and locally # publish them in domain 0. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow ROS 2 specific Topic Name with type . # Insert new topics in order to route them. @@ -77,15 +74,11 @@ participants: # 9: Add the addresses where this Client will try to reach a Discovery Server. -# 10: Connecting to a Discovery Server with ROS 2 GuidPrefix <44.53. .5f.45.50.52.4f.53.49.4d.41>. +# 10: Connect to a Discovery Server in IP localhost listening. This domain will be translated as ip: "127.0.0.1" -# 11: Set the Remote Discovery Server GuidPrefix to <44.53.01.5f.45.50.52.4f.53.49.4d.41>. +# 11: Discovery Server listening port is 11888. -# 12: Connect to a Discovery Server in IP localhost listening. This domain will be translated as ip: "127.0.0.1" - -# 13: Discovery Server listening port is 11888. - -# 14: This is the same configuration as the result using Fast DDS environment variable: +# 12: This is the same configuration as the result using Fast DDS environment variable: # $> export ROS_DISCOVERY_SERVER=";127.0.0.1:11888" # Add every other address where trying to reach this same remote Discovery Server, # or add every other Discovery Server connection required. diff --git a/docs/resources/examples/ros_discovery_server.yaml b/docs/resources/examples/ros_discovery_server.yaml index cc80dcabf..d647e2bc1 100644 --- a/docs/resources/examples/ros_discovery_server.yaml +++ b/docs/resources/examples/ros_discovery_server.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -49,7 +49,7 @@ participants: # The other direction of communication is also possible; receive messages at the Discovery Server and locally # publish them in domain 0. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow DDS ROS 2 specific Topic Name with type . # Insert new topics in order to route them. diff --git a/docs/resources/examples/wan_client.yaml b/docs/resources/examples/wan_client.yaml index 450fc6388..7cbd00848 100644 --- a/docs/resources/examples/wan_client.yaml +++ b/docs/resources/examples/wan_client.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -53,7 +53,7 @@ participants: # Client specifies which DDS Router starts the communication with the other, and after communication has been # established, both routers behave in the same way. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow DDS Topic Name with type . diff --git a/docs/resources/examples/wan_ds_client.yaml b/docs/resources/examples/wan_ds_client.yaml index 48c36ff3e..4c7636c7e 100644 --- a/docs/resources/examples/wan_ds_client.yaml +++ b/docs/resources/examples/wan_ds_client.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -34,18 +34,14 @@ participants: - name: WANClient # 6 kind: wan-ds # 7 - discovery-server-guid: - id: 2 # 8 - connection-addresses: # 9 - - discovery-server-guid: - id: 1 # 10 - addresses: # 11 + connection-addresses: # 8 + - addresses: # 9 - ip: 1.1.1.1 port: 11666 - listening-addresses: # 12 - - ip: 2.2.2.2 # 13 - port: 11670 # 14 - transport: udp # 15 + listening-addresses: # 10 + - ip: 2.2.2.2 # 11 + port: 11670 # 12 + transport: udp # 13 ################################## # CONFIGURATION DESCRIPTION @@ -58,7 +54,7 @@ participants: # Client specifies which DDS Router starts the communication with the other, and after communication has been # established, both routers behave in the same way. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow DDS Topic Name with type . @@ -76,26 +72,22 @@ participants: # 7: Kind of WANClient: . # WAN communication with another DDS Router via Discovery Server. -# 8: Set the Discovery Server GuidPrefix to <01.0f.02.00.00.00.00.00.00.00.ca.fe> for WANClient. - -# 9: Add the addresses where to reach the remote DDS Routers that will connect to. +# 8: Add the addresses where to reach the remote DDS Routers that will connect to. # Add as many connection-addresses as needed. -# 10: Set the Remote Discovery Server GuidPrefix to <01.0f.01.00.00.00.00.00.00.00.ca.fe>. - -# 11: Connect to a Discovery Server in IP <1.1.1.1> listening in port 11666 over UDP transport (default). +# 9: Connect to a Discovery Server in IP <1.1.1.1> listening in port 11666 over UDP transport (default). # This is the same configuration that must be set in the DDS Router that works as a Server in its listening-addresses. # Add every other address where trying to reach this same remote WAN Discovery Server. -# 12: Add the interfaces where this Participant will listen in WAN. +# 10: Add the interfaces where this Participant will listen in WAN. # This is only needed if Remote WAN Server is using only UDP. # Add as many listening-addresses as needed. -# 13: Listen in public IP (2.2.2.2) for remote traffic. +# 11: Listen in public IP (2.2.2.2) for remote traffic. # This IP must be set to the public IP of the host where this DDS Router will run. -# 14: Listening port is 11670. +# 12: Listening port is 11670. # Remember that if the host is under a NAT, the IP must be the public one and must be forwarded from network # router to this host to the same port. -# 15: It uses UDP transport by default if not set. Could be set to "udp" or "tcp". +# 13: It uses UDP transport by default if not set. Could be set to "udp" or "tcp". diff --git a/docs/resources/examples/wan_ds_server.yaml b/docs/resources/examples/wan_ds_server.yaml index 9bb253a4c..d7e16e98a 100644 --- a/docs/resources/examples/wan_ds_server.yaml +++ b/docs/resources/examples/wan_ds_server.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -34,12 +34,10 @@ participants: - name: WANServer # 6 kind: wan-ds # 7 - discovery-server-guid: - id: 1 # 8 - listening-addresses: # 9 - - ip: 1.1.1.1 # 10 - port: 11666 # 11 - transport: udp # 12 + listening-addresses: # 8 + - ip: 1.1.1.1 # 9 + port: 11666 # 10 + transport: udp # 11 ################################## # CONFIGURATION DESCRIPTION @@ -52,7 +50,7 @@ participants: # Server specifies which DDS Router starts the communication with the other, and after communication has been # established, both routers behave in the same way. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow DDS Topic Name with type . @@ -70,17 +68,14 @@ participants: # 7: Kind of WANServer: . # WAN communication with another DDS Router via Discovery Server. -# 8: Set this Discovery Server GuidPrefix to <01.0f.01.00.00.00.00.00.00.00.ca.fe> for WANServer. -# This GuidPrefix is needed in order from a remote DDS Router to connect with this one. - -# 9: Add the interfaces where this Participant will listen in WAN. +# 8: Add the interfaces where this Participant will listen in WAN. # Add as many listening-addresses as needed. -# 10: Listen in public IP (1.1.1.1) for remote traffic. +# 9: Listen in public IP (1.1.1.1) for remote traffic. # This IP must be set to the public IP of the host where this DDS Router will run. -# 11: Listening port is 11666. +# 10: Listening port is 11666. # Remember that if the host is under a NAT, the IP must be the public one and must be forwarded from network # router to this host to the same port. -# 12: It uses UDP transport by default if not set. Could be set to "udp" or "tcp". +# 11: It uses UDP transport by default if not set. Could be set to "udp" or "tcp". diff --git a/docs/resources/examples/wan_server.yaml b/docs/resources/examples/wan_server.yaml index d87509add..25ed20d61 100644 --- a/docs/resources/examples/wan_server.yaml +++ b/docs/resources/examples/wan_server.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -50,7 +50,7 @@ participants: # Server specifies which DDS Router starts the communication with the other, and after communication has been # established, both routers behave in the same way. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow DDS Topic Name with type . diff --git a/docs/resources/examples/xml.yaml b/docs/resources/examples/xml.yaml index 211cdd8d1..ecb82741d 100644 --- a/docs/resources/examples/xml.yaml +++ b/docs/resources/examples/xml.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # CONFIGURATION VERSION @@ -48,7 +48,7 @@ participants: # to DDS Domain 1. # The communication is in both directions. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Configure how to load XML configurations. diff --git a/docs/resources/getting_started/client-ddsrouter.yaml b/docs/resources/getting_started/client-ddsrouter.yaml index 179d9e6ab..cd617f3ad 100644 --- a/docs/resources/getting_started/client-ddsrouter.yaml +++ b/docs/resources/getting_started/client-ddsrouter.yaml @@ -1,6 +1,6 @@ # client-ddsrouter.yaml -version: v4.0 +version: v5.0 allowlist: - name: Square diff --git a/docs/resources/getting_started/server-ddsrouter.yaml b/docs/resources/getting_started/server-ddsrouter.yaml index 5f0a92aba..aeb7f8c36 100644 --- a/docs/resources/getting_started/server-ddsrouter.yaml +++ b/docs/resources/getting_started/server-ddsrouter.yaml @@ -1,6 +1,6 @@ # server-ddsrouter.yaml -version: v4.0 +version: v5.0 allowlist: - name: Square diff --git a/docs/resources/use_cases/ros_cloud/ConfigMap.yaml b/docs/resources/use_cases/ros_cloud/ConfigMap.yaml index fd7869bc9..6921c3ae4 100644 --- a/docs/resources/use_cases/ros_cloud/ConfigMap.yaml +++ b/docs/resources/use_cases/ros_cloud/ConfigMap.yaml @@ -4,7 +4,7 @@ metadata: name: ddsrouter-config data: ddsrouter.config.file: |- - version: v4.0 + version: v5.0 allowlist: - name: rt/chatter diff --git a/docs/resources/use_cases/ros_cloud/local-ddsrouter.yaml b/docs/resources/use_cases/ros_cloud/local-ddsrouter.yaml index 679a7d802..6e50c13d9 100644 --- a/docs/resources/use_cases/ros_cloud/local-ddsrouter.yaml +++ b/docs/resources/use_cases/ros_cloud/local-ddsrouter.yaml @@ -1,6 +1,6 @@ # local-ddsrouter.yaml -version: v4.0 +version: v5.0 allowlist: - name: rt/chatter diff --git a/docs/resources/use_cases/wan_tcp/dds_router_net_A.yaml b/docs/resources/use_cases/wan_tcp/dds_router_net_A.yaml index 556dce65a..7b84c96cb 100644 --- a/docs/resources/use_cases/wan_tcp/dds_router_net_A.yaml +++ b/docs/resources/use_cases/wan_tcp/dds_router_net_A.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/docs/resources/use_cases/wan_tcp/dds_router_net_B_lan.yaml b/docs/resources/use_cases/wan_tcp/dds_router_net_B_lan.yaml index 58e03f27e..e5fefaae9 100644 --- a/docs/resources/use_cases/wan_tcp/dds_router_net_B_lan.yaml +++ b/docs/resources/use_cases/wan_tcp/dds_router_net_B_lan.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/docs/resources/use_cases/wan_tcp/dds_router_net_B_wan.yaml b/docs/resources/use_cases/wan_tcp/dds_router_net_B_wan.yaml index ead44a478..5f80fa43d 100644 --- a/docs/resources/use_cases/wan_tcp/dds_router_net_B_wan.yaml +++ b/docs/resources/use_cases/wan_tcp/dds_router_net_B_wan.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 participants: diff --git a/docs/rst/user_manual/configuration.rst b/docs/rst/user_manual/configuration.rst index 302cbf3fc..10d29e6ef 100644 --- a/docs/rst/user_manual/configuration.rst +++ b/docs/rst/user_manual/configuration.rst @@ -35,17 +35,17 @@ This value allows users to keep using the same YAML file with an old configurati - *v2.2.0* -**The current configuration version is v4.0**. +**The current configuration version is v5.0**. This is the configuration version that is described along this page. .. note:: - The current default version when the tag ``version`` is not set is *v4.0*. + The current default version when the tag ``version`` is not set is *v5.0*. .. warning:: **Deprecation warning**. - Update to version `v4.0` since previous `v3.1` is no longer supported. + Version `v4.0` is deprecated and will be removed in a future release, please update to version `v5.0`. .. _user_manual_configuration_load_xml: @@ -741,7 +741,8 @@ For more information, check section :ref:`user_manual_wan_configuration_nat_trav Discovery Server GuidPrefix --------------------------- -A :term:`Discovery Server` requires a DDS :term:`GuidPrefix` in order for other Participants to connect to it. +In |fastdds| versions previous to *v3.0.0*, a :term:`Discovery Server` requires a DDS :term:`GuidPrefix` in order for other Participants to connect to it. +Although this parameter is no longer mandatory, it is still possible to set it so that a Discovery Server client from an older release may still stablish connection with a Discovery Server server from the newer ones. Under the ``discovery-server-guid`` tag, there are several possibilities for configuring a GuidPrefix. @@ -840,21 +841,17 @@ Discovery Server Connection Addresses ------------------------------------- Tag ``connection-addresses`` configure a connection with one or multiple remote Discovery Servers. -``connection-addresses`` is the *key* for an array in which each element has a GuidPrefix referencing the Discovery -Server to connect with; and a tag ``addresses`` configuring the addresses of such Discovery Server. +``connection-addresses`` is the *key* for an array in which each element has a tag ``addresses`` configuring the +addresses of such Discovery Server. Each element inside ``addresses`` must follow the configuration for :ref:`user_manual_configuration_network_address`. .. code-block:: yaml connection-addresses: - - discovery-server-guid: - guid: 44.53.0d.5f.45.50.52.4f.53.49.4d.41 - addresses: + - addresses: - ip: 127.0.0.1 port: 11666 - - discovery-server-guid: - id: 4 - addresses: + - addresses: - ip: 2001:4860:4860::8888 port: 11667 transport: tcp @@ -977,7 +974,7 @@ A complete example of all the configurations described on this page can be found .. code-block:: yaml # Version Latest - version: v4.0 + version: v5.0 # Specifications specs: @@ -1113,10 +1110,7 @@ A complete example of all the configurations described on this page can be found transport: tcp # Transport = TCP connection-addresses: - - discovery-server-guid: - id: 2 - ros-discovery-server: true - addresses: + - addresses: - domain: "localhost" port: 22000 @@ -1133,9 +1127,7 @@ A complete example of all the configurations described on this page can be found id: 2 # Internal WAN Discovery Server id => GuidPrefix = 01.0f.02.00.00.00.00.00.00.00.ca.fe connection-addresses: # WAN Discovery Server Connection Addresses - - discovery-server-guid: - id: 4 # External WAN Discovery Server id => GuidPrefix = 01.0f.04.00.00.00.00.00.00.00.ca.fe - addresses: + - addresses: - ip: 8.8.8.8 # IP = 8.8.8.8 port: 11666 # Port = 11666 transport: udp # Transport = UDP diff --git a/docs/rst/user_manual/participants/local_discovery_server.rst b/docs/rst/user_manual/participants/local_discovery_server.rst index 75f7f2c26..3292a7a0e 100644 --- a/docs/rst/user_manual/participants/local_discovery_server.rst +++ b/docs/rst/user_manual/participants/local_discovery_server.rst @@ -53,8 +53,7 @@ Configure a Local Discovery Server setting the GuidPrefix used for ROS 2 deploym (``44.53.02.5f.45.50.52.4f.53.49.4d.41``). It listens for clients in *localhost* in ports ``11600`` in ``UDP`` and ``11601`` in ``TCP``. This example connects the local Discovery Server Participant with a remote Discovery Server listening in IPv6 address -``2001:4860:4860::8888`` and port ``11666`` and configured with ``01.0f.04.00.00.00.00.00.00.00.ca.fe`` -Discovery Server GuidPrefix. +``2001:4860:4860::8888`` and port ``11666``. .. code-block:: yaml @@ -74,8 +73,6 @@ Discovery Server GuidPrefix. transport: tcp # Use TCP transport connection-addresses: # External Discovery Server Listening Addresses - - discovery-server-guid: - id: 4 # External Discovery Server id => GuidPrefix = 01.0f.04.00.00.00.00.00.00.00.ca.fe - addresses: + - addresses: - ip: 2001:4860:4860::8888 # Use UDP by default port: 11666 diff --git a/docs/rst/user_manual/participants/wan_discovery_server.rst b/docs/rst/user_manual/participants/wan_discovery_server.rst index 9a5c7990c..c37b2bd16 100644 --- a/docs/rst/user_manual/participants/wan_discovery_server.rst +++ b/docs/rst/user_manual/participants/wan_discovery_server.rst @@ -62,8 +62,8 @@ Configuration Example Configure a WAN Discovery Server with GuidPrefix id ``2`` (``01.0f.02.00.00.00.00.00.00.00.ca.fe``). It listens for clients in public IP ``82.0.0.1`` in port ``11600`` in ``TCP``. -It connects with a remote WAN Participant in IPv6 address ``2001:4860:4860::8888`` and port ``11666`` which Discovery -Server GuidPrefix is ``01.0f.04.00.00.00.00.00.00.00.ca.fe`` using ``UDP`` transport. +It connects with a remote WAN Participant in IPv6 address ``2001:4860:4860::8888`` and port ``11666`` +using ``UDP`` transport. .. code-block:: yaml @@ -72,16 +72,14 @@ Server GuidPrefix is ``01.0f.04.00.00.00.00.00.00.00.ca.fe`` using ``UDP`` trans kind: wan-discovery-server discovery-server-guid: - id: 2 # GuidPrefix = 01.0f.02.00.00.00.00.00.00.00.ca.fe + id: 2 # GuidPrefix = 01.0f.02.00.00.00.00.00.00.00.ca.fe [optional] listening-addresses: # WAN Discovery Server Listening Addresses - ip: 82.0.0.1 # Use UDP by default port: 11600 connection-addresses: # Another WAN Participant Listening Addresses - - discovery-server-guid: - id: 4 # External Discovery Server id => GuidPrefix = 01.0f.04.00.00.00.00.00.00.00.ca.fe - addresses: + - addresses: - ip: 2001:4860:4860::8888 port: 11666 transport: udp # Use UDP transport diff --git a/resources/configurations/examples/change_domain.yaml b/resources/configurations/examples/change_domain.yaml index c02bef39a..eca8089a5 100644 --- a/resources/configurations/examples/change_domain.yaml +++ b/resources/configurations/examples/change_domain.yaml @@ -3,7 +3,7 @@ ############################# # Yaml configuration file version -version: v4.0 +version: v5.0 # DDS Router participants participants: diff --git a/resources/configurations/examples/change_domain_allowlist.yaml b/resources/configurations/examples/change_domain_allowlist.yaml index bd77fe63d..900b46f3d 100644 --- a/resources/configurations/examples/change_domain_allowlist.yaml +++ b/resources/configurations/examples/change_domain_allowlist.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -43,7 +43,7 @@ participants: # This configuration example configures a DDS Router to listen to every message published in two different domains # and transmit those messages through the other domain. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow DDS Topic Name with type . diff --git a/resources/configurations/examples/echo.yaml b/resources/configurations/examples/echo.yaml index 3b53e1b99..2d9f2f4fe 100644 --- a/resources/configurations/examples/echo.yaml +++ b/resources/configurations/examples/echo.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -46,7 +46,7 @@ participants: # HelloWorldTopic (from Fast DDS HelloWorld) and rt/chatter from ROS2 demo_nodes, and to print the received # messages in stdout. Information regarding discovery events is also printed to stdout. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow DDS Topic Name with type . diff --git a/resources/configurations/examples/repeater.yaml b/resources/configurations/examples/repeater.yaml index 4f19f5285..719832d5d 100644 --- a/resources/configurations/examples/repeater.yaml +++ b/resources/configurations/examples/repeater.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -43,7 +43,7 @@ participants: # Server specifies which DDS Router starts the communication with the other, and after communication has been # established, both routers behave in the same way. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow DDS Topic Name with type . diff --git a/resources/configurations/examples/ros_discovery_client.yaml b/resources/configurations/examples/ros_discovery_client.yaml index 3ab12d54f..8781c7e91 100644 --- a/resources/configurations/examples/ros_discovery_client.yaml +++ b/resources/configurations/examples/ros_discovery_client.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -36,13 +36,10 @@ participants: ros-discovery-server: true # 7 id: 2 # 8 connection-addresses: # 9 - - discovery-server-guid: - ros-discovery-server: true # 10 - id: 1 # 11 - addresses: - - domain: localhost # 12 - port: 11888 # 13 - # 14 + - addresses: + - domain: localhost # 10 + port: 11888 # 11 + # 12 ################################## # CONFIGURATION DESCRIPTION @@ -53,7 +50,7 @@ participants: # The other direction of communication is also possible; receive messages at the Discovery Server and locally # publish them in domain 0. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow ROS 2 specific Topic Name with type . # Insert new topics in order to route them. @@ -77,15 +74,11 @@ participants: # 9: Add the addresses where this Client will try to reach a Discovery Server. -# 10: Connecting to a Discovery Server with ROS 2 GuidPrefix <44.53. .5f.45.50.52.4f.53.49.4d.41>. +# 10: Connect to a Discovery Server in IP localhost listening. This domain will be translated as ip: "127.0.0.1" -# 11: Set the Remote Discovery Server GuidPrefix to <44.53.01.5f.45.50.52.4f.53.49.4d.41>. +# 11: Discovery Server listening port is 11888. -# 12: Connect to a Discovery Server in IP localhost listening. This domain will be translated as ip: "127.0.0.1" - -# 13: Discovery Server listening port is 11888. - -# 14: This is the same configuration as the result using Fast DDS environment variable: +# 12: This is the same configuration as the result using Fast DDS environment variable: # $> export ROS_DISCOVERY_SERVER=";127.0.0.1:11888" # Add every other address where trying to reach this same remote Discovery Server, # or add every other Discovery Server connection required. diff --git a/resources/configurations/examples/ros_discovery_server.yaml b/resources/configurations/examples/ros_discovery_server.yaml index cc80dcabf..d647e2bc1 100644 --- a/resources/configurations/examples/ros_discovery_server.yaml +++ b/resources/configurations/examples/ros_discovery_server.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -49,7 +49,7 @@ participants: # The other direction of communication is also possible; receive messages at the Discovery Server and locally # publish them in domain 0. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow DDS ROS 2 specific Topic Name with type . # Insert new topics in order to route them. diff --git a/resources/configurations/examples/wan_client.yaml b/resources/configurations/examples/wan_client.yaml index fdc77daf4..78b3de2d9 100644 --- a/resources/configurations/examples/wan_client.yaml +++ b/resources/configurations/examples/wan_client.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -54,7 +54,7 @@ participants: # Client specifies which DDS Router starts the communication with the other, and after communication has been # established, both routers behave in the same way. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow DDS Topic Name with type . diff --git a/resources/configurations/examples/wan_ds_client.yaml b/resources/configurations/examples/wan_ds_client.yaml index b5e1b6d65..85fdb2d24 100644 --- a/resources/configurations/examples/wan_ds_client.yaml +++ b/resources/configurations/examples/wan_ds_client.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -34,12 +34,8 @@ participants: - name: WANClient # 6 kind: wan-discovery-server # 7 - discovery-server-guid: - id: 2 # 8 - connection-addresses: # 9 - - discovery-server-guid: - id: 1 # 10 - addresses: # 11 + connection-addresses: # 8 + - addresses: # 9 - ip: 1.1.1.1 port: 11777 transport: tcp @@ -55,7 +51,7 @@ participants: # Client specifies which DDS Router starts the communication with the other, and after communication has been # established, both routers behave in the same way. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow DDS Topic Name with type . @@ -73,13 +69,9 @@ participants: # 7: Kind of WANClient: . # WAN communication with another DDS Router via Discovery Server. -# 8: Set the Discovery Server GuidPrefix to <01.0f.02.00.00.00.00.00.00.00.ca.fe> for WANClient. - -# 9: Add the addresses where to reach the remote DDS Routers that will connect to. +# 8: Add the addresses where to reach the remote DDS Routers that will connect to. # Add as many connection-addresses as needed. -# 10: Set the Remote Discovery Server GuidPrefix to <01.0f.01.00.00.00.00.00.00.00.ca.fe>. - -# 11: Connect to a Discovery Server in IP <1.1.1.1> listening in port 11666 over UDP transport (default). +# 9: Connect to a Discovery Server in IP <1.1.1.1> listening in port 11666 over UDP transport (default). # This is the same configuration that must be set in the DDS Router that works as a Server in its listening-addresses. # Add every other address where trying to reach this same remote WAN Discovery Server. diff --git a/resources/configurations/examples/wan_ds_server.yaml b/resources/configurations/examples/wan_ds_server.yaml index 9f7909958..3131b96ca 100644 --- a/resources/configurations/examples/wan_ds_server.yaml +++ b/resources/configurations/examples/wan_ds_server.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -34,13 +34,11 @@ participants: - name: WANServer # 6 kind: wan-discovery-server # 7 - discovery-server-guid: - id: 1 # 8 - listening-addresses: # 9 - - ip: 1.1.1.1 # 10 - port: 11666 # 11 - external-port: 11777 # 12 - transport: tcp # 13 + listening-addresses: # 8 + - ip: 1.1.1.1 # 9 + port: 11666 # 10 + external-port: 11777 # 11 + transport: tcp # 12 ################################## # CONFIGURATION DESCRIPTION @@ -53,7 +51,7 @@ participants: # Server specifies which DDS Router starts the communication with the other, and after communication has been # established, both routers behave in the same way. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow DDS Topic Name with type . @@ -71,21 +69,18 @@ participants: # 7: Kind of WANServer: . # WAN communication with another DDS Router via Discovery Server. -# 8: Set this Discovery Server GuidPrefix to <01.0f.01.00.00.00.00.00.00.00.ca.fe> for WANServer. -# This GuidPrefix is needed in order from a remote DDS Router to connect with this one. - -# 9: Add the interfaces where this Participant will listen in WAN. +# 8: Add the interfaces where this Participant will listen in WAN. # Add as many listening-addresses as needed. -# 10: Listen in public IP (1.1.1.1) for remote traffic. +# 9: Listen in public IP (1.1.1.1) for remote traffic. # This IP must be set to the public IP of the host where this DDS Router will run. -# 11: Listening port is 11666. +# 10: Listening port is 11666. # Remember that if the host is under a NAT, this port is the one that the host will open, but not the one # used as public in the router. -# 12: External port is 11777. +# 11: External port is 11777. # This port is used in case the host is under a NAT. This is the public port accessible from any external point # in the network, and should be forwarded from the network router to the "port" value. -# 13: It uses TCP. UDP transport is used by default if not set. Could be set to "udp" or "tcp". +# 12: It uses TCP. UDP transport is used by default if not set. Could be set to "udp" or "tcp". diff --git a/resources/configurations/examples/wan_server.yaml b/resources/configurations/examples/wan_server.yaml index fba1f8336..ca8147227 100644 --- a/resources/configurations/examples/wan_server.yaml +++ b/resources/configurations/examples/wan_server.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # ALLOWED TOPICS @@ -50,7 +50,7 @@ participants: # Server specifies which DDS Router starts the communication with the other, and after communication has been # established, both routers behave in the same way. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Allow DDS Topic Name with type . diff --git a/resources/configurations/examples/xml.yaml b/resources/configurations/examples/xml.yaml index 35280ddfe..2b62ead17 100644 --- a/resources/configurations/examples/xml.yaml +++ b/resources/configurations/examples/xml.yaml @@ -4,7 +4,7 @@ ################################## # CONFIGURATION VERSION -version: v4.0 # 0 +version: v5.0 # 0 ################################## # CONFIGURATION VERSION @@ -58,7 +58,7 @@ participants: # to DDS Domain 1. # The communication is in both directions. -# 0: Use YAML configuration version v4.0 +# 0: Use YAML configuration version v5.0 # 1: Configure how to load XML configurations. diff --git a/resources/configurations/security/dds/configurations/ddsrouter.yaml b/resources/configurations/security/dds/configurations/ddsrouter.yaml index 68906549b..3a421b0bb 100644 --- a/resources/configurations/security/dds/configurations/ddsrouter.yaml +++ b/resources/configurations/security/dds/configurations/ddsrouter.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 xml: files: diff --git a/tools/ddsrouter_tool/test/application/CMakeLists.txt b/tools/ddsrouter_tool/test/application/CMakeLists.txt index cfc411d9a..722a718c4 100644 --- a/tools/ddsrouter_tool/test/application/CMakeLists.txt +++ b/tools/ddsrouter_tool/test/application/CMakeLists.txt @@ -22,7 +22,7 @@ find_package(PythonInterp 3 REQUIRED) set(TEST_CONFIGURATIONS simple_configuration ds_configuration - complex_configuration_v3 + complex_configuration wan_configuration ) diff --git a/tools/ddsrouter_tool/test/application/configurations/complex_configuration_v3.yaml b/tools/ddsrouter_tool/test/application/configurations/complex_configuration.yaml similarity index 91% rename from tools/ddsrouter_tool/test/application/configurations/complex_configuration_v3.yaml rename to tools/ddsrouter_tool/test/application/configurations/complex_configuration.yaml index c65ade7da..8100bdfad 100644 --- a/tools/ddsrouter_tool/test/application/configurations/complex_configuration_v3.yaml +++ b/tools/ddsrouter_tool/test/application/configurations/complex_configuration.yaml @@ -6,7 +6,7 @@ # 1 Initial Peers repeater Participant with connection and listening addresses # 2 topics, one with key and one without -version: v4.0 +version: v5.0 builtin-topics: - name: "rt/chatter" @@ -55,21 +55,14 @@ participants: - name: local-ds kind: local-discovery-server - discovery-server-guid: - id: 0 - listening-addresses: - ip: "127.0.0.1" port: 11666 - name: wan kind: wan-ds - discovery-server-guid: - id: 1 connection-addresses: - - discovery-server-guid: - id: 2 - addresses: + - addresses: - ip: "127.0.0.1" port: 11667 external-port: 11678 diff --git a/tools/ddsrouter_tool/test/application/configurations/ds_configuration.yaml b/tools/ddsrouter_tool/test/application/configurations/ds_configuration.yaml index 84406b2eb..c22896284 100644 --- a/tools/ddsrouter_tool/test/application/configurations/ds_configuration.yaml +++ b/tools/ddsrouter_tool/test/application/configurations/ds_configuration.yaml @@ -3,7 +3,7 @@ # 1 WAN Participant with connection address # 2 topics, one with key and one without -version: v4.0 +version: v5.0 builtin-topics: - name: "rt/chatter" @@ -20,20 +20,14 @@ participants: - name: local-ds kind: local-discovery-server - discovery-server-guid: - id: 0 listening-addresses: - ip: "127.0.0.1" port: 11666 - name: wan kind: wan-ds - discovery-server-guid: - id: 1 connection-addresses: - - discovery-server-guid: - id: 2 - addresses: + - addresses: - ip: "127.0.0.1" port: 11667 transport: tcp diff --git a/tools/ddsrouter_tool/test/application/configurations/simple_configuration.yaml b/tools/ddsrouter_tool/test/application/configurations/simple_configuration.yaml index ca03e192b..f18f2593c 100644 --- a/tools/ddsrouter_tool/test/application/configurations/simple_configuration.yaml +++ b/tools/ddsrouter_tool/test/application/configurations/simple_configuration.yaml @@ -3,7 +3,7 @@ # 1 Simple Participant in domain 0 # 2 topics, one with key and one without -version: v4.0 +version: v5.0 builtin-topics: - name: "rt/chatter" diff --git a/tools/ddsrouter_tool/test/application/configurations/wan_configuration.yaml b/tools/ddsrouter_tool/test/application/configurations/wan_configuration.yaml index 28196ef17..7b5deec2b 100644 --- a/tools/ddsrouter_tool/test/application/configurations/wan_configuration.yaml +++ b/tools/ddsrouter_tool/test/application/configurations/wan_configuration.yaml @@ -1,5 +1,5 @@ -version: v4.0 +version: v5.0 participants: diff --git a/tools/ddsrouter_yaml_validator/ddsrouter_yaml_validator/full_example.yaml b/tools/ddsrouter_yaml_validator/ddsrouter_yaml_validator/full_example.yaml index 60b68b064..11554456c 100644 --- a/tools/ddsrouter_yaml_validator/ddsrouter_yaml_validator/full_example.yaml +++ b/tools/ddsrouter_yaml_validator/ddsrouter_yaml_validator/full_example.yaml @@ -1,4 +1,4 @@ -version: v4.0 # Required +version: v5.0 # Required threads: 32 # Optional diff --git a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/address_no_ip_nor_domain.yaml b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/address_no_ip_nor_domain.yaml index 97a0ea297..a00717b0d 100644 --- a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/address_no_ip_nor_domain.yaml +++ b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/address_no_ip_nor_domain.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 allowlist: - name: HelloWorldTopic diff --git a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/address_no_port.yaml b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/address_no_port.yaml index ccdc1fe26..2bf6c27ab 100644 --- a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/address_no_port.yaml +++ b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/address_no_port.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 allowlist: - name: HelloWorldTopic diff --git a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/builtin_topic_no_name.yaml b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/builtin_topic_no_name.yaml index 4c117db4b..359c42c87 100644 --- a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/builtin_topic_no_name.yaml +++ b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/builtin_topic_no_name.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 builtin-topics: - type: HelloWorld diff --git a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/builtin_topic_no_type.yaml b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/builtin_topic_no_type.yaml index d6fcad24d..443ba8b47 100644 --- a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/builtin_topic_no_type.yaml +++ b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/builtin_topic_no_type.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 builtin-topics: - name: HelloWorldTopic diff --git a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/ds_participant_no_discovery_server_guid.yaml b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/ds_participant_no_discovery_server_guid.yaml index 68843dc6d..576723c2c 100644 --- a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/ds_participant_no_discovery_server_guid.yaml +++ b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/ds_participant_no_discovery_server_guid.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 allowlist: - name: HelloWorldTopic diff --git a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/ds_participant_no_listening_nor_connection_addresses.yaml b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/ds_participant_no_listening_nor_connection_addresses.yaml index c7cdb2a15..4c3452940 100644 --- a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/ds_participant_no_listening_nor_connection_addresses.yaml +++ b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/ds_participant_no_listening_nor_connection_addresses.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 allowlist: - name: HelloWorldTopic diff --git a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/filter_topic_no_name.yaml b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/filter_topic_no_name.yaml index 84640c068..9dfbcae2d 100644 --- a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/filter_topic_no_name.yaml +++ b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/filter_topic_no_name.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 allowlist: - type: HelloWorld diff --git a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/initial_peers_no_addresses.yaml b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/initial_peers_no_addresses.yaml index e82cd8e98..ede89094a 100644 --- a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/initial_peers_no_addresses.yaml +++ b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/initial_peers_no_addresses.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 allowlist: - name: HelloWorldTopic diff --git a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/no_participant_kind.yaml b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/no_participant_kind.yaml index 07f60c8e4..9b4daad29 100644 --- a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/no_participant_kind.yaml +++ b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/no_participant_kind.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 allowlist: - name: HelloWorldTopic diff --git a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/no_participant_name.yaml b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/no_participant_name.yaml index 8b639c347..e16f500a7 100644 --- a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/no_participant_name.yaml +++ b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/no_participant_name.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 allowlist: - name: HelloWorldTopic diff --git a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/tls_ca_no_private_key_provided_cert.yaml b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/tls_ca_no_private_key_provided_cert.yaml index 3b2dbd12f..8080c1a63 100644 --- a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/tls_ca_no_private_key_provided_cert.yaml +++ b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/tls_ca_no_private_key_provided_cert.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 allowlist: - name: HelloWorldTopic diff --git a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/tls_no_ca.yaml b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/tls_no_ca.yaml index 1a6c0c7a7..0129aca70 100644 --- a/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/tls_no_ca.yaml +++ b/tools/ddsrouter_yaml_validator/tests/invalid_configuration_files/tls_no_ca.yaml @@ -1,4 +1,4 @@ -version: v4.0 +version: v5.0 allowlist: - name: HelloWorldTopic