Tests

Signed-off-by: tempate <[email protected]>
eProsima · Jul 15, 2024 · a1db606 · a1db606
1 parent 468cc1a
commit a1db606
Show file tree

Hide file tree

Showing 37 changed files with 918 additions and 21 deletions.
diff --git a/ddsrouter_test/compose/CMakeLists.txt b/ddsrouter_test/compose/CMakeLists.txt
@@ -45,12 +45,18 @@ set(TESTS
     forwarding_routes/topic_routes
     forwarding_routes/repeater
 
-    remove_unused_entities/disconnect
-    remove_unused_entities/disconnect_wan
-    remove_unused_entities/persist_diff_domain
-    remove_unused_entities/persist_same_domain
-    remove_unused_entities/reconnect
-    remove_unused_entities/reconnect_wan
+    remove_unused_entities/reader/disconnect
+    remove_unused_entities/reader/disconnect_wan
+    remove_unused_entities/reader/persist_diff_domain
+    remove_unused_entities/reader/persist_same_domain
+    remove_unused_entities/reader/reconnect
+    remove_unused_entities/reader/reconnect_wan
+    remove_unused_entities/writer/disconnect
+    remove_unused_entities/writer/disconnect_wan
+    remove_unused_entities/writer/persist_diff_domain
+    remove_unused_entities/writer/persist_same_domain
+    remove_unused_entities/writer/reconnect
+    remove_unused_entities/writer/reconnect_wan
 
     frequency/max-tx-rate/specs
     frequency/max-tx-rate/participant

diff --git a/...ve_unused_entities/disconnect/compose.yml → ...ed_entities/reader/disconnect/compose.yml b/...ve_unused_entities/disconnect/compose.yml → ...ed_entities/reader/disconnect/compose.yml
@@ -48,7 +48,7 @@ services:
     networks:
       - std_net
     volumes:
-      - ../../../scripts:/scripts
+      - ../../../../scripts:/scripts
     command: python3 /scripts/execute_and_validate_publisher.py --exe install/AdvancedConfigurationExample/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationExample --n-unmatches 1 --timeout 8 --args "--samples 80 --domain 80 --topic topic0 --interval 100"
 
 
@@ -59,7 +59,7 @@ services:
     networks:
       - std_net
     volumes:
-      - ../../../scripts:/scripts
+      - ../../../../scripts:/scripts
     command: python3 /scripts/execute_and_validate_subscriber.py --exe install/AdvancedConfigurationExample/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationExample --samples 20 --timeout 4 --args "--samples 20 --domain 81 --topic topic0"
 
 

diff --git a/...tities/persist_same_domain/ddsrouter.yaml → ...entities/reader/disconnect/ddsrouter.yaml b/...tities/persist_same_domain/ddsrouter.yaml → ...entities/reader/disconnect/ddsrouter.yaml
@@ -12,3 +12,4 @@ participants:
 
 specs:
   remove-unused-entities: true
+  discovery-trigger: reader
diff --git a/...nused_entities/disconnect_wan/compose.yml → ...ntities/reader/disconnect_wan/compose.yml b/...nused_entities/disconnect_wan/compose.yml → ...ntities/reader/disconnect_wan/compose.yml
@@ -79,7 +79,7 @@ services:
     networks:
       - edge_0_net
     volumes:
-      - ../../../scripts:/scripts
+      - ../../../../scripts:/scripts
     command: python3 /scripts/execute_and_validate_publisher.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --n-unmatches 1 --timeout 8 --args "--samples 80 --domain 80 --interval 100"
 
   # DOMAIN 81
@@ -103,7 +103,7 @@ services:
     networks:
       - edge_1_net
     volumes:
-      - ../../../scripts:/scripts
+      - ../../../../scripts:/scripts
     command: python3 /scripts/execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 20 --timeout 8 --args "--samples 20 --domain 81"
 
 networks:

diff --git a/...ties/reconnect_wan/ddsrouter_cloud_0.yaml → ...der/disconnect_wan/ddsrouter_cloud_0.yaml b/...ties/reconnect_wan/ddsrouter_cloud_0.yaml → ...der/disconnect_wan/ddsrouter_cloud_0.yaml
@@ -18,3 +18,4 @@ participants:
 
 specs:
   remove-unused-entities: true
+  discovery-trigger: reader
diff --git a/...ies/disconnect_wan/ddsrouter_cloud_1.yaml → ...der/disconnect_wan/ddsrouter_cloud_1.yaml b/...ies/disconnect_wan/ddsrouter_cloud_1.yaml → ...der/disconnect_wan/ddsrouter_cloud_1.yaml
@@ -18,3 +18,4 @@ participants:
 
 specs:
   remove-unused-entities: true
+  discovery-trigger: reader
diff --git a/...ities/reconnect_wan/ddsrouter_edge_0.yaml → ...ader/disconnect_wan/ddsrouter_edge_0.yaml b/...ities/reconnect_wan/ddsrouter_edge_0.yaml → ...ader/disconnect_wan/ddsrouter_edge_0.yaml
@@ -15,3 +15,4 @@ participants:
 
 specs:
   remove-unused-entities: true
+  discovery-trigger: reader
diff --git a/...ities/reconnect_wan/ddsrouter_edge_1.yaml → ...ader/disconnect_wan/ddsrouter_edge_1.yaml b/...ities/reconnect_wan/ddsrouter_edge_1.yaml → ...ader/disconnect_wan/ddsrouter_edge_1.yaml
@@ -15,3 +15,4 @@ participants:
 
 specs:
   remove-unused-entities: true
+  discovery-trigger: reader
diff --git a/..._entities/persist_diff_domain/compose.yml → ...es/reader/persist_diff_domain/compose.yml b/..._entities/persist_diff_domain/compose.yml → ...es/reader/persist_diff_domain/compose.yml
@@ -83,7 +83,7 @@ services:
     networks:
       - std_net
     volumes:
-      - ../../../scripts:/scripts
+      - ../../../../scripts:/scripts
     command: python3 /scripts/execute_and_validate_publisher.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --n-unmatches 1 --timeout 11 --args "--samples 110 --domain 80 --topic topic0 --interval 100"
 
   # DOMAIN 81
@@ -93,7 +93,7 @@ services:
     networks:
       - std_net
     volumes:
-      - ../../../scripts:/scripts
+      - ../../../../scripts:/scripts
     command: python3 /scripts/execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 40 --timeout 6 --args "--samples 40 --domain 81 --topic topic0"
 
 
@@ -104,7 +104,7 @@ services:
     networks:
       - std_net
     volumes:
-      - ../../../scripts:/scripts
+      - ../../../../scripts:/scripts
     command: python3 /scripts/execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 40 --timeout 8 --delay 2 --args "--samples 40 --domain 82 --topic topic0"
 
 networks:

diff --git a/...tities/persist_diff_domain/ddsrouter.yaml → ...reader/persist_diff_domain/ddsrouter.yaml b/...tities/persist_diff_domain/ddsrouter.yaml → ...reader/persist_diff_domain/ddsrouter.yaml
@@ -16,3 +16,4 @@ participants:
 
 specs:
   remove-unused-entities: true
+  discovery-trigger: reader
diff --git a/..._entities/persist_same_domain/compose.yml → ...es/reader/persist_same_domain/compose.yml b/..._entities/persist_same_domain/compose.yml → ...es/reader/persist_same_domain/compose.yml
@@ -78,7 +78,7 @@ services:
     networks:
       - std_net
     volumes:
-      - ../../../scripts:/scripts
+      - ../../../../scripts:/scripts
     command: python3 /scripts/execute_and_validate_publisher.py --exe install/AdvancedConfigurationExample/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationExample --n-unmatches 1 --timeout 11 --args "--samples 110 --domain 80 --topic topic0 --interval 100"
 
 
@@ -89,7 +89,7 @@ services:
     networks:
       - std_net
     volumes:
-      - ../../../scripts:/scripts
+      - ../../../../scripts:/scripts
     command: python3 /scripts/execute_and_validate_subscriber.py --exe install/AdvancedConfigurationExample/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationExample --samples 40 --timeout 6 --args "--samples 40 --domain 81 --topic topic0"
 
   subscriber_t0_2:
@@ -98,7 +98,7 @@ services:
     networks:
       - std_net
     volumes:
-      - ../../../scripts:/scripts
+      - ../../../../scripts:/scripts
     command: python3 /scripts/execute_and_validate_subscriber.py --exe install/AdvancedConfigurationExample/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationExample --samples 40 --timeout 8 --delay 2 --args "--samples 40 --domain 81 --topic topic0"
 
 networks:

diff --git a/...unused_entities/disconnect/ddsrouter.yaml → ...reader/persist_same_domain/ddsrouter.yaml b/...unused_entities/disconnect/ddsrouter.yaml → ...reader/persist_same_domain/ddsrouter.yaml
@@ -12,3 +12,4 @@ participants:
 
 specs:
   remove-unused-entities: true
+  discovery-trigger: reader
diff --git a/...ove_unused_entities/reconnect/compose.yml → ...sed_entities/reader/reconnect/compose.yml b/...ove_unused_entities/reconnect/compose.yml → ...sed_entities/reader/reconnect/compose.yml
@@ -59,7 +59,7 @@ services:
     networks:
       - std_net
     volumes:
-      - ../../../scripts:/scripts
+      - ../../../../scripts:/scripts
     command: install/AdvancedConfigurationExample/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationExample publisher --samples 110 --domain 80 --topic topic0 --interval 100
 
 
@@ -70,7 +70,7 @@ services:
     networks:
       - std_net
     volumes:
-      - ../../../scripts:/scripts
+      - ../../../../scripts:/scripts
     command: python3 /scripts/execute_and_validate_subscriber.py --exe install/AdvancedConfigurationExample/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationExample --samples 20 --timeout 3 --args "--samples 20 --domain 81 --topic topic0"
 
   subscriber_t0_2:
@@ -79,7 +79,7 @@ services:
     networks:
       - std_net
     volumes:
-      - ../../../scripts:/scripts
+      - ../../../../scripts:/scripts
     command: python3 /scripts/execute_and_validate_subscriber.py --exe install/AdvancedConfigurationExample/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationExample --samples 20 --timeout 6 --delay 4 --args "--samples 20 --domain 81 --topic topic0"
 
 networks:

diff --git a/..._unused_entities/reconnect/ddsrouter.yaml → ..._entities/reader/reconnect/ddsrouter.yaml b/..._unused_entities/reconnect/ddsrouter.yaml → ..._entities/reader/reconnect/ddsrouter.yaml
@@ -12,3 +12,4 @@ participants:
 
 specs:
   remove-unused-entities: true
+  discovery-trigger: reader
diff --git a/...unused_entities/reconnect_wan/compose.yml → ...entities/reader/reconnect_wan/compose.yml b/...unused_entities/reconnect_wan/compose.yml → ...entities/reader/reconnect_wan/compose.yml
@@ -97,7 +97,7 @@ services:
     networks:
       - edge_1_net
     volumes:
-      - ../../../scripts:/scripts
+      - ../../../../scripts:/scripts
     command: python3 /scripts/execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 20 --timeout 8 --args "--samples 20 --domain 81"
 
   subscriber_2:
@@ -108,7 +108,7 @@ services:
     networks:
       - edge_1_net
     volumes:
-      - ../../../scripts:/scripts
+      - ../../../../scripts:/scripts
     command: python3 /scripts/execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 20 --timeout 6 --delay 4 --args "--samples 20 --domain 81"
 
 networks:

diff --git a/...ies/disconnect_wan/ddsrouter_cloud_0.yaml → ...ader/reconnect_wan/ddsrouter_cloud_0.yaml b/...ies/disconnect_wan/ddsrouter_cloud_0.yaml → ...ader/reconnect_wan/ddsrouter_cloud_0.yaml
@@ -18,3 +18,4 @@ participants:
 
 specs:
   remove-unused-entities: true
+  discovery-trigger: reader
diff --git a/...ties/reconnect_wan/ddsrouter_cloud_1.yaml → ...ader/reconnect_wan/ddsrouter_cloud_1.yaml b/...ties/reconnect_wan/ddsrouter_cloud_1.yaml → ...ader/reconnect_wan/ddsrouter_cloud_1.yaml
@@ -18,3 +18,4 @@ participants:
 
 specs:
   remove-unused-entities: true
+  discovery-trigger: reader
diff --git a/...ties/disconnect_wan/ddsrouter_edge_0.yaml → ...eader/reconnect_wan/ddsrouter_edge_0.yaml b/...ties/disconnect_wan/ddsrouter_edge_0.yaml → ...eader/reconnect_wan/ddsrouter_edge_0.yaml
@@ -15,3 +15,4 @@ participants:
 
 specs:
   remove-unused-entities: true
+  discovery-trigger: reader
diff --git a/...ties/disconnect_wan/ddsrouter_edge_1.yaml → ...eader/reconnect_wan/ddsrouter_edge_1.yaml b/...ties/disconnect_wan/ddsrouter_edge_1.yaml → ...eader/reconnect_wan/ddsrouter_edge_1.yaml
@@ -15,3 +15,4 @@ participants:
 
 specs:
   remove-unused-entities: true
+  discovery-trigger: reader
diff --git a/ddsrouter_test/compose/test_cases/remove_unused_entities/writer/disconnect/compose.yml b/ddsrouter_test/compose/test_cases/remove_unused_entities/writer/disconnect/compose.yml
@@ -0,0 +1,90 @@
+# Test description:
+#   This test checks that tracks get deleted when their last publisher disconnects.
+#
+# Test architecture:
+#
+# 1. Check that the subscribers connect to the publisher.
+#
+# ┌───────────────────┐            ┌────────────────────┐
+# │  Domain 80        │            │         Domain 81  │
+# │ ┌──────────────┐ ┌┼────────────┼┐ ┌───────────────┐ │
+# │ │publisher_0_t0│ ││  ddsrouter ││ │subscriber_1_t0│ │
+# │ │             ─┼─┼┤►          ─┼┼─┤►              │ │
+# │ │(local)       │ ││  (local)   ││ │(local)        │ │
+# │ └──────────────┘ └┼──────────┬─┼┘ └───────────────┘ │
+# │                   │          │ │                    │
+# └───────────────────┘          │ │  ┌───────────────┐ │
+#                                │ │  │subscriber_2_t0│ │
+#                                └─┼──┤►              │ │
+#                                  │  │(local)        │ │
+#                                  │  └───────────────┘ │
+#                                  │                    │
+#                                  └────────────────────┘
+#
+# 2. Check that when the publisher disconnects the track gets deleted.
+#
+# ┌───────────────────┐             ┌────────────────────┐
+# │  Domain 80        │             │         Domain 81  │
+# │                  ┌┼─────────────┼┐ ┌───────────────┐ │
+# │                  ││  ddsrouter  ││ │subscriber_2_t0| │
+# │                  ││             ││ │               │ │
+# │                  ││  (local)    ││ │(local)        │ │
+# │                  └┼─────────────┼┘ └───────────────┘ │
+# │                   │             │                    │
+# └───────────────────┘             └────────────────────┘
+#
+
+services:
+
+  # ROUTER
+  ddsrouter:
+    image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
+    container_name: ddsrouter
+    networks:
+      - std_net
+    volumes:
+      - ./ddsrouter.yaml:/config.yaml
+    command: ddsrouter -c /config.yaml --timeout 10
+
+  # DOMAIN 80
+  publisher_0_t0:
+    image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
+    container_name: publisher_0_t0
+    depends_on:
+      - ddsrouter
+    networks:
+      - std_net
+    volumes:
+      - ../../../../scripts:/scripts
+    command: python3 /scripts/execute_and_validate_publisher.py --exe install/AdvancedConfigurationExample/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationExample --timeout 4 --args "--samples 40 --domain 80 --topic topic0 --interval 100"
+
+  # DOMAIN 81
+
+  # Subscriber to verify the track has been created
+  subscriber_1_t0:
+    image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
+    container_name: subscriber_1_t0
+    depends_on:
+      - ddsrouter
+    networks:
+      - std_net
+    volumes:
+      - ../../../../scripts:/scripts
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe install/AdvancedConfigurationExample/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationExample --samples 10 --timeout 8 --args "--domain 81 --samples 10 --topic topic0"
+
+  # Subscriber to verify the track has been deleted
+  subscriber_2_t0:
+    image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
+    container_name: subscriber_2_t0
+    depends_on:
+      - ddsrouter
+    networks:
+      - std_net
+    volumes:
+      - ../../../../scripts:/scripts
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe install/AdvancedConfigurationExample/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationExample --n-unmatches 1 --timeout 8 --args "--domain 81 --topic topic0"
+
+networks:
+  std_net:
+  default:
+    driver: none
diff --git a/ddsrouter_test/compose/test_cases/remove_unused_entities/writer/disconnect/ddsrouter.yaml b/ddsrouter_test/compose/test_cases/remove_unused_entities/writer/disconnect/ddsrouter.yaml
@@ -0,0 +1,15 @@
+version: v4.0
+
+participants:
+
+  - name: Local_80
+    kind: local
+    domain: 80
+
+  - name: Local_81
+    kind: local
+    domain: 81
+
+specs:
+  remove-unused-entities: true
+  discovery-trigger: writer
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,4 @@ participants:

		specs:
		remove-unused-entities: true
		discovery-trigger: reader
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@ participants:

		specs:
		remove-unused-entities: true
		discovery-trigger: reader
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,3 +15,4 @@ participants:

		specs:
		remove-unused-entities: true
		discovery-trigger: reader
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,4 @@ participants:

		specs:
		remove-unused-entities: true
		discovery-trigger: reader