Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[19942] Make remove unused entities compatible with the discovery trigger #460

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[19942] Make remove unused entities compatible with the discovery trigger #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8600297
Update documentation
Tempate Jan 17, 2024
b209bc5
Tests
Tempate Jul 15, 2024
abf5323
Fixes after rebase
juanlofer-eprosima Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions ddsrouter_test/compose/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...ve_unused_entities/disconnect/compose.yml → ...ed_entities/reader/disconnect/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ services:
networks:
- std_net
volumes:
- ../../../scripts:/scripts
- ../../../../scripts:/scripts
command: python3 /scripts/execute_and_validate_publisher.py --exe build/fastdds_configuration_example/configuration --n-unmatches 1 --timeout 8 --args "--samples 80 --domain 80 --name topic0 --interval 100"


Expand All @@ -59,7 +59,7 @@ services:
networks:
- std_net
volumes:
- ../../../scripts:/scripts
- ../../../../scripts:/scripts
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 4 --args "--samples 20 --domain 81 --name topic0"


Expand Down
1 change: 1 addition & 0 deletions ...tities/persist_same_domain/ddsrouter.yaml → ...entities/reader/disconnect/ddsrouter.yaml
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions ...nused_entities/disconnect_wan/compose.yml → ...ntities/reader/disconnect_wan/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ services:
networks:
- edge_0_net
volumes:
- ../../../scripts:/scripts
- ../../../../scripts:/scripts
command: python3 /scripts/execute_and_validate_publisher.py --exe build/fastdds_configuration_example/configuration --n-unmatches 1 --timeout 8 --args "--samples 80 --domain 80 --interval 100"

# DOMAIN 81
Expand All @@ -103,7 +103,7 @@ services:
networks:
- edge_1_net
volumes:
- ../../../scripts:/scripts
- ../../../../scripts:/scripts
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 8 --args "--samples 20 --domain 81"

networks:
Expand Down
1 change: 1 addition & 0 deletions ...ties/reconnect_wan/ddsrouter_cloud_0.yaml → ...der/disconnect_wan/ddsrouter_cloud_0.yaml
View file
Open in desktop
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
1 change: 1 addition & 0 deletions ...ies/disconnect_wan/ddsrouter_cloud_1.yaml → ...der/disconnect_wan/ddsrouter_cloud_1.yaml
View file
Open in desktop
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
1 change: 1 addition & 0 deletions ...ities/reconnect_wan/ddsrouter_edge_0.yaml → ...ader/disconnect_wan/ddsrouter_edge_0.yaml
View file
Open in desktop
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
1 change: 1 addition & 0 deletions ...ities/reconnect_wan/ddsrouter_edge_1.yaml → ...ader/disconnect_wan/ddsrouter_edge_1.yaml
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions ..._entities/persist_diff_domain/compose.yml → ...es/reader/persist_diff_domain/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ services:
networks:
- std_net
volumes:
- ../../../scripts:/scripts
- ../../../../scripts:/scripts
command: python3 /scripts/execute_and_validate_publisher.py --exe build/fastdds_configuration_example/configuration --n-unmatches 1 --timeout 11 --args "--samples 110 --domain 80 --name topic0 --interval 100"

# DOMAIN 81
Expand All @@ -93,7 +93,7 @@ services:
networks:
- std_net
volumes:
- ../../../scripts:/scripts
- ../../../../scripts:/scripts
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 40 --timeout 6 --args "--samples 40 --domain 81 --name topic0"


Expand All @@ -104,7 +104,7 @@ services:
networks:
- std_net
volumes:
- ../../../scripts:/scripts
- ../../../../scripts:/scripts
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 40 --timeout 8 --delay 2 --args "--samples 40 --domain 82 --name topic0"

networks:
Expand Down
1 change: 1 addition & 0 deletions ...tities/persist_diff_domain/ddsrouter.yaml → ...reader/persist_diff_domain/ddsrouter.yaml
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions ..._entities/persist_same_domain/compose.yml → ...es/reader/persist_same_domain/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ services:
networks:
- std_net
volumes:
- ../../../scripts:/scripts
- ../../../../scripts:/scripts
command: python3 /scripts/execute_and_validate_publisher.py --exe build/fastdds_configuration_example/configuration --n-unmatches 1 --timeout 11 --args "--samples 110 --domain 80 --name topic0 --interval 100"


