[21136] Add XML configuration for FlowControllerDescriptor to 2.x #4893

Mario-DL · 2024-06-05T07:37:02Z

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

Commit messages follow the project guidelines.
The code follows the style guidelines of this project.
Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
Any new/modified methods have been properly documented using Doxygen.
Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
[ X Changes are backport compatible: they do NOT break ABI nor change library core behavior.
Changes are API compatible.
New feature has been added to the versions.md file (if applicable).
New feature has been documented/Current behavior is correctly described in the documentation.
- Related documentation PR: [21136] Add XML configuration for FlowControllerDescriptor to 2.x Fast-DDS-docs#793
Applicable backports have been included in the description.

Reviewer Checklist

The PR has a milestone assigned.
The title and description correctly express the PR's purpose.
Check contributor checklist is correct.
Check CI results: changes do not issue any warning.
Check CI results: failing tests are unrelated with the changes.

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

… source files Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

test/unittest/dds/profiles/test_xml_profile.xml

test/unittest/xmlparser/wrapper/XMLParserTest.hpp

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

JesusPoderoso

LGTM with green CI

JesusPoderoso · 2024-06-06T10:41:03Z

@richiprosima please test this

EduPonz · 2024-06-06T10:48:41Z

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

mergify · 2024-06-06T10:48:56Z

backport 2.13.x 2.10.x 2.6.x

✅ Backports have been created

#4905 [21136] Add XML configuration for FlowControllerDescriptor to 2.x (backport #4893) has been created for branch 2.13.x but encountered conflicts
#4906 [21136] Add XML configuration for FlowControllerDescriptor to 2.x (backport #4893) has been created for branch 2.10.x but encountered conflicts
#4907 [21136] Add XML configuration for FlowControllerDescriptor to 2.x (backport #4893) has been created for branch 2.6.x but encountered conflicts

* Refs #21136: Replace const char* with string Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Update fastRTPS_profiles.xsd Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Implement flow controller descriptor list in XML related source files Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Update tests Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: versions.md Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Apply rev Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit e6044e0) # Conflicts: # test/unittest/xmlparser/XMLProfileParserTests.cpp # versions.md

* Refs #21136: Replace const char* with string Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Update fastRTPS_profiles.xsd Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Implement flow controller descriptor list in XML related source files Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Update tests Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: versions.md Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Apply rev Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit e6044e0) # Conflicts: # include/fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp # resources/xsd/fastRTPS_profiles.xsd # test/unittest/dds/profiles/test_xml_for_string_profile.xml # test/unittest/dds/profiles/test_xml_profile.xml # test/unittest/xmlparser/XMLProfileParserTests.cpp # test/unittest/xmlparser/test_xml_profile.xml # test/unittest/xmlparser/test_xml_profile_env_var.xml # versions.md

* Refs #21136: Replace const char* with string Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Update fastRTPS_profiles.xsd Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Implement flow controller descriptor list in XML related source files Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Update tests Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: versions.md Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Apply rev Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit e6044e0) # Conflicts: # include/fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp # resources/xsd/fastRTPS_profiles.xsd # test/unittest/dds/profiles/test_xml_profiles.xml # test/unittest/dds/profiles/test_xml_profiles_for_string.xml # test/unittest/xmlparser/XMLParserTests.cpp # test/unittest/xmlparser/XMLProfileParserTests.cpp # test/unittest/xmlparser/test_xml_profile.xml # test/unittest/xmlparser/test_xml_profile_env_var.xml # versions.md

* Refs #21136: Replace const char* with string Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Update fastRTPS_profiles.xsd Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Implement flow controller descriptor list in XML related source files Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Update tests Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: versions.md Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Apply rev Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit e6044e0) # Conflicts: # test/unittest/xmlparser/XMLProfileParserTests.cpp # versions.md

) * Add XML configuration for FlowControllerDescriptor to 2.x (#4893) * Refs #21136: Replace const char* with string Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Update fastRTPS_profiles.xsd Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Implement flow controller descriptor list in XML related source files Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Update tests Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: versions.md Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Apply rev Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit e6044e0) # Conflicts: # include/fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp # resources/xsd/fastRTPS_profiles.xsd # test/unittest/dds/profiles/test_xml_profiles.xml # test/unittest/dds/profiles/test_xml_profiles_for_string.xml # test/unittest/xmlparser/XMLParserTests.cpp # test/unittest/xmlparser/XMLProfileParserTests.cpp # test/unittest/xmlparser/test_xml_profile.xml # test/unittest/xmlparser/test_xml_profile_env_var.xml # versions.md * Bugfix: Revert XML Flow controller names to `const char*` (#4911) * Refs #21054: Revert to const char* for flow controller names Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21054: Handle flow controller names in a XMLParser collection Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21054: Apply Miguel suggestion Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21054: Apply second suggestion Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21244: Solve conflicts and remove threadsettings from flow_controller_descriptor Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com> Co-authored-by: Mario Dominguez <mariodominguez@eprosima.com>

) * Add XML configuration for FlowControllerDescriptor to 2.x (#4893) * Refs #21136: Replace const char* with string Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Update fastRTPS_profiles.xsd Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Implement flow controller descriptor list in XML related source files Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Update tests Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: versions.md Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Apply rev Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit e6044e0) # Conflicts: # test/unittest/xmlparser/XMLProfileParserTests.cpp # versions.md * Bugfix: Revert XML Flow controller names to `const char*` (#4911) * Refs #21054: Revert to const char* for flow controller names Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21054: Handle flow controller names in a XMLParser collection Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21054: Apply Miguel suggestion Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21054: Apply second suggestion Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21310: Fix building Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com> Co-authored-by: Mario Dominguez <mariodominguez@eprosima.com>

) * Add XML configuration for FlowControllerDescriptor to 2.x (#4893) * Refs #21136: Replace const char* with string Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Update fastRTPS_profiles.xsd Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Implement flow controller descriptor list in XML related source files Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Update tests Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: versions.md Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Apply rev Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit e6044e0) * Bugfix: Revert XML Flow controller names to `const char*` (#4911) * Refs #21054: Revert to const char* for flow controller names Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21054: Handle flow controller names in a XMLParser collection Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21054: Apply Miguel suggestion Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21054: Apply second suggestion Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21244: Solve conflicts and remove threadsettings from flow_controller_descriptor Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com> Co-authored-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #21136: Replace const char* with string Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Update fastRTPS_profiles.xsd Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Implement flow controller descriptor list in XML related source files Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Update tests Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: versions.md Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Apply rev Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

) * Add XML configuration for FlowControllerDescriptor to 2.x (#4893) * Refs #21136: Replace const char* with string Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Update fastRTPS_profiles.xsd Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Implement flow controller descriptor list in XML related source files Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Update tests Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: versions.md Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21136: Apply rev Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Bugfix: Revert XML Flow controller names to `const char*` (#4911) * Refs #21054: Revert to const char* for flow controller names Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21054: Handle flow controller names in a XMLParser collection Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21054: Apply Miguel suggestion Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #21054: Apply second suggestion Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Fix build after rebase. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Fix XSD schema. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Fix XML files. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Fix unit tests Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Fix xsd. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com>

Mario-DL added 5 commits June 5, 2024 09:29

Refs #21136: Replace const char* with string

fa5055a

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Refs #21136: Update fastRTPS_profiles.xsd

56d54bf

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Refs #21136: Implement flow controller descriptor list in XML related…

5d5dd6d

… source files Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Refs #21136: Update tests

6b4d2aa

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Refs #21136: versions.md

eef71bf

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL added the doc-pending Issue or PR which is pending to be documented label Jun 5, 2024

Mario-DL added this to the v2.14.2 milestone Jun 5, 2024

Refs #21136: Linter

b047d1d

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL removed the doc-pending Issue or PR which is pending to be documented label Jun 5, 2024

Mario-DL requested a review from richiprosima June 5, 2024 07:49

github-actions bot added ci-pending PR which CI is running labels Jun 5, 2024

JesusPoderoso requested changes Jun 5, 2024

View reviewed changes

test/unittest/dds/profiles/test_xml_profile.xml Outdated Show resolved Hide resolved

test/unittest/xmlparser/wrapper/XMLParserTest.hpp Outdated Show resolved Hide resolved

test/unittest/xmlparser/wrapper/XMLParserTest.hpp Outdated Show resolved Hide resolved

Refs #21136: Apply rev

9bdba10

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

JesusPoderoso requested review from JesusPoderoso and removed request for richiprosima June 5, 2024 08:43

JesusPoderoso approved these changes Jun 5, 2024

View reviewed changes

EduPonz added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Jun 6, 2024

EduPonz merged commit e6044e0 into 2.14.x Jun 6, 2024
12 of 15 checks passed

EduPonz deleted the feature/2.x/21054 branch June 6, 2024 10:48

mergify bot mentioned this pull request Jun 6, 2024

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

Merged

14 tasks

mergify bot mentioned this pull request Jun 6, 2024

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

Merged

14 tasks

mergify bot mentioned this pull request Jun 6, 2024

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

Merged

14 tasks

Mario-DL mentioned this pull request Jun 7, 2024

[21136] Bugfix: Revert XML Flow controller names to const char* #4911

Merged

12 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[21136] Add XML configuration for FlowControllerDescriptor to 2.x #4893

[21136] Add XML configuration for FlowControllerDescriptor to 2.x #4893

Mario-DL commented Jun 5, 2024 •

edited by EduPonz

Loading

JesusPoderoso left a comment

JesusPoderoso commented Jun 6, 2024

EduPonz commented Jun 6, 2024

mergify bot commented Jun 6, 2024 •

edited

Loading

[21136] Add XML configuration for FlowControllerDescriptor to 2.x #4893

[21136] Add XML configuration for FlowControllerDescriptor to 2.x #4893

Conversation

Mario-DL commented Jun 5, 2024 • edited by EduPonz Loading

Description

Contributor Checklist

Reviewer Checklist

JesusPoderoso left a comment

Choose a reason for hiding this comment

JesusPoderoso commented Jun 6, 2024

EduPonz commented Jun 6, 2024

mergify bot commented Jun 6, 2024 • edited Loading

✅ Backports have been created

Mario-DL commented Jun 5, 2024 •

edited by EduPonz

Loading

mergify bot commented Jun 6, 2024 •

edited

Loading