eProsima / Fast-DDS

The most complete DDS - Proven: Plenty of success cases. Looking for commercial support? Contact info@eprosima.com
https://eprosima.com
Apache License 2.0
2.16k stars 765 forks source link

[21136] Add XML configuration for FlowControllerDescriptor to 2.x (backport #4893) #4905

Closed mergify[bot] closed 2 months ago

mergify[bot] commented 4 months ago

Description

This PR is a partial backport from #4837 that brings the XML configuration of the FLow Controller Descriptor List. In 2.x both ThroughtputController and FlowcontrollerDescriptor coexist.

@Mergifyio backport 2.13.x 2.10.x 2.6.x

Contributor Checklist

Reviewer Checklist

mergify[bot] commented 4 months ago

Cherry-pick of e6044e01172525295733737e574e69f74ff507ca has failed:

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

You are currently cherry-picking commit e6044e011.
  (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:
    modified:   include/fastdds/dds/core/policy/QosPolicies.hpp
    modified:   include/fastdds/rtps/attributes/WriterAttributes.h
    modified:   include/fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp
    modified:   include/fastrtps/xmlparser/XMLParser.h
    modified:   include/fastrtps/xmlparser/XMLParserCommon.h
    modified:   resources/xsd/fastRTPS_profiles.xsd
    modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp
    modified:   src/cpp/rtps/xmlparser/XMLElementParser.cpp
    modified:   src/cpp/rtps/xmlparser/XMLParser.cpp
    modified:   src/cpp/rtps/xmlparser/XMLParserCommon.cpp
    modified:   test/unittest/dds/profiles/test_xml_for_string_profile.xml
    modified:   test/unittest/dds/profiles/test_xml_profile.xml
    modified:   test/unittest/dds/publisher/PublisherTests.cpp
    modified:   test/unittest/xmlparser/XMLElementParserTests.cpp
    modified:   test/unittest/xmlparser/XMLParserTests.cpp
    modified:   test/unittest/xmlparser/test_xml_deprecated.xml
    modified:   test/unittest/xmlparser/test_xml_profile.xml
    modified:   test/unittest/xmlparser/test_xml_profile_env_var.xml
    modified:   test/unittest/xmlparser/test_xml_rooted_deprecated.xml
    modified:   test/unittest/xmlparser/wrapper/XMLParserTest.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   test/unittest/xmlparser/XMLProfileParserTests.cpp
    both modified:   versions.md

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

JesusPoderoso commented 4 months ago

Docs associated PR:

JesusPoderoso commented 3 months ago

@richiprosima please test this

JesusPoderoso commented 2 months ago

CI issues unrelated to the PR. Labeling as ready to merge!