-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add discovery server tcp tests + remove tcp tests from failing tests
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
- Loading branch information
Showing
10 changed files
with
161 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
ddsrouter_test/compose/test_cases/discovery_server/tcp/ddsrouter_cloud_discovery.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
19 changes: 19 additions & 0 deletions
19
ddsrouter_test/compose/test_cases/discovery_server/tcp/ddsrouter_edge_1.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
19 changes: 19 additions & 0 deletions
19
ddsrouter_test/compose/test_cases/discovery_server/tcp/ddsrouter_edge_2.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
104 changes: 104 additions & 0 deletions
104
ddsrouter_test/compose/test_cases/discovery_server/udp/compose.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
File renamed without changes.
File renamed without changes.
File renamed without changes.