Skip to content

[20086] Methods to configure transport scenarios (backport #4098) #4171

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

Merged
merged 9 commits into from
Jan 30, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 19, 2023

This is an automatic backport of pull request #4098 done by Mergify.
Cherry-pick of 8cbd461 has failed:

On branch mergify/bp/2.12.x/pr-4098
Your branch is up to date with 'origin/2.12.x'.

You are currently cherry-picking commit 8cbd46144.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   include/fastdds/rtps/attributes/BuiltinTransports.hpp
	modified:   include/fastrtps/xmlparser/XMLParserCommon.h
	modified:   src/cpp/CMakeLists.txt
	modified:   src/cpp/fastdds/domain/qos/DomainParticipantQos.cpp
	new file:   src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp
	modified:   src/cpp/rtps/xmlparser/XMLParser.cpp
	modified:   src/cpp/rtps/xmlparser/XMLParserCommon.cpp
	new file:   src/cpp/utils/string_utilities.hpp
	modified:   test/blackbox/CMakeLists.txt
	modified:   test/blackbox/api/dds-pim/PubSubReader.hpp
	modified:   test/blackbox/api/dds-pim/PubSubWriter.hpp
	modified:   test/blackbox/api/fastrtps_deprecated/PubSubReader.hpp
	modified:   test/blackbox/api/fastrtps_deprecated/PubSubWriter.hpp
	new file:   test/blackbox/builtin_transports_profile.xml
	modified:   test/blackbox/common/BlackboxTestsTransportCustom.cpp
	new file:   test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h
	modified:   test/unittest/dds/participant/CMakeLists.txt
	modified:   test/unittest/dds/participant/ParticipantTests.cpp
	modified:   test/unittest/dds/publisher/CMakeLists.txt
	modified:   test/unittest/dds/status/CMakeLists.txt
	modified:   test/unittest/xmlparser/XMLElementParserTests.cpp
	modified:   test/unittest/xmlparser/wrapper/XMLParserTest.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   include/fastdds/dds/domain/qos/DomainParticipantQos.hpp
	both modified:   include/fastdds/rtps/attributes/RTPSParticipantAttributes.h
	both modified:   include/fastrtps/xmlparser/XMLParser.h
	both modified:   resources/xsd/fastRTPS_profiles.xsd
	both modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp
	both modified:   src/cpp/rtps/xmlparser/XMLElementParser.cpp
	both modified:   test/unittest/dynamic_types/CMakeLists.txt
	both modified:   test/unittest/statistics/dds/CMakeLists.txt
	both modified:   test/unittest/xmlparser/CMakeLists.txt
	both modified:   versions.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Refs #20020. Added enumeration for possible builtin transports configuration.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Add method to parse environment variable.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Cleanup RTPSParticipantAttributes.h.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Moved default transports configuration into RTPSParticipantAttributes::setup_transports.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. RTPSParticipantImpl constructor uses private copy of attributes.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Added support for DEFAULTv6.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. SHM transport added before UDP.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Added support for SHM.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Added support for UDPv4.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Added support for UDPv6.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Factor out duplicated code.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Added support for LARGE_DATA.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Added support for LARGE_DATAv6.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Added DomainParticipantQos::setup_transports.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020: Add constants for builtin transports

Signed-off-by: cferreiragonz <[email protected]>

* Refs #20020: Add XML parser functions for builtin_transports

Signed-off-by: cferreiragonz <[email protected]>

* Refs #20020: add builtinTransports to .xsd

Signed-off-by: cferreiragonz <[email protected]>

* Refs #20020: add mock tests needed

Signed-off-by: cferreiragonz <[email protected]>

* Refs #20020: Add builtin transports XML file

Signed-off-by: cferreiragonz <[email protected]>

* Refs #20020: Add new API to tests classes

Signed-off-by: cferreiragonz <[email protected]>

* Refs #20020: Add Blackbox tests

Signed-off-by: cferreiragonz <[email protected]>

* Refs 20020: Rename XML file and EOF

Signed-off-by: cferreiragonz <[email protected]>

* Refs #20020: Add unittest test

Signed-off-by: elianalf <[email protected]>

* Refs #20020: Update versions.md

Signed-off-by: cferreiragonz <[email protected]>

* Refs #20020: Make enum uint16_t

Signed-off-by: cferreiragonz <[email protected]>

* Refs #20020: Add Parsing test

Signed-off-by: cferreiragonz <[email protected]>

* Refs #20020: Apply minor changes

Signed-off-by: cferreiragonz <[email protected]>

* Refs #20020: Remove - in CMakeLists

Signed-off-by: cferreiragonz <[email protected]>

* Refs #20020: Uncrustify

Signed-off-by: cferreiragonz <[email protected]>

* Refs #20020: Fix .xsd and remove unnecesary mock test

Signed-off-by: cferreiragonz <[email protected]>

* Refs #20020: Add implementation for mock test

Signed-off-by: cferreiragonz <[email protected]>

* Refs #20020: Fix windows build

Signed-off-by: cferreiragonz <[email protected]>

* Refs #20020: Uncrustify

Signed-off-by: cferreiragonz <[email protected]>

* Disable v6 tests for Mac

Signed-off-by: cferreiragonz <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
Signed-off-by: elianalf <[email protected]>
Co-authored-by: cferreiragonz <[email protected]>
Co-authored-by: elianalf <[email protected]>
(cherry picked from commit 8cbd461)

# Conflicts:
#	include/fastdds/dds/domain/qos/DomainParticipantQos.hpp
#	include/fastdds/rtps/attributes/RTPSParticipantAttributes.h
#	include/fastrtps/xmlparser/XMLParser.h
#	resources/xsd/fastRTPS_profiles.xsd
#	src/cpp/rtps/participant/RTPSParticipantImpl.cpp
#	src/cpp/rtps/xmlparser/XMLElementParser.cpp
#	test/unittest/dynamic_types/CMakeLists.txt
#	test/unittest/statistics/dds/CMakeLists.txt
#	test/unittest/xmlparser/CMakeLists.txt
#	versions.md
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Dec 19, 2023
@elianalf elianalf added this to the v2.12.2 milestone Dec 19, 2023
elianalf and others added 4 commits December 20, 2023 11:18
Signed-off-by: elianalf <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
@elianalf elianalf removed the conflicts Backport PR wich git cherry pick failed label Dec 21, 2023
Signed-off-by: elianalf <[email protected]>
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@cferreiragonz
Copy link
Contributor

The changes of #4181 corresponding to builtin transports have been cherry-picked to this PR and deleted from #4192

Co-authored-by: Eduardo Ponz Segrelles <[email protected]>
@cferreiragonz cferreiragonz force-pushed the mergify/bp/2.12.x/pr-4098 branch from 4acd173 to f940e24 Compare January 11, 2024 11:16
@EduPonz
Copy link

EduPonz commented Jan 12, 2024

@richiprosima please test linux test mac test windows

@Mario-DL
Copy link
Member

Mario-DL commented Jan 16, 2024

I ordered a manual Sanitizer analysis here since it seems to consistently complain in these backports despite test errors seems unrelated

@MiguelCompany MiguelCompany merged commit e09870f into 2.12.x Jan 30, 2024
@MiguelCompany MiguelCompany deleted the mergify/bp/2.12.x/pr-4098 branch January 30, 2024 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants