Skip to content

[21670] Fix failing tests in Router 2.x #508

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

Merged
juanlofer-eprosima merged 2 commits into from
Jun 18, 2025
Merged

[21670] Fix failing tests in Router 2.x #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f2a959
Refs #21670: Fix destructor in tests for 2.x
cferreiragonz May 27, 2025
e10eb05
Refs #21670: Use whitelist for DS with Fast 2.x
cferreiragonz Jun 18, 2025
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
7 changes: 7 additions & 0 deletions ddsrouter_core/test/blackbox/ddsrouter_core/dds/WAN/DDSTestWAN.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,13 @@ discovery_server_participant_configuration(
);
}

// Localhost translation is never accomplished in DS with Fast DDS 2.x due to fixed GUIDs.
// TCPv6 suffers from this issue as it will not be able to make any connection. A whitelist is needed to enforce
// localhost connections.
// This issue is fixed in Fast DDS 3.x with machine_id based translations and non-fixed GUIDs DS's.
participants::types::WhitelistType lo_wl = (ip_version == participants::types::IpVersion::v4 ? "127.0.0.1" : "::1");
conf.whitelist.insert(lo_wl);

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));
Expand Down
8 changes: 4 additions & 4 deletions ddsrouter_core/test/blackbox/ddsrouter_core/dds/types/test_participants.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,10 +286,6 @@ class TestSubscriber
{
if (participant_ != nullptr)
{
if (topic_ != nullptr)
{
participant_->delete_topic(topic_);
}
if (subscriber_ != nullptr)
{
if (reader_ != nullptr)
Expand All @@ -298,6 +294,10 @@ class TestSubscriber
}
participant_->delete_subscriber(subscriber_);
}
if (topic_ != nullptr)
{
participant_->delete_topic(topic_);
}
eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->delete_participant(participant_);
}
}
Expand Down
Loading