Make DiscoveryServer servers' guid prefix optional (#467)

* Remove non-mandatory guid-prefix from discovery server blackbox tests Signed-off-by: Juan Lopez Fernandez <[email protected]> * Raise YAML reader version Signed-off-by: Juan Lopez Fernandez <[email protected]> * Remove non-required guid-prefix from DiscoveryServer Docker tests Signed-off-by: Juan Lopez Fernandez <[email protected]> * Update documentation: version section Signed-off-by: Juan Lopez Fernandez <[email protected]> * Update documentation and examples: guid-less discovery server Signed-off-by: Juan Lopez Fernandez <[email protected]> * Update missing v4 -> v5 Signed-off-by: Juan Lopez Fernandez <[email protected]> --------- Signed-off-by: Juan Lopez Fernandez <[email protected]>
eProsima · Sep 9, 2024 · ff7ff53 · ff7ff53
1 parent 2eb0bf5
commit ff7ff53
Show file tree

Hide file tree

Showing 153 changed files with 263 additions and 335 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-version: v4.0
+version: v5.0
 
 participants:
 

diff --git a/...uter_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_cloud_0.yaml b/...uter_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/...uter_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_cloud_1.yaml b/...uter_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/...outer_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_edge_0.yaml b/...outer_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/...outer_test/compose/test_cases/remove_unused_entities/disconnect_wan/ddsrouter_edge_1.yaml b/...outer_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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-version: v4.0
+version: v5.0
 
 participants:
 

diff --git a/...outer_test/compose/test_cases/remove_unused_entities/reconnect_wan/ddsrouter_cloud_0.yaml b/...outer_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/...outer_test/compose/test_cases/remove_unused_entities/reconnect_wan/ddsrouter_cloud_1.yaml b/...outer_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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-version: v4.0
+version: v5.0
 
 participants:
 

diff --git a/...t/compose/test_cases/rpc/ros2_services_repeater_with_talker/ddsrouter_cloud_repeater.yaml b/...t/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/...uter_test/compose/test_cases/rpc/ros2_services_repeater_with_talker/ddsrouter_edge_1.yaml b/...uter_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/...uter_test/compose/test_cases/rpc/ros2_services_repeater_with_talker/ddsrouter_edge_2.yaml b/...uter_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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-version: v4.0
+version: v5.0
 
 xml:
   files: