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.

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

Allow DomainParticipantQos updates for UserDataQosPolicy and adding new servers to the remote server list #2142

Merged
merged 5 commits into from
Aug 12, 2021

Conversation

JLBuenoLopez
Copy link
Contributor

This PR includes:

  • Fix the DDS and RTPS layer link to propagate the DomainParticipantQos updates
  • Implementation to allow updates of user_data.
  • Implementation to allow adding new servers to the remote servers list.
  • Blackbox tests that checks both functionalities
  • Corresponding unit test when possible

JLBuenoLopez and others added 5 commits August 12, 2021 09:49
* Refs 12196: add empty api

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: apply review suggestions

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
)

* Refs #12196: link dds and rtps layers

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: modify and announce change in user data QoS

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: update remote servers list

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: add update_attributes method to RTPSParticipant mock class

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: protect remote servers list with PDP mutex

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: fix ParticipantTests.CheckDomainParticipantQos test. The first time the QoS was set it was calling to the update_attributes method

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs 12196: apply review suggestions

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: uncrustify

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: reset hasChanged flag

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: refactor to check if Qos has changed both in DDS and RTPS layers

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: apply review suggestions

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: fix ParticipantTests

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: bug fix

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
* Refs 12197: Check that the only modification in wire_protocol is the list of servers

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12196: Unit test for changing WireProtocolQosPolicy

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12196: Apply suggestions

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12196: Uncrustify

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
* Refs #12196: modify Blackbox PubSubParticipant API to include UserDataQosPolicy

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: add discovery participant API to PubSubParticipant

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: add blackbox test that checks user data QoS update

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: uncrustify

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: fix deadlock in Blackbox test

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: apply review suggestions

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
* Refs 12278: Only add new servers

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Update Discovery Server with new servers

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Check that old server list is a subset of the new one when using DDS layer

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Test now checks that servers cannot be removed from list

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Manually match new server' PDP endpoints

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Discovery test for adding servers

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Randomize test parameters

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Uncrustify

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Address Windows warning

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Apply suggestions

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Use nullptr and add headers

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Add SystemInfo source to CMake

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
@EduPonz EduPonz linked an issue Aug 12, 2021 that may be closed by this pull request
@EduPonz EduPonz added this to the v2.4.0 milestone Aug 12, 2021
@EduPonz
Copy link

EduPonz commented Aug 12, 2021

@richiprosima please test mac

@EduPonz
Copy link

EduPonz commented Aug 12, 2021

@richiprosima please test windows

@EduPonz EduPonz merged commit f96903c into master Aug 12, 2021
@EduPonz EduPonz deleted the feature/rtps-participant-qos-updates branch August 12, 2021 12:05
SamuelWHalodi pushed a commit to SamuelWHalodi/Fast-DDS that referenced this pull request Oct 4, 2021
…ew servers to the remote server list (eProsima#2142)

* Add empty api (eProsima#2111)

* Refs 12196: add empty api

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: apply review suggestions

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* DomainParticipantQos propagation to the RTPS layer implementation (eProsima#2113)

* Refs #12196: link dds and rtps layers

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: modify and announce change in user data QoS

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: update remote servers list

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: add update_attributes method to RTPSParticipant mock class

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: protect remote servers list with PDP mutex

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: fix ParticipantTests.CheckDomainParticipantQos test. The first time the QoS was set it was calling to the update_attributes method

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs 12196: apply review suggestions

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: uncrustify

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: reset hasChanged flag

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: refactor to check if Qos has changed both in DDS and RTPS layers

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: apply review suggestions

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: fix ParticipantTests

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: bug fix

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* WireProtocolConfigQos update through DomainParticipant::set_qos (eProsima#2131)

* Refs 12197: Check that the only modification in wire_protocol is the list of servers

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12196: Unit test for changing WireProtocolQosPolicy

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12196: Apply suggestions

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12196: Uncrustify

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Add UserDataQoS blackbox test (eProsima#2130)

* Refs #12196: modify Blackbox PubSubParticipant API to include UserDataQosPolicy

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: add discovery participant API to PubSubParticipant

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: add blackbox test that checks user data QoS update

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: uncrustify

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: fix deadlock in Blackbox test

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12196: apply review suggestions

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Propagate servers list updates to PDPServer and PDPClient (eProsima#2138)

* Refs 12278: Only add new servers

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Update Discovery Server with new servers

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Check that old server list is a subset of the new one when using DDS layer

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Test now checks that servers cannot be removed from list

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Manually match new server' PDP endpoints

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Discovery test for adding servers

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Randomize test parameters

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Uncrustify

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Address Windows warning

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Apply suggestions

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Use nullptr and add headers

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs 12278: Add SystemInfo source to CMake

Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
Signed-off-by: Samuel Wilhelmsson <samuel@halodi.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't change user_data in DATA(p) [12147]
2 participants