Expand All @@ -89,7 +89,7 @@ services:
networks:
- std_net
volumes:
- ../../../scripts:/scripts
- ../../../../scripts:/scripts
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 40 --timeout 6 --args "--samples 40 --domain 81 --name topic0"

subscriber_t0_2:
Expand All @@ -98,7 +98,7 @@ services:
networks:
- std_net
volumes:
- ../../../scripts:/scripts
- ../../../../scripts:/scripts
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 40 --timeout 8 --delay 2 --args "--samples 40 --domain 81 --name topic0"

networks:
Expand Down
1 change: 1 addition & 0 deletions ...unused_entities/disconnect/ddsrouter.yaml → ...reader/persist_same_domain/ddsrouter.yaml
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions ...ove_unused_entities/reconnect/compose.yml → ...sed_entities/reader/reconnect/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ services:
networks:
- std_net
volumes:
- ../../../scripts:/scripts
- ../../../../scripts:/scripts
command: build/fastdds_configuration_example/configuration publisher --samples 110 --domain 80 --name topic0 --interval 100


Expand All @@ -70,7 +70,7 @@ services:
networks:
- std_net
volumes:
- ../../../scripts:/scripts
- ../../../../scripts:/scripts
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 3 --args "--samples 20 --domain 81 --name topic0"

subscriber_t0_2:
Expand All @@ -79,7 +79,7 @@ services:
networks:
- std_net
volumes:
- ../../../scripts:/scripts
- ../../../../scripts:/scripts
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 6 --delay 4 --args "--samples 20 --domain 81 --name topic0"

networks:
Expand Down
1 change: 1 addition & 0 deletions ..._unused_entities/reconnect/ddsrouter.yaml → ..._entities/reader/reconnect/ddsrouter.yaml
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions ...unused_entities/reconnect_wan/compose.yml → ...entities/reader/reconnect_wan/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ services:
networks:
- edge_1_net
volumes:
- ../../../scripts:/scripts
- ../../../../scripts:/scripts
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 8 --args "--samples 20 --domain 81"

subscriber_2:
Expand All @@ -108,7 +108,7 @@ services:
networks:
- edge_1_net
volumes:
- ../../../scripts:/scripts
- ../../../../scripts:/scripts
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 6 --delay 4 --args "--samples 20 --domain 81"

networks:
Expand Down
1 change: 1 addition & 0 deletions ...ies/disconnect_wan/ddsrouter_cloud_0.yaml → ...ader/reconnect_wan/ddsrouter_cloud_0.yaml
View file
Open in desktop
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
1 change: 1 addition & 0 deletions ...ties/reconnect_wan/ddsrouter_cloud_1.yaml → ...ader/reconnect_wan/ddsrouter_cloud_1.yaml
View file
Open in desktop
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
1 change: 1 addition & 0 deletions ...ties/disconnect_wan/ddsrouter_edge_0.yaml → ...eader/reconnect_wan/ddsrouter_edge_0.yaml
View file
Open in desktop
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
1 change: 1 addition & 0 deletions ...ties/disconnect_wan/ddsrouter_edge_1.yaml → ...eader/reconnect_wan/ddsrouter_edge_1.yaml
View file
Open in desktop
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
90 changes: 90 additions & 0 deletions ddsrouter_test/compose/test_cases/remove_unused_entities/writer/disconnect/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 build/fastdds_configuration_example/configuration --timeout 4 --args "--samples 40 --domain 80 --name 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 build/fastdds_configuration_example/configuration --samples 10 --timeout 8 --args "--domain 81 --samples 10 --name 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 build/fastdds_configuration_example/configuration --n-unmatches 1 --timeout 8 --args "--domain 81 --name topic0"

networks:
std_net:
default:
driver: none
15 changes: 15 additions & 0 deletions ddsrouter_test/compose/test_cases/remove_unused_entities/writer/disconnect/ddsrouter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
version: v5.0

participants:

- name: Local_80
kind: local
domain: 80

- name: Local_81
kind: local
domain: 81

specs:
remove-unused-entities: true
discovery-trigger: writer
Loading
Loading