From 4b991f4d5fbe4f9e937662c41d6ef4a632ab883e Mon Sep 17 00:00:00 2001 From: JLBuenoLopez-eProsima Date: Mon, 3 Jul 2023 16:01:11 +0200 Subject: [PATCH 1/3] Refs #19038: endpoint configurable ignore local endpoints feature Signed-off-by: JLBuenoLopez-eProsima --- code/DDSCodeTester.cpp | 20 +++++++++++++- code/XMLTester.xml | 27 ++++++++++++++++++- .../ignore_local_endpoints.rst | 16 ++++++++--- 3 files changed, 58 insertions(+), 5 deletions(-) diff --git a/code/DDSCodeTester.cpp b/code/DDSCodeTester.cpp index 6a2d39afc..12782a833 100644 --- a/code/DDSCodeTester.cpp +++ b/code/DDSCodeTester.cpp @@ -778,13 +778,31 @@ void dds_domain_examples() } { - // IGNORE_LOCAL_ENDPOINTS_DOMAINPARTICIPANT + // IGNORE_LOCAL_ENDPOINTS + // DomainParticipant level: every local endpoint is not matched with + // any other local endpoint. DomainParticipantQos participant_qos; // Avoid local matching of this participant's endpoints participant_qos.properties().properties().emplace_back( "fastdds.ignore_local_endpoints", "true"); + + // Endpoint level: DataWriter ignores any other local endpoint + DataWriterQos datawriter_qos; + + // Avoid local matching with any other local endpoint + datawriter_qos.properties().properties().emplace_back( + "fastdds.ignore_local_endpoints", + "true"); + + // Endpoint level: DataReader ignores any other local endpoint + DataReaderQos datareader_qos; + + // Avoid local matching with any other local endpoint + datareader_qos.properties().properties().emplace_back( + "fastdds.ignore_local_endpoints", + "true"); //!-- } } diff --git a/code/XMLTester.xml b/code/XMLTester.xml index 6a93fc32b..2d764f129 100644 --- a/code/XMLTester.xml +++ b/code/XMLTester.xml @@ -2587,7 +2587,7 @@ <--> -IGNORE_LOCAL_ENDPOINTS_DOMAINPARTICIPANT<--> +IGNORE_LOCAL_ENDPOINTS<--> + + fastdds.ignore_local_endpoints + true + + + + + + + + + + + fastdds.ignore_local_endpoints + true + + + + + IGNORE_LOCAL_ENDPOINTS_DOMAINPARTICIPANT<--> + :start-after: IGNORE_LOCAL_ENDPOINTS<--> :end-before: <--> :lines: 2-4,6-18,20-21 From b08bbe8e1933cd8fef3d042318a85afa9f3576df Mon Sep 17 00:00:00 2001 From: JLBuenoLopez-eProsima Date: Mon, 3 Jul 2023 16:31:51 +0200 Subject: [PATCH 2/3] Refs #19038: fix CI Signed-off-by: JLBuenoLopez-eProsima --- code/XMLTester.xml | 4 ++-- docs/fastdds/property_policies/ignore_local_endpoints.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/XMLTester.xml b/code/XMLTester.xml index 2d764f129..b045ad8c7 100644 --- a/code/XMLTester.xml +++ b/code/XMLTester.xml @@ -2616,7 +2616,7 @@ true - + @@ -2628,7 +2628,7 @@ true - + IGNORE_LOCAL_ENDPOINTS<--> :end-before: <--> - :lines: 2-4,6-18,20-21 + :lines: 2-4,6-41,43-44 .. note:: An invalid value of ``fastdds.ignore_local_endpoints`` results in the default behaviour. From b0c2d9bd6c42d545ffa2546ca8f721179a3c6c24 Mon Sep 17 00:00:00 2001 From: JLBuenoLopez-eProsima Date: Tue, 4 Jul 2023 10:31:58 +0200 Subject: [PATCH 3/3] Refs #19038: apply review suggestion Signed-off-by: JLBuenoLopez-eProsima --- docs/fastdds/property_policies/ignore_local_endpoints.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/fastdds/property_policies/ignore_local_endpoints.rst b/docs/fastdds/property_policies/ignore_local_endpoints.rst index cf938b413..3dd5616ac 100644 --- a/docs/fastdds/property_policies/ignore_local_endpoints.rst +++ b/docs/fastdds/property_policies/ignore_local_endpoints.rst @@ -19,8 +19,8 @@ endpoints through the PropertyPolicyQos. The property can be configured both at the DomainParticipant level as at the endpoint level: * When configured in the DomainParticipant, no local endpoint will be matched. -* When configured in a specific endpoint, that specific endpoint will not be matched with any local one, but any other - local endpoint will be, unless trying to match with an endpoint with the property set. +* When configured in a specific endpoint, that specific endpoint will not be matched with any local one, independently + if the other endpoint has or not the property enabled. .. note::