From 428bcc003c2aa146a153be8c41f1511c16f25096 Mon Sep 17 00:00:00 2001 From: Jesus Perez Date: Fri, 15 Mar 2024 08:49:06 +0100 Subject: [PATCH] Add discovery server tcp tests + remove tcp tests from failing tests Signed-off-by: Jesus Perez --- ddsrouter_test/compose/CMakeLists.txt | 4 +- ddsrouter_test/compose/TEST_XFAIL.list | 4 +- .../discovery_server/{ => tcp}/compose.yml | 6 +- .../tcp/ddsrouter_cloud_discovery.yaml | 12 ++ .../tcp/ddsrouter_edge_1.yaml | 19 ++++ .../tcp/ddsrouter_edge_2.yaml | 19 ++++ .../discovery_server/udp/compose.yml | 104 ++++++++++++++++++ .../{ => udp}/ddsrouter_cloud_discovery.yaml | 0 .../{ => udp}/ddsrouter_edge_1.yaml | 0 .../{ => udp}/ddsrouter_edge_2.yaml | 0 10 files changed, 161 insertions(+), 7 deletions(-) rename ddsrouter_test/compose/test_cases/discovery_server/{ => tcp}/compose.yml (96%) create mode 100644 ddsrouter_test/compose/test_cases/discovery_server/tcp/ddsrouter_cloud_discovery.yaml create mode 100644 ddsrouter_test/compose/test_cases/discovery_server/tcp/ddsrouter_edge_1.yaml create mode 100644 ddsrouter_test/compose/test_cases/discovery_server/tcp/ddsrouter_edge_2.yaml create mode 100644 ddsrouter_test/compose/test_cases/discovery_server/udp/compose.yml rename ddsrouter_test/compose/test_cases/discovery_server/{ => udp}/ddsrouter_cloud_discovery.yaml (100%) rename ddsrouter_test/compose/test_cases/discovery_server/{ => udp}/ddsrouter_edge_1.yaml (100%) rename ddsrouter_test/compose/test_cases/discovery_server/{ => udp}/ddsrouter_edge_2.yaml (100%) diff --git a/ddsrouter_test/compose/CMakeLists.txt b/ddsrouter_test/compose/CMakeLists.txt index a88e120e2..d1bdef674 100644 --- a/ddsrouter_test/compose/CMakeLists.txt +++ b/ddsrouter_test/compose/CMakeLists.txt @@ -18,10 +18,12 @@ set(TESTS repeater_tcp tcp udp - discovery_server dds_rtps dds + discovery_server/udp + discovery_server/tcp + rpc/ros2_services_cloud rpc/ros2_services_repeater rpc/ros2_services_repeater_with_talker diff --git a/ddsrouter_test/compose/TEST_XFAIL.list b/ddsrouter_test/compose/TEST_XFAIL.list index a8a0930a4..68bb8d38e 100644 --- a/ddsrouter_test/compose/TEST_XFAIL.list +++ b/ddsrouter_test/compose/TEST_XFAIL.list @@ -1,6 +1,4 @@ -tool.application.ddsrouter.compose.discovery_server -tool.application.ddsrouter.compose.repeater_tcp -tool.application.ddsrouter.compose.tcp +tool.application.ddsrouter.compose.discovery_server.tcp tool.application.ddsrouter.compose.rpc_ros2_services_cloud tool.application.ddsrouter.compose.rpc_ros2_services_correct_target tool.application.ddsrouter.compose.rpc_ros2_services_repeater diff --git a/ddsrouter_test/compose/test_cases/discovery_server/compose.yml b/ddsrouter_test/compose/test_cases/discovery_server/tcp/compose.yml similarity index 96% rename from ddsrouter_test/compose/test_cases/discovery_server/compose.yml rename to ddsrouter_test/compose/test_cases/discovery_server/tcp/compose.yml index b3c799a6b..48c8ba2d0 100644 --- a/ddsrouter_test/compose/test_cases/discovery_server/compose.yml +++ b/ddsrouter_test/compose/test_cases/discovery_server/tcp/compose.yml @@ -1,5 +1,5 @@ # Test description: -# This test checks the Discovery Server functionality, by creating a Router Discovery Server blocking every topic. +# This test checks the TCP Discovery Server functionality, by creating a Router Discovery Server blocking every topic. # The edge routers must discover each other via Discovery Server and transmit data from one another. # # Test architecture: @@ -70,7 +70,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 12 --args "--domain 1 --samples 20" ddsrouter_edge_2: @@ -93,7 +93,7 @@ services: networks: - edge_2_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 12 --args "--domain 2 --samples 20" networks: diff --git a/ddsrouter_test/compose/test_cases/discovery_server/tcp/ddsrouter_cloud_discovery.yaml b/ddsrouter_test/compose/test_cases/discovery_server/tcp/ddsrouter_cloud_discovery.yaml new file mode 100644 index 000000000..def968f51 --- /dev/null +++ b/ddsrouter_test/compose/test_cases/discovery_server/tcp/ddsrouter_cloud_discovery.yaml @@ -0,0 +1,12 @@ +version: v4.0 + +participants: + + - name: Cloud_Discovery_Server_Participant + kind: wan-ds + discovery-server-guid: + id: 0 + listening-addresses: + - ip: 127.0.0.1 + port: 11666 + transport: tcp diff --git a/ddsrouter_test/compose/test_cases/discovery_server/tcp/ddsrouter_edge_1.yaml b/ddsrouter_test/compose/test_cases/discovery_server/tcp/ddsrouter_edge_1.yaml new file mode 100644 index 000000000..1eeabbe8c --- /dev/null +++ b/ddsrouter_test/compose/test_cases/discovery_server/tcp/ddsrouter_edge_1.yaml @@ -0,0 +1,19 @@ +version: v4.0 + +participants: + + - name: Simple_Participant + kind: local + domain: 1 + + - name: Edge_1_DS_Participant + kind: wan-ds + discovery-server-guid: + id: 1 + connection-addresses: + - discovery-server-guid: + id: 0 + addresses: + - ip: 127.0.0.1 + port: 11666 + transport: tcp diff --git a/ddsrouter_test/compose/test_cases/discovery_server/tcp/ddsrouter_edge_2.yaml b/ddsrouter_test/compose/test_cases/discovery_server/tcp/ddsrouter_edge_2.yaml new file mode 100644 index 000000000..15bde76d0 --- /dev/null +++ b/ddsrouter_test/compose/test_cases/discovery_server/tcp/ddsrouter_edge_2.yaml @@ -0,0 +1,19 @@ +version: v4.0 + +participants: + + - name: Simple_Participant + kind: local + domain: 2 + + - name: Edge_2_DS_Participant + kind: wan-ds + discovery-server-guid: + id: 2 + connection-addresses: + - discovery-server-guid: + id: 0 + addresses: + - ip: 127.0.0.1 + port: 11666 + transport: tcp diff --git a/ddsrouter_test/compose/test_cases/discovery_server/udp/compose.yml b/ddsrouter_test/compose/test_cases/discovery_server/udp/compose.yml new file mode 100644 index 000000000..6f57897c2 --- /dev/null +++ b/ddsrouter_test/compose/test_cases/discovery_server/udp/compose.yml @@ -0,0 +1,104 @@ +# Test description: +# This test checks the UDP Discovery Server functionality, by creating a Router Discovery Server blocking every topic. +# The edge routers must discover each other via Discovery Server and transmit data from one another. +# +# Test architecture: +# +# ┌────────────────────────────────────────────────────────────────┐ +# │ cloud_edge_net │ +# │ │ +# │ ┌──────────────────┐ │ +# │ │ ddsrouter_cloud │ │ +# │ │ (ds_wan | block) │ │ +# │ └─▲──────────────▲─┘ │ +# │ │ │ │ +# │ ┌--------------┘ └---------┐ │ +# ┌──────┼───────────┼──────────────────┐ ┌───────────┼────────────┼──────┐ +# │ │ │ │ │ │ │ │ +# │ │ ┌─────────▼────────┐ │ │ ┌───────▼──────────┐ │ │ +# │ │ │ ddsrouter_edge_1 │──────────────────────│ ddsrouter_edge_2 │ │ │ +# │ │ │ (local + ds_wan) │ │ │ │ (local + ds_wan) │ │ │ +# │ │ └───────┬────▲─────┘ │ │ └───────┬──────────┘ │ │ +# │ │ │ │ │ │ │ │ │ +# │ └─────────┼────┼───────────────┼────────┼───────────┼────────────┘ │ +# │ │ │ │ │ │ │ +# │ ┌─────────────▼┐ ┌┴───────────┐ │ │ ┌──────▼───────┐ │ +# │ │ sub_edge_1 │ │ pub_edge_1 │ │ │ │ sub_edge_2 │ │ +# │ │ (subscriber) │ │ (publisher)│ │ │ │ (subscriber) │ │ +# │ └──────────────┘ └────────────┘ │ │ └──────────────┘ │ +# │ │ │ │ +# │ edge_1_net (domain 1) │ │ edge_2_net (domain 2) │ +# └─────────────────────────────────────┘ └───────────────────────────────┘ + +services: + + ddsrouter_cloud: + image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE} + container_name: ddsrouter_cloud + networks: + - cloud_edge_net + volumes: + - ./ddsrouter_cloud_discovery.yaml:/config.yaml + command: ddsrouter -c /config.yaml --timeout 12 + + ddsrouter_edge_1: + image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE} + container_name: ddsrouter_edge_1 + depends_on: + - ddsrouter_cloud + networks: + - cloud_edge_net + - edge_1_net + volumes: + - ./ddsrouter_edge_1.yaml:/config.yaml + command: ddsrouter -c /config.yaml --timeout 12 + + pub_edge_1: + image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE} + container_name: pub_edge_1 + depends_on: + - ddsrouter_edge_1 + networks: + - edge_1_net + command: install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample publisher -i 100 -s 110 -d 1 + + sub_edge_1: + image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE} + container_name: sub_edge_1 + depends_on: + - ddsrouter_edge_1 + networks: + - edge_1_net + volumes: + - ../../../scripts:/scripts + command: python3 /scripts/execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 20 --timeout 12 --args "--domain 1 --samples 20" + + ddsrouter_edge_2: + image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE} + container_name: ddsrouter_edge_2 + depends_on: + - ddsrouter_cloud + networks: + - cloud_edge_net + - edge_2_net + volumes: + - ./ddsrouter_edge_2.yaml:/config.yaml + command: ddsrouter -c /config.yaml --timeout 12 + + sub_edge_2: + image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE} + container_name: sub_edge_2 + depends_on: + - ddsrouter_edge_2 + networks: + - edge_2_net + volumes: + - ../../../scripts:/scripts + command: python3 /scripts/execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 20 --timeout 12 --args "--domain 2 --samples 20" + +networks: + edge_1_net: + edge_2_net: + cloud_edge_net: + default: + driver: none diff --git a/ddsrouter_test/compose/test_cases/discovery_server/ddsrouter_cloud_discovery.yaml b/ddsrouter_test/compose/test_cases/discovery_server/udp/ddsrouter_cloud_discovery.yaml similarity index 100% rename from ddsrouter_test/compose/test_cases/discovery_server/ddsrouter_cloud_discovery.yaml rename to ddsrouter_test/compose/test_cases/discovery_server/udp/ddsrouter_cloud_discovery.yaml diff --git a/ddsrouter_test/compose/test_cases/discovery_server/ddsrouter_edge_1.yaml b/ddsrouter_test/compose/test_cases/discovery_server/udp/ddsrouter_edge_1.yaml similarity index 100% rename from ddsrouter_test/compose/test_cases/discovery_server/ddsrouter_edge_1.yaml rename to ddsrouter_test/compose/test_cases/discovery_server/udp/ddsrouter_edge_1.yaml diff --git a/ddsrouter_test/compose/test_cases/discovery_server/ddsrouter_edge_2.yaml b/ddsrouter_test/compose/test_cases/discovery_server/udp/ddsrouter_edge_2.yaml similarity index 100% rename from ddsrouter_test/compose/test_cases/discovery_server/ddsrouter_edge_2.yaml rename to ddsrouter_test/compose/test_cases/discovery_server/udp/ddsrouter_edge_2.yaml